From 9843bed95f127502acf7189871853c9d64a541a5 Mon Sep 17 00:00:00 2001 From: fansan Date: Sat, 13 Jun 2026 08:48:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20TitleSettingsPa?= =?UTF-8?q?ge=20=E6=A0=87=E9=A2=98=E9=97=B4=E8=B7=9D=E4=B8=8E=E5=AD=97?= =?UTF-8?q?=E5=8F=B7=E5=8A=A0=E5=87=8F=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/read/sheet/TextTitleSheet.kt | 36 ++++++++++++------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt b/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt index 24001eedc..7ba63f837 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt @@ -362,6 +362,12 @@ internal fun TitleSettingsPage( ) { var titleMode by remember { mutableIntStateOf(ReadBookConfig.titleMode) } var titleBold by remember { mutableIntStateOf(ReadBookConfig.titleBold) } + var titleSegScaling by remember { mutableFloatStateOf(ReadBookConfig.titleSegScaling) } + var titleLineSpacingExtra by remember { mutableIntStateOf(ReadBookConfig.titleLineSpacingExtra) } + var titleLineSpacingSub by remember { mutableIntStateOf(ReadBookConfig.titleLineSpacingSub) } + var titleSize by remember { mutableIntStateOf(ReadBookConfig.titleSize) } + var titleTopSpacing by remember { mutableIntStateOf(ReadBookConfig.titleTopSpacing) } + var titleBottomSpacing by remember { mutableIntStateOf(ReadBookConfig.titleBottomSpacing) } var showColorPicker by remember { mutableStateOf(false) } var colorPickerId by remember { mutableIntStateOf(0) } @@ -429,50 +435,56 @@ internal fun TitleSettingsPage( // Title spacing sliders TinySliderSettingItem( title = stringResource(R.string.subtitle_scale), - value = ReadBookConfig.titleSegScaling * 10, + value = titleSegScaling * 10, valueRange = 0f..100f, onValueChange = { value -> - onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleSegScaling(value / 10f))) + titleSegScaling = value / 10f + onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleSegScaling(titleSegScaling))) }, ) TinySliderSettingItem( title = stringResource(R.string.heading_spacing), - value = ReadBookConfig.titleLineSpacingExtra.toFloat(), + value = titleLineSpacingExtra.toFloat(), valueRange = 0f..100f, onValueChange = { value -> - onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleLineSpacingExtra(value.toInt()))) + titleLineSpacingExtra = value.toInt() + onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleLineSpacingExtra(titleLineSpacingExtra))) }, ) TinySliderSettingItem( title = stringResource(R.string.subtitle_margin), - value = ReadBookConfig.titleLineSpacingSub.toFloat(), + value = titleLineSpacingSub.toFloat(), valueRange = 0f..100f, onValueChange = { value -> - onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleLineSpacingSub(value.toInt()))) + titleLineSpacingSub = value.toInt() + onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleLineSpacingSub(titleLineSpacingSub))) }, ) TinySliderSettingItem( title = stringResource(R.string.title_font_size), - value = ReadBookConfig.titleSize.toFloat(), + value = titleSize.toFloat(), valueRange = 0f..100f, onValueChange = { value -> - onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleSize(value.toInt()))) + titleSize = value.toInt() + onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleSize(titleSize))) }, ) TinySliderSettingItem( title = stringResource(R.string.title_margin_top), - value = ReadBookConfig.titleTopSpacing.toFloat(), + value = titleTopSpacing.toFloat(), valueRange = 0f..100f, onValueChange = { value -> - onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleTopSpacing(value.toInt()))) + titleTopSpacing = value.toInt() + onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleTopSpacing(titleTopSpacing))) }, ) TinySliderSettingItem( title = stringResource(R.string.title_margin_bottom), - value = ReadBookConfig.titleBottomSpacing.toFloat(), + value = titleBottomSpacing.toFloat(), valueRange = 0f..100f, onValueChange = { value -> - onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleBottomSpacing(value.toInt()))) + titleBottomSpacing = value.toInt() + onIntent(ReadBookIntent.UpdateConfig(ConfigUpdate.TitleBottomSpacing(titleBottomSpacing))) }, ) From 2f06e56104aa55ba34ac3ad55ecfcf6d11dd6531 Mon Sep 17 00:00:00 2001 From: fansan Date: Sat, 13 Jun 2026 09:14:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20TitleSettingsPa?= =?UTF-8?q?ge=20=E6=A0=87=E9=A2=98=E9=97=B4=E8=B7=9D=E4=B8=8E=E5=AD=97?= =?UTF-8?q?=E5=8F=B7=E5=8A=A0=E5=87=8F=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/ui/book/read/sheet/TextTitleSheet.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt b/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt index 7ba63f837..5ca6ceb9a 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/sheet/TextTitleSheet.kt @@ -360,14 +360,14 @@ internal fun TextEffectsPage( internal fun TitleSettingsPage( onIntent: (ReadBookIntent) -> Unit, ) { - var titleMode by remember { mutableIntStateOf(ReadBookConfig.titleMode) } - var titleBold by remember { mutableIntStateOf(ReadBookConfig.titleBold) } - var titleSegScaling by remember { mutableFloatStateOf(ReadBookConfig.titleSegScaling) } - var titleLineSpacingExtra by remember { mutableIntStateOf(ReadBookConfig.titleLineSpacingExtra) } - var titleLineSpacingSub by remember { mutableIntStateOf(ReadBookConfig.titleLineSpacingSub) } - var titleSize by remember { mutableIntStateOf(ReadBookConfig.titleSize) } - var titleTopSpacing by remember { mutableIntStateOf(ReadBookConfig.titleTopSpacing) } - var titleBottomSpacing by remember { mutableIntStateOf(ReadBookConfig.titleBottomSpacing) } + var titleMode by remember(ReadBookConfig.titleMode) { mutableIntStateOf(ReadBookConfig.titleMode) } + var titleBold by remember(ReadBookConfig.titleBold) { mutableIntStateOf(ReadBookConfig.titleBold) } + var titleSegScaling by remember(ReadBookConfig.titleSegScaling) { mutableFloatStateOf(ReadBookConfig.titleSegScaling) } + var titleLineSpacingExtra by remember(ReadBookConfig.titleLineSpacingExtra) { mutableIntStateOf(ReadBookConfig.titleLineSpacingExtra) } + var titleLineSpacingSub by remember(ReadBookConfig.titleLineSpacingSub) { mutableIntStateOf(ReadBookConfig.titleLineSpacingSub) } + var titleSize by remember(ReadBookConfig.titleSize) { mutableIntStateOf(ReadBookConfig.titleSize) } + var titleTopSpacing by remember(ReadBookConfig.titleTopSpacing) { mutableIntStateOf(ReadBookConfig.titleTopSpacing) } + var titleBottomSpacing by remember(ReadBookConfig.titleBottomSpacing) { mutableIntStateOf(ReadBookConfig.titleBottomSpacing) } var showColorPicker by remember { mutableStateOf(false) } var colorPickerId by remember { mutableIntStateOf(0) }