feat: 优化

app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigContract.kt

@@ -17,7 +17,6 @@ data class ThemeConfigUiState(
 
 sealed interface ThemeConfigSheet {
     data class Background(val dark: Boolean) : ThemeConfigSheet
-    data object NavigationIcons : ThemeConfigSheet
     data object MainNavigation : ThemeConfigSheet
     data object LauncherIcon : ThemeConfigSheet
     data object DividerColor : ThemeConfigSheet

app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigScreen.kt

@@ -812,30 +812,6 @@ fun ThemeConfigScreen(
                 }
             }
 
-            // Nav icon settings
-            item {
-                SplicedColumnGroup(title = stringResource(R.string.theme_config_nav_icon_settings)) {
-                    val customCount = listOf(
-                        appShell.navIconHome,
-                        appShell.navIconBookshelf,
-                        appShell.navIconExplore,
-                        appShell.navIconRss,
-                        appShell.navIconMy
-                    ).count { it.isNotEmpty() }
-                    ClickableSettingItem(
-                        title = stringResource(R.string.theme_config_nav_icons),
-                        description = if (customCount > 0) {
-                            stringResource(R.string.theme_config_nav_icons_custom_count, customCount)
-                        } else {
-                            stringResource(R.string.theme_config_nav_icons_default)
-                        },
-                        onClick = {
-                            onIntent(ThemeConfigIntent.ShowSheet(ThemeConfigSheet.NavigationIcons))
-                        }
-                    )
-                }
-            }
-
             item {
                 SplicedColumnGroup {
                     ClickableSettingItem(
@@ -875,14 +851,6 @@ fun ThemeConfigScreen(
         onRemoveImage = { onIntent(ThemeConfigIntent.RemoveBackground(it)) },
     )
 
-    NavIconManageSheet(
-        show = state.activeSheet == ThemeConfigSheet.NavigationIcons,
-        settings = appShell,
-        onDismissRequest = { onIntent(ThemeConfigIntent.DismissSheet) },
-        onSelectIcon = { onIntent(ThemeConfigIntent.RequestNavigationIcon(it)) },
-        onClearIcon = { onIntent(ThemeConfigIntent.SelectNavigationIcon(it, "")) },
-    )
-
     MainNavigationSettingsSheet(
         show = state.activeSheet == ThemeConfigSheet.MainNavigation,
         settings = appShell,
@@ -892,6 +860,8 @@ fun ThemeConfigScreen(
         },
         onSetOrder = { onIntent(ThemeConfigIntent.SetMainNavigationOrder(it)) },
         onSetDefault = { onIntent(ThemeConfigIntent.SetDefaultHomePage(it)) },
+        onRequestNavigationIcon = { onIntent(ThemeConfigIntent.RequestNavigationIcon(it)) },
+        onClearNavigationIcon = { onIntent(ThemeConfigIntent.SelectNavigationIcon(it, "")) },
     )
 
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -1032,7 +1032,7 @@
     <string name="show_discovery">显示发现</string>
     <string name="show_home">显示首页</string>
     <string name="main_navigation_settings">首页与导航</string>
-    <string name="main_navigation_settings_summary">配置首页、发现、订阅和默认主页</string>
+    <string name="main_navigation_settings_summary">配置首页、发现、订阅、默认主页和导航栏图标</string>
     <string name="navigation_order">导航顺序</string>
     <string name="style">样式</string>
     <string name="group_style">分组样式</string>
@@ -1527,7 +1527,6 @@
     <string name="theme_config_blur_radius_performance_summary">模糊半径越大，系统运行越卡顿</string>
     <string name="theme_config_divider_width">分割线粗细</string>
     <string name="theme_config_divider_length">分割线长度</string>
-    <string name="theme_config_nav_icon_settings">导航栏图标设置</string>
     <string name="theme_config_nav_icons">导航栏图标</string>
     <string name="theme_config_nav_icons_custom_count">已设置 %1$d 个自定义图标</string>
     <string name="theme_config_nav_icons_default">使用默认图标</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -901,7 +901,7 @@
     <string name="show_discovery">顯示發現</string>
     <string name="show_home">顯示首頁</string>
     <string name="main_navigation_settings">首頁與導覽</string>
-    <string name="main_navigation_settings_summary">設定首頁、發現、訂閱和預設主頁</string>
+    <string name="main_navigation_settings_summary">設定首頁、發現、訂閱、預設主頁和導航欄圖標</string>
     <string name="navigation_order">導覽順序</string>
     <string name="style">樣式</string>
     <string name="group_style">分組樣式</string>
@@ -2170,7 +2170,6 @@
     <string name="theme_config_label_color_name">標籤 %1$d</string>
     <string name="theme_config_manage_label_colors">管理標籤顏色</string>
     <string name="theme_config_miuix_experimental_warning">Miuix 目前為實驗性功能，不適用於 View 介面。</string>
-    <string name="theme_config_nav_icon_settings">導航欄圖標設定</string>
     <string name="theme_config_nav_icons">導航欄圖標</string>
     <string name="theme_config_nav_icons_custom_count">已設定 %1$d 個自訂圖標</string>
     <string name="theme_config_nav_icons_default">使用預設圖標</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -904,7 +904,7 @@
     <string name="show_discovery">顯示發現</string>
     <string name="show_home">顯示首頁</string>
     <string name="main_navigation_settings">首頁與導覽</string>
-    <string name="main_navigation_settings_summary">設定首頁、發現、訂閱和預設主頁</string>
+    <string name="main_navigation_settings_summary">設定首頁、發現、訂閱、預設主頁和導航欄圖示</string>
     <string name="navigation_order">導覽順序</string>
     <string name="style">樣式</string>
     <string name="group_style">分組樣式</string>
@@ -1689,7 +1689,6 @@
     <string name="theme_config_blur_radius_performance_summary">較大的模糊半徑可能降低效能</string>
     <string name="theme_config_divider_width">分隔線寬度</string>
     <string name="theme_config_divider_length">分隔線長度</string>
-    <string name="theme_config_nav_icon_settings">導航欄圖示設定</string>
     <string name="theme_config_nav_icons">導航欄圖示</string>
     <string name="theme_config_nav_icons_custom_count">已設定 %1$d 個自訂圖示</string>
     <string name="theme_config_nav_icons_default">使用預設圖示</string>

app/src/main/res/values/strings.xml

@@ -1072,7 +1072,7 @@
     <string name="show_discovery">Show Discovery</string>
     <string name="show_home">Show Home</string>
     <string name="main_navigation_settings">Home and navigation</string>
-    <string name="main_navigation_settings_summary">Configure Home, Discovery, Subscriptions, and the start page</string>
+    <string name="main_navigation_settings_summary">Configure Home, Discovery, Subscriptions, start page, and navigation icons</string>
     <string name="navigation_order">Navigation order</string>
     <string name="style">Style</string>
     <string name="group_style">Group style</string>
@@ -1587,7 +1587,6 @@
     <string name="theme_config_blur_radius_performance_summary">Higher blur radius may reduce performance</string>
     <string name="theme_config_divider_width">Divider Width</string>
     <string name="theme_config_divider_length">Divider Length</string>
-    <string name="theme_config_nav_icon_settings">Navigation Bar Icon Settings</string>
     <string name="theme_config_nav_icons">Navigation Bar Icons</string>
     <string name="theme_config_nav_icons_custom_count">%1$d custom icons set</string>
     <string name="theme_config_nav_icons_default">Using default icons</string>