Update the Wear media sample to Material3 and nav 3

.gitignore

@@ -37,9 +37,9 @@ checksum.txt
 # Paparazzi failures output folder
 out/
 
-/.idea/shelf
-/.idea/deploymentTargetSelector.xml
-/.idea/appInsightsSettings.xml
+# Android Studio / IntelliJ caches and user-specific settings
+**/.idea/*
+!/.idea/.gitignore
+!/.idea/.name
+!/.idea/icon.svg
 /.kotlin/**/*
-/.idea/runConfigurations.xml
-/.idea/assetWizardSettings.xml

ai/sample/core/build.gradle.kts

@@ -58,7 +58,6 @@ android {
 protobuf {
   protoc { artifact = libs.protobuf.protoc.stnd.get().toString() }
   plugins {
-    create("javalite") { artifact = libs.protobuf.protoc.gen.javalite.get().toString() }
     create("grpc") { artifact = libs.protobuf.protoc.gen.grpc.java.get().toString() }
     create("grpckt") { artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString() }
   }

auth/sample/shared/build.gradle.kts

@@ -56,7 +56,6 @@ android {
 protobuf {
   protoc { artifact = libs.protobuf.protoc.stnd.get().toString() }
   plugins {
-    create("javalite") { artifact = libs.protobuf.protoc.gen.javalite.get().toString() }
     create("grpc") { artifact = libs.protobuf.protoc.gen.grpc.java.get().toString() }
     create("grpckt") { artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString() }
   }

datalayer/core/build.gradle.kts

@@ -53,7 +53,6 @@ android {
 
 protobuf {
   protoc { artifact = libs.protobuf.protoc.stnd.get().toString() }
-  plugins { create("javalite") { artifact = libs.protobuf.protoc.gen.javalite.get().toString() } }
   generateProtoTasks {
     all().forEach { task ->
       task.builtins {

datalayer/grpc/build.gradle.kts

@@ -49,7 +49,6 @@ android {
 protobuf {
   protoc { artifact = libs.protobuf.protoc.stnd.get().toString() }
   plugins {
-    create("javalite") { artifact = libs.protobuf.protoc.gen.javalite.get().toString() }
     create("grpc") { artifact = libs.protobuf.protoc.gen.grpc.java.get().toString() }
     create("grpckt") { artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString() }
   }

datalayer/sample/shared/build.gradle.kts

@@ -56,7 +56,6 @@ android {
 protobuf {
   protoc { artifact = libs.protobuf.protoc.stnd.get().toString() }
   plugins {
-    create("javalite") { artifact = libs.protobuf.protoc.gen.javalite.get().toString() }
     create("grpc") { artifact = libs.protobuf.protoc.gen.grpc.java.get().toString() }
     create("grpckt") { artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString() }
   }

datalayer/sample/wear/build.gradle.kts

@@ -78,7 +78,6 @@ android {
 protobuf {
   protoc { artifact = libs.protobuf.protoc.stnd.get().toString() }
   plugins {
-    create("javalite") { artifact = libs.protobuf.protoc.gen.javalite.get().toString() }
     create("grpc") { artifact = libs.protobuf.protoc.gen.grpc.java.get().toString() }
     create("grpckt") { artifact = libs.protobuf.protoc.gen.grpc.kotlin.get().toString() }
   }

gradle/libs.versions.toml

@@ -14,6 +14,7 @@ androidx-test-espresso = "3.7.0"
 androidx-test-ext = "1.3.0"
 androidx-test-runner = "1.7.0"
 androidx-wear-watchface = "1.3.0"
+androidx-wear-watchface-rendering = "1.2.1"
 androidxActivity = "1.13.0"
 androidxComposeBom = "2026.03.01"
 androidxCore = "1.18.0"
@@ -71,7 +72,7 @@ tiles-tooling-preview = "1.6.0"
 truth = "1.4.5"
 wearInput = "1.2.0"
 wearToolingPreview = "1.0.0"
-wearcompose = "1.6.1"
+wearcompose = "1.6.2"
 agp = "9.1.0"
 
 [libraries]
@@ -86,7 +87,7 @@ androidx-benchmark-junit4 = { module = "androidx.benchmark:benchmark-junit4", ve
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "androidx-benchmark" }
 androidx-complications-data = { module = "androidx.wear.watchface:watchface-complications-data", version.ref = "androidx-complications-data" }
 androidx-complications-datasource-ktx = { module = "androidx.wear.watchface:watchface-complications-data-source-ktx", version.ref = "androidx-wear-watchface" }
-androidx-complications-rendering = { module = "androidx.wear.watchface:watchface-complications-rendering", version = "1.2.1" }
+androidx-complications-rendering = { module = "androidx.wear.watchface:watchface-complications-rendering", version.ref = "androidx-wear-watchface-rendering" }
 androidx-concurrent-future = { module = "androidx.concurrent:concurrent-futures", version.ref = "androidx-concurrent" }
 androidx-concurrent-future-ktx = { module = "androidx.concurrent:concurrent-futures-ktx", version.ref = "androidx-concurrent" }
 androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "androidx-constraintlayout-compose" }
@@ -237,6 +238,9 @@ turbine = { module = "app.cash.turbine:turbine", version.ref = "app-cash-turbine
 wearcompose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "wearcompose" }
 wearcompose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearcompose" }
 wearcompose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "wearcompose" }
+wearcompose-navigation3 = { module = "androidx.wear.compose:compose-navigation3", version = "1.6.2" }
+navigation3-runtime = { module = "androidx.navigation3:navigation3-runtime", version = "1.1.1" }
+navigation3-ui = { module = "androidx.navigation3:navigation3-ui", version = "1.1.1" }
 wearcompose-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "wearcompose" }
 
 [plugins]

media/data/api/current.api

@@ -217,6 +217,17 @@ package com.google.android.horologist.media.database {
     method public abstract com.google.android.horologist.media.database.dao.PlaylistMediaDao playlistMediaDao();
   }
 
+  @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class MediaDatabase_Impl extends com.google.android.horologist.media.database.MediaDatabase {
+    ctor public MediaDatabase_Impl();
+    method public void clearAllTables();
+    method protected androidx.room.InvalidationTracker createInvalidationTracker();
+    method protected androidx.room.RoomOpenDelegate createOpenDelegate();
+    method public com.google.android.horologist.media.database.dao.MediaDao mediaDao();
+    method public com.google.android.horologist.media.database.dao.MediaDownloadDao mediaDownloadDao();
+    method public com.google.android.horologist.media.database.dao.PlaylistDao playlistDao();
+    method public com.google.android.horologist.media.database.dao.PlaylistMediaDao playlistMediaDao();
+  }
+
 }
 
 package com.google.android.horologist.media.database.dao {
@@ -226,6 +237,17 @@ package com.google.android.horologist.media.database.dao {
     method @androidx.room.Insert(onConflict=androidx.room.OnConflictStrategy.Companion.REPLACE) public suspend Object? upsert(java.util.List<com.google.android.horologist.media.database.model.MediaEntity> mediaList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
   }
 
+  @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class MediaDao_Impl implements com.google.android.horologist.media.database.dao.MediaDao {
+    ctor public MediaDao_Impl(androidx.room.RoomDatabase __db);
+    method public suspend Object? delete(java.util.List<java.lang.String> mediaIds, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public suspend Object? upsert(java.util.List<com.google.android.horologist.media.database.model.MediaEntity> mediaList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    field public static final com.google.android.horologist.media.database.dao.MediaDao_Impl.Companion Companion;
+  }
+
+  public static final class MediaDao_Impl.Companion {
+    method public java.util.List<kotlin.reflect.KClass<? extends java.lang.Object?>> getRequiredConverters();
+  }
+
   @androidx.room.Dao @com.google.android.horologist.annotations.ExperimentalHorologistApi public interface MediaDownloadDao {
     method @androidx.room.Query("\n        DELETE FROM MediaDownloadEntity\n        WHERE mediaId = :mediaId\n    ") public suspend Object? delete(String mediaId, kotlin.coroutines.Continuation<? super kotlin.Unit>);
     method @androidx.room.Query("\n        DELETE FROM MediaDownloadEntity\n        WHERE mediaId in (:mediaIds)\n    ") public suspend Object? delete(java.util.List<java.lang.String> mediaIds, kotlin.coroutines.Continuation<? super kotlin.Unit>);
@@ -264,6 +286,23 @@ package com.google.android.horologist.media.database.dao {
     property public com.google.android.horologist.media.database.model.MediaDownloadEntityStatus status;
   }
 
+  @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class MediaDownloadDao_Impl implements com.google.android.horologist.media.database.dao.MediaDownloadDao {
+    ctor public MediaDownloadDao_Impl(androidx.room.RoomDatabase __db);
+    method public suspend Object? delete(String mediaId, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public suspend Object? delete(java.util.List<java.lang.String> mediaIds, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public suspend Object? getAllByStatus(com.google.android.horologist.media.database.model.MediaDownloadEntityStatus status, kotlin.coroutines.Continuation<? super java.util.List<com.google.android.horologist.media.database.model.MediaDownloadEntity>>);
+    method public kotlinx.coroutines.flow.Flow<java.util.List<com.google.android.horologist.media.database.model.MediaDownloadEntity>> getList(java.util.List<java.lang.String> mediaIds);
+    method public suspend Object? insert(com.google.android.horologist.media.database.model.MediaDownloadEntity mediaDownloadEntity, kotlin.coroutines.Continuation<? super java.lang.Long>);
+    method public suspend Object? updateProgress(String mediaId, float progress, long size, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public suspend Object? updateStatus(String mediaId, com.google.android.horologist.media.database.model.MediaDownloadEntityStatus status, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    method public suspend Object? updateStatusAndProgress(com.google.android.horologist.media.database.dao.MediaDownloadDao.StatusAndProgress statusAndProgress, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    field public static final com.google.android.horologist.media.database.dao.MediaDownloadDao_Impl.Companion Companion;
+  }
+
+  public static final class MediaDownloadDao_Impl.Companion {
+    method public java.util.List<kotlin.reflect.KClass<? extends java.lang.Object?>> getRequiredConverters();
+  }
+
   @androidx.room.Dao @com.google.android.horologist.annotations.ExperimentalHorologistApi public interface PlaylistDao {
     method @androidx.room.Query("\n        DELETE FROM PlaylistEntity\n        WHERE playlistId in (:playlistIds)\n    ") public void delete(java.util.List<java.lang.String> playlistIds);
     method @androidx.room.Query("\n        SELECT * FROM PlaylistEntity\n        WHERE EXISTS (\n            SELECT 1 FROM PlaylistMediaEntity\n            WHERE PlaylistMediaEntity.playlistId = PlaylistEntity.playlistId\n            AND EXISTS (\n                SELECT 1 FROM MediaDownloadEntity\n                WHERE MediaDownloadEntity.mediaId = PlaylistMediaEntity.mediaId\n            )\n        )\n    ") @androidx.room.Transaction public kotlinx.coroutines.flow.Flow<java.util.List<com.google.android.horologist.media.database.model.PopulatedPlaylist>> getAllDownloaded();
@@ -273,11 +312,37 @@ package com.google.android.horologist.media.database.dao {
     method @androidx.room.Insert(onConflict=androidx.room.OnConflictStrategy.Companion.REPLACE) public suspend Object? upsert(com.google.android.horologist.media.database.model.PlaylistEntity playlistEntity, java.util.List<com.google.android.horologist.media.database.model.MediaEntity> mediaEntityList, java.util.List<com.google.android.horologist.media.database.model.PlaylistMediaEntity> playlistMediaEntityList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
   }
 
+  @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class PlaylistDao_Impl implements com.google.android.horologist.media.database.dao.PlaylistDao {
+    ctor public PlaylistDao_Impl(androidx.room.RoomDatabase __db);
+    method public void delete(java.util.List<java.lang.String> playlistIds);
+    method public kotlinx.coroutines.flow.Flow<java.util.List<com.google.android.horologist.media.database.model.PopulatedPlaylist>> getAllDownloaded();
+    method public kotlinx.coroutines.flow.Flow<java.util.List<com.google.android.horologist.media.database.model.PopulatedPlaylist>> getAllPopulated();
+    method public suspend Object? getPopulated(String playlistId, kotlin.coroutines.Continuation<? super com.google.android.horologist.media.database.model.PopulatedPlaylist?>);
+    method public kotlinx.coroutines.flow.Flow<com.google.android.horologist.media.database.model.PopulatedPlaylist?> getPopulatedStream(String playlistId);
+    method public suspend Object? upsert(com.google.android.horologist.media.database.model.PlaylistEntity playlistEntity, java.util.List<com.google.android.horologist.media.database.model.MediaEntity> mediaEntityList, java.util.List<com.google.android.horologist.media.database.model.PlaylistMediaEntity> playlistMediaEntityList, kotlin.coroutines.Continuation<? super kotlin.Unit>);
+    field public static final com.google.android.horologist.media.database.dao.PlaylistDao_Impl.Companion Companion;
+  }
+
+  public static final class PlaylistDao_Impl.Companion {
+    method public java.util.List<kotlin.reflect.KClass<? extends java.lang.Object?>> getRequiredConverters();
+  }
+
   @androidx.room.Dao @com.google.android.horologist.annotations.ExperimentalHorologistApi public interface PlaylistMediaDao {
     method @androidx.room.Query("\n        DELETE FROM PlaylistMediaEntity\n        WHERE mediaId in (:mediaIds)\n    ") public void deleteByMediaId(java.util.List<java.lang.String> mediaIds);
     method @androidx.room.Query("\n        DELETE FROM PlaylistMediaEntity\n        WHERE playlistId in (:playlistIds)\n    ") public void deleteByPlaylistId(java.util.List<java.lang.String> playlistIds);
   }
 
+  @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class PlaylistMediaDao_Impl implements com.google.android.horologist.media.database.dao.PlaylistMediaDao {
+    ctor public PlaylistMediaDao_Impl(androidx.room.RoomDatabase __db);
+    method public void deleteByMediaId(java.util.List<java.lang.String> mediaIds);
+    method public void deleteByPlaylistId(java.util.List<java.lang.String> playlistIds);
+    field public static final com.google.android.horologist.media.database.dao.PlaylistMediaDao_Impl.Companion Companion;
+  }
+
+  public static final class PlaylistMediaDao_Impl.Companion {
+    method public java.util.List<kotlin.reflect.KClass<? extends java.lang.Object?>> getRequiredConverters();
+  }
+
 }
 
 package com.google.android.horologist.media.database.mapper {

media/sample/build.gradle.kts

@@ -37,13 +37,13 @@ if (localFile.exists()) {
 }
 
 android {
-  compileSdk = 36
+  compileSdk = 37
 
   defaultConfig {
     applicationId = "com.google.android.horologist.mediasample"
     // Min because of Tiles
     minSdk = 26
-    targetSdk = 34
+    targetSdk = 37
 
     versionCode = 1
     versionName = "1.0"
@@ -106,7 +106,7 @@ android {
 
 protobuf {
   protoc { artifact = libs.protobuf.protoc.stnd.get().toString() }
-  plugins { create("javalite") { artifact = libs.protobuf.protoc.gen.javalite.get().toString() } }
+
   generateProtoTasks {
     all().forEach { task ->
       task.builtins {
@@ -121,6 +121,7 @@ dependencies {
   api(projects.annotations)
 
   implementation(projects.media.audio)
+  implementation(projects.media.audioUiMaterial3)
   implementation(projects.media.audioUi)
   implementation(projects.composables)
   implementation(projects.composeLayout)
@@ -130,6 +131,7 @@ dependencies {
   implementation(projects.media.backendMedia3)
   implementation(projects.media.data)
   implementation(projects.media.sync)
+  implementation(projects.media.uiMaterial3)
   implementation(projects.media.ui)
   implementation(projects.networkAwareness.core)
   implementation(projects.networkAwareness.ui)
@@ -151,6 +153,9 @@ dependencies {
   implementation(libs.wearcompose.material)
   implementation(libs.wearcompose.foundation)
   implementation(libs.wearcompose.navigation)
+  implementation(libs.wearcompose.navigation3)
+  implementation(libs.navigation3.runtime)
+  implementation(libs.navigation3.ui)
 
   implementation(libs.androidx.corektx)
   implementation(libs.androidx.lifecycle.runtime)

media/sample/src/androidTest/java/com/google/android/horologist/mediasample/MediaActivityTest.kt

@@ -19,8 +19,8 @@ package com.google.android.horologist.mediasample
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.lifecycle.Lifecycle
 import androidx.test.filters.LargeTest
-import com.google.android.horologist.media.ui.navigation.MediaNavController.navigateToLibrary
-import com.google.android.horologist.media.ui.navigation.NavigationScreen
+import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToLibrary
+import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToVolume
 import com.google.android.horologist.mediasample.ui.app.MediaActivity
 import org.junit.Ignore
 import org.junit.Rule
@@ -49,12 +49,12 @@ class MediaActivityTest {
 
     private fun toListAndBack() {
         rule.runOnUiThread {
-            rule.activity.navController.navigate(NavigationScreen.Volume)
+            rule.activity.backStack.navigateToVolume()
         }
         rule.waitForIdle()
 
         rule.runOnUiThread {
-            rule.activity.navController.navigateToLibrary()
+            rule.activity.backStack.navigateToLibrary()
         }
         rule.waitForIdle()
     }

media/sample/src/debug/java/com/google/android/horologist/mediasample/data/service/tile/SampleTilePreview.kt

@@ -24,10 +24,8 @@ import androidx.wear.tiles.tooling.preview.TilePreviewData
 import androidx.wear.tooling.preview.devices.WearDevices
 import com.google.android.horologist.compose.tools.tileRendererPreviewData
 import com.google.android.horologist.media.ui.tiles.MediaCollectionsTileRenderer
-import com.google.android.horologist.media.ui.tiles.toTileColors
 import com.google.android.horologist.mediasample.BuildConfig
 import com.google.android.horologist.mediasample.R
-import com.google.android.horologist.mediasample.ui.app.UampColors
 import com.google.android.horologist.tiles.images.drawableResToImageResource
 import com.google.android.horologist.tiles.images.toImageResource
 
@@ -36,7 +34,6 @@ import com.google.android.horologist.tiles.images.toImageResource
 fun SampleTilePreview(context: Context): TilePreviewData = tileRendererPreviewData(
     renderer = MediaCollectionsTileRenderer(
         context = context,
-        materialTheme = UampColors.toTileColors(),
         debugResourceMode = BuildConfig.DEBUG,
     ),
     tileState = MediaCollectionsTileRenderer.MediaCollectionsState(

media/sample/src/main/java/com/google/android/horologist/mediasample/data/service/tile/MediaCollectionsTileService.kt

@@ -19,17 +19,16 @@ package com.google.android.horologist.mediasample.data.service.tile
 import androidx.wear.protolayout.ActionBuilders
 import androidx.wear.protolayout.ActionBuilders.AndroidActivity
 import androidx.wear.protolayout.ResourceBuilders.Resources
+import androidx.wear.protolayout.material.Colors
 import androidx.wear.tiles.RequestBuilders.ResourcesRequest
 import androidx.wear.tiles.RequestBuilders.TileRequest
 import androidx.wear.tiles.TileBuilders.Tile
 import coil.ImageLoader
 import com.google.android.horologist.media.repository.PlaylistRepository
 import com.google.android.horologist.media.ui.tiles.MediaCollectionsTileRenderer
-import com.google.android.horologist.media.ui.tiles.toTileColors
 import com.google.android.horologist.mediasample.BuildConfig
 import com.google.android.horologist.mediasample.R
 import com.google.android.horologist.mediasample.ui.app.MediaActivity
-import com.google.android.horologist.mediasample.ui.app.UampColors
 import com.google.android.horologist.tiles.SuspendingTileService
 import com.google.android.horologist.tiles.images.loadImageResource
 import dagger.hilt.android.AndroidEntryPoint
@@ -52,7 +51,8 @@ class MediaCollectionsTileService : SuspendingTileService() {
 
     private val renderer: MediaCollectionsTileRenderer = MediaCollectionsTileRenderer(
         context = this,
-        materialTheme = UampColors.toTileColors(),
+        // TO DO Migrate Tile to Material 3 theme from app
+        materialTheme = Colors.DEFAULT,
         debugResourceMode = BuildConfig.DEBUG,
     )