Refactor search toolbar and fix browse source (#8360)

app/src/main/java/eu/kanade/presentation/browse/SourceSearchScreen.kt

@@ -6,12 +6,10 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
 import androidx.paging.compose.collectAsLazyPagingItems
 import eu.kanade.domain.manga.model.Manga
-import eu.kanade.presentation.browse.components.BrowseSourceSearchToolbar
 import eu.kanade.presentation.components.Scaffold
-import eu.kanade.tachiyomi.R
+import eu.kanade.presentation.components.SearchToolbar
 import eu.kanade.tachiyomi.source.LocalSource
 import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourcePresenter
 import eu.kanade.tachiyomi.ui.more.MoreController
@@ -38,13 +36,11 @@ fun SourceSearchScreen(
 
     Scaffold(
         topBar = { scrollBehavior ->
-            BrowseSourceSearchToolbar(
+            SearchToolbar(
                 searchQuery = presenter.searchQuery ?: "",
-                onSearchQueryChanged = { presenter.searchQuery = it },
-                placeholderText = stringResource(R.string.action_search_hint),
-                navigateUp = navigateUp,
-                onResetClick = { presenter.searchQuery = "" },
-                onSearchClick = { presenter.search(it) },
+                onChangeSearchQuery = { presenter.searchQuery = it },
+                onClickCloseSearch = navigateUp,
+                onSearch = { presenter.search(it) },
                 scrollBehavior = scrollBehavior,
             )
         },

app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceToolbar.kt

@@ -1,13 +1,10 @@
 package eu.kanade.presentation.browse.components
 
-import androidx.compose.foundation.text.KeyboardActions
-import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ViewList
 import androidx.compose.material.icons.filled.ViewModule
 import androidx.compose.material.icons.outlined.Help
 import androidx.compose.material.icons.outlined.Public
-import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.runtime.Composable
@@ -15,14 +12,12 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
-import androidx.compose.ui.platform.LocalFocusManager
-import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.input.ImeAction
 import eu.kanade.domain.library.model.LibraryDisplayMode
 import eu.kanade.presentation.browse.BrowseSourceState
 import eu.kanade.presentation.components.AppBar
 import eu.kanade.presentation.components.AppBarActions
+import eu.kanade.presentation.components.AppBarTitle
 import eu.kanade.presentation.components.DropdownMenu
 import eu.kanade.presentation.components.RadioMenuItem
 import eu.kanade.presentation.components.SearchToolbar
@@ -42,59 +37,21 @@ fun BrowseSourceToolbar(
     onSearch: (String) -> Unit,
     scrollBehavior: TopAppBarScrollBehavior? = null,
 ) {
-    if (state.searchQuery == null) {
-        BrowseSourceRegularToolbar(
-            title = if (state.isUserQuery) state.currentFilter.query else source?.name.orEmpty(),
-            isLocalSource = source is LocalSource,
-            displayMode = displayMode,
-            onDisplayModeChange = onDisplayModeChange,
-            navigateUp = navigateUp,
-            onSearchClick = { state.searchQuery = if (state.isUserQuery) state.currentFilter.query else "" },
-            onWebViewClick = onWebViewClick,
-            onHelpClick = onHelpClick,
-            scrollBehavior = scrollBehavior,
-        )
-    } else {
-        val cancelSearch = { state.searchQuery = null }
-        BrowseSourceSearchToolbar(
-            searchQuery = state.searchQuery!!,
-            onSearchQueryChanged = { state.searchQuery = it },
-            placeholderText = stringResource(R.string.action_search_hint),
-            navigateUp = cancelSearch,
-            onResetClick = { state.searchQuery = "" },
-            onSearchClick = {
-                onSearch(it)
-                cancelSearch()
-            },
-            scrollBehavior = scrollBehavior,
-        )
-    }
-}
+    // Avoid capturing unstable source in actions lambda
+    val title = source?.name
+    val isLocalSource = source is LocalSource
 
-@Composable
-fun BrowseSourceRegularToolbar(
-    title: String,
-    isLocalSource: Boolean,
-    displayMode: LibraryDisplayMode,
-    onDisplayModeChange: (LibraryDisplayMode) -> Unit,
-    navigateUp: () -> Unit,
-    onSearchClick: () -> Unit,
-    onWebViewClick: () -> Unit,
-    onHelpClick: () -> Unit,
-    scrollBehavior: TopAppBarScrollBehavior?,
-) {
-    AppBar(
+    SearchToolbar(
         navigateUp = navigateUp,
-        title = title,
+        titleContent = { AppBarTitle(title) },
+        searchQuery = state.searchQuery,
+        onChangeSearchQuery = { state.searchQuery = it },
+        onSearch = onSearch,
+        onClickCloseSearch = navigateUp,
         actions = {
             var selectingDisplayMode by remember { mutableStateOf(false) }
             AppBarActions(
                 actions = listOf(
-                    AppBar.Action(
-                        title = stringResource(R.string.action_search),
-                        icon = Icons.Outlined.Search,
-                        onClick = onSearchClick,
-                    ),
                     AppBar.Action(
                         title = stringResource(R.string.action_display_mode),
                         icon = if (displayMode == LibraryDisplayMode.List) Icons.Filled.ViewList else Icons.Filled.ViewModule,
@@ -123,18 +80,21 @@ fun BrowseSourceRegularToolbar(
                     text = { Text(text = stringResource(R.string.action_display_comfortable_grid)) },
                     isChecked = displayMode == LibraryDisplayMode.ComfortableGrid,
                 ) {
+                    selectingDisplayMode = false
                     onDisplayModeChange(LibraryDisplayMode.ComfortableGrid)
                 }
                 RadioMenuItem(
                     text = { Text(text = stringResource(R.string.action_display_grid)) },
                     isChecked = displayMode == LibraryDisplayMode.CompactGrid,
                 ) {
+                    selectingDisplayMode = false
                     onDisplayModeChange(LibraryDisplayMode.CompactGrid)
                 }
                 RadioMenuItem(
                     text = { Text(text = stringResource(R.string.action_display_list)) },
                     isChecked = displayMode == LibraryDisplayMode.List,
                 ) {
+                    selectingDisplayMode = false
                     onDisplayModeChange(LibraryDisplayMode.List)
                 }
             }
@@ -142,34 +102,3 @@ fun BrowseSourceRegularToolbar(
         scrollBehavior = scrollBehavior,
     )
 }
-
-@Composable
-fun BrowseSourceSearchToolbar(
-    searchQuery: String,
-    onSearchQueryChanged: (String) -> Unit,
-    placeholderText: String?,
-    navigateUp: () -> Unit,
-    onResetClick: () -> Unit,
-    onSearchClick: (String) -> Unit,
-    scrollBehavior: TopAppBarScrollBehavior?,
-) {
-    val keyboardController = LocalSoftwareKeyboardController.current
-    val focusManager = LocalFocusManager.current
-
-    SearchToolbar(
-        searchQuery = searchQuery,
-        onChangeSearchQuery = onSearchQueryChanged,
-        placeholderText = placeholderText,
-        keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
-        keyboardActions = KeyboardActions(
-            onSearch = {
-                onSearchClick(searchQuery)
-                focusManager.clearFocus()
-                keyboardController?.hide()
-            },
-        ),
-        onClickCloseSearch = navigateUp,
-        onClickResetSearch = onResetClick,
-        scrollBehavior = scrollBehavior,
-    )
-}