From 243da5dea627ea0262420aa791fa6c880f5fd2ee Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Tue, 11 Nov 2025 00:55:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9B=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E4=B8=8B=E5=88=92=E7=BA=BF=E4=B8=8E=E9=98=85=E8=AF=BB=E9=A1=B6?=
 =?UTF-8?q?=E6=A0=8F=E7=9A=84=E5=89=8D=E6=8F=90=E5=B7=A5=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../legado/app/help/config/ReadBookConfig.kt  | 38 +++++++++++++++++++
 .../read/page/provider/ChapterProvider.kt     |  2 +-
 app/src/main/res/values-zh/arrays.xml         | 12 ++++++
 app/src/main/res/values/array_values.xml      | 12 ++++++
 app/src/main/res/values/arrays.xml            | 12 ++++++
 app/src/main/res/xml/pref_config_read.xml     |  8 ++++
 app/version.properties                        |  2 +-
 7 files changed, 84 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt b/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt
index c22ac491f..83dcbe5c5 100644
--- a/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt
+++ b/app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt
@@ -382,6 +382,12 @@ object ReadBookConfig {
             config.underline = value
         }
 
+    var underlineHeight: Int
+        get() = config.underlineHeight
+        set(value) {
+            config.underlineHeight = value
+        }
+
     var dottedLine: Boolean
         get() = config.dottedLine
         set(value) {
@@ -622,6 +628,9 @@ object ReadBookConfig {
         var titleSegFlag: String = "",//分段判断，碰到指定值时分段
         var paragraphIndent: String = "　　",//段落缩进
         var underline: Boolean = false, //下划线
+        var underlineHeight: Int = 1,
+        var underlineColor: String = "#3E3D3B",
+        var underlineColorNight: String = "#ADADAD",
         var dottedLine: Boolean = false, //虚线
         var dottedBase: Float = 6f, //长度
         var dottedRatio: Float = 6f,
@@ -678,6 +687,12 @@ object ReadBookConfig {
         @Transient
         private var menuAcColorNightInt = -1
 
+        @Transient
+        private var underlineColorInt = -1
+
+        @Transient
+        private var underlineColorNightInt = -1
+
         @Transient
         private var initColorInt = false
 
@@ -691,6 +706,8 @@ object ReadBookConfig {
             menuBgColorNightInt = menuBgColorNight.toColorInt()
             menuAcColorInt = menuAcColor.toColorInt()
             menuAcColorNightInt = menuAcColorNight.toColorInt()
+            underlineColorInt = underlineColor.toColorInt()
+            underlineColorNightInt = underlineColorNight.toColorInt()
             initColorInt = true
         }
 
@@ -846,6 +863,27 @@ object ReadBookConfig {
             }
         }
 
+        fun curUnderlineColor(): Int {
+            return when {
+                AppConfig.isNightTheme -> underlineColorNightInt
+                else -> underlineColorInt
+            }
+        }
+
+        fun setUnderlineColor(bg: Int) {
+            when {
+                AppConfig.isNightTheme -> {
+                    underlineColorNight = "#${bg.hexString}"
+                    underlineColorNightInt = bg
+                }
+
+                else -> {
+                    underlineColor = "#${bg.hexString}"
+                    underlineColorInt = bg
+                }
+            }
+        }
+
         fun curBgType(): Int {
             return when {
                 AppConfig.isEInkMode -> bgTypeEInk
diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
index c248ede13..c0c0553aa 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/provider/ChapterProvider.kt
@@ -61,7 +61,7 @@ object ChapterProvider {
         Paint(contentPaint).apply {
             clearShadowLayer()
             isAntiAlias = true
-            strokeWidth = 1.dpToPx().toFloat()
+            strokeWidth = ReadBookConfig.underlineHeight.toFloat()
             style = Paint.Style.STROKE
         }
     }
diff --git a/app/src/main/res/values-zh/arrays.xml b/app/src/main/res/values-zh/arrays.xml
index 7cc18d2d2..9f5a3f334 100644
--- a/app/src/main/res/values-zh/arrays.xml
+++ b/app/src/main/res/values-zh/arrays.xml
@@ -175,5 +175,17 @@
         <item>仅显示滑动条</item>
     </string-array>
 
+    <string-array name="title_bar_mode">
+        <item>自动</item>
+        <item>在应用栏上显示</item>
+        <item>在独立行上显示</item>
+    </string-array>
+
+    <string-array name="title_chapter_mode">
+        <item>不显示标题</item>
+        <item>不显示</item>
+        <item>Disable title and chapter display</item>
+    </string-array>
+
     <string name="all_version">所有版本</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/array_values.xml b/app/src/main/res/values/array_values.xml
index e3cb729b6..6865c969b 100644
--- a/app/src/main/res/values/array_values.xml
+++ b/app/src/main/res/values/array_values.xml
@@ -98,4 +98,16 @@
         <item>4</item>
     </string-array>
 
+    <string-array name="title_bar_mode_value">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
+    <string-array name="title_chapter_mode_value">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 902a7e5d2..8a3dc94ec 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -94,6 +94,18 @@
 		<item>Only slider</item>
 	</string-array>
 
+	<string-array name="title_bar_mode">
+		<item>Auto</item>
+		<item>Show in TopBar</item>
+		<item>Show in another line</item>
+	</string-array>
+
+	<string-array name="title_chapter_mode">
+		<item>Disable title display</item>
+		<item>Disable chapter display</item>
+		<item>Disable title and chapter display</item>
+	</string-array>
+
 	<string-array name="screen_direction_title">
 		<item>@string/screen_unspecified</item>
 		<item>@string/screen_portrait</item>
diff --git a/app/src/main/res/xml/pref_config_read.xml b/app/src/main/res/xml/pref_config_read.xml
index ef041a909..0e2ce048b 100644
--- a/app/src/main/res/xml/pref_config_read.xml
+++ b/app/src/main/res/xml/pref_config_read.xml
@@ -41,6 +41,14 @@
             android:title="@string/padding_display_cutouts"
             app:isBottomBackground="true" />
 
+        <io.legado.app.lib.prefs.NameListPreference
+            android:defaultValue="0"
+            android:entries="@array/read_slider_mode"
+            android:entryValues="@array/read_slider_mode_value"
+            android:key="title_bar_mode"
+            android:title="@string/read_slider_mode"
+            app:isBottomBackground="true" />
+
         <io.legado.app.lib.prefs.Preference
             android:key="menuAlpha"
             android:summary="@string/menu_alpha_sum"
diff --git a/app/version.properties b/app/version.properties
index 03bf770b0..dbef59f59 100644
--- a/app/version.properties
+++ b/app/version.properties
@@ -1,4 +1,4 @@
 VERSION_MAJOR=3
 VERSION_MINOR=26
 VERSION_PATCH=3
-VERSION_SUFFIX=-beta.1
\ No newline at end of file
+VERSION_SUFFIX=-beta.2
\ No newline at end of file