|
|
@@ -1039,7 +1039,12 @@ export struct LocalMusic {
|
|
|
DialogHelper.showBottomSheetDialog({
|
|
|
title: "请选择排序模式",
|
|
|
maskColor: Color.Transparent,
|
|
|
- sheets: ["按名称升序", "按名称降序"],
|
|
|
+ // sheets: ["按名称升序", "按名称降序"],
|
|
|
+ sheets:[
|
|
|
+ {value:'按名称升序',fontColor: $r('app.color.text_color') },
|
|
|
+ {value:'按名称降序',fontColor: $r('app.color.text_color') },
|
|
|
+ ],
|
|
|
+ backgroundColor:$r('app.color.bg_card'),
|
|
|
height: '30%',
|
|
|
transition: AnimationHelper.transitionInDown(555),
|
|
|
onAction: (index) => {
|
|
|
@@ -1061,8 +1066,18 @@ export struct LocalMusic {
|
|
|
title: "请选择排序模式",
|
|
|
maskColor: Color.Transparent,
|
|
|
height: '75%',
|
|
|
- sheets: ["按艺术家升序", "按艺术家降序", "按专辑升序", "按专辑降序", "按名称升序", "按名称降序", "按添加时间升序",
|
|
|
- "按添加时间降序"],
|
|
|
+ // sheets: ["按艺术家升序", "按艺术家降序", "按专辑升序", "按专辑降序", "按名称升序", "按名称降序", "按添加时间升序","按添加时间降序"],
|
|
|
+ sheets:[
|
|
|
+ { value: "按艺术家升序", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "按艺术家降序", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "按专辑升序", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "按专辑降序", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "按名称升序", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "按名称降序", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "按添加时间升序", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "按添加时间降序", fontColor: $r('app.color.text_color') },
|
|
|
+ ],
|
|
|
+ backgroundColor: $r('app.color.bg_card'),
|
|
|
transition: AnimationHelper.transitionInDown(555),
|
|
|
onAction: (index) => {
|
|
|
this.doSortType(index)
|
|
|
@@ -1746,7 +1761,7 @@ export struct LocalMusic {
|
|
|
.width('35%')
|
|
|
.height(60)
|
|
|
.margin({ top: 10, bottom: 10, right: 6 })
|
|
|
- .backgroundColor($r('app.color.title_bar_bg'))
|
|
|
+ .backgroundColor($r('app.color.tab_item_bg'))
|
|
|
.onClick(() => {
|
|
|
if (this.isAllSelected) {
|
|
|
// 全不选
|
|
|
@@ -1762,7 +1777,7 @@ export struct LocalMusic {
|
|
|
.height(60)
|
|
|
.id('music_cut')
|
|
|
.margin({ top: 10, bottom: 10, right: 6 })
|
|
|
- .backgroundColor($r('app.color.title_bar_bg'))
|
|
|
+ .backgroundColor($r('app.color.tab_item_bg'))
|
|
|
.onClick(() => {
|
|
|
this.showCutDialogForMultipleFiles(false, 'music_cut')
|
|
|
})
|
|
|
@@ -1773,7 +1788,7 @@ export struct LocalMusic {
|
|
|
.id('music_cut_current')
|
|
|
.visibility(this.isHasDir ? Visibility.Visible : Visibility.None)
|
|
|
.margin({ top: 10, bottom: 10, right: 6 })
|
|
|
- .backgroundColor($r('app.color.title_bar_bg'))
|
|
|
+ .backgroundColor($r('app.color.tab_item_bg'))
|
|
|
.onClick(() => {
|
|
|
|
|
|
this.showCutDialogForMultipleFiles(true, 'music_cut_current')
|
|
|
@@ -1783,7 +1798,7 @@ export struct LocalMusic {
|
|
|
.height(60)
|
|
|
.id('music_copy_current')// .visibility(this.isHasDir?Visibility.None:Visibility.None)
|
|
|
.margin({ top: 10, bottom: 10, right: 6 })
|
|
|
- .backgroundColor($r('app.color.title_bar_bg'))
|
|
|
+ .backgroundColor($r('app.color.tab_item_bg'))
|
|
|
.onClick(() => {
|
|
|
this.showCopyDialogForMultipleFiles(false, 'music_copy_current')
|
|
|
})
|
|
|
@@ -1792,7 +1807,7 @@ export struct LocalMusic {
|
|
|
.width('35%')
|
|
|
.height(60)
|
|
|
.margin({ top: 10, bottom: 10, right: 6 })
|
|
|
- .backgroundColor($r('app.color.title_bar_bg'))
|
|
|
+ .backgroundColor($r('app.color.tab_item_bg'))
|
|
|
.onClick(() => {
|
|
|
this.showWarnIsDelete()
|
|
|
})
|
|
|
@@ -1800,7 +1815,7 @@ export struct LocalMusic {
|
|
|
.width('35%')
|
|
|
.height(60)
|
|
|
.margin({ top: 10, bottom: 10, right: 6 })
|
|
|
- .backgroundColor($r('app.color.title_bar_bg'))
|
|
|
+ .backgroundColor($r('app.color.tab_item_bg'))
|
|
|
.onClick(() => {
|
|
|
this.selectedFiles = [];
|
|
|
this.isAllSelected = false
|
|
|
@@ -6234,9 +6249,13 @@ export struct LocalMusic {
|
|
|
|
|
|
DialogHelper.showActionSheetDialog({
|
|
|
title: '温馨提醒:\n1.歌词文件名必须和目标歌曲文件名相同\n2.歌词文件和目标歌曲要同个歌单路径。',
|
|
|
- sheets: ["本地歌词", "搜索歌词"],
|
|
|
+ // sheets: ["本地歌词", "搜索歌词"],
|
|
|
+ sheets:[
|
|
|
+ { value: "本地歌词", fontColor: $r('app.color.text_color') },
|
|
|
+ { value: "搜索歌词", fontColor: $r('app.color.text_color') },
|
|
|
+ ],
|
|
|
maskColor: Color.Transparent,
|
|
|
-
|
|
|
+ backgroundColor: $r('app.color.bg_card'),
|
|
|
transition: AnimationHelper.transitionInDown(666),
|
|
|
onAction: (index) => {
|
|
|
switch (index) {
|