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

Removed zeros properties in Fields, now specified via type parameter.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-09-04 23:52:14 -07:00
parent 11a6fcaf54
commit d877b32e42
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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.Option
import net.thauvin.erik.android.tesremoteprogrammer.models.Params import net.thauvin.erik.android.tesremoteprogrammer.models.Params
import net.thauvin.erik.android.tesremoteprogrammer.util.Dtmf 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 net.thauvin.erik.android.tesremoteprogrammer.widget.ScrollAwareFABBehavior
import org.jetbrains.anko.* import org.jetbrains.anko.*
import org.jetbrains.anko.custom.ankoView 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 "")) inputFilters.add(NumberFilter(field.digits, if (field.alt) params.alt else ""))
if (field.max != -1 && field.min != -1) { if (field.max != -1 && field.min != -1) {
inputFilters.add( inputFilters.add(
MinMaxFilter(field.min, field.max, field.size, field.zeros)) MinMaxFilter(field.min, field.max, field.size, params.type.isDKS()))
} }
} }

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

@ -25,7 +25,6 @@ data class Field(var hint: String,
var digits: String, var digits: String,
var alpha: Boolean, var alpha: Boolean,
val alt: Boolean, val alt: Boolean,
var zeros: Boolean,
var minSize: Int, var minSize: Int,
var size: Int, var size: Int,
var min: 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( constructor(source: Parcel) : this(
source.readString(), source.readString(),
source.readString(), source.readString(),
1.equals(source.readInt()), 1.equals(source.readInt()),
1.equals(source.readInt()), 1.equals(source.readInt()),
1.equals(source.readInt()),
source.readInt(), source.readInt(),
source.readInt(), source.readInt(),
source.readInt(), source.readInt(),
@ -60,7 +58,6 @@ data class Field(var hint: String,
dest?.writeString(digits) dest?.writeString(digits)
dest?.writeInt((if (alpha) 1 else 0)) dest?.writeInt((if (alpha) 1 else 0))
dest?.writeInt((if (alt) 1 else 0)) dest?.writeInt((if (alt) 1 else 0))
dest?.writeInt((if (zeros) 1 else 0))
dest?.writeInt(minSize) dest?.writeInt(minSize)
dest?.writeInt(size) dest?.writeInt(size)
dest?.writeInt(min) dest?.writeInt(min)