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

remove getView from functional timer and add when in sessionRoute

Browse source
This commit is contained in:
Lukas Barragan Torres 2023-04-26 11:05:08 +02:00
parent 4996d387ad
commit c3a9826001
6 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt
View file

@ -19,8 +19,4 @@ class FunctionalCustomTimer(studyTime: Int) : FunctionalTimer(studyTime) {
return hasEnded() return hasEnded()
} }
override fun getView(): AbstractSessionScreen {
return CustomSessionScreen(this)
}
} }

4
app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalEndlessTimer.kt
View file

@ -16,8 +16,4 @@ class FunctionalEndlessTimer : FunctionalTimer(0) {
override fun tick() { override fun tick() {
time.plusOne() time.plusOne()
} }
override fun getView(): AbstractSessionScreen {
return EndlessSessionScreen()
}
} }

4
app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt
View file

@ -39,8 +39,4 @@ class FunctionalPomodoroTimer(
override fun hasCurrentCountdownEnded(): Boolean { override fun hasCurrentCountdownEnded(): Boolean {
return time.time == 0 return time.time == 0
} }
override fun getView(): AbstractSessionScreen {
return BreakSessionScreen(this)
}
} }

3
app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt
View file

@ -13,7 +13,4 @@ abstract class FunctionalTimer(initialValue: Int) {
abstract fun hasEnded(): Boolean abstract fun hasEnded(): Boolean
abstract fun hasCurrentCountdownEnded(): Boolean abstract fun hasCurrentCountdownEnded(): Boolean
abstract fun getView(): AbstractSessionScreen
} }

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

@ -5,8 +5,13 @@ 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.FunctionalCustomTimer
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.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.BreakSessionScreen
import be.ugent.sel.studeez.screens.session.sessionScreens.CustomSessionScreen
import be.ugent.sel.studeez.screens.session.sessionScreens.EndlessSessionScreen
data class SessionActions( data class SessionActions(
val getTimer: () -> FunctionalTimer, val getTimer: () -> FunctionalTimer,
@ -32,7 +37,6 @@ fun SessionRoute(
open: (String) -> Unit, open: (String) -> Unit,
viewModel: SessionViewModel, viewModel: SessionViewModel,
) { ) {
val sessionScreen: AbstractSessionScreen = viewModel.getTimer().getView()
val context = LocalContext.current val context = LocalContext.current
val uri: Uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION) val uri: Uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
val mediaplayer = MediaPlayer() val mediaplayer = MediaPlayer()
@ -46,8 +50,16 @@ fun SessionRoute(
mediaplayer.setOnPreparedListener { mediaplayer.setOnPreparedListener {
// mediaplayer.start() // mediaplayer.start()
} }
sessionScreen.SessionScreen(
val sessionScreen = when (val timer = viewModel.getTimer()) {
is FunctionalCustomTimer -> CustomSessionScreen(timer)
is FunctionalPomodoroTimer -> BreakSessionScreen(timer)
is FunctionalEndlessTimer -> EndlessSessionScreen()
else -> throw java.lang.IllegalArgumentException("Unknown Timer")
}
sessionScreen(
open = open, open = open,
sessionActions = getSessionActions(viewModel, mediaplayer), sessionActions = getSessionActions(viewModel, mediaplayer)
) )
} }

2
app/src/main/java/be/ugent/sel/studeez/screens/session/sessionScreens/AbstractSessionScreen.kt
View file

@ -27,7 +27,7 @@ abstract class AbstractSessionScreen {
var timerEnd = false var timerEnd = false
@Composable @Composable
fun SessionScreen( operator fun invoke(
open: (String) -> Unit, open: (String) -> Unit,
sessionActions: SessionActions, sessionActions: SessionActions,
) { ) {