Update to latest Horologist

Change-Id: Ie939e3538220769a76941b69c3c2253cb908e3fb

Author: kul3r4

Jetcaster/gradle/libs.versions.toml

@@ -24,8 +24,8 @@ androidx-test-ext-junit = "1.2.1"
 androidx-test-ext-truth = "1.6.0"
 androidx-tv-foundation = "1.0.0-alpha12"
 androidx-tv-material = "1.0.0"
-androidx-wear-compose-material3 = "1.0.0-alpha35"
-androidx-wear-compose = "1.5.0-alpha12"
+androidx-wear-compose-material3 = "1.5.0-beta01"
+androidx-wear-compose = "1.5.0-beta01"
 androidx-window = "1.3.0"
 androidxHiltNavigationCompose = "1.2.0"
 androix-test-uiautomator = "2.3.0"
@@ -37,7 +37,8 @@ google-maps = "19.2.0"
 gradle-versions = "0.52.0"
 hilt = "2.56.2"
 hiltExt = "1.2.0"
-horologist = "0.7.11-alpha"
+horologist = "0.7.14-beta"
+# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
 jdkDesugar = "2.1.5"
 junit = "4.13.2"
 kotlin = "2.1.20"
@@ -60,6 +61,7 @@ spotless = "7.0.3"
 targetSdk = "33"
 version-catalog-update = "1.0.0"
 material3Android = "1.3.1"
+media3CommonKtx = "1.7.1"
 
 [libraries]
 accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
@@ -139,6 +141,7 @@ hilt-android-testing = { module = "com.google.dagger:hilt-android-testing", vers
 hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" }
 hilt-ext-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "hiltExt" }
 horologist-audio-ui = { module = "com.google.android.horologist:horologist-audio-ui", version.ref = "horologist" }
+horologist-audio-uimaterial3 = { module = "com.google.android.horologist:horologist-audio-ui-material3", version.ref = "horologist" }
 horologist-audio-ui-model = { module = "com.google.android.horologist:horologist-audio-ui-model", version.ref = "horologist" }
 horologist-composables = { module = "com.google.android.horologist:horologist-composables", version.ref = "horologist" }
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
@@ -147,6 +150,7 @@ horologist-compose-tools = { module = "com.google.android.horologist:horologist-
 horologist-images-coil = { module = "com.google.android.horologist:horologist-images-coil", version.ref = "horologist" }
 horologist-media-data = { module = "com.google.android.horologist:horologist-media-data", version.ref = "horologist" }
 horologist-media-ui = { module = "com.google.android.horologist:horologist-media-ui", version.ref = "horologist" }
+horologist-media-uimaterial3 = { module = "com.google.android.horologist:horologist-media-ui-material3", version.ref = "horologist" }
 horologist-media-ui-model = { module = "com.google.android.horologist:horologist-media-ui-model", version.ref = "horologist" }
 horologist-roboscreenshots = { module = "com.google.android.horologist:horologist-roboscreenshots", version.ref = "horologist" }
 junit = { module = "junit:junit", version.ref = "junit" }
@@ -167,6 +171,7 @@ rometools-rome = { module = "com.rometools:rome", version.ref = "rome" }
 androidx-media3-session = {module = "androidx.media3:media3-session",version.ref = "media3"}
 androidx-media3-exoplayer = {module = "androidx.media3:media3-exoplayer", version.ref = "media3"}
 androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
+androidx-media3-common-ktx = { group = "androidx.media3", name = "media3-common-ktx", version.ref = "media3CommonKtx" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

Jetcaster/wear/build.gradle

@@ -75,6 +75,7 @@ android {
 
 dependencies {
 
+    implementation libs.androidx.media3.common.ktx
     def composeBom = platform(libs.androidx.compose.bom)
 
     // General compose dependencies
@@ -100,15 +101,19 @@ dependencies {
     implementation(libs.androidx.material.icons.core)
     implementation(libs.androidx.compose.material.iconsExtended)
 
+    implementation(libs.androidx.media3.exoplayer)
+    implementation(libs.androidx.media3.ui.compose)
+    implementation(libs.androidx.media3.session)
+
     // Horologist for correct Compose layout
-    implementation libs.horologist.composables
     implementation libs.horologist.compose.layout
-    implementation libs.horologist.compose.material
 
     //Horologist Media toolkit
     implementation libs.horologist.media.ui
+    implementation libs.horologist.media.uimaterial3
     implementation libs.horologist.media.ui.model
     implementation libs.horologist.audio.ui
+    implementation libs.horologist.audio.uimaterial3
     implementation libs.horologist.audio.ui.model
     implementation libs.horologist.media.data
     implementation libs.horologist.images.coil

Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt

@@ -30,7 +30,6 @@ import androidx.wear.compose.navigation.composable
 import androidx.wear.compose.foundation.pager.rememberPagerState
 import androidx.wear.compose.material3.AppScaffold
 import androidx.wear.compose.material3.ScreenScaffold
-import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
 import androidx.wear.compose.navigation.rememberSwipeDismissableNavHostState
 import com.example.jetcaster.theme.WearAppTheme
 import com.example.jetcaster.ui.Episode
@@ -50,12 +49,12 @@ import com.example.jetcaster.ui.player.PlayerScreen
 import com.example.jetcaster.ui.podcast.PodcastDetailsScreen
 import com.example.jetcaster.ui.podcasts.PodcastsScreen
 import com.example.jetcaster.ui.queue.QueueScreen
-import com.google.android.horologist.audio.ui.VolumeScreen
+import com.google.android.horologist.audio.ui.material3.VolumeScreen
 import com.google.android.horologist.audio.ui.VolumeViewModel
-import com.google.android.horologist.media.ui.navigation.MediaNavController.navigateToPlayer
-import com.google.android.horologist.media.ui.navigation.MediaNavController.navigateToVolume
-import com.google.android.horologist.media.ui.navigation.NavigationScreens
-import com.google.android.horologist.media.ui.screens.playerlibrarypager.PlayerLibraryPagerScreen
+import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToPlayer
+import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToVolume
+import com.google.android.horologist.media.ui.material3.navigation.NavigationScreens
+import com.google.android.horologist.media.ui.material3.screens.playerlibrarypager.PlayerLibraryPagerScreen
 
 @Composable
 fun WearApp(navController: NavHostController) {

Jetcaster/wear/src/main/java/com/example/jetcaster/theme/ColorScheme.kt

@@ -44,10 +44,12 @@ import com.example.jetcaster.designsystem.theme.tertiaryDark
 
 internal val wearColorPalette: ColorScheme = ColorScheme(
     primary = primaryDark,
+    primaryDim= primaryDark,
     onPrimary = Color(0xFF542104),
     primaryContainer = primaryContainerDark,
     onPrimaryContainer = onPrimaryContainerDark,
     secondary = secondaryDark,
+    secondaryDim = secondaryDark,
     onSecondary = onSecondaryDark,
     secondaryContainer = secondaryContainerDark,
     onSecondaryContainer = onSecondaryContainerDark,

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/JetcasterNavController.kt

@@ -16,20 +16,80 @@
 
 package com.example.jetcaster.ui
 
-import com.google.android.horologist.media.ui.navigation.NavigationScreen
-import kotlinx.serialization.Serializable
+import android.net.Uri
+import androidx.navigation.NamedNavArgument
+import androidx.navigation.NavController
+import androidx.navigation.NavType
+import androidx.navigation.navArgument
+import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToPlayer
+import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToVolume
+import com.google.android.horologist.media.ui.material3.navigation.NavigationScreens
+import com.google.android.horologist.media.ui.material3.screens.playerlibrarypager.PlayerLibraryPagerScreen
 
-@Serializable
-data object YourPodcasts : NavigationScreen
+/**
+ * NavController extensions that links to the screens of the Jetcaster app.
+ */
+public object JetcasterNavController {
+
+    public fun NavController.navigateToYourPodcast() {
+        navigate(YourPodcasts.destination())
+    }
+
+    public fun NavController.navigateToLatestEpisode() {
+        navigate(LatestEpisodes.destination())
+    }
+
+    public fun NavController.navigateToPodcastDetails(podcastUri: String) {
+        navigate(PodcastDetails.destination(podcastUri))
+    }
+
+    public fun NavController.navigateToUpNext() {
+        navigate(UpNext.destination())
+    }
+
+    public fun NavController.navigateToEpisode(episodeUri: String) {
+        navigate(Episode.destination(episodeUri))
+    }
+}
+
+public object YourPodcasts : NavigationScreens("yourPodcasts") {
+    public fun destination(): String = navRoute
+}
+
+public object LatestEpisodes : NavigationScreens("latestEpisodes") {
+    public fun destination(): String = navRoute
+}
+
+public object PodcastDetails : NavigationScreens("podcast?podcastUri={podcastUri}") {
+    public const val PODCAST_URI: String = "podcastUri"
+    public fun destination(podcastUri: String): String {
+        val encodedUri = Uri.encode(podcastUri)
+        return "podcast?$PODCAST_URI=$encodedUri"
+    }
 
-@Serializable
-data object LatestEpisodes : NavigationScreen
+    override val arguments: List<NamedNavArgument>
+        get() = listOf(
+            navArgument(PODCAST_URI) {
+                type = NavType.StringType
+            },
+        )
+}
 
-@Serializable
-data class PodcastDetails(val podcastUri: String) : NavigationScreen
+public object Episode : NavigationScreens("episode?episodeUri={episodeUri}") {
+    public const val EPISODE_URI: String = "episodeUri"
+    public fun destination(episodeUri: String): String {
+        val encodedUri = Uri.encode(episodeUri)
+        return "episode?$EPISODE_URI=$encodedUri"
+    }
 
-@Serializable
-data class Episode(val episodeUri: String) : NavigationScreen
+    override val arguments: List<NamedNavArgument>
+        get() = listOf(
+            navArgument(EPISODE_URI) {
+                type = NavType.StringType
+            },
+        )
+}
 
-@Serializable
-data object UpNext : NavigationScreen
+public object UpNext : NavigationScreens("upNext") {
+    public fun destination(): String = navRoute
+}

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/PlaceholderButton.kt

@@ -33,6 +33,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.unit.dp
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import androidx.wear.compose.material3.Button
 import androidx.wear.compose.material3.ButtonDefaults
 import androidx.wear.compose.material3.FilledTonalButton
@@ -46,20 +47,21 @@ import com.google.android.horologist.annotations.ExperimentalHorologistApi
 /**
  * A placeholder chip to be displayed while the contents of the [Button] is being loaded.
  */
+@OptIn(ExperimentalWearMaterialApi::class)
 @ExperimentalHorologistApi
 @Composable
 fun PlaceholderButton(
     modifier: Modifier = Modifier,
     onClick: () -> Unit = {},
-    placeholderState: PlaceholderState = rememberPlaceholderState { false },
+    placeholderState: PlaceholderState = rememberPlaceholderState(false),
     secondaryLabel: Boolean = true,
     icon: Boolean = true
 ) {
     var labelText by remember { mutableStateOf("") }
     var imageVector: ImageVector? by remember { mutableStateOf(null) }
-    val buttonPlaceholderState = rememberPlaceholderState {
+    val buttonPlaceholderState = rememberPlaceholderState (
         labelText.isNotEmpty() && imageVector != null
-    }
+    )
     FilledTonalButton(
         onClick = { onClick },
         enabled = true,
@@ -100,11 +102,6 @@ fun PlaceholderButton(
         } else {
             null
         },
-        colors =
-        PlaceholderDefaults.placeholderButtonColors(
-            originalButtonColors = ButtonDefaults.buttonColors(),
-            placeholderState = buttonPlaceholderState
-        ),
         modifier = modifier.fillMaxWidth()
             .placeholderShimmer(buttonPlaceholderState)
     )

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/SettingsButtons.kt

@@ -17,7 +17,9 @@
 package com.example.jetcaster.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -27,10 +29,12 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import com.example.jetcaster.R
 import com.example.jetcaster.ui.player.PlayerUiState
+import com.google.android.horologist.audio.AudioOutput
 import com.google.android.horologist.audio.ui.VolumeUiState
-import com.google.android.horologist.audio.ui.components.SettingsButtonsDefaults
-import com.google.android.horologist.audio.ui.components.actions.SetVolumeButton
-import com.google.android.horologist.audio.ui.components.actions.SettingsButton
+import com.google.android.horologist.audio.ui.material3.components.actions.SettingsButton
+import com.google.android.horologist.audio.ui.material3.components.actions.VolumeButtonWithBadge
+import com.google.android.horologist.audio.ui.material3.components.toAudioOutputUi
+
 
 /**
  * Settings buttons for the Jetcaster media app.
@@ -50,23 +54,24 @@ fun SettingsButtons(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.SpaceEvenly,
     ) {
-        PlaybackSpeedButton(
-            currentPlayerSpeed = playerUiState.episodePlayerState
-                .playbackSpeed.toMillis().toFloat() / 1000,
-            onPlaybackSpeedChange = onPlaybackSpeedChange,
-            enabled = enabled,
-        )
+        Box(modifier = Modifier.weight(1f).fillMaxHeight()) {
+            VolumeButtonWithBadge(
+                onOutputClick = onVolumeClick,
+                audioOutputUi = AudioOutput.BluetoothHeadset(id = "id", name = "name")
+                    .toAudioOutputUi(),
+                volumeUiState = volumeUiState
+            )
+        }
 
-        SettingsButtonsDefaults.BrandIcon(
-            iconId = R.drawable.ic_logo,
-            enabled = enabled,
-        )
+        Box(modifier = Modifier.weight(1f).fillMaxHeight()) {
+            PlaybackSpeedButton(
+                currentPlayerSpeed = playerUiState.episodePlayerState
+                    .playbackSpeed.toMillis().toFloat() / 1000,
+                onPlaybackSpeedChange = onPlaybackSpeedChange,
+                enabled = enabled
+            )
+        }
 
-        SetVolumeButton(
-            onVolumeClick = onVolumeClick,
-            volumeUiState = volumeUiState,
-            enabled = enabled,
-        )
     }
 }