copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

fix source-search clear causing disappearance of search box

Browse source
This commit is contained in:
Cuong-Tran 2024-11-08 15:43:38 +07:00
parent f72be9c810
commit fed40c1391
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
4 changed files with 48 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt
View file

@ -1,5 +1,6 @@
package eu.kanade.presentation.browse
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
@ -331,6 +332,10 @@ fun RadioSelectorSearchable(
selected: Int?,
onSelectOption: (Int) -> Unit = {},
) {
BackHandler(enabled = !queryString.isNullOrBlank()) {
onChangeSearchQuery?.invoke("")
}
Column(Modifier.verticalScroll(rememberScrollState())) {
SourcesSearchBox(
searchQuery = queryString,

10
app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt
View file

@ -40,13 +40,11 @@ import tachiyomi.presentation.core.components.BadgeGroup
import tachiyomi.presentation.core.components.FastScrollLazyColumn
import tachiyomi.presentation.core.components.Scroller.STICKY_HEADER_KEY_PREFIX
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.components.material.topSmallPaddingValues
import tachiyomi.presentation.core.i18n.stringResource
import tachiyomi.presentation.core.icons.FlagEmoji
import tachiyomi.presentation.core.screens.EmptyScreen
import tachiyomi.presentation.core.screens.LoadingScreen
import tachiyomi.presentation.core.theme.header
import tachiyomi.presentation.core.util.plus
import tachiyomi.presentation.core.util.secondaryItemAlpha
@Composable
@ -64,7 +62,7 @@ fun MigrateSourceScreen(
when {
state.isLoading -> LoadingScreen(Modifier.padding(contentPadding))
// KMK -->
state.searchQuery.isNullOrBlank() &&
state.searchQuery == null &&
// KMK <--
state.isEmpty -> EmptyScreen(
stringRes = MR.strings.information_empty_library,
@ -110,12 +108,12 @@ private fun MigrateSourceList(
val lazyListState = rememberLazyListState()
BackHandler(enabled = !state.searchQuery.isNullOrBlank()) {
onChangeSearchQuery(null)
onChangeSearchQuery("")
}
Column(
// Wrap around so we can use stickyHeader
modifier = Modifier.padding(contentPadding + topSmallPaddingValues),
modifier = Modifier.padding(contentPadding),
) {
AnimatedFloatingSearchBox(
listState = lazyListState,
@ -125,7 +123,7 @@ private fun MigrateSourceList(
modifier = Modifier
.padding(
horizontal = MaterialTheme.padding.medium,
vertical = MaterialTheme.padding.extraSmall,
vertical = MaterialTheme.padding.small,
),
)

4
app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt
View file

@ -68,14 +68,14 @@ fun SourcesScreen(
val lazyListState = rememberLazyListState()
BackHandler(enabled = !state.searchQuery.isNullOrBlank()) {
onChangeSearchQuery(null)
onChangeSearchQuery("")
}
// KMK <--
when {
state.isLoading -> LoadingScreen(Modifier.padding(contentPadding))
// KMK -->
state.searchQuery.isNullOrBlank() &&
state.searchQuery == null &&
// KMK <--
state.isEmpty -> EmptyScreen(
MR.strings.source_empty_screen,

54
app/src/main/java/eu/kanade/presentation/components/SourceSearchBox.kt
View file

@ -26,6 +26,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusManager
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.onFocusChanged
@ -33,14 +34,18 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.platform.SoftwareKeyboardController
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import tachiyomi.i18n.MR
import tachiyomi.presentation.core.components.material.padding
import tachiyomi.presentation.core.i18n.stringResource
import tachiyomi.presentation.core.util.clearFocusOnSoftKeyboardHide
import tachiyomi.presentation.core.util.isScrollingUp
import tachiyomi.presentation.core.util.isScrolledToStart
import tachiyomi.presentation.core.util.isScrollingDown
import tachiyomi.presentation.core.util.runOnEnterKeyPressed
import tachiyomi.presentation.core.util.secondaryItemAlpha
@ -51,9 +56,12 @@ fun AnimatedFloatingSearchBox(
onChangeSearchQuery: (String?) -> Unit,
modifier: Modifier = Modifier,
placeholderText: String? = null,
focusManager: FocusManager = LocalFocusManager.current,
focusRequester: FocusRequester = remember { FocusRequester() },
keyboardController: SoftwareKeyboardController? = LocalSoftwareKeyboardController.current,
) {
AnimatedVisibility(
visible = listState.isScrollingUp(),
visible = listState.isScrolledToStart() || !listState.isScrollingDown(),
enter = expandVertically(),
exit = shrinkVertically(),
modifier = modifier,
@ -62,6 +70,9 @@ fun AnimatedFloatingSearchBox(
searchQuery = searchQuery,
onChangeSearchQuery = onChangeSearchQuery,
placeholderText = placeholderText,
focusManager = focusManager,
focusRequester = focusRequester,
keyboardController = keyboardController,
)
}
}
@ -72,23 +83,22 @@ fun SourcesSearchBox(
onChangeSearchQuery: (String?) -> Unit,
modifier: Modifier = Modifier,
placeholderText: String? = null,
focusManager: FocusManager = LocalFocusManager.current,
focusRequester: FocusRequester = remember { FocusRequester() },
keyboardController: SoftwareKeyboardController? = LocalSoftwareKeyboardController.current,
) {
val focusRequester = remember { FocusRequester() }
val keyboardController = LocalSoftwareKeyboardController.current
val focusManager = LocalFocusManager.current
val searchAndClearFocus: () -> Unit = f@{
if (searchQuery.isNullOrBlank()) return@f
focusManager.clearFocus()
keyboardController?.hide()
}
val onClickClearSearch: () -> Unit = {
onChangeSearchQuery(null)
onChangeSearchQuery("")
focusRequester.requestFocus()
keyboardController?.show()
}
val onClickCloseSearch: () -> Unit = {
onClickClearSearch()
onChangeSearchQuery("")
focusManager.clearFocus()
keyboardController?.hide()
}
@ -131,16 +141,14 @@ fun SourcesSearchBox(
},
leadingIcon = {
SearchBoxLeadingIcon(
isFocused || !searchQuery.isNullOrBlank(),
modifier = Modifier,
onClickCloseSearch,
isSearching = isFocused || !searchQuery.isNullOrBlank(),
onClickCloseSearch = onClickCloseSearch,
)
},
trailingIcon = {
SearchBoxTrailingIcon(
searchQuery.isNullOrEmpty(),
modifier = Modifier,
onClickClearSearch,
isEmpty = searchQuery.isNullOrEmpty(),
onClickClearSearch = onClickClearSearch,
)
},
shape = RoundedCornerShape(24.dp),
@ -150,7 +158,7 @@ fun SourcesSearchBox(
errorIndicatorColor = Color.Transparent,
cursorColor = MaterialTheme.colorScheme.onBackground,
),
contentPadding = PaddingValues(12.dp),
contentPadding = PaddingValues(MaterialTheme.padding.small),
)
},
)
@ -159,11 +167,12 @@ fun SourcesSearchBox(
@Composable
fun SearchBoxLeadingIcon(
isSearching: Boolean,
@Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier,
modifier: Modifier = Modifier,
onClickCloseSearch: () -> Unit = {},
) {
if (isSearching) {
IconButton(
modifier = modifier,
onClick = onClickCloseSearch,
) {
Icon(
@ -173,6 +182,7 @@ fun SearchBoxLeadingIcon(
}
} else {
Icon(
modifier = modifier,
imageVector = Icons.Filled.Search,
contentDescription = "Search",
)
@ -182,11 +192,12 @@ fun SearchBoxLeadingIcon(
@Composable
fun SearchBoxTrailingIcon(
isEmpty: Boolean,
@Suppress("UNUSED_PARAMETER") modifier: Modifier = Modifier,
modifier: Modifier = Modifier,
onClickClearSearch: () -> Unit = {},
) {
if (!isEmpty) {
IconButton(
modifier = modifier,
onClick = onClickClearSearch,
) {
Icon(
@ -196,3 +207,12 @@ fun SearchBoxTrailingIcon(
}
}
}
@Preview
@Composable
fun PreviewClearFocusOnKeyboardDismissExample() {
SourcesSearchBox(
searchQuery = "Hello World",
onChangeSearchQuery = {},
)
}