Improve media artwork display in MediaRouteControllerDialog (#66)

* Improve media artwork display in `MediaRouteControllerDialog`

* Update screenshots

* Update Detekt configuration to ignore tests for undocumented symbols

* Remove unnecessary Kotlin BOM declaration

* Switch to the platform APIs instead of the legacy ones

* Fix display of the media artwork

---------

Co-authored-by: MGaetan89 <1009664+MGaetan89@users.noreply.github.com>

Author: MGaetan89

config/detekt.yml

@@ -17,16 +17,16 @@ comments:
 
   UndocumentedPublicClass:
     active: true
-    excludes: [ '**/demo/**' ]
+    excludes: [ '**/demo/**', '**/*Test.kt' ]
     ignoreDefaultCompanionObject: true
 
   UndocumentedPublicFunction:
     active: true
-    excludes: [ '**/demo/**' ]
+    excludes: [ '**/demo/**', '**/*Test.kt' ]
 
   UndocumentedPublicProperty:
     active: true
-    excludes: [ '**/demo/**' ]
+    excludes: [ '**/demo/**', '**/*Test.kt' ]
 
 complexity:
   LongParameterList:

demo/src/main/java/ch/srgssr/androidx/mediarouter/compose/demo/MainViewModel.kt

@@ -6,6 +6,10 @@
 package ch.srgssr.androidx.mediarouter.compose.demo
 
 import android.app.Application
+import android.media.MediaMetadata.METADATA_KEY_ART_URI
+import android.media.MediaMetadata.METADATA_KEY_TITLE
+import android.media.session.MediaSession
+import android.media.session.PlaybackState
 import androidx.annotation.OptIn
 import androidx.core.net.toUri
 import androidx.lifecycle.AndroidViewModel
@@ -15,18 +19,23 @@ import androidx.media3.cast.SessionAvailabilityListener
 import androidx.media3.common.MediaItem
 import androidx.media3.common.MediaMetadata
 import androidx.media3.common.MimeTypes
+import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.exoplayer.ExoPlayer
+import androidx.mediarouter.media.MediaRouter
 import com.google.android.gms.cast.framework.CastContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribed
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlin.time.Duration.Companion.seconds
+import android.media.MediaMetadata as PlatformMediaMetadata
 
 @OptIn(UnstableApi::class)
 class MainViewModel(application: Application) : AndroidViewModel(application) {
+    private val playerListener = PlayerListener()
+    private val mediaSession = MediaSession(application, "androidx-mediarouter-compose-demo")
     private val localPlayer = ExoPlayer.Builder(application).build()
     private val castPlayer = CastPlayer(CastContext.getSharedInstance(application))
     private val currentPlayer =
@@ -35,13 +44,15 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     val player = currentPlayer
         .onEach { player ->
             val oldPlayer = if (player == localPlayer) castPlayer else localPlayer
+            player.addListener(playerListener)
             player.volume = oldPlayer.volume
             player.repeatMode = oldPlayer.repeatMode
             player.playWhenReady = oldPlayer.playWhenReady
 
             oldPlayer.currentMediaItem?.let {
                 player.setMediaItem(it, oldPlayer.currentPosition)
             }
+            oldPlayer.removeListener(playerListener)
             oldPlayer.stop()
         }
         .stateIn(
@@ -51,6 +62,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
         )
 
     init {
+        MediaRouter.getInstance(application).setMediaSession(mediaSession)
+
         localPlayer.setMediaItem(mediaItem)
         localPlayer.volume = 0f
         localPlayer.prepare()
@@ -68,11 +81,51 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     override fun onCleared() {
+        mediaSession.release()
         localPlayer.release()
         castPlayer.setSessionAvailabilityListener(null)
         castPlayer.release()
     }
 
+    private inner class PlayerListener : Player.Listener {
+        override fun onMediaMetadataChanged(mediaMetadata: MediaMetadata) {
+            mediaSession.setMetadata(
+                PlatformMediaMetadata.Builder()
+                    .putText(METADATA_KEY_TITLE, mediaItem.mediaMetadata.title)
+                    .putText(METADATA_KEY_ART_URI, mediaItem.mediaMetadata.artworkUri.toString())
+                    .build()
+            )
+        }
+
+        override fun onPlaybackStateChanged(@Player.State playbackState: Int) {
+            val state = when (playbackState) {
+                Player.STATE_IDLE -> PlaybackState.STATE_CONNECTING
+                Player.STATE_BUFFERING -> PlaybackState.STATE_BUFFERING
+                Player.STATE_READY -> PlaybackState.STATE_PLAYING
+                Player.STATE_ENDED -> PlaybackState.STATE_STOPPED
+                else -> PlaybackState.STATE_NONE
+            }
+            val player = currentPlayer.value
+            val position = player.currentPosition
+            val playbackSpeed = player.playbackParameters.speed
+            val actions = listOfNotNull(
+                PlaybackState.ACTION_PAUSE.takeIf { player.isCommandAvailable(Player.COMMAND_PLAY_PAUSE) },
+                PlaybackState.ACTION_PLAY.takeIf { player.isCommandAvailable(Player.COMMAND_PLAY_PAUSE) },
+                PlaybackState.ACTION_PLAY_PAUSE.takeIf { player.isCommandAvailable(Player.COMMAND_PLAY_PAUSE) },
+                PlaybackState.ACTION_STOP.takeIf { player.isCommandAvailable(Player.COMMAND_STOP) },
+            ).fold(0L) { actions, action ->
+                actions or action
+            }
+
+            mediaSession.setPlaybackState(
+                PlaybackState.Builder()
+                    .setState(state, position, playbackSpeed)
+                    .setActions(actions)
+                    .build()
+            )
+        }
+    }
+
     private companion object {
         @Suppress("MaxLineLength")
         private val mediaItem = MediaItem.Builder()

gradle/libs.versions.toml

@@ -64,10 +64,11 @@ androidx-test-core = { group = "androidx.test", name = "core", version.ref = "an
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
 androidx-test-monitor = { group = "androidx.test", name = "monitor", version.ref = "androidx-test-monitor" }
 coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil" }
+coil-compose-core = { group = "io.coil-kt.coil3", name = "coil-compose-core", version.ref = "coil" }
+coil-core = { group = "io.coil-kt.coil3", name = "coil-core", version.ref = "coil" }
 coil-network-okhttp = { group = "io.coil-kt.coil3", name = "coil-network-okhttp", version.ref = "coil" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
-kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
-kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test" }
+kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 kotlinx-coroutines-core = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
 play-services-cast-framework = { group = "com.google.android.gms", name = "play-services-cast-framework", version.ref = "play-services-cast-framework" }

mediarouter-compose/build.gradle.kts

@@ -118,16 +118,17 @@ dependencies {
     implementation(libs.androidx.media)
     api(libs.androidx.mediarouter)
     implementation(libs.coil.compose)
+    implementation(libs.coil.compose.core)
+    implementation(libs.coil.core)
     implementation(libs.coil.network.okhttp)
-    implementation(platform(libs.kotlin.bom))
-    testImplementation(libs.kotlinx.coroutines.core)
 
     testImplementation(libs.androidx.activity)
     testImplementation(libs.androidx.test.core)
     testImplementation(libs.androidx.test.ext.junit)
     testImplementation(libs.androidx.test.monitor)
     testImplementation(libs.junit)
     testImplementation(libs.kotlin.test)
+    testImplementation(libs.kotlinx.coroutines.core)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.robolectric)
     testImplementation(libs.robolectric.annotations)