From 83bc8185446bc1c34b8db84445844d51e1d12045 Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Sat, 13 Jun 2026 22:27:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E6=A1=86=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=96=87=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/legado/app/ui/rss/article/RssSortScreen.kt     |  2 +-
 .../legado/app/ui/widget/components/FontSelectGrid.kt |  2 +-
 .../io/legado/app/ui/widget/components/SearchBar.kt   | 11 +++++++----
 .../app/ui/widget/components/list/ListScaffold.kt     |  2 +-
 .../ui/widget/components/rules/RuleListScaffold.kt    |  2 +-
 .../ui/widget/components/topbar/DynamicTopAppBar.kt   |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml            |  1 +
 app/src/main/res/values-zh-rHK/strings.xml            |  1 +
 app/src/main/res/values-zh-rTW/strings.xml            |  1 +
 app/src/main/res/values/strings.xml                   |  1 +
 10 files changed, 16 insertions(+), 9 deletions(-)

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 <T> 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 <T> 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 <T> 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 @@
     <string name="version">版本</string>
     <string name="local">本地</string>
     <string name="search">搜索</string>
+    <string name="search_placeholder">搜索…</string>
     <string name="input_search_key">Input search keyword</string>
     <string name="origin_format">来源：%s</string>
     <string name="read_dur_progress">最近：%s</string>
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 @@
     <string name="version">版本</string>
     <string name="local">本地</string>
     <string name="search">搜尋</string>
+    <string name="search_placeholder">搜尋…</string>
     <string name="input_search_key">Input search keyword</string>
     <string name="origin_format">來源: %s</string>
     <string name="read_dur_progress">最近: %s</string>
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 @@
     <string name="version">版本</string>
     <string name="local">本機</string>
     <string name="search">搜尋</string>
+    <string name="search_placeholder">搜尋…</string>
     <string name="input_search_key">Input search keyword</string>
     <string name="origin_format">來源：%s</string>
     <string name="read_dur_progress">最近：%s</string>
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 @@
     <string name="version">Version</string>
     <string name="local">Local</string>
     <string name="search">Search</string>
+    <string name="search_placeholder">Search…</string>
     <string name="input_search_key">Input search keyword</string>
     <string name="origin_format">Origin: %s</string>
     <string name="read_dur_progress">Origin: %s</string>