Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,9 @@ dependencies {
implementation(libs.androidx.material.icons.extended)
implementation(libs.androidx.material3)
implementation(libs.androidx.material3.window.size)
implementation(libs.androidx.media3.datasource.okhttp)
implementation(libs.androidx.media3.exoplayer)
implementation(libs.androidx.media3.session)
implementation(libs.androidx.navigation.compose)
implementation(libs.androidx.paging.compose)
implementation(libs.androidx.paging.runtime.ktx)
Expand Down
28 changes: 28 additions & 0 deletions app/src/main/java/com/capyreader/app/common/AudioEnclosure.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package com.capyreader.app.common

import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.Saver
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.Json

@Serializable
data class AudioEnclosure(
val url: String,
val title: String,
val feedName: String,
val durationSeconds: Long?,
val artworkUrl: String?
) {
companion object
}

val AudioEnclosure.Companion.Saver
get() = Saver<MutableState<AudioEnclosure?>, String>(
save = { state ->
Json.encodeToString(state.value)
},
restore = { jsonString ->
mutableStateOf(Json.decodeFromString(jsonString))
}
)
23 changes: 23 additions & 0 deletions app/src/main/java/com/capyreader/app/common/WebViewInterface.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import kotlinx.serialization.json.Json
class WebViewInterface(
private val navigateToMedia: (media: Media) -> Unit,
private val onRequestLinkDialog: (link: ShareLink) -> Unit,
private val onOpenAudioPlayer: (audio: AudioEnclosure) -> Unit = {},
private val onPauseAudio: () -> Unit = {},
) {
var onRequestAudioState: () -> Unit = {}
@JavascriptInterface
fun openImageGallery(imagesJson: String, clickedIndex: Int) {
try {
Expand All @@ -33,6 +36,26 @@ class WebViewInterface(
}
}

@JavascriptInterface
fun openAudioPlayer(audioJson: String) {
try {
val audio = Json.decodeFromString<AudioEnclosure>(audioJson)
onOpenAudioPlayer(audio)
} catch (e: Exception) {
CapyLog.error("open_audio_player", e)
}
}

@JavascriptInterface
fun pauseAudio() {
onPauseAudio()
}

@JavascriptInterface
fun requestAudioState() {
onRequestAudioState()
}

companion object {
const val INTERFACE_NAME = "Android"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ class AppPreferences(context: Context) {
val showTodayFilter: Preference<Boolean>
get() = preferenceStore.getBoolean("show_today_filter", true)

val enableAudioPlayer: Preference<Boolean>
get() = preferenceStore.getBoolean("enable_audio_player", false)

fun clearAll() {
preferenceStore.clearAll()
}
Expand Down
44 changes: 42 additions & 2 deletions app/src/main/java/com/capyreader/app/ui/articles/ArticleScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import androidx.activity.compose.BackHandler
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.DrawerValue
Expand Down Expand Up @@ -43,8 +45,11 @@ import androidx.core.net.toUri
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.paging.compose.collectAsLazyPagingItems
import com.capyreader.app.R
import com.capyreader.app.common.AudioEnclosure
import com.capyreader.app.common.Media
import com.capyreader.app.common.Saver
import com.capyreader.app.ui.articles.audio.AudioPlayerController
import com.capyreader.app.ui.articles.audio.FloatingAudioPlayer
import com.capyreader.app.preferences.AfterReadAllBehavior
import com.capyreader.app.preferences.AppPreferences
import com.capyreader.app.refresher.RefreshInterval
Expand Down Expand Up @@ -191,6 +196,8 @@ fun ArticleScreen(
val currentFeed by viewModel.currentFeed.collectAsStateWithLifecycle(null)
val scrollBehavior = pinnedScrollBehavior()
var media by rememberSaveable(saver = Media.Saver) { mutableStateOf(null) }
val audioController: AudioPlayerController = koinInject()
val audioEnclosure by audioController.currentAudio.collectAsState()
val focusManager = LocalFocusManager.current
val openUpdatePasswordDialog = {
viewModel.dismissUnauthorizedMessage()
Expand Down Expand Up @@ -535,6 +542,23 @@ fun ArticleScreen(
position = MarkReadPosition.FLOATING_ACTION_BUTTON,
)
}
},
bottomBar = {
AnimatedVisibility(
enter = slideInVertically(initialOffsetY = { it }) + fadeIn(),
exit = slideOutVertically(targetOffsetY = { it }) + fadeOut(),
visible = audioEnclosure != null,
) {
audioEnclosure?.let { audio ->
FloatingAudioPlayer(
audio = audio,
controller = audioController,
onDismiss = {
audioController.dismiss()
},
)
}
}
}
) { innerPadding ->
ArticleListScaffold(
Expand Down Expand Up @@ -594,6 +618,9 @@ fun ArticleScreen(
CapyPlaceholder()
}
} else if (article != null) {
val isAudioPlaying by audioController.isPlaying.collectAsState()
val currentAudio by audioController.currentAudio.collectAsState()

ArticleView(
article = article,
articles = articles,
Expand All @@ -604,12 +631,20 @@ fun ArticleScreen(
onToggleStar = viewModel::toggleArticleStar,
enableBackHandler = media == null,
onSelectMedia = { media = it },
onSelectAudio = { audio ->
audioController.play(audio)
},
onPauseAudio = {
audioController.pause()
},
onSelectArticle = { articleID ->
setArticle(articleID)
},
onScrollToArticle = { index ->
scrollToArticle(index)
}
},
currentAudioUrl = currentAudio?.url,
isAudioPlaying = isAudioPlaying,
)
}
}
Expand All @@ -628,6 +663,7 @@ fun ArticleScreen(
)
}


if (viewModel.showUnauthorizedMessage) {
UnauthorizedAlertDialog(
onConfirm = openUpdatePasswordDialog,
Expand Down Expand Up @@ -673,7 +709,11 @@ fun ArticleScreen(
media = null
}

BackHandler(media == null && search.isActive && article == null) {
BackHandler(audioEnclosure != null && media == null) {
audioController.dismiss()
}

BackHandler(media == null && audioEnclosure == null && search.isActive && article == null) {
search.clear()
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
package com.capyreader.app.ui.articles

import android.content.Context
import com.capyreader.app.R
import com.capyreader.app.preferences.AppPreferences
import com.capyreader.app.ui.articles.audio.AudioPlayerController
import com.capyreader.app.ui.articles.feeds.edit.EditFeedViewModel
import com.jocmp.capy.accounts.baseHttpClient
import com.jocmp.capy.articles.ArticleRenderer
import com.jocmp.capy.articles.AudioPlayerLabels
import org.koin.androidx.viewmodel.dsl.viewModel
import org.koin.dsl.module

Expand All @@ -14,15 +19,28 @@ internal val articlesModule = module {
)
}
single {
ArticleRenderer(
AudioPlayerController(
context = get(),
okHttpClient = baseHttpClient()
)
}
single {
val context = get<Context>()

ArticleRenderer(
context = context,
textSize = get<AppPreferences>().readerOptions.fontSize,
fontOption = get<AppPreferences>().readerOptions.fontFamily,
titleFontSize = get<AppPreferences>().readerOptions.titleFontSize,
textAlignment = get<AppPreferences>().readerOptions.titleTextAlignment,
titleFollowsBodyFont = get<AppPreferences>().readerOptions.titleFollowsBodyFont,
hideTopMargin = get<AppPreferences>().readerOptions.pinTopToolbar,
enableHorizontalScroll = get<AppPreferences>().readerOptions.enableHorizontaPagination,
enableAudioPlayer = get<AppPreferences>().enableAudioPlayer,
audioPlayerLabels = AudioPlayerLabels(
play = context.getString(R.string.audio_player_play),
pause = context.getString(R.string.audio_player_pause),
),
)
}
viewModel {
Expand Down
Loading