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

fix(read): 导出配置补齐 fontSizeOffset 字段,字号偏移描述改用字符串资源

HapeLee 3 месяцев назад
Родитель
Сommit
d47a1775a9

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

@@ -760,7 +760,7 @@ object ReadBookConfig {
             "tipDividerColor" to tipDividerColor,
             "headerMode" to headerMode,
             "footerMode" to footerMode,
-            "highlightRules" to highlightRules.map { mapOf("id" to it.id, "name" to it.name, "pattern" to it.pattern, "sampleText" to it.sampleText, "targetScope" to it.targetScope, "enabled" to it.enabled, "position" to it.position, "textColor" to it.textColor, "bgColor" to it.bgColor, "underlineMode" to it.underlineMode, "underlineColor" to it.underlineColor, "underlineWidth" to it.underlineWidth, "underlineOffset" to it.underlineOffset, "underlineSvgPath" to it.underlineSvgPath, "bgImage" to it.bgImage, "bgImageFit" to it.bgImageFit, "bgImageScale" to it.bgImageScale, "configName" to it.configName, "fontPath" to it.fontPath) }
+            "highlightRules" to highlightRules.map { mapOf("id" to it.id, "name" to it.name, "pattern" to it.pattern, "sampleText" to it.sampleText, "targetScope" to it.targetScope, "enabled" to it.enabled, "position" to it.position, "textColor" to it.textColor, "bgColor" to it.bgColor, "underlineMode" to it.underlineMode, "underlineColor" to it.underlineColor, "underlineWidth" to it.underlineWidth, "underlineOffset" to it.underlineOffset, "underlineSvgPath" to it.underlineSvgPath, "bgImage" to it.bgImage, "bgImageFit" to it.bgImageFit, "bgImageScale" to it.bgImageScale, "configName" to it.configName, "fontPath" to it.fontPath, "fontSizeOffset" to it.fontSizeOffset) }
         )
 
         fun getBgPath(bgIndex: Int): String? {

+ 5 - 1
app/src/main/java/io/legado/app/ui/book/read/sheet/HighlightRuleEditSheet.kt

@@ -360,7 +360,11 @@ fun HighlightRuleEditSheet(
                 value = fontSizeOffset.toFloat(),
                 valueRange = -10f..10f,
                 steps = 19,
-                description = if (fontSizeOffset == 0) "默认" else String.format("%+d sp", fontSizeOffset),
+                description = if (fontSizeOffset == 0) {
+                    stringResource(R.string.text_default)
+                } else {
+                    stringResource(R.string.font_size_offset_value, fontSizeOffset)
+                },
                 onValueChange = { fontSizeOffset = it.toInt() },
             )
 

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

@@ -782,6 +782,7 @@
     <string name="underline_width">下划线宽度</string>
     <string name="underline_offset">下划线偏移</string>
     <string name="font_size_offset">字号偏移</string>
+    <string name="font_size_offset_value">%1$+d sp</string>
     <string name="svg_path">SVG路径</string>
     <string name="svg_path_hint">坐标范围:X(0-100),Y(0-100)</string>
     <string name="bg_image_fit">背景适配</string>

+ 1 - 0
app/src/main/res/values/strings.xml

@@ -813,6 +813,7 @@
     <string name="underline_width">Underline Width</string>
     <string name="underline_offset">Underline Offset</string>
     <string name="font_size_offset">Font Size Offset</string>
+    <string name="font_size_offset_value">%1$+d sp</string>
     <string name="svg_path">SVG Path</string>
     <string name="svg_path_hint">Coordinates: X(0-100), Y(0-100)</string>
     <string name="bg_image_fit">Background Fit</string>