Merge pull request #326 from yschimke/updates

Wear Updates

app/src/main/java/com/surrus/peopleinspace/ui/PeopleInSpaceApp.kt

@@ -5,12 +5,12 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
-import androidx.compose.foundation.layout.consumedWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.NavigationRailItem
@@ -20,7 +20,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBar
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.NavigationRail
-import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
@@ -83,7 +82,7 @@ fun PeopleInSpaceApp(
                         onNavigateToDestination = appState::navigate,
                         modifier = Modifier
                             .padding(padding)
-                            .consumedWindowInsets(padding)
+                            .windowInsetsPadding(WindowInsets.statusBars)
                     )
                 }
             }

gradle/libs.versions.toml

@@ -1,4 +1,5 @@
 [versions]
+composeUiTooling = "1.3.0"
 kotlin = "1.9.21"
 ksp = "1.9.21-1.0.16"
 coroutines = "1.8.0-RC"
@@ -8,26 +9,29 @@ androidGradlePlugin = "8.2.0"
 koin = "3.5.3"
 koinCompose = "3.5.3"
 ktor = "2.3.7"
+osmAndroidCompose = "0.0.5"
 slf4j = "2.0.9"
 sqlDelight = "2.0.1"
 kmpNativeCoroutines = "1.0.0-ALPHA-23"
 
 androidxActivity = "1.8.2"
 androidxComposeCompiler = "1.5.5-dev-k1.9.21-163bb051fe5"
 jbComposeCompiler = "1.5.4"
-androidxComposeBom = "2023.10.01"
+androidxComposeBom = "2024.01.00"
 androidxNavigationCompose = "2.7.6"
-wearCompose = "1.2.1"
-androidxLifecycle = "2.6.2"
+uiToolingPreview = "1.6.0"
+wearCompose = "1.3.0"
+androidxLifecycle = "2.7.0"
 imageLoader = "1.7.1"
 osmdroidAndroid = "6.1.18"
 
 composeMultiplatform = "1.6.0-alpha01"
 accompanist = "0.32.0"
 coilCompose = "2.5.0"
-horologist = "0.5.14"
+horologist = "0.5.20"
 glanceWearTiles = "1.0.0-alpha05"
 glanceAppWidget = "1.0.0"
+okhttp = "5.0.0-alpha.12"
 
 junit = "4.13.2"
 androidxTestJUnit = "1.1.5"
@@ -45,10 +49,15 @@ kotlinterGradle = "3.4.5"
 minSdk = "24"
 minWearSdk = "26"
 targetSdk = "34"
+targetWearSdk = "33"
 compileSdk = "34"
 
 
 [libraries]
+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" }
+osm-android-compose = { module = "tech.utsmankece:osm-android-compose", version.ref = "osmAndroidCompose" }
+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-test = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-test", version.ref = "coroutines" }
 kotlinx-datetime = { group = "org.jetbrains.kotlinx", name = "kotlinx-datetime", version.ref = "kotlinxDateTime" }
@@ -73,7 +82,7 @@ androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-view
 androidx-tracing = "androidx.tracing:tracing:1.2.0"
 
 splash-screen = "androidx.core:core-splashscreen:1.0.1"
-metrics = "androidx.metrics:metrics-performance:1.0.0-alpha02"
+metrics = "androidx.metrics:metrics-performance:1.0.0-beta01"
 
 imageLoader = { module = "io.github.qdsfdhvh:image-loader", version.ref = "imageLoader" }
 osmdroidAndroid = { module = "org.osmdroid:osmdroid-android", version.ref = "osmdroidAndroid" }
@@ -86,6 +95,7 @@ coilCompose = { group = "io.coil-kt", name = "coil-compose", version.ref = "coil
 accompanist-swiperefresh = { group = "com.google.accompanist", name = "accompanist-swiperefresh", version.ref = "accompanist" }
 accompanist-placeholder = { group = "com.google.accompanist", name = "accompanist-placeholder-material3", version.ref = "accompanist" }
 horologist-compose-layout = { module = "com.google.android.horologist:horologist-compose-layout", version.ref = "horologist" }
+horologist-composables = { 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" }
@@ -108,8 +118,8 @@ ktor-client-darwin = { group = "io.ktor", name = "ktor-client-darwin", version.r
 ktor-client-java = { group = "io.ktor", name = "ktor-client-java", version.ref = "ktor" }
 ktor-client-js = { group = "io.ktor", name = "ktor-client-js", version.ref = "ktor" }
 
-okhttp = { module = "com.squareup.okhttp3:okhttp", version = "4.12.0" }
-loggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version = "4.9.2" }
+okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
+loggingInterceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 
 ktor-serialization-kotlinx-json = { group = "io.ktor", name = "ktor-serialization-kotlinx-json", version.ref = "ktor" }
 slf4j = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" }

settings.gradle.kts

@@ -30,7 +30,6 @@ include(":compose-desktop")
 include(":compose-web-wasm")
 include(":compose-ios")
 include(":wearApp")
-include(":wearApp-benchmark")
 include(":web")
 include(":backend")
 include(":graphql-server")

wearApp/build.gradle.kts

@@ -13,7 +13,7 @@ android {
     defaultConfig {
         applicationId = "com.surrus.peopleinspace"
         minSdk = libs.versions.minWearSdk.get().toInt()
-        targetSdk = libs.versions.targetSdk.get().toInt()
+        targetSdk = libs.versions.targetWearSdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -50,6 +50,7 @@ android {
 
 dependencies {
     implementation(libs.osmdroidAndroid)
+    implementation(libs.osm.android.compose)
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.metrics)
@@ -67,6 +68,12 @@ dependencies {
     implementation(libs.koin.android)
     implementation(libs.koin.androidx.compose)
 
+    implementation(libs.splash.screen)
+
+    implementation(libs.androidx.ui.tooling)
+    implementation(libs.wear.ui.tooling)
+    debugImplementation(libs.androidx.ui.tooling.preview)
+
     implementation(libs.okhttp)
     implementation(libs.loggingInterceptor)