Merge pull request #46 from THEOplayer/release/1.9.1

Release 1.9.1

CHANGELOG.md

@@ -9,6 +9,14 @@
 > - 🏠 Internal
 > - 💅 Polish
 
+## v1.9.1 (2024-10-01)
+
+* 🐛 Fix `DurationDisplay` to show the time of the live point when playing a live or DVR stream.
+* 🐛 Fix `CurrentTimeDisplay` to show the time offset to the live point when playing a live or DVR stream with `showRemaining = true`.
+* 💅 Changed `DefaultUi` to hide the current time display when playing a live stream.
+* 💅 Changed `DefaultUi` to show the time offset to the live point when playing a DVR stream.
+* 💅 Changed `LanguageMenuButton` to automatically hide itself when there are no alternative audio or subtitle tracks to select.
+
 ## v1.9.0 (2024-09-10)
 
 * 💥 Updated to Jetpack Compose version 1.7.0 ([BOM](https://developer.android.com/jetpack/compose/bom) 2024.09.00).

gradle.properties

@@ -24,4 +24,4 @@ android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 org.gradle.configuration-cache=true
 # The version of the THEOplayer Open Video UI for Android.
-version=1.9.0
+version=1.9.1

ui/src/main/java/com/theoplayer/android/ui/CurrentTimeDisplay.kt

@@ -21,7 +21,7 @@ fun CurrentTimeDisplay(
 ) {
     val player = Player.current
     val currentTime = player?.currentTime ?: 0.0
-    val duration = player?.duration ?: Double.NaN
+    val duration = player?.seekable?.lastEnd ?: player?.duration ?: Double.NaN
 
     val time = if (showRemaining) {
         -(duration - currentTime)

ui/src/main/java/com/theoplayer/android/ui/DefaultUI.kt

@@ -112,7 +112,12 @@ fun DefaultUI(
                 Row(verticalAlignment = Alignment.CenterVertically) {
                     MuteButton()
                     LiveButton()
-                    CurrentTimeDisplay(showDuration = true)
+                    if (player.streamType != StreamType.Live) {
+                        CurrentTimeDisplay(
+                            showRemaining = player.streamType == StreamType.Dvr,
+                            showDuration = player.streamType == StreamType.Vod
+                        )
+                    }
                     Spacer(modifier = Modifier.weight(1f))
                     FullscreenButton()
                 }

ui/src/main/java/com/theoplayer/android/ui/DurationDisplay.kt

@@ -14,7 +14,7 @@ fun DurationDisplay(
     modifier: Modifier = Modifier
 ) {
     val player = Player.current
-    val duration = player?.duration ?: Double.NaN
+    val duration = player?.seekable?.lastEnd ?: player?.duration ?: Double.NaN
 
     Text(modifier = modifier, text = formatTime(duration))
 }

ui/src/main/java/com/theoplayer/android/ui/LanguageMenu.kt

@@ -48,11 +48,11 @@ fun MenuScope.LanguageMenu() {
     }
 }
 
-private fun showAudioTracks(player: Player?): Boolean {
+internal fun showAudioTracks(player: Player?): Boolean {
     return player != null && player.audioTracks.size >= 2
 }
 
-private fun showSubtitleTracks(player: Player?): Boolean {
+internal fun showSubtitleTracks(player: Player?): Boolean {
     return player != null && player.subtitleTracks.isNotEmpty()
 }
 

ui/src/main/java/com/theoplayer/android/ui/LanguageMenuButton.kt

@@ -25,10 +25,20 @@ fun MenuScope.LanguageMenuButton(
         )
     }
 ) {
+    val player = Player.current
+    if (!showLanguageMenuButton(player)) {
+        // Hide when no alternative audio or subtitle tracks are available
+        return
+    }
+
     IconButton(
         modifier = modifier,
         contentPadding = contentPadding,
         onClick = { openMenu { LanguageMenu() } }) {
         content()
     }
-}
+}
+
+internal fun showLanguageMenuButton(player: Player?): Boolean {
+    return showAudioTracks(player) || showSubtitleTracks(player)
+}