Просмотр исходного кода

refactor(read): remove unused shadow set and chinese convert feature

移除了阅读样式设置页中未使用的阴影设置入口,以及删除了闲置的中文简繁转换功能相关代码,清理冗余代码提升可维护性
52fisher 3 месяцев назад
Родитель
Сommit
346ff438e9

+ 0 - 3
app/src/main/java/io/legado/app/ui/book/read/ReadBookMenuBar.kt

@@ -711,9 +711,6 @@ private fun ReadBookMenuSurface(
                                 onOpenUnderlineConfig = {
                                     onIntent(ReadBookIntent.ShowSheet(ReadBookSheet.UnderlineConfig))
                                 },
-                                onOpenShadowSet = {
-                                    onIntent(ReadBookIntent.ShowSheet(ReadBookSheet.ShadowSet))
-                                },
                                 onOpenFontSelect = {
                                     onIntent(ReadBookIntent.ShowSheet(ReadBookSheet.FontSelect))
                                 },

+ 0 - 73
app/src/main/java/io/legado/app/ui/book/read/sheet/GlobalThemePage.kt

@@ -25,10 +25,8 @@ import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.DarkMode
 import androidx.compose.material.icons.filled.FormatUnderlined
 import androidx.compose.material.icons.filled.GridView
-import androidx.compose.material.icons.filled.Layers
 import androidx.compose.material.icons.filled.LightMode
 import androidx.compose.material.icons.filled.Tablet
-import androidx.compose.material.icons.filled.Translate
 import androidx.compose.material.icons.filled.Visibility
 import androidx.compose.material3.Icon
 import androidx.compose.material3.PlainTooltip
@@ -80,7 +78,6 @@ fun GlobalThemePage(
     eyeProtectionEnabled: Boolean,
     onOpenBgTextConfig: (Int) -> Unit,
     onOpenUnderlineConfig: () -> Unit,
-    onOpenShadowSet: () -> Unit,
     onShareLayoutChange: (Boolean) -> Unit,
     onStyleSelect: (Int) -> Unit,
     modifier: Modifier = Modifier,
@@ -94,7 +91,6 @@ fun GlobalThemePage(
     val styleSelect = styleConfig.styleSelect
     val shareLayout = styleConfig.shareLayout
     val isNightTheme = LegadoTheme.isDark
-    val chineseConverterType = preferences.chineseConverterType
     val doubleHorizontalPage = preferences.doubleHorizontalPage
 
     val configList = styleConfig.styleItems
@@ -137,25 +133,6 @@ fun GlobalThemePage(
                     )
                 }
             }
-            NormalCard(
-                onClick = onOpenShadowSet,
-                modifier = Modifier
-                    .height(56.dp)
-                    .aspectRatio(1f),
-                containerColor = LegadoTheme.colorScheme.surfaceContainerLow,
-                cornerRadius = 12.dp
-            ) {
-                Box(
-                    contentAlignment = Alignment.Center,
-                    modifier = Modifier.fillMaxSize(),
-                ) {
-                    Icon(
-                        imageVector = Icons.Default.Layers,
-                        contentDescription = stringResource(R.string.text_shadow_set),
-                        tint = LegadoTheme.colorScheme.onSurfaceVariant
-                    )
-                }
-            }
         }
 
         Spacer(Modifier.height(4.dp))
@@ -386,56 +363,6 @@ fun GlobalThemePage(
                     }
                 }
             }
-            // 中文简繁互转 — dropdown menu
-            Box {
-                var showChineseConvertMenu by remember { mutableStateOf(false) }
-                val chineseConvertEntries = stringArrayResource(R.array.chinese_mode)
-                val chineseConvertValues = remember { arrayOf("0", "1", "2") }
-                NormalCard(
-                    onClick = { showChineseConvertMenu = true },
-                    modifier = Modifier
-                        .height(56.dp)
-                        .aspectRatio(1f),
-                    containerColor = if (chineseConverterType > 0) {
-                        LegadoTheme.colorScheme.secondaryContainer
-                    } else {
-                        LegadoTheme.colorScheme.surfaceContainerLow
-                    },
-                    cornerRadius = 12.dp
-                ) {
-                    Box(
-                        contentAlignment = Alignment.Center,
-                        modifier = Modifier.fillMaxSize(),
-                    ) {
-                        Icon(
-                            imageVector = Icons.Default.Translate,
-                            contentDescription = stringResource(R.string.chinese_converter),
-                            tint = if (chineseConverterType > 0) {
-                                LegadoTheme.colorScheme.onSecondaryContainer
-                            } else {
-                                LegadoTheme.colorScheme.onSurfaceVariant
-                            }
-                        )
-                    }
-                }
-                RoundDropdownMenu(
-                    expanded = showChineseConvertMenu,
-                    onDismissRequest = { showChineseConvertMenu = false },
-                ) { dismiss ->
-                    chineseConvertEntries.forEachIndexed { index, display ->
-                        RoundDropdownMenuItem(
-                            text = display,
-                            isSelected = chineseConvertValues[index] == chineseConverterType.toString(),
-                            onClick = {
-                                onIntent(ReadBookIntent.UpdateConfig(
-                                    ConfigUpdate.ChineseConverterType(chineseConvertValues[index].toInt())
-                                ))
-                                dismiss()
-                            },
-                        )
-                    }
-                }
-            }
             // 平板/横屏双页 — dropdown menu
             Box {
                 NormalCard(

+ 0 - 2
app/src/main/java/io/legado/app/ui/book/read/sheet/ReadStyleSheet.kt

@@ -42,7 +42,6 @@ fun ReadStyleContent(
     onOpenMoreConfig: () -> Unit,
     onOpenBgTextConfig: (Int) -> Unit,
     onOpenUnderlineConfig: () -> Unit,
-    onOpenShadowSet: () -> Unit,
     onOpenFontSelect: () -> Unit,
     onToggleDayNight: () -> Unit,
     onPageChanged: (Int) -> Unit = {},
@@ -98,7 +97,6 @@ fun ReadStyleContent(
                         eyeProtectionEnabled = eyeProtectionEnabled,
                         onOpenBgTextConfig = onOpenBgTextConfig,
                         onOpenUnderlineConfig = onOpenUnderlineConfig,
-                        onOpenShadowSet = onOpenShadowSet,
                         onShareLayoutChange = { shareLayout ->
                             onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.ShareLayout(shareLayout)))
                         },