mediaplayer in AbstractSessionScreen + InvisibleSessionManagerTest.kt fixed

This commit is contained in:
Rune Dyselinck 2023-04-28 14:42:37 +02:00
parent 46d60e100b
commit e421430f0b
11 changed files with 59 additions and 44 deletions

View file

@ -5,12 +5,6 @@ class FunctionalCustomTimer(studyTime: Int) : FunctionalTimer(studyTime) {
override fun tick() {
if (!hasEnded()) {
time.minOne()
} else {
mediaPlayer?.setOnCompletionListener {
mediaPlayer!!.release()
mediaPlayer = null
}
mediaPlayer?.start()
}
}

View file

@ -10,14 +10,10 @@ class FunctionalPomodoroTimer(
override fun tick() {
if (hasEnded()) {
mediaPlayer?.setOnCompletionListener {
mediaPlayer!!.release()
mediaPlayer = null
}
mediaPlayer?.start()
return
} else if (hasCurrentCountdownEnded()) {
mediaPlayer?.start()
}
if (hasCurrentCountdownEnded()) {
if (isInBreak) {
breaksRemaining--
time.time = studyTime

View file

@ -1,10 +1,7 @@
package be.ugent.sel.studeez.data.local.models.timer_functional
import android.media.MediaPlayer
abstract class FunctionalTimer(initialValue: Int) {
val time: Time = Time(initialValue)
var mediaPlayer: MediaPlayer? = null
fun getHoursMinutesSeconds(): HoursMinutesSeconds {
return time.getAsHMS()