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

Improved number field size validation.

Browse source
This commit is contained in:
Erik C. Thauvin 2016-09-05 22:16:42 -07:00
parent 943498bed8
commit 1d4f1b9958
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -44,6 +44,7 @@ import com.google.gson.JsonSyntaxException
import net.thauvin.erik.android.tesremoteprogrammer.models.Config import net.thauvin.erik.android.tesremoteprogrammer.models.Config
import net.thauvin.erik.android.tesremoteprogrammer.models.Configurations import net.thauvin.erik.android.tesremoteprogrammer.models.Configurations
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.util.isDigits import net.thauvin.erik.android.tesremoteprogrammer.util.isDigits
import org.jetbrains.anko.* import org.jetbrains.anko.*
import org.jetbrains.anko.design.textInputLayout import org.jetbrains.anko.design.textInputLayout
@ -459,13 +460,12 @@ class MainActivity : AppCompatActivity(), AnkoLogger {
if (it.text.isNullOrBlank()) { if (it.text.isNullOrBlank()) {
it.error = getString(R.string.error_required) it.error = getString(R.string.error_required)
isValid = false isValid = false
} else if (size > 0 && (fields[1].text.length != size)) {
isValid = false
fields[1].error = getString(R.string.error_invalid_size, size,
resources.getQuantityString(R.plurals.error_digit, size), "")
} }
} }
if (size > 0 && (fields[1].text.length != size)) {
isValid = false
fields[1].error = getString(R.string.error_invalid_size, size,
resources.getQuantityString(R.plurals.error_digit, size))
}
return isValid return isValid
} }