added openAndPopUp
This commit is contained in:
parent
4e35951850
commit
312fc3167a
1 changed files with 6 additions and 2 deletions
|
@ -13,23 +13,27 @@ data class SessionActions(
|
||||||
val getTask: () -> String,
|
val getTask: () -> String,
|
||||||
val prepareMediaPlayer: () -> Unit,
|
val prepareMediaPlayer: () -> Unit,
|
||||||
val releaseMediaPlayer: () -> Unit,
|
val releaseMediaPlayer: () -> Unit,
|
||||||
|
val endSession: () -> Unit
|
||||||
)
|
)
|
||||||
|
|
||||||
private fun getSessionActions(
|
private fun getSessionActions(
|
||||||
viewModel: SessionViewModel,
|
viewModel: SessionViewModel,
|
||||||
|
openAndPopUp: (String, String) -> Unit,
|
||||||
mediaplayer: MediaPlayer,
|
mediaplayer: MediaPlayer,
|
||||||
): SessionActions {
|
): SessionActions {
|
||||||
return SessionActions(
|
return SessionActions(
|
||||||
getTimer = viewModel::getTimer,
|
getTimer = viewModel::getTimer,
|
||||||
getTask = viewModel::getTask,
|
getTask = viewModel::getTask,
|
||||||
|
endSession = { viewModel.endSession(openAndPopUp) },
|
||||||
prepareMediaPlayer = mediaplayer::prepareAsync,
|
prepareMediaPlayer = mediaplayer::prepareAsync,
|
||||||
releaseMediaPlayer = mediaplayer::release,
|
releaseMediaPlayer = mediaplayer::release
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun SessionRoute(
|
fun SessionRoute(
|
||||||
open: (String) -> Unit,
|
open: (String) -> Unit,
|
||||||
|
openAndPopUp: (String, String) -> Unit,
|
||||||
viewModel: SessionViewModel,
|
viewModel: SessionViewModel,
|
||||||
) {
|
) {
|
||||||
val sessionScreen: AbstractSessionScreen = viewModel.getTimer().getView()
|
val sessionScreen: AbstractSessionScreen = viewModel.getTimer().getView()
|
||||||
|
@ -48,6 +52,6 @@ fun SessionRoute(
|
||||||
}
|
}
|
||||||
sessionScreen.SessionScreen(
|
sessionScreen.SessionScreen(
|
||||||
open = open,
|
open = open,
|
||||||
sessionActions = getSessionActions(viewModel, mediaplayer),
|
sessionActions = getSessionActions(viewModel, openAndPopUp, mediaplayer),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue