erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

Added toDialPad extension function.

Browse source
This commit is contained in:
Erik C. Thauvin 2019-09-26 15:13:11 -07:00
parent c34f5d393c
commit 81972c3e2c
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/ProgrammingActivity.kt
View file

@ -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.isDKS
import net.thauvin.erik.android.tesremoteprogrammer.util.isLinear import net.thauvin.erik.android.tesremoteprogrammer.util.isLinear
import net.thauvin.erik.android.tesremoteprogrammer.widget.ScrollAwareFABBehavior 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.AnkoLogger
import org.jetbrains.anko.bottomPadding import org.jetbrains.anko.bottomPadding
import org.jetbrains.anko.custom.ankoView import org.jetbrains.anko.custom.ankoView
@ -217,15 +218,24 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger {
} }
startActivity<StepsActivity>( 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 { } else {
Snackbar.make(this@coordinatorLayout, Snackbar.make(
this@coordinatorLayout,
getString(R.string.error_invalid_dtmf, dtmf), getString(R.string.error_invalid_dtmf, dtmf),
Snackbar.LENGTH_LONG).show() Snackbar.LENGTH_LONG
).show()
} }
} else { } else {
Snackbar.make(this@coordinatorLayout, R.string.error_invalid_field, Snackbar.make(
Snackbar.LENGTH_LONG).show() this@coordinatorLayout, R.string.error_invalid_field,
Snackbar.LENGTH_LONG
).show()
} }
} }
} }

12
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt
View file

@ -1,7 +1,7 @@
/* /*
* Strings.kt * 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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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() return result.toString()
} }
fun String.toDialPad() = this.replaceAll(
arrayOf(
Pair("*", "✱"),
Pair("#", "＃")
)
)