Update horologist to v0.6.6 (#1210)

* Update horologist to v0.6.6 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Yuri Schimke <[email protected]>
joreilly · Mar 26, 2024 · 38b8360 · 38b8360
1 parent 155092d
commit 38b8360
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,7 +13,7 @@ credentials-play-services-auth = "1.2.1"
 decompose = "2.2.2"
 essenty = "1.3.0"
 googleid = "1.1.0"
-horologist = "0.6.5"
+horologist = "0.6.6"
 image-loader = "1.7.7"
 io-coil-kt = "2.6.0"
 kmp-nativecoroutines = "1.0.0-ALPHA-24"

diff --git a/...rc/main/java/dev/johnoreilly/confetti/wear/complication/NextSessionComplicationService.kt b/...rc/main/java/dev/johnoreilly/confetti/wear/complication/NextSessionComplicationService.kt
@@ -3,7 +3,6 @@ package dev.johnoreilly.confetti.wear.complication
 import android.app.PendingIntent
 import android.app.PendingIntent.FLAG_IMMUTABLE
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
-import android.content.Context
 import android.content.Intent
 import androidx.core.net.toUri
 import androidx.wear.watchface.complications.data.ComplicationType
@@ -15,7 +14,6 @@ import dev.johnoreilly.confetti.ConfettiRepository
 import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.fragment.SessionDetails
 import dev.johnoreilly.confetti.toTimeZone
-import dev.johnoreilly.confetti.wear.MainActivity
 import dev.johnoreilly.confetti.wear.settings.PhoneSettingsSync
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
@@ -38,13 +36,13 @@ class NextSessionComplicationService :
 
     override fun onComplicationActivated(complicationInstanceId: Int, type: ComplicationType) {
         runBlocking {
-            wearAppHelper.markComplicationAsActivated(this@NextSessionComplicationService.javaClass.simpleName, complicationInstanceId, type)
+            wearAppHelper.markComplicationAsActivated(this@NextSessionComplicationService.javaClass.name, complicationInstanceId, type)
         }
     }
 
     override fun onComplicationDeactivated(complicationInstanceId: Int) {
         runBlocking {
-            wearAppHelper.markComplicationAsDeactivated(this@NextSessionComplicationService.javaClass.simpleName, complicationInstanceId, ComplicationType.EMPTY)
+            wearAppHelper.markComplicationAsDeactivated(complicationInstanceId)
         }
     }
 

diff --git a/wearApp/src/main/java/dev/johnoreilly/confetti/wear/navigation/WearAppComponent.kt b/wearApp/src/main/java/dev/johnoreilly/confetti/wear/navigation/WearAppComponent.kt
@@ -1,7 +1,6 @@
 package dev.johnoreilly.confetti.wear.navigation
 
 import android.content.Intent
-import android.os.Build
 import android.util.Log
 import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.decompose.router.stack.ChildStack
@@ -115,8 +114,8 @@ class DefaultWearAppComponent(
     override suspend fun waitForConference(): String {
         val conference = appState.filterNotNull().map { it.defaultConference }.firstOrNull()
 
-        // Nasty hack to avoid failure on robolectric
-        if (!isRoboUnitTest()) {
+        // Workaround to avoid failure on robolectric
+        if (wearAppHelper.isAvailable()) {
             if (conference == null) {
                 wearAppHelper.markSetupNoLongerComplete()
             } else {
@@ -129,10 +128,6 @@ class DefaultWearAppComponent(
         return conference ?: AppSettings.CONFERENCE_NOT_SET
     }
 
-    fun isRoboUnitTest(): Boolean {
-        return "robolectric" == Build.FINGERPRINT
-    }
-
     override val isWaitingOnThemeOrData: Boolean
         get() = config is Config.Loading || appState.value == null
 

diff --git a/wearApp/src/test/kotlin/dev/johnoreilly/confetti/wear/SettingsScreenTest.kt b/wearApp/src/test/kotlin/dev/johnoreilly/confetti/wear/SettingsScreenTest.kt
@@ -64,8 +64,6 @@ class SettingsScreenTest(override val device: WearDevice) : BaseScreenshotTest()
         composeRule.onNode(hasScrollToIndexAction())
             .scrollToBottom()
         takeScreenshot("_end")
-        composeRule.onNodeWithContentDescription("Logged in as John O'Reilly")
-            .assertHasClickAction()
     }
 
     @Test