From 81972c3e2c6202760660a76cb52e53d1bceb7e9e Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Thu, 26 Sep 2019 15:13:11 -0700
Subject: [PATCH] Added toDialPad extension function.

---
 .../ProgrammingActivity.kt                    | 20 ++++++++++++++-----
 .../tesremoteprogrammer/util/Strings.kt       | 12 ++++++++---
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
index 248b94e..0065e7d 100644
--- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
+++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
@@ -49,6 +49,7 @@ import net.thauvin.erik.android.tesremoteprogrammer.util.Dtmf
 import net.thauvin.erik.android.tesremoteprogrammer.util.isDKS
 import net.thauvin.erik.android.tesremoteprogrammer.util.isLinear
 import net.thauvin.erik.android.tesremoteprogrammer.widget.ScrollAwareFABBehavior
+import net.thauvin.erik.android.tesremoteprogrammer.util.toDialPad
 import org.jetbrains.anko.AnkoLogger
 import org.jetbrains.anko.bottomPadding
 import org.jetbrains.anko.custom.ankoView
@@ -217,15 +218,24 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
                             }
 
                             startActivity<StepsActivity>(
-                                StepsActivity.EXTRA_STEPS to "$begin${dtmf.replace(MainActivity.QUOTE, empty)}$end".split(MainActivity.PAUSE))
+                                StepsActivity.EXTRA_STEPS to "$begin${
+                                dtmf.replace(
+                                    MainActivity.QUOTE,
+                                    empty
+                                )}$end".toDialPad().split(MainActivity.PAUSE)
+                            )
                         } else {
-                            Snackbar.make(this@coordinatorLayout,
+                            Snackbar.make(
+                                this@coordinatorLayout,
                                 getString(R.string.error_invalid_dtmf, dtmf),
-                                Snackbar.LENGTH_LONG).show()
+                                Snackbar.LENGTH_LONG
+                            ).show()
                         }
                     } else {
-                        Snackbar.make(this@coordinatorLayout, R.string.error_invalid_field,
-                            Snackbar.LENGTH_LONG).show()
+                        Snackbar.make(
+                            this@coordinatorLayout, R.string.error_invalid_field,
+                            Snackbar.LENGTH_LONG
+                        ).show()
                     }
                 }
             }
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 8ff2e20..52a16f0 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
@@ -1,7 +1,7 @@
 /*
  * Strings.kt
  *
- * Copyright 2016-2018 Erik C. Thauvin (erik@thauvin.net)
+ * Copyright 2016-2019 Erik C. Thauvin (erik@thauvin.net)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,6 +51,12 @@ fun String.replaceAll(replace: Array<Pair<String, String>>): String {
             }
         }
     }
-
     return result.toString()
-}
\ No newline at end of file
+}
+
+fun String.toDialPad() = this.replaceAll(
+    arrayOf(
+        Pair("*", "✱"),
+        Pair("#", "＃")
+    )
+)