diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssSortScreen.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortScreen.kt index da5eeed14..16ce64293 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssSortScreen.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortScreen.kt @@ -383,7 +383,7 @@ private fun RssSearchSheet( query = query, onQueryChange = onQueryChange, onSearch = onSearch, - placeholder = stringResource(R.string.search_content), + placeholder = stringResource(R.string.search_placeholder), modifier = Modifier.fillMaxWidth() ) } diff --git a/app/src/main/java/io/legado/app/ui/widget/components/FontSelectGrid.kt b/app/src/main/java/io/legado/app/ui/widget/components/FontSelectGrid.kt index e15dda904..71a743148 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/FontSelectGrid.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/FontSelectGrid.kt @@ -84,7 +84,7 @@ fun FontSelectGrid( SearchBar( query = searchQuery, onQueryChange = { searchQuery = it }, - placeholder = stringResource(R.string.search_content), + placeholder = stringResource(R.string.search_placeholder), autoFocus = false, ) diff --git a/app/src/main/java/io/legado/app/ui/widget/components/SearchBar.kt b/app/src/main/java/io/legado/app/ui/widget/components/SearchBar.kt index ea7d86685..d05544d8e 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/SearchBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/SearchBar.kt @@ -24,8 +24,10 @@ import androidx.compose.ui.focus.FocusRequester import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalSoftwareKeyboardController +import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp +import io.legado.app.R import io.legado.app.ui.theme.LegadoTheme import io.legado.app.ui.theme.ThemeResolver import io.legado.app.ui.widget.components.icon.AppIcon @@ -41,7 +43,7 @@ fun SearchBar( query: String, onQueryChange: (String) -> Unit, onSearch: (String) -> Unit = {}, - placeholder: String = "搜索...", + placeholder: String? = null, leadingIcon: @Composable (() -> Unit)? = { AppIcon( modifier = Modifier.padding(horizontal = 12.dp), @@ -93,6 +95,7 @@ fun SearchBar( } else { if (isMiuix) MiuixTheme.colorScheme.surfaceContainer else MaterialTheme.colorScheme.surfaceContainerLow } + val resolvedPlaceholder = placeholder ?: stringResource(R.string.search_placeholder) if (isMiuix) { AppDenseTextField( @@ -101,7 +104,7 @@ fun SearchBar( .fillMaxWidth() .padding(vertical = 4.dp) .focusRequester(focusRequester), - placeholder = { AppText(placeholder) }, + placeholder = { AppText(resolvedPlaceholder) }, leadingIcon = leadingIcon, trailingIcon = trailingIcon, keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), @@ -111,7 +114,7 @@ fun SearchBar( lineLimits = TextFieldLineLimits.SingleLine, backgroundColor = resolvedBackgroundColor, miuixUseSearchBarInputField = true, - miuixSearchBarLabel = placeholder, + miuixSearchBarLabel = resolvedPlaceholder, miuixOnSearch = onSearch, ) } else { @@ -127,7 +130,7 @@ fun SearchBar( modifier = modifier .fillMaxWidth() .focusRequester(focusRequester), - placeholder = { AppText(placeholder) }, + placeholder = { AppText(resolvedPlaceholder) }, leadingIcon = leadingIcon, trailingIcon = trailingIcon, keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search), diff --git a/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt b/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt index 800b8b81c..106169b86 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/list/ListScaffold.kt @@ -51,7 +51,7 @@ fun ListScaffold( onSearchQueryChange: (String) -> Unit, onSearchSubmit: (String) -> Unit = {}, searchTrailingIcon: @Composable (() -> Unit)? = null, - searchPlaceholder: String = "搜索...", + searchPlaceholder: String? = null, topBarActions: @Composable RowScope.() -> Unit = {}, bottomContent: @Composable (ColumnScope.(GlassTopAppBarScrollBehavior) -> Unit)? = null, dropDownMenuContent: @Composable (ColumnScope.(dismiss: () -> Unit) -> Unit)? = null, diff --git a/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleListScaffold.kt b/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleListScaffold.kt index 8d612b079..2eccfac43 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleListScaffold.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/rules/RuleListScaffold.kt @@ -44,7 +44,7 @@ fun RuleListScaffold( onBackClick: () -> Unit, onSearchToggle: (Boolean) -> Unit, onSearchQueryChange: (String) -> Unit, - searchPlaceholder: String = "搜索...", + searchPlaceholder: String? = null, topBarActions: @Composable RowScope.() -> Unit = {}, bottomContent: @Composable (ColumnScope.(GlassTopAppBarScrollBehavior) -> Unit)? = null, dropDownMenuContent: (@Composable ColumnScope.(dismiss: () -> Unit) -> Unit)? = null, diff --git a/app/src/main/java/io/legado/app/ui/widget/components/topbar/DynamicTopAppBar.kt b/app/src/main/java/io/legado/app/ui/widget/components/topbar/DynamicTopAppBar.kt index 44531eec1..09f63f514 100644 --- a/app/src/main/java/io/legado/app/ui/widget/components/topbar/DynamicTopAppBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/components/topbar/DynamicTopAppBar.kt @@ -40,7 +40,7 @@ fun DynamicTopAppBar( onSearchToggle: (Boolean) -> Unit, onSearchQueryChange: (String) -> Unit, onSearchSubmit: (String) -> Unit = {}, - searchPlaceholder: String, + searchPlaceholder: String?, searchLeadingIcon: ImageVector = Icons.Default.Search, searchTrailingIcon: @Composable (() -> Unit)? = null, searchDropdownMenu: (@Composable (onDismiss: () -> Unit) -> Unit)? = null, diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ceb804474..2364dff3a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -105,6 +105,7 @@ 版本 本地 搜索 + 搜索… Input search keyword 来源:%s 最近:%s diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index af567e4f8..a362ecf2a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -78,6 +78,7 @@ 版本 本地 搜尋 + 搜尋… Input search keyword 來源: %s 最近: %s diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0423bab46..dacc5b224 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -80,6 +80,7 @@ 版本 本機 搜尋 + 搜尋… Input search keyword 來源:%s 最近:%s diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3dccbfcda..eb0394a28 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -124,6 +124,7 @@ Version Local Search + Search… Input search keyword Origin: %s Origin: %s