Merge pull request #449 from yschimke/wear_updates

Major updates for Wear

Author: joreilly

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ kotlin = "2.2.10"
 ksp = "2.2.10-2.0.2"
 
 compose-multiplatform = "1.8.2"
-composeUiTooling = "1.4.1"
+composeUiTooling = "1.5.4"
 coroutines = "1.10.2"
 kotlinxSerialization = "1.9.0"
 androidGradlePlugin = "8.12.2"
@@ -12,29 +12,30 @@ koin-annotations = "2.2.0"
 ktor = "3.2.3"
 osmdroidAndroid = "6.1.20"
 osmAndroidCompose = "0.0.5"
+tiles = "1.6.0-alpha02"
+protolayout = "1.4.0-alpha02"
 slf4j = "2.0.17"
 sqlDelight = "2.1.0"
 sqlJs = "1.8.0"
 webPackPlugin = "9.1.0"
 
 
 androidxActivity = "1.10.1"
-androidxComposeBom = "2025.08.01"
-material3-adaptive = "1.1.0"
-material3-adaptive-navigation-suite = "1.3.2"
-androidxNavigationCompose = "2.9.3"
-uiToolingPreview = "1.9.0"
-wearCompose = "1.4.1"
-androidxLifecycle = "2.9.3"
-androidxLifecycleKMP = "2.9.3"
+androidxComposeBom = "2025.10.01"
+material3-adaptive = "1.2.0"
+material3-adaptive-navigation-suite = "1.4.0"
+androidxNavigationCompose = "2.9.5"
+uiToolingPreview = "1.9.4"
+wearCompose = "1.5.4"
+androidxLifecycle = "2.9.4"
+androidxLifecycleKMP = "2.9.5"
 
 coilCompose = "2.7.0"
 coilCompose3 = "3.3.0"
 
-horologist = "0.6.23"
-glanceWearTiles = "1.0.0-alpha05"
+horologist = "0.8.2-alpha"
 glanceAppWidget = "1.1.1"
-okhttp = "5.1.0"
+okhttp = "5.2.1"
 kermit = "2.0.8"
 
 gradleVersionsPlugin = "0.52.0"
@@ -50,8 +51,14 @@ minWearSdk = "26"
 targetWearSdk = "33"
 
 [libraries]
+androidx-protolayout-material3 = { module = "androidx.wear.protolayout:protolayout-material3", version.ref = "protolayout" }
+androidx-tiles = { module = "androidx.wear.tiles:tiles", version.ref = "tiles" }
+androidx-tiles-tooling = { module = "androidx.wear.tiles:tiles-tooling", version.ref = "tiles" }
+androidx-tiles-tooling-preview = { module = "androidx.wear.tiles:tiles-tooling-preview", version.ref = "tiles" }
 androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "uiToolingPreview" }
 androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "uiToolingPreview" }
+androidx-wear-compose-compose-material3 = { module = "androidx.wear.compose:compose-material3", version.ref = "wearCompose" }
+horologist-tiles = { module = "com.google.android.horologist:horologist-tiles", version.ref = "horologist" }
 wear-ui-tooling = { module = "androidx.wear.compose:compose-ui-tooling", version.ref = "composeUiTooling" }
 kotlinx-coroutines = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlinx-coroutines-swing = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-swing", version.ref = "coroutines" }
@@ -94,14 +101,12 @@ wear-compose-founndation = { module = "androidx.wear.compose:compose-foundation"
 wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "wearCompose" }
 wear-compose-navigation = { module = "androidx.wear.compose:compose-navigation", version.ref = "wearCompose" }
 
-coilCompose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coilCompose" }
 coil3-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coilCompose3" }
 coil3-network-ktor = { group = "io.coil-kt.coil3", name = "coil-network-ktor3", version.ref = "coilCompose3" }
 
 
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
 
-glance-tiles = { module = "androidx.glance:glance-wear-tiles", version.ref = "glanceWearTiles" }
 glance-appwidget = { module = "androidx.glance:glance-appwidget", version.ref = "glanceAppWidget" }
 
 androidx-navigation-compose-testing = { module = "androidx.navigation:navigation-testing", version.ref = "androidxNavigationCompose" }

wearApp/build.gradle.kts

@@ -27,15 +27,21 @@ android {
         release {
             isMinifyEnabled = true
             isShrinkResources = true
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
             // temporary hack for local testing of release builds
             signingConfig = signingConfigs.getByName("debug")
         }
         create("benchmark") {
             isMinifyEnabled = true
             isShrinkResources = true
             isDebuggable = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "benchmark-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "benchmark-rules.pro"
+            )
             // temporary hack for local testing of release builds
             signingConfig = signingConfigs.getByName("debug")
             matchingFallbacks.addAll(listOf("release", "debug"))
@@ -55,11 +61,15 @@ dependencies {
     implementation(libs.wear.compose.founndation)
     implementation(libs.wear.compose.material)
     implementation(libs.wear.compose.navigation)
+    implementation(libs.androidx.wear.compose.compose.material3)
+    implementation(libs.androidx.protolayout.material3)
 
     implementation(libs.androidx.compose.ui.tooling)
     implementation(libs.horologist.compose.layout)
-    implementation(libs.glance.tiles)
-    implementation(libs.coilCompose)
+    implementation(libs.horologist.tiles)
+    implementation(libs.androidx.tiles.tooling.preview)
+    implementation(libs.androidx.tiles)
+    implementation(libs.coil3.compose)
 
     implementation(libs.koin.core)
     implementation(libs.koin.android)
@@ -70,6 +80,7 @@ dependencies {
     implementation(libs.androidx.ui.tooling)
     implementation(libs.wear.ui.tooling)
     debugImplementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.tiles.tooling)
 
     implementation(libs.okhttp)
     implementation(libs.loggingInterceptor)

wearApp/src/androidTest/java/com/surrus/peopleinspace/wear/PeopleInSpaceTest.kt

@@ -1,18 +1,14 @@
-@file:OptIn(ExperimentalHorologistApi::class)
-
-package dev.johnoreilly.peopleinspace.wear
+package com.surrus.peopleinspace.wear
 
 import androidx.compose.ui.test.assertContentDescriptionEquals
 import androidx.compose.ui.test.assertIsDisplayed
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
 import androidx.compose.ui.test.onParent
-import com.google.android.horologist.annotations.ExperimentalHorologistApi
-import com.google.android.horologist.compose.layout.ScalingLazyColumnDefaults
+import com.surrus.peopleinspace.list.PersonList
+import com.surrus.peopleinspace.list.PersonListTag
 import dev.johnoreilly.common.remote.Assignment
-import dev.johnoreilly.peopleinspace.list.PersonList
-import dev.johnoreilly.peopleinspace.list.PersonListTag
 import org.junit.Rule
 import org.junit.Test
 
@@ -40,7 +36,6 @@ class PeopleInSpaceTest {
                 people = listOf(),
                 personSelected = {},
                 issMapClick = {},
-                columnState = ScalingLazyColumnDefaults.belowTimeText().create()
             )
         }
 
@@ -54,7 +49,6 @@ class PeopleInSpaceTest {
                 people = peopleList,
                 personSelected = {},
                 issMapClick = {},
-                columnState = ScalingLazyColumnDefaults.belowTimeText().create()
             )
         }
 

wearApp/src/main/AndroidManifest.xml

@@ -3,12 +3,12 @@
 
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"  />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <uses-feature android:name="android.hardware.type.watch" />
 
     <application
-        android:name=".PeopleInSpaceApplication"
+        android:name="com.surrus.peopleinspace.PeopleInSpaceApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_american_astronaut"
         android:label="@string/app_name"
@@ -23,7 +23,7 @@
             android:value="true" />
 
         <activity
-            android:name=".MainActivity"
+            android:name="com.surrus.peopleinspace.MainActivity"
             android:exported="true"
             android:icon="@drawable/ic_american_astronaut"
             android:label="@string/app_name">
@@ -46,7 +46,7 @@
         </activity>
 
         <service
-            android:name=".tile.PeopleInSpaceTile"
+            android:name="com.surrus.peopleinspace.tile.PeopleInSpaceTile"
             android:exported="true"
             android:icon="@drawable/ic_iss"
             android:label="@string/app_name"

wearApp/src/main/java/com/surrus/peopleinspace/MainActivity.kt

@@ -1,9 +1,9 @@
-package dev.johnoreilly.peopleinspace
+package com.surrus.peopleinspace
 
+import android.R
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.compose.runtime.LaunchedEffect
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.navigation.NavHostController
 import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
@@ -25,7 +25,7 @@ class MainActivity : ComponentActivity() {
 
         super.onCreate(savedInstanceState)
 
-        setTheme(android.R.style.Theme_DeviceDefault)
+        setTheme(R.style.Theme_DeviceDefault)
 
         setContent {
             navController = rememberSwipeDismissableNavController()

wearApp/src/main/java/com/surrus/peopleinspace/PeopleInSpaceApp.kt

@@ -1,22 +1,18 @@
-@file:OptIn(ExperimentalHorologistApi::class)
-
-package dev.johnoreilly.peopleinspace
+package com.surrus.peopleinspace
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavDeepLink
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
+import androidx.wear.compose.material3.AppScaffold
 import androidx.wear.compose.navigation.SwipeDismissableNavHost
 import androidx.wear.compose.navigation.composable
-import com.google.android.horologist.annotations.ExperimentalHorologistApi
-import com.google.android.horologist.compose.layout.AppScaffold
-import dev.johnoreilly.peopleinspace.list.PersonListScreen
-import dev.johnoreilly.peopleinspace.map.IssMapScreen
-import dev.johnoreilly.peopleinspace.person.PersonDetailsScreen
+import com.surrus.peopleinspace.list.PersonListScreen
+import com.surrus.peopleinspace.map.IssMapScreen
+import com.surrus.peopleinspace.person.PersonDetailsScreen
 
 @Composable
 fun PeopleInSpaceApp(navController: NavHostController) {
@@ -41,7 +37,7 @@ fun PeopleInSpaceApp(navController: NavHostController) {
             }
 
             composable(
-                route = Screen.PersonDetails.route + "/{$PERSON_NAME_NAV_ARGUMENT}",
+                route = Screen.PersonDetails.route + "/{${PERSON_NAME_NAV_ARGUMENT}}",
                 arguments = listOf(
                     navArgument(PERSON_NAME_NAV_ARGUMENT, builder = {
                         type = NavType.StringType

wearApp/src/main/java/com/surrus/peopleinspace/PeopleInSpaceApplication.kt

@@ -1,19 +1,21 @@
-package dev.johnoreilly.peopleinspace
+package com.surrus.peopleinspace
 
 import android.app.Application
 import co.touchlab.kermit.Logger
-import coil.ImageLoader
-import coil.ImageLoaderFactory
+import coil3.ImageLoader
+import coil3.PlatformContext
+import coil3.SingletonImageLoader
+import com.surrus.peopleinspace.di.wearAppModule
+import com.surrus.peopleinspace.di.wearImageLoader
 import dev.johnoreilly.common.di.initKoin
-import dev.johnoreilly.peopleinspace.di.wearAppModule
-import dev.johnoreilly.peopleinspace.di.wearImageLoader
+import dev.johnoreilly.peopleinspace.BuildConfig
 import org.koin.android.ext.koin.androidContext
 import org.koin.android.ext.koin.androidLogger
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import org.koin.core.logger.Level
 
-class PeopleInSpaceApplication : Application(), KoinComponent, ImageLoaderFactory {
+class PeopleInSpaceApplication : Application(), KoinComponent, SingletonImageLoader.Factory {
 
     override fun onCreate() {
         super.onCreate()
@@ -30,6 +32,6 @@ class PeopleInSpaceApplication : Application(), KoinComponent, ImageLoaderFactor
         Logger.d { "PeopleInSpaceApplication" }
     }
 
-    override fun newImageLoader(): ImageLoader = get()
+    override fun newImageLoader(context: PlatformContext): ImageLoader = get()
 }
 

wearApp/src/main/java/com/surrus/peopleinspace/di/AppModule.kt

@@ -1,12 +1,13 @@
-package dev.johnoreilly.peopleinspace.di
+package com.surrus.peopleinspace.di
 
-import android.util.Log
-import coil.ImageLoader
-import coil.util.DebugLogger
+import coil3.ImageLoader
+import coil3.request.crossfade
+import coil3.util.DebugLogger
+import coil3.util.Logger
+import com.surrus.peopleinspace.list.PersonListViewModel
+import com.surrus.peopleinspace.map.MapViewModel
+import com.surrus.peopleinspace.person.PersonDetailsViewModel
 import dev.johnoreilly.peopleinspace.BuildConfig
-import dev.johnoreilly.peopleinspace.list.PersonListViewModel
-import dev.johnoreilly.peopleinspace.map.MapViewModel
-import dev.johnoreilly.peopleinspace.person.PersonDetailsViewModel
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.module.dsl.viewModel
 import org.koin.dsl.module
@@ -26,10 +27,9 @@ val wearImageLoader = module {
     single {
         ImageLoader.Builder(androidContext())
             .crossfade(true)
-            .respectCacheHeaders(false)
             .apply {
                 if (BuildConfig.DEBUG) {
-                    logger(DebugLogger(Log.VERBOSE))
+                    logger(DebugLogger(Logger.Level.Info))
                 }
             }
             .build()