diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt index e523c16..c8ae71f 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/SettingsScreen.kt @@ -101,15 +101,9 @@ fun SettingsScreenRoot( onDispose { viewModel.cancelTextFieldFlowCollection() } } - val focusTimeInputFieldState = rememberSaveable(saver = TextFieldState.Saver) { - viewModel.focusTimeTextFieldState - } - val shortBreakTimeInputFieldState = rememberSaveable(saver = TextFieldState.Saver) { - viewModel.shortBreakTimeTextFieldState - } - val longBreakTimeInputFieldState = rememberSaveable(saver = TextFieldState.Saver) { - viewModel.longBreakTimeTextFieldState - } + val focusTimeInputFieldState = viewModel.focusTimeTextFieldState + val shortBreakTimeInputFieldState = viewModel.shortBreakTimeTextFieldState + val longBreakTimeInputFieldState = viewModel.longBreakTimeTextFieldState val isPlus by viewModel.isPlus.collectAsStateWithLifecycle() val alarmEnabled by viewModel.alarmEnabled.collectAsStateWithLifecycle(true) diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinuteInputField.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinuteInputField.kt index f34a694..f5f0c23 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinuteInputField.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinuteInputField.kt @@ -54,7 +54,7 @@ fun MinuteInputField( state = state, lineLimits = TextFieldLineLimits.SingleLine, inputTransformation = MinutesInputTransformation, - outputTransformation = MinutesOutputTransformation, +// outputTransformation = MinutesOutputTransformation, keyboardOptions = KeyboardOptions( keyboardType = KeyboardType.NumberPassword, imeAction = imeAction diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinutesTransformation.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinutesTransformation.kt index e9df5af..790c6fb 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinutesTransformation.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/components/MinutesTransformation.kt @@ -18,9 +18,7 @@ package org.nsh07.pomodoro.ui.settingsScreen.components import androidx.compose.foundation.text.input.InputTransformation -import androidx.compose.foundation.text.input.OutputTransformation import androidx.compose.foundation.text.input.TextFieldBuffer -import androidx.compose.foundation.text.input.insert import androidx.core.text.isDigitsOnly object MinutesInputTransformation : InputTransformation { @@ -31,11 +29,11 @@ object MinutesInputTransformation : InputTransformation { } } -object MinutesOutputTransformation : OutputTransformation { - override fun TextFieldBuffer.transformOutput() { - when (this.length) { - 0 -> insert(0, "00") - 1 -> insert(0, "0") - } - } -} \ No newline at end of file +//object MinutesOutputTransformation : OutputTransformation { +// override fun TextFieldBuffer.transformOutput() { +// when (this.length) { +// 0 -> insert(0, "00") +// 1 -> insert(0, "0") +// } +// } +//} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 85f21bf..ae2a776 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,17 +2,17 @@ activityCompose = "1.11.0" adaptive = "1.2.0" agp = "8.11.2" -composeBom = "2025.10.01" +composeBom = "2025.11.00" coreKtx = "1.17.0" espressoCore = "3.7.0" junit = "4.13.2" junitVersion = "1.3.0" kotlin = "2.2.21" -ksp = "2.2.20-2.0.4" +ksp = "2.3.1" lifecycleRuntimeKtx = "2.9.4" -materialKolor = "3.0.1" -navigation3 = "1.0.0-beta01" -revenuecat = "9.12.0" +materialKolor = "4.0.3" +navigation3 = "1.0.0-rc01" +revenuecat = "9.12.1" room = "2.8.3" vico = "2.2.1"