tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

#118 gebruik nieuwe visitor om sessionScreen te instantieren

Browse source
This commit is contained in:
lbarraga 2023-05-15 16:34:19 +02:00
parent 052ebb8c32
commit 4466f3646f
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/be/ugent/sel/studeez/screens/session/SessionRoute.kt
View file

@ -5,9 +5,12 @@ import android.media.RingtoneManager
import android.net.Uri import android.net.Uri
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalPomodoroTimer
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimer import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimer
import be.ugent.sel.studeez.screens.session.sessionScreens.AbstractSessionScreen import be.ugent.sel.studeez.screens.session.sessionScreens.AbstractSessionScreen
import be.ugent.sel.studeez.screens.session.sessionScreens.GetSessionScreen import be.ugent.sel.studeez.screens.session.sessionScreens.GetSessionScreen
import be.ugent.sel.studeez.screens.session.sessionScreens.composables.BreakSessionScreenComposable
import be.ugent.sel.studeez.screens.session.sessionScreens.composables.GetSessionScreenComposable
data class SessionActions( data class SessionActions(
val getTimer: () -> FunctionalTimer, val getTimer: () -> FunctionalTimer,
@ -47,10 +50,8 @@ fun SessionRoute(
mediaplayer = mediaplayer mediaplayer = mediaplayer
) )
val sessionScreen: AbstractSessionScreen = viewModel.getTimer().accept(GetSessionScreen(mediaplayer)) val sessionActions = getSessionActions(viewModel, openAndPopUp, mediaplayer)
val sessionScreen = viewModel.getTimer().accept(GetSessionScreenComposable(mediaplayer, open, sessionActions))
sessionScreen( sessionScreen()
open = open,
sessionActions = getSessionActions(viewModel, openAndPopUp, mediaplayer)
)
} }