From 161c5ff6434b466a6c590834db92dcae2ba4e289 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 28 Jul 2020 03:17:41 -0700
Subject: [PATCH] Cleanup filters.

---
 .../erik/android/tesremoteprogrammer/MainActivity.kt   |  5 +++--
 .../tesremoteprogrammer/filters/MinMaxFilter.kt        | 10 ++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
index 7630a2d..777db02 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
@@ -128,7 +128,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
 
         val tmp: Config? = try {
             Gson().fromJson(
-                InputStreamReader(contentResolver.openInputStream(intent.data!!)),
+                InputStreamReader(contentResolver.openInputStream(intent.data!!)!!),
                 Config::class.java
             )
         } catch (jse: JsonSyntaxException) {
@@ -260,6 +260,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
                 // programming title
                 textView {
                     topPadding = dip(10)
+                    bottomPadding = dip(10)
                     text = getString(R.string.programming_heading)
                     setTextSize(TypedValue.COMPLEX_UNIT_DIP, 18f)
                     typeface = Typeface.DEFAULT_BOLD
@@ -338,7 +339,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
                 alert.show()
             }
         }
-        return super.onOptionsItemSelected(item)
+        return super.onOptionsItemSelected(item!!)
     }
 
     @SuppressLint("NeedOnRequestPermissionsResult")
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/MinMaxFilter.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/MinMaxFilter.kt
index 6d9c4ff..ed60b5f 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/MinMaxFilter.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/MinMaxFilter.kt
@@ -51,16 +51,14 @@ class MinMaxFilter(
 
             if (zeros) {
                 if (size > 1 && len != size) {
-                    i = if (i == 0) {
+                    if (i == 0) {
                         return true
                     } else {
-                        s.padEnd(size, '0').toInt()
+                        i = s.padEnd(size, '0').toInt()
                     }
                 }
-            } else {
-                if (len > 1 && s.startsWith("0")) {
-                    return false
-                }
+            } else if (len > 1 && s.startsWith("0")) {
+                return false
             }
 
             return i in IntRange(min, max)