fix: 主题配置支持页面指示器颜色 (#53)

Co-authored-by: qwertyyb <[email protected]>
qwertyyb · Mar 23, 2022 · dc9fbed · dc9fbed
1 parent dbf01c8
commit dc9fbed
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 46 deletions.
diff --git a/Fire/Assets.xcassets/arrowDownOff.imageset/Contents.json b/Fire/Assets.xcassets/arrowDownOff.imageset/Contents.json
diff --git a/Fire/Assets.xcassets/arrowDownOff.imageset/arrow-left-c-copy-3.png b/Fire/Assets.xcassets/arrowDownOff.imageset/arrow-left-c-copy-3.png
diff --git a/Fire/Assets.xcassets/arrowUpOff.imageset/Contents.json b/Fire/Assets.xcassets/arrowUpOff.imageset/Contents.json
diff --git a/Fire/Assets.xcassets/arrowUpOff.imageset/Tarrow-3.png b/Fire/Assets.xcassets/arrowUpOff.imageset/Tarrow-3.png
diff --git a/Fire/CandidatesView.swift b/Fire/CandidatesView.swift
@@ -91,7 +91,8 @@ struct CandidatesView: View {
     var _indicator: some View {
         if direction == CandidatesDirection.horizontal {
             return AnyView(VStack(spacing: 0) {
-                Image(hasPrev ? "arrowUp" : "arrowUpOff")
+                Image("arrowUp")
+                    .renderingMode(.template)
                     .resizable()
                     .frame(width: 10, height: 10, alignment: .center)
                     .onTapGesture {
@@ -101,7 +102,12 @@ struct CandidatesView: View {
                             object: nil
                         )
                     }
-                Image(hasNext ? "arrowDown" : "arrowDownOff")
+                    .foregroundColor(Color(hasPrev
+                                     ? themeConfig[colorScheme].pageIndicatorColor
+                                     : themeConfig[colorScheme].pageIndicatorDisabledColor
+                    ))
+                Image("arrowDown")
+                    .renderingMode(.template)
                     .resizable()
                     .frame(width: 10, height: 10, alignment: .center)
                     .onTapGesture {
@@ -112,10 +118,15 @@ struct CandidatesView: View {
                             object: nil
                         )
                     }
+                    .foregroundColor(Color(hasNext
+                                     ? themeConfig[colorScheme].pageIndicatorColor
+                                     : themeConfig[colorScheme].pageIndicatorDisabledColor
+                    ))
             })
         }
         return AnyView(HStack(spacing: 4) {
-            Image(hasPrev ? "arrowUp" : "arrowUpOff")
+            Image("arrowUp")
+                .renderingMode(.template)
                 .resizable()
                 .frame(width: 10, height: 10, alignment: .center)
                 .rotationEffect(Angle(degrees: -90), anchor: .center)
@@ -126,7 +137,8 @@ struct CandidatesView: View {
                         object: nil
                     )
                 }
-            Image(hasNext ? "arrowDown" : "arrowDownOff")
+            Image("arrowDown")
+                .renderingMode(.template)
                 .resizable()
                 .frame(width: 10, height: 10, alignment: .center)
                 .rotationEffect(Angle(degrees: -90), anchor: .center)

diff --git a/Fire/Theme/ThemeConfig.swift b/Fire/Theme/ThemeConfig.swift
@@ -49,6 +49,11 @@ struct ApperanceThemeConfig: Codable {
     let selectedIndexColor: ColorData
     let selectedTextColor: ColorData
     let selectedCodeColor: ColorData
+
+    // 页面指示器颜色
+    let pageIndicatorColor: ColorData
+    // 页面指示器置灰色
+    let pageIndicatorDisabledColor: ColorData
 
     let fontName: String
     let fontSize: Float
@@ -94,6 +99,8 @@ let defaultThemeConfig = ThemeConfig(
         selectedIndexColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 1),
         selectedTextColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 1),
         selectedCodeColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 0.8),
+        pageIndicatorColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 1),
+        pageIndicatorDisabledColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 0.4),
         fontName: "system",
         fontSize: 20),
     dark: ApperanceThemeConfig(
@@ -112,6 +119,8 @@ let defaultThemeConfig = ThemeConfig(
         selectedIndexColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 1),
         selectedTextColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 1),
         selectedCodeColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 0.8),
+        pageIndicatorColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 1),
+        pageIndicatorDisabledColor: ColorData(red: 0.863, green: 0.078, blue: 0.235, opacity: 0.4),
         fontName: "system",
         fontSize: 20
     )