[优化] 可调整下划线离字体距离

app/src/main/java/io/legado/app/help/config/ReadBookConfig.kt

@@ -415,6 +415,12 @@ object ReadBookConfig {
             config.underlineHeight = value
         }
 
+    var underlinePadding: Int
+        get() = config.underlinePadding
+        set(value) {
+            config.underlinePadding = value
+        }
+
     var dottedLine: Boolean
         get() = config.dottedLine
         set(value) {
@@ -593,6 +599,7 @@ object ReadBookConfig {
             exportConfig.paragraphIndent = shareConfig.paragraphIndent
             exportConfig.underline = shareConfig.underline
             exportConfig.underlineHeight = shareConfig.underlineHeight
+            exportConfig.underlinePadding = shareConfig.underlinePadding
             exportConfig.dottedLine = shareConfig.dottedLine
             exportConfig.dottedBase = shareConfig.dottedBase
             exportConfig.dottedRatio = shareConfig.dottedRatio
@@ -710,6 +717,7 @@ object ReadBookConfig {
         var titleSegFlag: String = "",//分段判断，碰到指定值时分段
         var paragraphIndent: String = "　　",//段落缩进
         var underline: Boolean = false, //下划线
+        var underlinePadding: Int = 10,
         var underlineHeight: Int = 1,
         var underlineColor: String = "#3E3D3B",
         var underlineColorNight: String = "#ADADAD",

app/src/main/java/io/legado/app/ui/book/read/config/UnderlineConfigDialog.kt

@@ -2,12 +2,12 @@ package io.legado.app.ui.book.read.config
 
 import android.os.Bundle
 import android.view.View
-import io.legado.app.help.config.ReadBookConfig
 import com.jaredrummler.android.colorpicker.ColorPickerDialog
 import io.legado.app.R
 import io.legado.app.base.BaseBottomSheetDialogFragment
 import io.legado.app.constant.EventBus
 import io.legado.app.databinding.DialogUnderlineConfigBinding
+import io.legado.app.help.config.ReadBookConfig
 import io.legado.app.help.config.ReadBookConfig.dottedLine
 import io.legado.app.help.config.ReadBookConfig.underline
 import io.legado.app.utils.observeEvent
@@ -87,6 +87,14 @@ class UnderlineConfigDialog : BaseBottomSheetDialogFragment(R.layout.dialog_unde
                 postEvent(EventBus.UP_CONFIG, arrayListOf(8, 9, 6))
             }
         }
+
+        binding.btnUnderlinePadding.apply {
+            progress = ReadBookConfig.underlinePadding
+            onChanged = {
+                ReadBookConfig.underlinePadding = it
+                postEvent(EventBus.UP_CONFIG, arrayListOf(8, 9, 6))
+            }
+        }
     }
 
 }

app/src/main/java/io/legado/app/ui/book/read/page/entities/TextLine.kt

@@ -220,7 +220,7 @@ data class TextLine(
      * 绘制下划线
      */
     private fun drawUnderline(canvas: Canvas, dottedLine: Boolean) {
-        val paint = ChapterProvider.linePaint
+        val paint = ChapterProvider.contentPaint
         paint.color = ReadBookConfig.durConfig.curUnderlineColor()
         paint.strokeWidth = ReadBookConfig.underlineHeight.toFloat()
         paint.pathEffect = if (dottedLine && !AppConfig.isEInkMode)
@@ -228,7 +228,7 @@ data class TextLine(
         else
             null
 
-        val lineY = height - 1.dpToPx()
+        val lineY = height + (ReadBookConfig.durConfig.underlinePadding - 10).dpToPx()
         canvas.drawLine(lineStart + indentWidth, lineY, lineEnd, lineY, paint)
     }
 

app/src/main/res/layout/dialog_underline_config.xml

@@ -66,12 +66,29 @@
 
     </com.google.android.material.button.MaterialButtonGroup>
 
-    <io.legado.app.ui.widget.SimpleSliderView
+    <LinearLayout
-        android:id="@+id/btn_underline_height"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:title="@string/underline_height"
+        android:gravity="bottom">
-        app:max="20" />
+
+        <io.legado.app.ui.widget.SimpleSliderView
+            android:id="@+id/btn_underline_height"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="32dp"
+            android:layout_weight="1"
+            app:max="20"
+            app:title="@string/underline_height" />
+
+        <io.legado.app.ui.widget.SimpleSliderView
+            android:id="@+id/btn_underline_padding"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            app:max="20"
+            app:title="@string/underline_padding" />
+    </LinearLayout>
+
 
     <TextView
         android:layout_width="wrap_content"