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 bd0f518..0ab3e92 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 @@ -41,6 +41,7 @@ import net.thauvin.erik.android.tesremoteprogrammer.filters.NumberFilter import net.thauvin.erik.android.tesremoteprogrammer.models.Option import net.thauvin.erik.android.tesremoteprogrammer.models.Params import net.thauvin.erik.android.tesremoteprogrammer.util.Dtmf +import net.thauvin.erik.android.tesremoteprogrammer.util.isDKS import net.thauvin.erik.android.tesremoteprogrammer.widget.ScrollAwareFABBehavior import org.jetbrains.anko.* import org.jetbrains.anko.custom.ankoView @@ -111,7 +112,7 @@ class ProgrammingActivity : AppCompatActivity(), AnkoLogger { inputFilters.add(NumberFilter(field.digits, if (field.alt) params.alt else "")) if (field.max != -1 && field.min != -1) { inputFilters.add( - MinMaxFilter(field.min, field.max, field.size, field.zeros)) + MinMaxFilter(field.min, field.max, field.size, params.type.isDKS())) } } diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt index c5ac5c9..1d0c6d8 100644 --- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt +++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/models/Field.kt @@ -25,7 +25,6 @@ data class Field(var hint: String, var digits: String, var alpha: Boolean, val alt: Boolean, - var zeros: Boolean, var minSize: Int, var size: Int, var min: Int, @@ -40,14 +39,13 @@ data class Field(var hint: String, } } - constructor() : this("", "", false, false, true, -1, -1, -1, -1) + constructor() : this("", "", false, false, -1, -1, -1, -1) constructor(source: Parcel) : this( source.readString(), source.readString(), 1.equals(source.readInt()), 1.equals(source.readInt()), - 1.equals(source.readInt()), source.readInt(), source.readInt(), source.readInt(), @@ -60,7 +58,6 @@ data class Field(var hint: String, dest?.writeString(digits) dest?.writeInt((if (alpha) 1 else 0)) dest?.writeInt((if (alt) 1 else 0)) - dest?.writeInt((if (zeros) 1 else 0)) dest?.writeInt(minSize) dest?.writeInt(size) dest?.writeInt(min)