From 182e642cfce2da5578b02b83c2b52f21d1a8485c Mon Sep 17 00:00:00 2001
From: Ivan Iskandar <12537387+ivaniskandar@users.noreply.github.com>
Date: Thu, 6 Apr 2023 09:15:56 +0700
Subject: [PATCH] SearchToolbar: Check initial search query to open keyboard by
 default (#9297)

---
 .../presentation/browse/components/BrowseSourceToolbar.kt      | 1 -
 app/src/main/java/eu/kanade/presentation/components/AppBar.kt  | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
index 4e6d4585c0..ccea144a28 100644
--- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
+++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt
@@ -45,7 +45,6 @@ fun BrowseSourceToolbar(
     var selectingDisplayMode by remember { mutableStateOf(false) }
 
     SearchToolbar(
-        initialShowKeyboard = searchQuery.isNullOrEmpty(),
         navigateUp = navigateUp,
         titleContent = { AppBarTitle(title) },
         searchQuery = searchQuery,
diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt
index 4b7a69da84..b7ccf967a3 100644
--- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt
+++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt
@@ -232,7 +232,6 @@ fun SearchToolbar(
     scrollBehavior: TopAppBarScrollBehavior? = null,
     visualTransformation: VisualTransformation = VisualTransformation.None,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    initialShowKeyboard: Boolean = true,
 ) {
     val focusRequester = remember { FocusRequester() }
 
@@ -257,7 +256,7 @@ fun SearchToolbar(
                     .fillMaxWidth()
                     .focusRequester(focusRequester)
                     .runOnEnterKeyPressed(action = searchAndClearFocus)
-                    .showSoftKeyboard(initialShowKeyboard)
+                    .showSoftKeyboard(remember { searchQuery.isEmpty() })
                     .clearFocusOnSoftKeyboardHide(),
                 textStyle = MaterialTheme.typography.titleMedium.copy(
                     color = MaterialTheme.colorScheme.onBackground,