Added 3 and 5 band resistor support.

ktprograms · Mar 13, 2021 · 762d205 · 762d205
1 parent 38ed14b
commit 762d205
Show file tree

Hide file tree

Showing 17 changed files with 786 additions and 184 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelogs
 
+### V 0.1.3 Beta
+- Added 3 and 5 band resistor support.
+
+>MD5: 82799120c8260f062fda1adffa37ee2a
+>
+>SHA1: 505f0d296f9ff5eef9efee23fc2769c18d295774
+
+
 ### V 0.1.2 Beta
 - Added ability to swipe left/right to go to the previous/next E12/E24 value.
 

diff --git a/README.md b/README.md
@@ -12,7 +12,10 @@ Once you have set all the bands to match your resistor's colours, you can then r
 
 By long pressing on a band, there will be a popup menu for you to choose the band's colour.
 
-You can swipe left/right to go to the previous/next E12/E24 value.
+You can swipe left/right to go to the previous/next E series value.
+
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.png" width="214" height="419" />
+<img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5.png" width="214" height="419" />
 <hr />
 
 ## Download

diff --git a/app/build.gradle b/app/build.gradle
@@ -33,8 +33,8 @@ android {
         applicationId "com.ktprograms.ohmsnow"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 3
-        versionName "v0.1.2-beta"
+        versionCode 4
+        versionName "v0.1.3-beta"
 
         vectorDrawables.useSupportLibrary true
     }

diff --git a/app/src/main/java/com/ktprograms/ohmsnow/Colors.kt b/app/src/main/java/com/ktprograms/ohmsnow/Colors.kt
@@ -22,10 +22,6 @@
 
 package com.ktprograms.ohmsnow
 
-data class Band(var value: BandColors)
-
-data class MultiplierBand(var value: MultiplierBandColors)
-
 enum class BandColors(val argb: Int) {
     BLACK(0xFF000000.toInt()),
     BROWN(0xFF964B00.toInt()),
@@ -56,11 +52,17 @@ enum class MultiplierBandColors(val argb: Int) {
 }
 
 enum class ToleranceBandColors(val argb: Int) {
+    NONE(0xFFFAD6A5.toInt()),
     SILVER(0xFFC0C0C0.toInt()),
     GOLD(0xFFD4AF37.toInt()),
     BROWN(0xFF964B00.toInt()),
+    RED(0xFFFF0000.toInt()),
+    ORANGE(0xFFFF7F50.toInt()),
+    YELLOW(0xFFFFFF00.toInt()),
     GREEN(0xFF32CD32.toInt()),
-    VIOLET(0xFF9400D3.toInt())
+    BLUE(0xFF0000FF.toInt()),
+    VIOLET(0xFF9400D3.toInt()),
+    GREY(0xFF808080.toInt()),
 }
 
 enum class BodyColors(val argb: Int) {