soundplayer to screens instead of mediaplayer
This commit is contained in:
parent
1db5a4160e
commit
4749108992
1 changed files with 5 additions and 7 deletions
|
@ -1,19 +1,15 @@
|
||||||
package be.ugent.sel.studeez.screens.session.sessionScreens.composables
|
package be.ugent.sel.studeez.screens.session.sessionScreens.composables
|
||||||
|
|
||||||
import android.media.MediaPlayer
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalCustomTimer
|
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalCustomTimer
|
||||||
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalEndlessTimer
|
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalEndlessTimer
|
||||||
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalPomodoroTimer
|
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalPomodoroTimer
|
||||||
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimerVisitor
|
import be.ugent.sel.studeez.data.local.models.timer_functional.FunctionalTimerVisitor
|
||||||
import be.ugent.sel.studeez.screens.session.SessionActions
|
import be.ugent.sel.studeez.screens.session.SessionActions
|
||||||
import be.ugent.sel.studeez.screens.session.sessionScreens.AbstractSessionScreen
|
import be.ugent.sel.studeez.screens.session.SoundPlayer
|
||||||
import be.ugent.sel.studeez.screens.session.sessionScreens.BreakSessionScreen
|
|
||||||
import be.ugent.sel.studeez.screens.session.sessionScreens.CustomSessionScreen
|
|
||||||
import be.ugent.sel.studeez.screens.session.sessionScreens.EndlessSessionScreen
|
|
||||||
|
|
||||||
class GetSessionScreenComposable(
|
class GetSessionScreenComposable(
|
||||||
private val mediaplayer: MediaPlayer?,
|
private val soundPlayer: SoundPlayer,
|
||||||
private val open: (String) -> Unit,
|
private val open: (String) -> Unit,
|
||||||
private val sessionActions: SessionActions
|
private val sessionActions: SessionActions
|
||||||
) :
|
) :
|
||||||
|
@ -23,7 +19,8 @@ class GetSessionScreenComposable(
|
||||||
return { CustomTimerSessionScreenComposable(
|
return { CustomTimerSessionScreenComposable(
|
||||||
open = open,
|
open = open,
|
||||||
sessionActions = sessionActions,
|
sessionActions = sessionActions,
|
||||||
customTimer = functionalCustomTimer
|
soundPlayer = soundPlayer,
|
||||||
|
customTimer = functionalCustomTimer,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -42,6 +39,7 @@ class GetSessionScreenComposable(
|
||||||
BreakSessionScreenComposable(
|
BreakSessionScreenComposable(
|
||||||
open = open,
|
open = open,
|
||||||
sessionActions = sessionActions,
|
sessionActions = sessionActions,
|
||||||
|
soundPlayer = soundPlayer,
|
||||||
pomodoroTimer = functionalPomodoroTimer
|
pomodoroTimer = functionalPomodoroTimer
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue