Refactor: Migrate AmbientAware and AmbientState to Horologist

Migrated `AmbientAware` and `AmbientState` from the local package to the Horologist library. This change updates the imports to use the Horologist versions of these components.
android · Dec 6, 2024 · 3ef516e · 3ef516e
1 parent 2bb4f93
commit 3ef516e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 325 deletions.
diff --git a/...SampleCompose/app/src/main/java/com/example/exercisesamplecompose/ambient/AmbientAware.kt b/...SampleCompose/app/src/main/java/com/example/exercisesamplecompose/ambient/AmbientAware.kt
diff --git a/...leCompose/app/src/main/java/com/example/exercisesamplecompose/ambient/AmbientAwareTime.kt b/...leCompose/app/src/main/java/com/example/exercisesamplecompose/ambient/AmbientAwareTime.kt
diff --git a/...SampleCompose/app/src/main/java/com/example/exercisesamplecompose/ambient/AmbientState.kt b/...SampleCompose/app/src/main/java/com/example/exercisesamplecompose/ambient/AmbientState.kt
diff --git a/...ose/app/src/main/java/com/example/exercisesamplecompose/presentation/ambient/AmbientUI.kt b/...ose/app/src/main/java/com/example/exercisesamplecompose/presentation/ambient/AmbientUI.kt
@@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.Paint
 import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.graphics.withSaveLayer
-import com.example.exercisesamplecompose.ambient.AmbientState
+import com.google.android.horologist.compose.ambient.AmbientState
 
 /**
  * A Paint object configured to apply a grayscale effect.

diff --git a/...p/src/main/java/com/example/exercisesamplecompose/presentation/exercise/ExerciseScreen.kt b/...p/src/main/java/com/example/exercisesamplecompose/presentation/exercise/ExerciseScreen.kt
@@ -42,8 +42,8 @@ import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.Text
 import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
 import com.example.exercisesamplecompose.R
-import com.example.exercisesamplecompose.ambient.AmbientAware
-import com.example.exercisesamplecompose.ambient.AmbientState
+import com.google.android.horologist.compose.ambient.AmbientAware
+import com.google.android.horologist.compose.ambient.AmbientState
 import com.example.exercisesamplecompose.data.ServiceState
 import com.example.exercisesamplecompose.presentation.ambient.ambientBlank
 import com.example.exercisesamplecompose.presentation.component.CaloriesText

diff --git a/.../java/com/example/exercisesamplecompose/presentation/preparing/PreparingExerciseScreen.kt b/.../java/com/example/exercisesamplecompose/presentation/preparing/PreparingExerciseScreen.kt
@@ -51,8 +51,8 @@ import androidx.wear.compose.material.Text
 import androidx.wear.compose.material.curvedText
 import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
 import com.example.exercisesamplecompose.R
-import com.example.exercisesamplecompose.ambient.AmbientAware
-import com.example.exercisesamplecompose.ambient.AmbientState
+import com.google.android.horologist.compose.ambient.AmbientAware
+import com.google.android.horologist.compose.ambient.AmbientState
 import com.example.exercisesamplecompose.data.ServiceState
 import com.example.exercisesamplecompose.presentation.ambient.ambientGray
 import com.example.exercisesamplecompose.presentation.dialogs.ExerciseInProgressAlert

diff --git a/...se/app/src/test/java/com/example/exercisesamplecompose/presentation/ExerciseScreenTest.kt b/...se/app/src/test/java/com/example/exercisesamplecompose/presentation/ExerciseScreenTest.kt
@@ -17,8 +17,8 @@
 package com.example.exercisesamplecompose.presentation
 
 import androidx.compose.runtime.CompositionLocalProvider
-import com.example.exercisesamplecompose.ambient.AmbientState
-import com.example.exercisesamplecompose.ambient.LocalAmbientState
+import com.google.android.horologist.compose.ambient.AmbientState
+import com.google.android.horologist.compose.ambient.LocalAmbientState
 import com.example.exercisesamplecompose.data.ServiceState
 import com.example.exercisesamplecompose.presentation.exercise.ExerciseScreen
 import com.example.exercisesamplecompose.presentation.exercise.ExerciseScreenState

diff --git a/...c/test/java/com/example/exercisesamplecompose/presentation/PreparingExerciseScreenTest.kt b/...c/test/java/com/example/exercisesamplecompose/presentation/PreparingExerciseScreenTest.kt
@@ -16,7 +16,7 @@
 
 package com.example.exercisesamplecompose.presentation
 
-import com.example.exercisesamplecompose.ambient.AmbientState
+import com.google.android.horologist.compose.ambient.AmbientState
 import com.example.exercisesamplecompose.data.ServiceState
 import com.example.exercisesamplecompose.presentation.preparing.PreparingExerciseScreen
 import com.example.exercisesamplecompose.presentation.preparing.PreparingScreenState

diff --git a/health-services/ExerciseSampleCompose/gradle/libs.versions.toml b/health-services/ExerciseSampleCompose/gradle/libs.versions.toml
@@ -7,7 +7,7 @@ androidx-wear-compose = "1.4.0"
 core-splashscreen = "1.0.1"
 dagger = "2.52"
 health-services = "1.0.0-rc02"
-horologist = "0.7.6-alpha"
+horologist = "0.7.7-alpha"
 org-jetbrains-kotlin = "1.9.25"
 ui-test-junit4 = "1.7.3"
 robolectric = "4.14.1"