From ee41200258da91a4c722fed4f4f408ed55f67a2f Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Tue, 22 Aug 2017 21:36:20 -0700
Subject: [PATCH] Optimization.

---
 .../erik/android/tesremoteprogrammer/StepsActivity.kt     | 8 ++------
 .../erik/android/tesremoteprogrammer/StepsFragment.kt     | 5 ++---
 .../android/tesremoteprogrammer/filters/AlphaFilter.kt    | 2 +-
 .../android/tesremoteprogrammer/filters/MinMaxFilter.kt   | 4 ++--
 .../android/tesremoteprogrammer/filters/NumberFilter.kt   | 2 +-
 .../erik/android/tesremoteprogrammer/models/Config.kt     | 4 +---
 .../erik/android/tesremoteprogrammer/models/Option.kt     | 4 +---
 .../thauvin/erik/android/tesremoteprogrammer/util/Dtmf.kt | 7 ++-----
 .../erik/android/tesremoteprogrammer/util/Strings.kt      | 8 ++------
 9 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsActivity.kt
index 33d2425..fa95265 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsActivity.kt
@@ -43,12 +43,8 @@ class StepsActivity : FragmentActivity() {
                                      steps: ArrayList<String>) : FragmentStatePagerAdapter(fm) {
         private val steps = ArrayList<String>(steps)
 
-        override fun getItem(position: Int): Fragment {
-            return StepsFragment.create(position, steps)
-        }
+        override fun getItem(position: Int): Fragment = StepsFragment.create(position, steps)
 
-        override fun getCount(): Int {
-            return steps.size
-        }
+        override fun getCount(): Int = steps.size
     }
 }
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsFragment.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsFragment.kt
index a06ecd2..010ec55 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsFragment.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/StepsFragment.kt
@@ -52,9 +52,8 @@ class StepsFragment : Fragment() {
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_steps, container, false) as ViewGroup
-    }
+                              savedInstanceState: Bundle?): View? =
+            inflater.inflate(R.layout.fragment_steps, container, false) as ViewGroup
 
     override fun onViewCreated(view: View?, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/AlphaFilter.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/AlphaFilter.kt
index 99c305e..69a8307 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/AlphaFilter.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/AlphaFilter.kt
@@ -39,7 +39,7 @@ class AlphaFilter(private val extras: String) : InputFilter {
             return source
         } else {
             val sb = StringBuilder()
-            (start..end - 1)
+            (start until end)
                     .map { source[it] }
                     .filter { it.isLetterOrDigit() || extras.contains(it) }
                     .forEach { sb.append(it) }
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 4ad3adb..fda012c 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
@@ -39,10 +39,10 @@ class MinMaxFilter(private val min: Int, private val max: Int, private val size:
 
             if (zeros) {
                 if (size > 1 && len != size) {
-                    if (i == 0) {
+                    i = if (i == 0) {
                         return true
                     } else {
-                        i = s.padEnd(size, '0').toInt()
+                        s.padEnd(size, '0').toInt()
                     }
                 }
             } else {
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/NumberFilter.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/NumberFilter.kt
index 7e8672b..b8af76a 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/NumberFilter.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/NumberFilter.kt
@@ -44,7 +44,7 @@ class NumberFilter(allowed: String, alt: String) : InputFilter, AnkoLogger {
             return source
         } else {
             val sb = StringBuilder()
-            (start..end - 1)
+            (start until end)
                     .map { source[it] }
                     .filter { allowed.contains(it) }
                     .forEach { sb.append(it.toUpperCase()) }
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt
index bc7abb5..6f84cc0 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Config.kt
@@ -37,9 +37,7 @@ data class Config(var params: Params, var opts: List<Option>) : Parcelable, Seri
             source.readParcelable<Params>(Params::class.java.classLoader),
             source.createTypedArrayList(Option.CREATOR))
 
-    override fun compareTo(other: Config): Int {
-        return params.name.compareTo(other.params.name)
-    }
+    override fun compareTo(other: Config): Int = params.name.compareTo(other.params.name)
 
     override fun describeContents() = 0
 
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
index d45d60f..0e60467 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
@@ -45,9 +45,7 @@ data class Option(var title: String,
             1 == source.readInt(),
             source.readString())
 
-    override fun compareTo(other: Option): Int {
-        return title.compareTo(other.title)
-    }
+    override fun compareTo(other: Option): Int = title.compareTo(other.title)
 
     override fun describeContents() = 0
 
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Dtmf.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Dtmf.kt
index 0704d05..ae667ce 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Dtmf.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Dtmf.kt
@@ -87,9 +87,7 @@ class Dtmf {
             return result.toString()
         }
 
-        fun isValidType(type: String): Boolean {
-            return type.equals(DKS, true) || type.equals(LINEAR, true)
-        }
+        fun isValidType(type: String): Boolean = type.equals(DKS, true) || type.equals(LINEAR, true)
 
 
         private fun linearAlphaToDigits(text: String): String {
@@ -189,8 +187,7 @@ class Dtmf {
         fun mock(option: Option, blank: String): String {
             val replace = arrayListOf(Pair(DTMF_MASTER, blank))
 
-            @Suppress("UNUSED_PARAMETER")
-            option.fields.forEachIndexed { i, field ->
+            option.fields.forEachIndexed { i, _ ->
                 replace.add(Pair(DTMF_FIELD.format(i + 1), blank))
             }
 
diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
index 446ab45..23d0606 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
@@ -31,13 +31,9 @@ fun String.isDigits(): Boolean {
     return true
 }
 
-fun String.isDKS(): Boolean {
-    return equals(Dtmf.DKS, true)
-}
+fun String.isDKS(): Boolean = equals(Dtmf.DKS, true)
 
-fun String.isLinear(): Boolean {
-    return equals(Dtmf.LINEAR, true)
-}
+fun String.isLinear(): Boolean = equals(Dtmf.LINEAR, true)
 
 fun String.replaceAll(replace: Array<Pair<String, String>>): String {
     val result = StringBuilder(this)