From ea2c91d59a6d4a501b7bf9c691307ea679c31835 Mon Sep 17 00:00:00 2001 From: lbarraga Date: Mon, 1 May 2023 17:55:25 +0200 Subject: [PATCH] #30 added timepicker card to custom timer edit screen --- .../editScreens/CustomTimerEditScreen.kt | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/CustomTimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/CustomTimerEditScreen.kt index 3e2e234..f3278d5 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/CustomTimerEditScreen.kt +++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/CustomTimerEditScreen.kt @@ -2,21 +2,22 @@ package be.ugent.sel.studeez.screens.timer_edit.editScreens import androidx.compose.runtime.* import androidx.compose.ui.tooling.preview.Preview -import be.ugent.sel.studeez.common.composable.TimePickerButton -import be.ugent.sel.studeez.data.local.models.timer_functional.HoursMinutesSeconds -import be.ugent.sel.studeez.data.local.models.timer_functional.Time +import be.ugent.sel.studeez.common.composable.TimePickerCard import be.ugent.sel.studeez.data.local.models.timer_info.CustomTimerInfo +import be.ugent.sel.studeez.ui.theme.StudeezTheme +import be.ugent.sel.studeez.R.string as AppText -class CustomTimerEditScreen(private val customTimerInfo: CustomTimerInfo): AbstractTimerEditScreen(customTimerInfo) { +class CustomTimerEditScreen( + private val customTimerInfo: CustomTimerInfo + ): AbstractTimerEditScreen(customTimerInfo) { @Composable override fun ExtraFields() { - // If the user presses the OK button on the timepicker, the time in the button should change - var studyTime by remember { mutableStateOf(customTimerInfo.studyTime) } - - val hms: HoursMinutesSeconds = Time(studyTime).getAsHMS() - TimePickerButton(hms) { _, hour, minute -> - studyTime = hour * 60 * 60 + minute * 60 + TimePickerCard( + text = AppText.studyTime, + initialSeconds = customTimerInfo.studyTime + ) { newTime -> + customTimerInfo.studyTime = newTime } } @@ -25,7 +26,9 @@ class CustomTimerEditScreen(private val customTimerInfo: CustomTimerInfo): Abstr @Preview @Composable -fun TimePickerPreview() { +fun CustomEditScreenPreview() { val customTimerInfo = CustomTimerInfo("custom", "my description", 25) - CustomTimerEditScreen(customTimerInfo).ExtraFields() + StudeezTheme { + CustomTimerEditScreen(customTimerInfo).invoke(onSaveClick = {}) + } } \ No newline at end of file