map implementation
This commit is contained in:
parent
eb28fa4ae4
commit
2971ae85aa
1 changed files with 12 additions and 2 deletions
|
@ -15,6 +15,8 @@ class BreakTimerFormScreen(
|
||||||
private val breakTimerInfo: PomodoroTimerInfo
|
private val breakTimerInfo: PomodoroTimerInfo
|
||||||
): AbstractTimerFormScreen(breakTimerInfo) {
|
): AbstractTimerFormScreen(breakTimerInfo) {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
override fun ExtraFields() {
|
override fun ExtraFields() {
|
||||||
// If the user presses the OK button on the timepicker, the time in the button should change
|
// If the user presses the OK button on the timepicker, the time in the button should change
|
||||||
|
@ -26,13 +28,17 @@ class BreakTimerFormScreen(
|
||||||
breakTimerInfo.breakTime = newTime
|
breakTimerInfo.breakTime = newTime
|
||||||
}
|
}
|
||||||
|
|
||||||
|
valids["repeats"] = remember {mutableStateOf(true)}
|
||||||
|
firsts["repeats"] = remember { mutableStateOf(true) }
|
||||||
|
|
||||||
LabeledErrorTextField(
|
LabeledErrorTextField(
|
||||||
initialValue = breakTimerInfo.repeats.toString(),
|
initialValue = breakTimerInfo.repeats.toString(),
|
||||||
label = R.string.repeats,
|
label = R.string.repeats,
|
||||||
errorText = AppText.repeats_error,
|
errorText = AppText.repeats_error,
|
||||||
isValid = mutableStateOf(false),
|
isValid = valids.getValue("repeats"),
|
||||||
|
isFirst = firsts.getValue("repeats"),
|
||||||
keyboardType = KeyboardType.Decimal,
|
keyboardType = KeyboardType.Decimal,
|
||||||
predicate = { it.matches(Regex("[1-9]+\\d*")) }
|
predicate = { isNumber(it) }
|
||||||
) { correctlyTypedInt ->
|
) { correctlyTypedInt ->
|
||||||
breakTimerInfo.repeats = correctlyTypedInt.toInt()
|
breakTimerInfo.repeats = correctlyTypedInt.toInt()
|
||||||
}
|
}
|
||||||
|
@ -40,6 +46,10 @@ class BreakTimerFormScreen(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun isNumber(text: String): Boolean {
|
||||||
|
return text.matches(Regex("[1-9]+\\d*"))
|
||||||
|
}
|
||||||
|
|
||||||
@Preview
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
fun BreakEditScreenPreview() {
|
fun BreakEditScreenPreview() {
|
||||||
|
|
Reference in a new issue