intermediate type select screen for add and route to edit instead of add
This commit is contained in:
parent
46109ac4ff
commit
9688426093
4 changed files with 15 additions and 6 deletions
|
@ -25,7 +25,7 @@ data class TimerOverviewActions(
|
|||
val getUserTimers: () -> Flow<List<TimerInfo>>,
|
||||
val getDefaultTimers: () -> List<TimerInfo>,
|
||||
val onEditClick: (TimerInfo) -> Unit,
|
||||
val onAddClick: () -> Unit,
|
||||
val onAddClick: () -> Unit
|
||||
)
|
||||
|
||||
fun getTimerOverviewActions(
|
||||
|
@ -36,7 +36,7 @@ fun getTimerOverviewActions(
|
|||
getUserTimers = viewModel::getUserTimers,
|
||||
getDefaultTimers = viewModel::getDefaultTimers,
|
||||
onEditClick = { viewModel.update(it, open) },
|
||||
onAddClick = { viewModel.create(open) }
|
||||
onAddClick = { viewModel.onAddClick(open) }
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -48,14 +48,14 @@ fun TimerOverviewRoute(
|
|||
) {
|
||||
TimerOverviewScreen(
|
||||
timerOverviewActions = getTimerOverviewActions(viewModel, open),
|
||||
drawerActions = drawerActions
|
||||
drawerActions = drawerActions,
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun TimerOverviewScreen(
|
||||
timerOverviewActions: TimerOverviewActions,
|
||||
drawerActions: DrawerActions
|
||||
drawerActions: DrawerActions,
|
||||
) {
|
||||
|
||||
val timers = timerOverviewActions.getUserTimers().collectAsState(initial = emptyList())
|
||||
|
|
|
@ -32,8 +32,8 @@ class TimerOverviewViewModel @Inject constructor(
|
|||
open(StudeezDestinations.TIMER_EDIT_SCREEN)
|
||||
}
|
||||
|
||||
fun create(open: (String) -> Unit) {
|
||||
open(StudeezDestinations.ADD_TIMER_SCREEN)
|
||||
fun onAddClick(open: (String) -> Unit) {
|
||||
open(StudeezDestinations.TIMER_TYPE_CHOOSING_SCREEN)
|
||||
}
|
||||
|
||||
fun delete(timerInfo: TimerInfo) =timerDAO.deleteTimer(timerInfo)
|
||||
|
|
Reference in a new issue