From 601740f258fe5f63d9412ea1316e9bc747b635ee Mon Sep 17 00:00:00 2001 From: Rune Dyselinck Date: Wed, 26 Apr 2023 11:38:09 +0200 Subject: [PATCH] secondaryscreentemplate error --- .idea/misc.xml | 3 +- .../studeez/navigation/StudeezDestinations.kt | 2 + .../add_timer/AddTimerViewModel.kt | 13 ++++++ .../add_timer/addTimerScreen.kt | 42 +++++++++++++++++++ 4 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/AddTimerViewModel.kt create mode 100644 app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/addTimerScreen.kt diff --git a/.idea/misc.xml b/.idea/misc.xml index 8978d23..704c883 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ + - + diff --git a/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezDestinations.kt b/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezDestinations.kt index 760c814..63f9d64 100644 --- a/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezDestinations.kt +++ b/app/src/main/java/be/ugent/sel/studeez/navigation/StudeezDestinations.kt @@ -18,4 +18,6 @@ object StudeezDestinations { // Edit screens const val EDIT_PROFILE_SCREEN = "edit_profile" + + const val ADD_TIMER_SCREEN = "add_timer" } \ No newline at end of file diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/AddTimerViewModel.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/AddTimerViewModel.kt new file mode 100644 index 0000000..a209f49 --- /dev/null +++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/AddTimerViewModel.kt @@ -0,0 +1,13 @@ +package be.ugent.sel.studeez.screens.timer_overview.add_timer + +import be.ugent.sel.studeez.domain.LogService +import be.ugent.sel.studeez.screens.StudeezViewModel +import dagger.hilt.android.lifecycle.HiltViewModel +import javax.inject.Inject + +@HiltViewModel +class AddTimerViewModel @Inject constructor( + logService: LogService +): StudeezViewModel(logService) { + +} diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/addTimerScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/addTimerScreen.kt new file mode 100644 index 0000000..a26826c --- /dev/null +++ b/app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/add_timer/addTimerScreen.kt @@ -0,0 +1,42 @@ +package be.ugent.sel.studeez.screens.timer_overview.add_timer + +import androidx.compose.runtime.Composable +import be.ugent.sel.studeez.common.composable.SecondaryScreenTemplate +import be.ugent.sel.studeez.common.composable.drawer.DrawerActions +import be.ugent.sel.studeez.common.composable.drawer.DrawerViewModel +import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions +import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions +import be.ugent.sel.studeez.common.composable.navbar.NavigationBarViewModel +import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions + +@Composable +fun AddTimerRoute( + open: (String) -> Unit, + openAndPopUp: (String, String) -> Unit + viewModel: AddTimerViewModel, + drawerViewModel: DrawerViewModel, + navBarViewModel: NavigationBarViewModel, +) { + addTimerScreen( + drawerActions = getDrawerActions( + drawerViewModel = drawerViewModel, + open = open, + openAndPopUp = openAndPopUp + ), + navigationBarActions = getNavigationBarActions( + navigationBarViewModel = navBarViewModel, + open = open + ) + ) +} + +fun addTimerScreen( + drawerActions: DrawerActions, + navigationBarActions: NavigationBarActions +) { + SecondaryScreenTemplate( + title = , + popUp = { /*TODO*/ }) { + + } +} \ No newline at end of file