From d8f8dcffbd78a49153a90676d94e43fe4e8a2119 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sat, 3 Feb 2024 17:47:45 +0800
Subject: [PATCH] Update compose snapshot and remove workaround

---
 .../com/hippo/ehviewer/ui/screen/SearchBarScreen.kt      | 9 ---------
 settings.gradle.kts                                      | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt
index e529fa705..34be9a5c6 100644
--- a/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt
+++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/screen/SearchBarScreen.kt
@@ -3,7 +3,6 @@ package com.hippo.ehviewer.ui.screen
 import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -20,7 +19,6 @@ import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.layout.union
 import androidx.compose.foundation.layout.windowInsetsPadding
@@ -76,7 +74,6 @@ import com.hippo.ehviewer.ui.LocalNavDrawerState
 import com.hippo.ehviewer.ui.LockDrawer
 import com.hippo.ehviewer.ui.main.FAB_ANIMATE_TIME
 import com.hippo.ehviewer.ui.tools.LocalDialogState
-import com.hippo.ehviewer.util.isAtLeastP
 import com.jamal.composeprefs3.ui.ifNotNullThen
 import com.jamal.composeprefs3.ui.ifTrueThen
 import eu.kanade.tachiyomi.util.lang.launchIO
@@ -234,12 +231,6 @@ fun SearchBarScreen(
     }
 
     Box(modifier = Modifier.fillMaxSize()) {
-        if (!isAtLeastP) {
-            // Workaround unable to exit search field
-            // https://issuetracker.google.com/issues/318968220
-            Box(Modifier.size(1.dp).focusable())
-        }
-
         Scaffold(
             topBar = {
                 // Placeholder, fill immutable SearchBar padding
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 4964eb97c..a96af1d13 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -14,7 +14,7 @@ dependencyResolutionManagement {
         mavenCentral()
         maven("https://jitpack.io")
         maven("https://androidx.dev/storage/compose-compiler/repository/")
-        maven("https://androidx.dev/snapshots/builds/11311962/artifacts/repository")
+        maven("https://androidx.dev/snapshots/builds/11401167/artifacts/repository")
     }
 }