From cfb356cbf183e945e4d8931ddfa7ceb538eac6c9 Mon Sep 17 00:00:00 2001 From: lbarraga Date: Mon, 1 May 2023 17:55:48 +0200 Subject: [PATCH] #30 added two timepicker cards to break timer edit screen --- .../editScreens/BreakTimerEditScreen.kt | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/BreakTimerEditScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/BreakTimerEditScreen.kt index f00e9f6..b6104b6 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/BreakTimerEditScreen.kt +++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_edit/editScreens/BreakTimerEditScreen.kt @@ -1,10 +1,16 @@ 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.R import be.ugent.sel.studeez.common.composable.TimePickerButton +import be.ugent.sel.studeez.common.composable.TimePickerCard 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.data.local.models.timer_info.CustomTimerInfo +import be.ugent.sel.studeez.data.local.models.timer_info.EndlessTimerInfo import be.ugent.sel.studeez.data.local.models.timer_info.PomodoroTimerInfo +import be.ugent.sel.studeez.ui.theme.StudeezTheme class BreakTimerEditScreen( private val breakTimerInfo: PomodoroTimerInfo @@ -13,17 +19,28 @@ class BreakTimerEditScreen( @Composable override fun ExtraFields() { // If the user presses the OK button on the timepicker, the time in the button should change - var studyTime: Int by remember { mutableStateOf(breakTimerInfo.studyTime) } - var breakTime: Int by remember { mutableStateOf(breakTimerInfo.breakTime) } - val breakHms: HoursMinutesSeconds = Time(breakTime).getAsHMS() - val studyHms: HoursMinutesSeconds = Time(studyTime).getAsHMS() - TimePickerButton(studyHms) { _, hour, minute -> - studyTime = hour * 60 * 60 + minute * 60 + TimePickerCard(R.string.studyTime, breakTimerInfo.studyTime) { newTime -> + breakTimerInfo.studyTime = newTime } - TimePickerButton(breakHms) { _, hour, minute -> - breakTime = hour * 60 * 60 + minute * 60 + TimePickerCard(R.string.breakTime, breakTimerInfo.breakTime) { newTime -> + breakTimerInfo.breakTime = newTime } } +} + +@Preview +@Composable +fun BreakEditScreenPreview() { + val pomodoroTimerInfo = PomodoroTimerInfo( + "Breaky the Breaktimer", + "Breaky is a breakdancer", + 10 * 60, + 60, + 5 + ) + StudeezTheme { + BreakTimerEditScreen(pomodoroTimerInfo).invoke(onSaveClick = {}) + } } \ No newline at end of file