Răsfoiți Sursa

修复播放列表的主题颜色bug

onecold 1 an în urmă
părinte
comite
ab0ba7b019

+ 10 - 9
entry/src/main/ets/view/LocalMusic.ets

@@ -2179,14 +2179,14 @@ export struct LocalMusic {
               duration: 555,
               duration: 555,
               curve: 'Linear',
               curve: 'Linear',
             })
             })
-            .fontColor(this.currentSong?.filePath === item.filePath ? $r('app.color.title_bar_bg') :
+            .fontColor(this.currentSong?.filePath === item.filePath ? $r('app.color.title_bar_bg_text') :
             $r('app.color.text_color'))
             $r('app.color.text_color'))
             .margin({ left: 10 })
             .margin({ left: 10 })
           Row() {
           Row() {
             Text(StrUtil.isEmpty(item.artist) ? item.cTime : item.artist + '  ' + item?.album)
             Text(StrUtil.isEmpty(item.artist) ? item.cTime : item.artist + '  ' + item?.album)
               .fontSize(11)
               .fontSize(11)
               .padding({ top: 8 })
               .padding({ top: 8 })
-              .fontColor(this.currentSong?.filePath === item.filePath ? $r('app.color.title_bar_bg') :
+              .fontColor(this.currentSong?.filePath === item.filePath ? $r('app.color.title_bar_bg_text') :
               $r('app.color.text_color'))
               $r('app.color.text_color'))
               .margin({ left: 10 })
               .margin({ left: 10 })
             Blank()
             Blank()
@@ -2194,7 +2194,8 @@ export struct LocalMusic {
               .fontSize(11)
               .fontSize(11)
               .padding({ top: 8 })
               .padding({ top: 8 })
               .visibility(StrUtil.isEmpty(item.artist) ? Visibility.Visible : Visibility.None)
               .visibility(StrUtil.isEmpty(item.artist) ? Visibility.Visible : Visibility.None)
-              .fontColor($r('app.color.text_color'))
+              .fontColor(this.currentSong?.filePath === item.filePath ? $r('app.color.title_bar_bg_text') :
+              $r('app.color.text_color'))
               .margin({ left: 10 })
               .margin({ left: 10 })
           }
           }
 
 
@@ -3956,24 +3957,24 @@ export struct LocalMusic {
 
 
           Text(item.name)
           Text(item.name)
             .fontSize(14)
             .fontSize(14)
-            .fontColor(this.curIndex === index ? $r('app.color.title_bar_bg') :
-              this.isFrontWhite ? Color.White : Color.Black)
+            .fontColor(this.curIndex === index ? $r('app.color.title_bar_bg_text') :
+              this.isFrontWhite ? Color.White : $r('app.color.text_color'))
             .maxLines(1)
             .maxLines(1)
             .margin({ left: 10 })
             .margin({ left: 10 })
           Row() {
           Row() {
             Text(StrUtil.isEmpty(item.artist) ? item.cTime : item.artist + '  ' + item?.album)
             Text(StrUtil.isEmpty(item.artist) ? item.cTime : item.artist + '  ' + item?.album)
               .fontSize(11)
               .fontSize(11)
               .padding({ top: 8 })
               .padding({ top: 8 })
-              .fontColor(this.curIndex === index ? $r('app.color.title_bar_bg') :
-                this.isFrontWhite ? $r('app.color.divider_color') : $r('app.color.pri_bg'))
+              .fontColor(this.curIndex === index ? $r('app.color.title_bar_bg_text') :
+                this.isFrontWhite ? $r('app.color.playlistText_color') : $r('app.color.text_color'))
               .margin({ left: 10 })
               .margin({ left: 10 })
             Blank()
             Blank()
             Text(item.size)
             Text(item.size)
               .fontSize(11)
               .fontSize(11)
               .padding({ top: 8 })
               .padding({ top: 8 })
               .visibility(StrUtil.isEmpty(item.artist) ? Visibility.Visible : Visibility.None)
               .visibility(StrUtil.isEmpty(item.artist) ? Visibility.Visible : Visibility.None)
-              .fontColor(this.curIndex === index ? $r('app.color.title_bar_bg') :
-                this.isFrontWhite ? $r('app.color.divider_color') : $r('app.color.pri_bg'))
+              .fontColor(this.curIndex === index ? $r('app.color.title_bar_bg_text') :
+                this.isFrontWhite ? $r('app.color.playlistText_color') : $r('app.color.text_color'))
               .margin({ left: 10 })
               .margin({ left: 10 })
           }
           }
 
 

+ 9 - 0
entry/src/main/resources/base/element/color.json

@@ -117,6 +117,15 @@
     {
     {
       "name": "select_swiper",
       "name": "select_swiper",
       "value": "#DBFFFFFF"
       "value": "#DBFFFFFF"
+    },
+
+    {
+      "name": "playlistText_color",
+      "value": "#D3D3D3"
+    },
+    {
+      "name": "title_bar_bg_text",
+      "value": "#FF4081"
     }
     }
   ]
   ]
 }
 }

+ 8 - 0
entry/src/main/resources/dark/element/color.json

@@ -135,6 +135,14 @@
     {
     {
       "name": "title_right_text",
       "name": "title_right_text",
       "value": "#CCCCCC"
       "value": "#CCCCCC"
+    },
+    {
+      "name": "playlistText_color",
+      "value": "#D3D3D3"
+    },
+    {
+      "name": "title_bar_bg_text",
+      "value": "#FF4081"
     }
     }
   ]
   ]
 }
 }

+ 8 - 0
entry/src/main/resources/light/element/color.json

@@ -107,6 +107,14 @@
     {
     {
       "name": "select_swiper",
       "name": "select_swiper",
       "value": "#DB000000"
       "value": "#DB000000"
+    },
+    {
+      "name": "playlistText_color",
+      "value": "#D3D3D3"
+    },
+    {
+      "name": "title_bar_bg_text",
+      "value": "#FF4081"
     }
     }
   ]
   ]
 } 
 }