Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Emit audio playback events via audio repository #2543

Merged
merged 1 commit into from
Jan 13, 2024
Merged

Emit audio playback events via audio repository #2543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions app/src/main/java/com/quran/labs/androidquran/bridge/AudioEventPresenterBridge.kt
View file
Open in desktop

This file was deleted.

60 changes: 60 additions & 0 deletions app/src/main/java/com/quran/labs/androidquran/bridge/AudioStatusRepositoryBridge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package com.quran.labs.androidquran.bridge

import com.quran.data.model.SuraAyah
import com.quran.labs.androidquran.common.audio.model.playback.AudioRequest
import com.quran.labs.androidquran.common.audio.model.playback.AudioStatus
import com.quran.labs.androidquran.common.audio.model.playback.PlaybackStatus
import com.quran.labs.androidquran.common.audio.repository.AudioStatusRepository
import com.quran.labs.androidquran.view.AudioStatusBar
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.cancel
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.onEach

class AudioStatusRepositoryBridge(
audioStatusRepository: AudioStatusRepository,
audioStatusBar: () -> AudioStatusBar,
onPlaybackAyahChanged: ((SuraAyah?) -> Unit)
) {

private val scope = MainScope()
private val audioPlaybackAyahFlow = audioStatusRepository.audioPlaybackFlow

init {
audioPlaybackAyahFlow
.onEach { status ->
when (status) {
is AudioStatus.Playback -> {
val statusBar = audioStatusBar()
if (status.playbackStatus == PlaybackStatus.PLAYING) {
statusBar.switchMode(AudioStatusBar.PLAYING_MODE)
if (status.audioRequest.repeatInfo >= -1) {
statusBar.setRepeatCount(status.audioRequest.repeatInfo)
statusBar.setSpeed(status.audioRequest.playbackSpeed)
}
} else if (status.playbackStatus == PlaybackStatus.PAUSED) {
statusBar.switchMode(AudioStatusBar.PAUSED_MODE)
} else if (status.playbackStatus == PlaybackStatus.PREPARING) {
statusBar.switchMode(AudioStatusBar.LOADING_MODE)
}
onPlaybackAyahChanged(status.currentAyah)
}
AudioStatus.Stopped -> {
audioStatusBar().switchMode(AudioStatusBar.STOPPED_MODE)
}
}
}
.launchIn(scope)
}

fun audioRequest(): AudioRequest? {
return when (val status = audioPlaybackAyahFlow.value) {
is AudioStatus.Playback -> status.audioRequest
AudioStatus.Stopped -> null
}
}

fun dispose() {
scope.cancel()
}
}
1 change: 1 addition & 0 deletions app/src/main/java/com/quran/labs/androidquran/presenter/audio/service/AudioQueue.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class AudioQueue(private val quranInfo: QuranInfo,

fun getCurrentSura() = playbackInfo.currentAyah.sura
fun getCurrentAyah() = playbackInfo.currentAyah.ayah
fun getCurrentPlaybackAyah() = playbackInfo.currentAyah

fun playNextAyah(skipAyahRepeat: Boolean = false): Boolean {
if (playbackInfo.shouldPlayBasmallah) {
Expand Down
11 changes: 6 additions & 5 deletions ...main/java/com/quran/labs/androidquran/presenter/quran/ayahtracker/AyahTrackerPresenter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import com.quran.data.model.selection.AyahSelection
import com.quran.data.model.selection.SelectionIndicator
import com.quran.data.model.selection.startSuraAyah
import com.quran.labs.androidquran.common.QuranAyahInfo
import com.quran.labs.androidquran.common.audio.model.playback.currentPlaybackAyah
import com.quran.labs.androidquran.common.audio.repository.AudioStatusRepository
import com.quran.labs.androidquran.data.QuranDisplayData
import com.quran.labs.androidquran.data.SuraAyahIterator
import com.quran.labs.androidquran.presenter.Presenter
Expand All @@ -34,7 +36,6 @@ import com.quran.mobile.bookmark.model.BookmarkModel
import com.quran.mobile.translation.model.LocalTranslation
import com.quran.page.common.data.AyahCoordinates
import com.quran.page.common.data.PageCoordinates
import com.quran.reading.common.AudioEventPresenter
import com.quran.reading.common.ReadingEventPresenter
import com.quran.recitation.events.RecitationEventPresenter
import com.quran.recitation.presenter.RecitationHighlightsPresenter
Expand All @@ -58,8 +59,8 @@ class AyahTrackerPresenter @Inject constructor(
private val quranSettings: QuranSettings,
private val readingEventPresenter: ReadingEventPresenter,
private val bookmarkModel: BookmarkModel,
private val audioEventPresenter: AudioEventPresenter,
private val recitationPresenter: RecitationPresenter,
private val audioStatusRepository: AudioStatusRepository,
recitationPresenter: RecitationPresenter,
private val recitationEventPresenter: RecitationEventPresenter,
private val recitationPopupPresenter: RecitationPopupPresenter,
private val recitationHighlightsPresenter: RecitationHighlightsPresenter,
Expand All @@ -81,8 +82,8 @@ class AyahTrackerPresenter @Inject constructor(
.onEach { onAyahSelectionChanged(it) }
.launchIn(scope)

audioEventPresenter.audioPlaybackAyahFlow
.onEach { onAudioSelectionChanged(it) }
audioStatusRepository.audioPlaybackFlow
.onEach { onAudioSelectionChanged(it.currentPlaybackAyah()) }
.launchIn(scope)

items.forEach { trackerItem ->
Expand Down
Loading