完善阅读器主题与批注界面

2026-07-13 13:01:14 +09:00
parent adc24d3f36
commit 6a0a1223b1
22 changed files with 133 additions and 189 deletions
@@ -30,59 +30,41 @@ public struct RDEPUBReaderTheme: Equatable {
        self.toolLineColor = toolLineColor
    }

-    public static let light = RDEPUBReaderTheme(
-        contentBackgroundColor: .white,
-        contentTextColor: .black,
-        toolBackgroundColor: .white,
-        toolControlTextColor: .black,
-        toolControlBorderUnselectColor: UIColor.lightGray.withAlphaComponent(0.5),
-        toolLineColor: UIColor.lightGray.withAlphaComponent(0.5)
+    public static let light = preset(contentBackground: .white, text: .black)
+
+    public static let dark = preset(contentBackground: .black, text: .white)
+
+    public static let yellow = preset(
+        contentBackground: UIColor(red: 0.89, green: 0.87, blue: 0.79, alpha: 1),
+        text: .black
    )

-    public static let dark = RDEPUBReaderTheme(
-        contentBackgroundColor: .black,
-        contentTextColor: .white,
-        toolBackgroundColor: .black,
-        toolControlTextColor: .white,
-        toolControlBorderUnselectColor: UIColor.lightGray.withAlphaComponent(0.5),
-        toolLineColor: UIColor.lightGray.withAlphaComponent(0.5)
+    public static let green = preset(
+        contentBackground: UIColor(red: 0.87, green: 0.91, blue: 0.82, alpha: 1),
+        text: .black
    )

-    public static let yellow = RDEPUBReaderTheme(
-        contentBackgroundColor: UIColor(red: 0.89, green: 0.87, blue: 0.79, alpha: 1),
-        contentTextColor: .black,
-        toolBackgroundColor: UIColor(red: 0.89, green: 0.87, blue: 0.79, alpha: 1),
-        toolControlTextColor: .black,
-        toolControlBorderUnselectColor: UIColor.lightGray.withAlphaComponent(0.5),
-        toolLineColor: UIColor.lightGray.withAlphaComponent(0.5)
+    public static let pink = preset(
+        contentBackground: UIColor(red: 1, green: 0.89, blue: 0.91, alpha: 1),
+        text: .black
    )

-    public static let green = RDEPUBReaderTheme(
-        contentBackgroundColor: UIColor(red: 0.87, green: 0.91, blue: 0.82, alpha: 1),
-        contentTextColor: .black,
-        toolBackgroundColor: UIColor(red: 0.87, green: 0.91, blue: 0.82, alpha: 1),
-        toolControlTextColor: .black,
-        toolControlBorderUnselectColor: UIColor.lightGray.withAlphaComponent(0.5),
-        toolLineColor: UIColor.lightGray.withAlphaComponent(0.5)
+    public static let blue = preset(
+        contentBackground: UIColor(red: 0.8, green: 0.84, blue: 0.89, alpha: 1),
+        text: .black
    )

-    public static let pink = RDEPUBReaderTheme(
-        contentBackgroundColor: UIColor(red: 1, green: 0.89, blue: 0.91, alpha: 1),
-        contentTextColor: .black,
-        toolBackgroundColor: UIColor(red: 1, green: 0.89, blue: 0.91, alpha: 1),
-        toolControlTextColor: .black,
-        toolControlBorderUnselectColor: UIColor.lightGray.withAlphaComponent(0.5),
-        toolLineColor: UIColor.lightGray.withAlphaComponent(0.5)
-    )
-
-    public static let blue = RDEPUBReaderTheme(
-        contentBackgroundColor: UIColor(red: 0.8, green: 0.84, blue: 0.89, alpha: 1),
-        contentTextColor: .black,
-        toolBackgroundColor: UIColor(red: 0.8, green: 0.84, blue: 0.89, alpha: 1),
-        toolControlTextColor: .black,
-        toolControlBorderUnselectColor: UIColor.lightGray.withAlphaComponent(0.5),
-        toolLineColor: UIColor.lightGray.withAlphaComponent(0.5)
-    )
+    /// 工具条/弹出页统一用比正文背景稍深的底色（暗色主题稍亮），拉开层次对比。
+    private static func preset(contentBackground: UIColor, text: UIColor) -> RDEPUBReaderTheme {
+        RDEPUBReaderTheme(
+            contentBackgroundColor: contentBackground,
+            contentTextColor: text,
+            toolBackgroundColor: contentBackground.rd_chromeShade,
+            toolControlTextColor: text,
+            toolControlBorderUnselectColor: UIColor.lightGray.withAlphaComponent(0.5),
+            toolLineColor: UIColor.lightGray.withAlphaComponent(0.5)
+        )
+    }
 }

 extension RDEPUBReaderTheme {