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

try to fix crash because of mediaplayer

Browse source
This commit is contained in:
brreynie 2023-04-24 00:18:38 +02:00
parent 6bfa96bab7
commit 70449500cc
1 changed files with 6 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt
View file

@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Button
import androidx.compose.material.Text import androidx.compose.material.Text
import androidx.compose.material.TextButton import androidx.compose.material.TextButton
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
@ -45,7 +44,6 @@ data class SessionActions(
val getTask: () -> String, val getTask: () -> String,
val prepareMediaPlayer: () -> Unit, val prepareMediaPlayer: () -> Unit,
val releaseMediaPlayer: () -> Unit, val releaseMediaPlayer: () -> Unit,
val play: () -> Unit,
) )
fun getSessionActions( fun getSessionActions(
@ -55,9 +53,8 @@ fun getSessionActions(
return SessionActions( return SessionActions(
getTimer = viewModel::getTimer, getTimer = viewModel::getTimer,
getTask = viewModel::getTask, getTask = viewModel::getTask,
prepareMediaPlayer = mediaplayer::prepare, prepareMediaPlayer = mediaplayer::prepareAsync,
releaseMediaPlayer = mediaplayer::release, releaseMediaPlayer = mediaplayer::release,
play = mediaplayer::start,
) )
} }
@ -68,11 +65,10 @@ fun SessionRoute(
) { ) {
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.create(context, uri) val mediaplayer = MediaPlayer()
mediaplayer.setDataSource(context, uri)
mediaplayer.setOnCompletionListener { mediaplayer.setOnCompletionListener {
if (!mediaplayer.isPlaying) {
mediaplayer.stop() mediaplayer.stop()
}
if (timerEnd) { if (timerEnd) {
mediaplayer.release() mediaplayer.release()
} }
@ -122,9 +118,6 @@ fun SessionScreen(
) )
} }
} }
// Button(onClick = sessionActions.play) {
// Text(text = "Play")
// }
} }
} }
@ -206,7 +199,7 @@ private fun Timer(
@Preview @Preview
@Composable @Composable
fun TimerPreview() { fun TimerPreview() {
Timer(sessionActions = SessionActions({ FunctionalEndlessTimer() }, { "Preview" }, {}, {}, {})) Timer(sessionActions = SessionActions({ FunctionalEndlessTimer() }, { "Preview" }, {}, {}))
} }
@Preview @Preview
@ -214,6 +207,6 @@ fun TimerPreview() {
fun SessionPreview() { fun SessionPreview() {
SessionScreen( SessionScreen(
open = {}, open = {},
sessionActions = SessionActions({ FunctionalEndlessTimer() }, { "Preview" }, {}, {}, {}) sessionActions = SessionActions({ FunctionalEndlessTimer() }, { "Preview" }, {}, {})
) )
} }