From 853a2d8c285ac5e4ed41b24b2c48d87df3329202 Mon Sep 17 00:00:00 2001
From: lbarraga <lukas.barragantorres@ugent.be>
Date: Fri, 5 May 2023 00:03:05 +0200
Subject: [PATCH] select timer type string resource and package refactor

---
 .../timer_form/timer_type_select/TimerTypeSelectScreen.kt | 8 +++++---
 .../timer_type_select/TimerTypeSelectViewModel.kt         | 4 +---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectScreen.kt
index 197f10c..fa8d650 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectScreen.kt
@@ -1,4 +1,4 @@
-package be.ugent.sel.studeez.screens.timer_form.timer_add
+package be.ugent.sel.studeez.screens.timer_form.timer_type_select
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -7,16 +7,18 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import be.ugent.sel.studeez.common.composable.SecondaryScreenTemplate
 import be.ugent.sel.studeez.data.local.models.timer_info.*
+import be.ugent.sel.studeez.R.string as AppText
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerType.CUSTOM
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerType.BREAK
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerType.ENDLESS
 
 val defaultTimerInfo: Map<TimerType, TimerInfo> = mapOf(
     CUSTOM to CustomTimerInfo("", "", 0),
-    BREAK to PomodoroTimerInfo("", "", 0, 0, 0),
+    BREAK to PomodoroTimerInfo("", "", 0, 0, 1),
     ENDLESS to EndlessTimerInfo("", ""),
 )
 
@@ -28,7 +30,7 @@ fun TimerTypeSelectScreen(
     viewModel: TimerTypeSelectViewModel = hiltViewModel()
 ) {
 
-    SecondaryScreenTemplate(title = "Edit Timer", popUp = popUp) {
+    SecondaryScreenTemplate(title = stringResource(id = AppText.timer_type_select), popUp = popUp) {
         Column(
             horizontalAlignment = Alignment.CenterHorizontally,
             modifier = Modifier.fillMaxWidth()
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectViewModel.kt
index d2f048b..569a36c 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectViewModel.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_form/timer_type_select/TimerTypeSelectViewModel.kt
@@ -1,13 +1,11 @@
-package be.ugent.sel.studeez.screens.timer_form.timer_add
+package be.ugent.sel.studeez.screens.timer_form.timer_type_select
 
 import be.ugent.sel.studeez.data.EditTimerState
 import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
 import be.ugent.sel.studeez.domain.LogService
-import be.ugent.sel.studeez.domain.TimerDAO
 import be.ugent.sel.studeez.navigation.StudeezDestinations
 import be.ugent.sel.studeez.screens.StudeezViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
 @HiltViewModel