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

Kotlin 1.6 optimization.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-02-09 17:08:14 -08:00
parent 1baeb4902c
commit 16a219be2f
11 changed files with 49 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt
View file

@ -138,7 +138,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
recreate()
}
if (errors.length > 0) {
if (errors.isNotEmpty()) {
alert {
title(R.string.alert_config_error)
message(fromHtml("$errors"))
@ -392,7 +392,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
}
// options
if (opts.size == 0) {
if (opts.isEmpty()) {
errors.append(getString(R.string.validate_missing_opts))
} else {
opts.forEachIndexed { i, option ->
@ -424,7 +424,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
R.string.validate_missing_opts_prop,
i + 1,
"dtmf"))
} else if (fields.size == 0) { // fields missing
} else if (fields.isEmpty()) { // fields missing
errors.append(getString(
R.string.validate_missing_opts_prop,
i + 1,

18
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/AlphaFilter.kt
View file

@ -21,13 +21,7 @@ import android.text.InputFilter
import android.text.SpannableStringBuilder
import android.text.Spanned
class AlphaFilter : InputFilter {
private val extras: String
constructor(extras: String) {
this.extras = extras
}
class AlphaFilter(private val extras: String) : InputFilter {
override fun filter(source: CharSequence,
start: Int,
end: Int,
@ -45,12 +39,10 @@ class AlphaFilter : InputFilter {
return source
} else {
val sb = StringBuilder()
for (i in start..end - 1) {
val c = source[i]
if (c.isLetterOrDigit() || extras.contains(c)) {
sb.append(c)
}
}
(start..end - 1)
.map { source[it] }
.filter { it.isLetterOrDigit() || extras.contains(it) }
.forEach { sb.append(it) }
return sb.toString()
}
}

13
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/MinMaxFilter.kt
View file

@ -21,18 +21,7 @@ import android.text.InputFilter
import android.text.Spanned
import org.jetbrains.anko.AnkoLogger
class MinMaxFilter : InputFilter, AnkoLogger {
private val min: Int
private val max: Int
private val size: Int
private val zeros: Boolean
constructor(min: Int, max: Int, size: Int, zeros: Boolean) {
this.min = min
this.max = max
this.size = size
this.zeros = zeros
}
class MinMaxFilter(private val min: Int, private val max: Int, private val size: Int, private val zeros: Boolean) : InputFilter, AnkoLogger {
override fun filter(source: CharSequence, start: Int, end: Int, dest: Spanned, dstart: Int, dend: Int): CharSequence? {
val input = (dest.toString() + source.toString())

28
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/filters/NumberFilter.kt
View file

@ -23,18 +23,10 @@ import android.text.Spanned
import net.thauvin.erik.android.tesremoteprogrammer.util.isDigits
import org.jetbrains.anko.AnkoLogger
class NumberFilter : InputFilter, AnkoLogger {
class NumberFilter(allowed: String, alt: String) : InputFilter, AnkoLogger {
private val allowed: String
private val digits = "0123456789"
constructor(allowed: String, alt: String) {
this.allowed = if (allowed.isDigits()) {
"$allowed$alt"
} else {
"$digits$alt"
}
}
override fun filter(source: CharSequence,
start: Int,
end: Int,
@ -52,13 +44,19 @@ class NumberFilter : InputFilter, AnkoLogger {
return source
} else {
val sb = StringBuilder()
for (i in start..end - 1) {
val c = source[i]
if (allowed.contains(c)) {
sb.append(c.toUpperCase())
}
}
(start..end - 1)
.map { source[it] }
.filter { allowed.contains(it) }
.forEach { sb.append(it.toUpperCase()) }
return sb.toString()
}
}
init {
this.allowed = if (allowed.isDigits()) {
"$allowed$alt"
} else {
"$digits$alt"
}
}
}

6
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt
View file

@ -45,9 +45,9 @@ data class Field(var hint: String,
constructor(source: Parcel) : this(
source.readString(),
source.readString(),
1.equals(source.readInt()),
1.equals(source.readInt()),
1.equals(source.readInt()),
1 == source.readInt(),
1 == source.readInt(),
1 == source.readInt(),
source.readInt(),
source.readInt(),
source.readInt(),

4
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Option.kt
View file

@ -41,8 +41,8 @@ data class Option(var title: String,
constructor(source: Parcel) : this(
source.readString(),
source.createTypedArrayList(Field.CREATOR),
1.equals(source.readInt()),
1.equals(source.readInt()),
1 == source.readInt(),
1 == source.readInt(),
source.readString())
override fun compareTo(other: Option): Int {

6
app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Dtmf.kt
View file

@ -157,7 +157,7 @@ class Dtmf {
ack: String,
option: Option,
fields: ArrayList<EditText>): String {
val replace = arrayListOf(Pair("$DTMF_MASTER", master))
val replace = arrayListOf(Pair(DTMF_MASTER, master))
fields.forEachIndexed { i, field ->
replace.add(Pair(DTMF_FIELD.format(i + 1),
@ -175,7 +175,7 @@ class Dtmf {
fun validate(dtmf: String, extra: String): Boolean {
dtmf.forEach {
if (!(it.isDigit() || it.equals(',') || extra.contains(it))) {
if (!(it.isDigit() || it == ',' || extra.contains(it))) {
return false
}
}
@ -183,7 +183,7 @@ class Dtmf {
}
fun mock(option: Option, blank: String): String {
val replace = arrayListOf(Pair("$DTMF_MASTER", blank))
val replace = arrayListOf(Pair(DTMF_MASTER, blank))
option.fields.forEachIndexed { i, field ->
replace.add(Pair(DTMF_FIELD.format(i + 1), blank))