From a13def740be14bbe242e549d8330704b643b85fc Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Thu, 17 Oct 2024 16:35:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=905.0.1release=E3=80=91=E9=BB=84?= =?UTF-8?q?=E8=93=9D=E5=B7=AE=E5=BC=82=E6=B6=88=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- permissionmanager/build-profile.json5 | 17 +++++- permissionmanager/obfuscation-rules.txt | 3 ++ .../GlobalSwitchSheetDialog.ets | 14 ++--- .../PermissionStateSheetDialog.ets | 34 ++++++------ .../common/components/alphabeticalIndex.ets | 8 +-- .../main/ets/common/components/backBar.ets | 16 +++--- .../main/ets/common/components/location.ets | 6 +-- .../src/main/ets/common/components/search.ets | 4 +- .../src/main/ets/common/utils/constant.ets | 4 +- .../main/ets/pages/application-secondary.ets | 26 +++++----- .../main/ets/pages/application-tertiary.ets | 46 ++++++++-------- .../main/ets/pages/authority-management.ets | 44 ++++++++-------- .../main/ets/pages/authority-secondary.ets | 16 +++--- .../ets/pages/authority-tertiary-groups.ets | 42 +++++++-------- .../src/main/ets/pages/authority-tertiary.ets | 20 +++---- .../src/main/ets/pages/dialogPlus.ets | 8 +-- .../src/main/ets/pages/globalSwitch.ets | 4 +- .../src/main/ets/pages/other-permissions.ets | 14 ++--- .../ets/pages/permission-access-record.ets | 52 +++++++++---------- .../src/main/ets/pages/securityDialog.ets | 37 +++++++++---- .../main/resources/base/element/color.json | 4 ++ 21 files changed, 228 insertions(+), 191 deletions(-) create mode 100644 permissionmanager/obfuscation-rules.txt diff --git a/permissionmanager/build-profile.json5 b/permissionmanager/build-profile.json5 index 01b4640..ee13d96 100644 --- a/permissionmanager/build-profile.json5 +++ b/permissionmanager/build-profile.json5 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,6 +18,21 @@ "entryModules": ['entry'], "buildOption": { }, + "buildOptionSet": [ + { + "name": "release", + "arkOptions": { + "obfuscation": { + "ruleOptions": { + "enable": true, + "files": [ + "./obfuscation-rules.txt" + ] + } + } + } + } + ], "targets": [ { "name": "default", diff --git a/permissionmanager/obfuscation-rules.txt b/permissionmanager/obfuscation-rules.txt new file mode 100644 index 0000000..1c8dc53 --- /dev/null +++ b/permissionmanager/obfuscation-rules.txt @@ -0,0 +1,3 @@ +-enable-toplevel-obfuscation +-enable-export-obfuscation +-enable-property-obfuscation \ No newline at end of file diff --git a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets index 7f600db..ec94b0a 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets @@ -220,7 +220,7 @@ struct applicationItem { Column() { Text(this.currentGroup == 'CAMERA' ? $r('app.string.close_camera') : $r('app.string.close_microphone')) .fontSize(Constants.TEXT_BIG_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) .width(Constants.FULL_WIDTH) @@ -231,7 +231,7 @@ struct applicationItem { $r('app.string.close_microphone_desc') ) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .lineHeight(Constants.TEXT_LINE_HEIGHT) } .clip(true) @@ -308,7 +308,7 @@ struct applicationItem { Column() { Text($r(this.backTitle, this.appName)) .align(Alignment.Start) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_BIG_FONT_SIZE) @@ -322,12 +322,12 @@ struct applicationItem { Row() { Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Text(this.currentGroup == 'CAMERA' ? $r('app.string.camera') : $r('app.string.microphone')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE).fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE).fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) Row() { Toggle({ type: ToggleType.Switch, isOn: this.globalIsOn }) - .selectedColor($r('sys.color.ohos_id_color_toolbar_icon_actived')) - .switchPointColor($r('sys.color.ohos_id_color_foreground_contrary')) + .selectedColor($r('sys.color.icon_emphasize')) + .switchPointColor($r('sys.color.comp_background_primary_contrary')) .onChange((isOn: boolean) => { if (isOn) { if (this.currentGroup == 'CAMERA') { @@ -358,7 +358,7 @@ struct applicationItem { }.height(Constants.LISTITEM_ROW_HEIGHT) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) }.padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .margin({ top: Constants.MARGIN_16 }) } diff --git a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets index 32f8112..ca51c5c 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets @@ -683,7 +683,7 @@ struct mediaDocumentItem { Row() { Text(this.backTitle) .align(Alignment.Start) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_BIG_FONT_SIZE) @@ -708,7 +708,7 @@ struct mediaDocumentItem { .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Bold) .textAlign(TextAlign.Start) } @@ -718,11 +718,11 @@ struct mediaDocumentItem { Row() { Text($r('app.string.version')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) Text(this.version) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) } .width(Constants.TERTIARY_HALF_WIDTH) @@ -734,17 +734,17 @@ struct mediaDocumentItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image($r('app.media.ic_public_fail')) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .width(Constants.TERTIARY_RADIO_IMAGE_WIDTH) .height(Constants.TERTIARY_RADIO_IMAGE_HEIGHT) .margin({ right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) Text($r('app.string.risk_warning')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontWeight(FontWeight.Regular) }.margin({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) } - }.backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }.backgroundColor($r('sys.color.interactive_click')) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .padding({ top: Constants.DEFAULT_PADDING_TOP, bottom: Constants.DEFAULT_PADDING_BOTTOM }) .margin({ left: Constants.DEFAULT_MARGIN_START, right: Constants.DEFAULT_MARGIN_END }) @@ -755,7 +755,7 @@ struct mediaDocumentItem { Span($r('app.string.access_permission')) } .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_secondary')) + .fontColor($r('sys.color.icon_secondary')) .fontWeight(FontWeight.Medium) .textAlign(TextAlign.Start) .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) @@ -773,7 +773,7 @@ struct mediaDocumentItem { Row() { Text(this.getCheckboxInfo(permission).label) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Checkbox() @@ -823,7 +823,7 @@ struct mediaDocumentItem { Row() { Text(item.name) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Radio({ value: 'Radio', group: 'radioGroup' }) @@ -871,11 +871,11 @@ struct mediaDocumentItem { } } .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) @@ -885,12 +885,12 @@ struct mediaDocumentItem { Row() { Text($r('app.string.precise_location')) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Toggle({ type: ToggleType.Switch, isOn: this.accurateIsOn }) - .selectedColor($r('sys.color.ohos_id_color_toolbar_icon_actived')) - .switchPointColor($r('sys.color.ohos_id_color_foreground_contrary')) + .selectedColor($r('sys.color.icon_emphasize')) + .switchPointColor($r('sys.color.comp_background_primary_contrary')) .onChange((isOn: boolean) => { let acManager = abilityAccessCtrl.createAtManager() if (isOn) { @@ -919,12 +919,12 @@ struct mediaDocumentItem { bottom: Constants.TERTIARY_LIST_PADDING_BOTTOM }) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) Row() { Text($r('app.string.get_the_exact_position')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) }.width(Constants.FULL_WIDTH) .padding({ diff --git a/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets b/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets index f08c6aa..c6ec8b8 100644 --- a/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets +++ b/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets @@ -33,10 +33,10 @@ export struct alphabetIndexerComponent { build() { AlphabetIndexer({ arrayValue: indexValue, selected: this.index }) - .color($r('sys.color.ohos_id_color_text_secondary')) - .selectedColor($r('sys.color.ohos_id_color_text_primary_activated')) // selected color - .popupColor($r('sys.color.ohos_id_color_text_primary_activated')) // popover color - .popupBackground($r('sys.color.ohos_id_color_card_bg')) // popover background color + .color($r('sys.color.font_secondary')) + .selectedColor($r('sys.color.font_emphasize')) // selected color + .popupColor($r('sys.color.font_emphasize')) // popover color + .popupBackground($r('sys.color.comp_background_list_card')) // popover background color .usingPopup(this.usingPopup) // whether to show a popup .font({ size: $r('sys.float.ohos_id_text_size_body3') }) .popupFont({ size: $r('sys.float.ohos_id_text_size_headline7') }) // Demo of the popup diff --git a/permissionmanager/src/main/ets/common/components/backBar.ets b/permissionmanager/src/main/ets/common/components/backBar.ets index 5cda7e1..fe38dca 100644 --- a/permissionmanager/src/main/ets/common/components/backBar.ets +++ b/permissionmanager/src/main/ets/common/components/backBar.ets @@ -32,7 +32,7 @@ export struct backBar { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image($r('app.media.ic_public_back')) - .fillColor($r('sys.color.ohos_id_color_primary')) + .fillColor($r('sys.color.icon_primary')) .objectFit(ImageFit.Contain) .height(Constants.BACKBAR_IMAGE_HEIGHT) .width(Constants.BACKBAR_IMAGE_WIDTH) @@ -46,7 +46,7 @@ export struct backBar { left: Constants.DEFAULT_MARGIN_START, right: Constants.BACKBAR_MARGIN_RIGHT }) - .backgroundColor(this.isBack ? $r('sys.color.ohos_id_color_click_effect') : '') + .backgroundColor(this.isBack ? $r('sys.color.interactive_click') : '') .onTouch(event => { if (event === undefined) { return; @@ -64,7 +64,7 @@ export struct backBar { }) Text(JSON.parse(this.title)) .align(Alignment.Start) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_BIG_FONT_SIZE) @@ -73,7 +73,7 @@ export struct backBar { if (this.recordable) { Row() { Image($r('sys.media.ohos_ic_public_more')) - .fillColor($r('sys.color.ohos_id_color_primary')) + .fillColor($r('sys.color.icon_primary')) .objectFit(ImageFit.Contain) .height(Constants.BACKBAR_IMAGE_WIDTH) .width(Constants.BACKBAR_IMAGE_HEIGHT) @@ -87,7 +87,7 @@ export struct backBar { right: Constants.DEFAULT_MARGIN_END }) .bindMenu(this.MenuBuilder()) - .backgroundColor(this.isMore ? $r('sys.color.ohos_id_color_click_effect') : '') + .backgroundColor(this.isMore ? $r('sys.color.interactive_click') : '') .onTouch(event => { if (event === undefined) { return; @@ -106,7 +106,7 @@ export struct backBar { .constraintSize({ minHeight: Constants.BACKBAR_MINHEIGHT }) .alignItems(HorizontalAlign.Start) .justifyContent(FlexAlign.Center) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } @Builder MenuBuilder() { @@ -115,7 +115,7 @@ export struct backBar { Text($r('app.string.permission_access_record')) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) }.constraintSize({ minWidth: Constants.MAXIMUM_HEADER_WIDTH }) .height(Constants.LISTITEM_ROW_HEIGHT) .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) @@ -127,7 +127,7 @@ export struct backBar { } : { angle: 90, direction: GradientDirection.Right, - colors: [[$r('sys.color.ohos_id_color_list_card_bg'), 1], [$r('sys.color.ohos_id_color_list_card_bg'), 1]] + colors: [[$r('sys.color.comp_background_list_card'), 1], [$r('sys.color.comp_background_list_card'), 1]] }) .onTouch(event => { if (event === undefined) { diff --git a/permissionmanager/src/main/ets/common/components/location.ets b/permissionmanager/src/main/ets/common/components/location.ets index e8a206e..6974671 100644 --- a/permissionmanager/src/main/ets/common/components/location.ets +++ b/permissionmanager/src/main/ets/common/components/location.ets @@ -51,7 +51,7 @@ export struct LocationCanvas { playMode: PlayMode.Normal // The animation mode }) Image($r('app.media.ic_public_gps_filled')) - .fillColor($r('sys.color.ohos_id_color_emphasize')) + .fillColor($r('sys.color.brand')) .width(Constants.LOCATION_ICON_WIDTH) .height(Constants.LOCATION_ICON_HEIGHT) .position({ x: Constants.LOCATION_ICON_POSITION_X, y: Constants.LOCATION_ICON_POSITION_Y }) @@ -101,13 +101,13 @@ export struct LocationCanvas { if (this.locationFlag == Constants.LOCATION_BOTH_PRECISE) { Button($r('app.string.precise_location_on')) .locationButton() - .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .fontColor($r('sys.color.font_emphasize')) .onClick(() => { this.locationFlag = Constants.LOCATION_BOTH_FUZZY }) } if (this.locationFlag == Constants.LOCATION_BOTH_FUZZY) { Button($r('app.string.precise_location_off')) .locationButton() - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .onClick(() => { this.locationFlag = Constants.LOCATION_BOTH_PRECISE }) } }.position({ x: 0, y: 0 }) diff --git a/permissionmanager/src/main/ets/common/components/search.ets b/permissionmanager/src/main/ets/common/components/search.ets index d82434b..032351e 100644 --- a/permissionmanager/src/main/ets/common/components/search.ets +++ b/permissionmanager/src/main/ets/common/components/search.ets @@ -30,7 +30,7 @@ export struct textInput { Column() { Flex({ alignContent: FlexAlign.Start }) { TextInput({ placeholder: $r('app.string.textInput_placeholder') }) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .padding({ left: Constants.TEXTINPUT_PADDING_LEFT }) .type(InputType.Normal) .border({ @@ -43,7 +43,7 @@ export struct textInput { family: 'sans-serif', style: FontStyle.Normal }) - .caretColor($r('sys.color.ohos_id_color_text_secondary')) + .caretColor($r('sys.color.font_secondary')) .height(Constants.TEXTINPUT_HEIGHT) .onChange((value: string) => { if (value === '' || value === null) { diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index 29bd8a1..e40a208 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -71,7 +71,8 @@ export default class Constants { public static TEXT_MIDDLE_FONT_SIZE = 16; public static TEXT_SMALL_FONT_SIZE = 14; public static TEXT_SMALLER_FONT_SIZE = 12; - public static FONT_SIZE_28 = 28; + public static FONT_SIZE_12 = '12vp'; + public static FONT_SIZE_28 = '28vp'; public static TEXT_LINE_HEIGHT = 22; public static TEXT_LINE_HEIGHT_24 = 24; public static TEXT_LINE_HEIGHT_27 = 27; @@ -110,6 +111,7 @@ export default class Constants { public static MARGIN_8 = 8; public static MARGIN_16 = 16; public static MARGIN_24 = 24; + public static PADDING_4 = 4; public static PADDING_8 = 8; public static PADDING_10 = 10; public static PADDING_14 = 14; diff --git a/permissionmanager/src/main/ets/pages/application-secondary.ets b/permissionmanager/src/main/ets/pages/application-secondary.ets index 27774b4..7d036fd 100644 --- a/permissionmanager/src/main/ets/pages/application-secondary.ets +++ b/permissionmanager/src/main/ets/pages/application-secondary.ets @@ -54,11 +54,11 @@ struct appNamePlusPage { Row() { Text(item.groupName) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_tertiary')) + .fillColor($r('sys.color.icon_tertiary')) .objectFit(ImageFit.Contain) .height(Constants.IMAGE_HEIGHT) .width(Constants.IMAGE_WIDTH) @@ -90,7 +90,7 @@ struct appNamePlusPage { } : { angle: 90, direction: GradientDirection.Right, - colors: [[$r('sys.color.ohos_id_color_list_card_bg'), 1], [$r('sys.color.ohos_id_color_list_card_bg'), 1]] + colors: [[$r('sys.color.comp_background_list_card'), 1], [$r('sys.color.comp_background_list_card'), 1]] }) .onTouch(event => { if (event === undefined) { @@ -301,7 +301,7 @@ struct appNamePlusPage { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Text($r('app.string.no_permission')) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) }.margin({ top: Constants.FLEX_MARGIN_TOP, bottom: Constants.FLEX_MARGIN_BOTTOM }) }.height(Constants.FULL_HEIGHT) }.flexGrow(Constants.FLEX_GROW) @@ -314,7 +314,7 @@ struct appNamePlusPage { } }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) } - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) }.margin({ top: Constants.ROW_MARGIN_TOP }) @@ -330,7 +330,7 @@ struct appNamePlusPage { Row() { Text($r('app.string.allowed')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .fontWeight(FontWeight.Medium) .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) }.constraintSize({ minHeight: Constants.SUBTITLE_MIN_HEIGHT }) @@ -346,12 +346,12 @@ struct appNamePlusPage { this.ListItemLayout(item, Constants.PERMISSION_ALLOW) }, (item: PermissionObj) => JSON.stringify(item)) } - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) @@ -367,7 +367,7 @@ struct appNamePlusPage { Row() { Text($r('app.string.banned')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .fontWeight(FontWeight.Medium) .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) }.constraintSize({ minHeight: Constants.SUBTITLE_MIN_HEIGHT }) @@ -383,12 +383,12 @@ struct appNamePlusPage { this.ListItemLayout(item, Constants.PERMISSION_BAN) }, (item: PermissionObj) => JSON.stringify(item)) } - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) @@ -411,9 +411,9 @@ struct appNamePlusPage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } } } diff --git a/permissionmanager/src/main/ets/pages/application-tertiary.ets b/permissionmanager/src/main/ets/pages/application-tertiary.ets index 6d27684..336604c 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -32,7 +32,7 @@ const DOWNLOAD_PERMISSION = 'ohos.permission.READ_WRITE_DOWNLOAD_DIRECTORY'; const DESKTOP_PERMISSION = 'ohos.permission.READ_WRITE_DESKTOP_DIRECTORY'; const DOCUMENTS_PERMISSION = 'ohos.permission.READ_WRITE_DOCUMENTS_DIRECTORY'; const PASTE = 'ohos.permission.READ_PASTEBOARD'; -let api: number = 0; +const showPrecise: number[] = [Constants.PERMISSION_ALLOW, Constants.PERMISSION_ALLOWED_ONLY_DURING_USE]; let accessTokenId: number = 0; let reqPermissionInfo: bundleManager.ReqPermissionDetail; @@ -78,9 +78,9 @@ struct mediaDocumentPage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } } @@ -174,7 +174,6 @@ struct mediaDocumentItem { @State mediaDocListItem: MediaDocObj[] = []; // Permission information array @Link selected: number; @Link accurateIsOn: boolean; - @State api: number = 0; @State isRisk: boolean = false; // Whether it is a risky application @State noForeground: boolean = false; @State isTouch: number = -1; @@ -331,9 +330,7 @@ struct mediaDocumentItem { bundleManager.getBundleInfo(this.bundleName, bundleManager.BundleFlag.GET_BUNDLE_INFO_WITH_APPLICATION) .then(res => { - this.api = res.targetVersion; this.version = res.versionName; - api = res.targetVersion; accessTokenId = res.appInfo.accessTokenId; let acManager = abilityAccessCtrl.createAtManager(); let accurateStatus = acManager.verifyAccessTokenSync(res.appInfo.accessTokenId, PRECISE_LOCATION_PERMISSION); @@ -369,7 +366,7 @@ struct mediaDocumentItem { .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Bold) .textAlign(TextAlign.Start) } @@ -378,11 +375,11 @@ struct mediaDocumentItem { Row() { Text($r('app.string.version')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) Text(this.version) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) } .width(Constants.TERTIARY_HALF_WIDTH) @@ -403,7 +400,7 @@ struct mediaDocumentItem { Span(this.reason) } .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_secondary')) + .fontColor($r('sys.color.icon_secondary')) .textAlign(TextAlign.Start) }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) } @@ -419,17 +416,17 @@ struct mediaDocumentItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image($r('app.media.ic_public_fail')) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .width(Constants.TERTIARY_RADIO_IMAGE_WIDTH) .height(Constants.TERTIARY_RADIO_IMAGE_HEIGHT) .margin({ right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) Text($r('app.string.risk_warning')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontWeight(FontWeight.Regular) }.margin({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) } - }.backgroundColor($r('sys.color.ohos_id_color_click_effect')) + }.backgroundColor($r('sys.color.interactive_click')) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .padding({ top: Constants.DEFAULT_PADDING_TOP, bottom: Constants.DEFAULT_PADDING_BOTTOM }) .margin({ left: Constants.DEFAULT_MARGIN_START, right: Constants.DEFAULT_MARGIN_END }) @@ -440,7 +437,7 @@ struct mediaDocumentItem { Span($r('app.string.access_permission')) } .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_secondary')) + .fontColor($r('sys.color.icon_secondary')) .fontWeight(FontWeight.Medium) .textAlign(TextAlign.Start) .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) @@ -457,7 +454,7 @@ struct mediaDocumentItem { Row() { Text(this.getCheckboxInfo(permission).label) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Checkbox() @@ -513,7 +510,7 @@ struct mediaDocumentItem { Row() { Text(item.name) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Radio({ value: 'Radio', group: 'radioGroup' }) @@ -589,26 +586,26 @@ struct mediaDocumentItem { } } .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) - if (this.permissions.includes(PRECISE_LOCATION_PERMISSION)) { + if (this.permissions.includes(PRECISE_LOCATION_PERMISSION) && showPrecise.includes(this.selected)) { Column() { Row() { Text($r('app.string.precise_location')) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Toggle({ type: ToggleType.Switch, isOn: this.accurateIsOn }) - .selectedColor($r('sys.color.ohos_id_color_toolbar_icon_actived')) - .switchPointColor($r('sys.color.ohos_id_color_foreground_contrary')) + .selectedColor($r('sys.color.icon_emphasize')) + .switchPointColor($r('sys.color.comp_background_primary_contrary')) .onChange((isOn: boolean) => { let acManager = abilityAccessCtrl.createAtManager() if (isOn) { @@ -622,7 +619,6 @@ struct mediaDocumentItem { } }) .padding({ right: 0 }) - .enabled(this.selected !== Constants.PERMISSION_BAN) }.width(Constants.FULL_WIDTH) .height(Constants.LISTITEM_ROW_HEIGHT) }.margin({ top: Constants.LOCATION_MARGIN_TOP, bottom: Constants.LOCATION_MARGIN_BOTTOM }) @@ -633,12 +629,12 @@ struct mediaDocumentItem { bottom: Constants.TERTIARY_LIST_PADDING_BOTTOM }) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) Row() { Text($r('app.string.get_the_exact_position')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) }.width(Constants.FULL_WIDTH) .padding({ diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index baeaa21..c6443ee 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -50,16 +50,16 @@ struct authorityManagementPage { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image(item.icon) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .customizeImage(Constants.MANAGEMENT_IMAGE_WIDTH, Constants.MANAGEMENT_IMAGE_HEIGHT) .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT }) Text(item.groupName) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_tertiary')) + .fillColor($r('sys.color.icon_tertiary')) .customizeImage(Constants.IMAGE_WIDTH, Constants.IMAGE_HEIGHT) } .width(Constants.FULL_WIDTH) @@ -117,7 +117,7 @@ struct authorityManagementPage { } : { angle: 90, direction: GradientDirection.Right, - colors: [[$r('sys.color.ohos_id_color_list_card_bg'), 1], [$r('sys.color.ohos_id_color_list_card_bg'), 1]] + colors: [[$r('sys.color.comp_background_list_card'), 1], [$r('sys.color.comp_background_list_card'), 1]] }) .onTouch(event => { if (event === undefined) { @@ -152,7 +152,7 @@ struct authorityManagementPage { .fontColor( this.currentIndex == index ? $r('sys.color.ohos_id_color_subtab_text_on') : - $r('sys.color.ohos_id_color_secondary') + $r('sys.color.icon_secondary') ) .fontWeight(this.currentIndex == index ? FontWeight.Bold : FontWeight.Regular) .lineHeight(Constants.TEXT_LINE_HEIGHT) @@ -449,13 +449,13 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + }.backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .margin({ bottom: Constants.LIST_MARGIN_BOTTOM }) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, endMargin: Constants.DEFAULT_MARGIN_END }) @@ -468,13 +468,13 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + }.backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .margin({ bottom: Constants.LIST_MARGIN_BOTTOM }) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, endMargin: Constants.DEFAULT_MARGIN_END }) @@ -490,13 +490,13 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + }.backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .margin({ bottom: Constants.LIST_MARGIN_BOTTOM }) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, endMargin: Constants.DEFAULT_MARGIN_END }) @@ -510,12 +510,12 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + }.backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, endMargin: Constants.DEFAULT_MARGIN_END }) @@ -553,9 +553,9 @@ struct authorityManagementPage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } } @@ -582,17 +582,17 @@ struct applicationItem { .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) Text(String(item.groupId.length)) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) Text($r('app.string.right')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ right: Constants.APPLICATION_TEXT_MARGIN_RIGHT }) Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_tertiary')) + .fillColor($r('sys.color.icon_tertiary')) .customizeImage(Constants.IMAGE_WIDTH, Constants.IMAGE_HEIGHT) } .width(Constants.FULL_WIDTH) @@ -613,7 +613,7 @@ struct applicationItem { } : { angle: 90, direction: GradientDirection.Right, - colors: [[$r('sys.color.ohos_id_color_list_card_bg'), 1], [$r('sys.color.ohos_id_color_list_card_bg'), 1]] + colors: [[$r('sys.color.comp_background_list_card'), 1], [$r('sys.color.comp_background_list_card'), 1]] }) .onTouch(event => { if (event === undefined) { @@ -658,12 +658,12 @@ struct applicationItem { ForEach(sortByName(this.applicationItem), (item: AppInfo) => { this.ListItemLayout(item) }, (item: AppInfo) => JSON.stringify(item)) - }.backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + }.backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DIVIDER_MARGIN_RIGHT_APPLICATION, endMargin: Constants.DEFAULT_MARGIN_END }) diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index caa90d2..4772e9e 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -47,9 +47,9 @@ struct appNamePage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } } @@ -68,11 +68,11 @@ struct appNameItem { Row() { Text(item.label) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_tertiary')) + .fillColor($r('sys.color.icon_tertiary')) .objectFit(ImageFit.Contain) .height(Constants.IMAGE_HEIGHT) .width(Constants.IMAGE_WIDTH) @@ -100,7 +100,7 @@ struct appNameItem { } : { angle: 90, direction: GradientDirection.Right, - colors: [[$r('sys.color.ohos_id_color_list_card_bg'), 1], [$r('sys.color.ohos_id_color_list_card_bg'), 1]] + colors: [[$r('sys.color.comp_background_list_card'), 1], [$r('sys.color.comp_background_list_card'), 1]] }) .onTouch(event => { if (event === undefined) { @@ -147,19 +147,19 @@ struct appNameItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Text($r('app.string.no_permission')) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) } } .width(Constants.FULL_WIDTH) .height(Constants.LISTITEM_ROW_HEIGHT) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) } - }.backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + }.backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index 16f8f38..17382e7 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -77,9 +77,9 @@ struct locationInfoPage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } onPageShow() { @@ -227,7 +227,7 @@ struct applicationItem { Column() { Text(this.currentGroup == 'CAMERA' ? $r('app.string.close_camera') : $r('app.string.close_microphone')) .fontSize(Constants.TEXT_BIG_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) .width(Constants.FULL_WIDTH) @@ -238,7 +238,7 @@ struct applicationItem { $r('app.string.close_microphone_desc') ) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .lineHeight(Constants.TEXT_LINE_HEIGHT) } .clip(true) @@ -264,18 +264,18 @@ struct applicationItem { .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) if (this.isRisk[item.index]) { Text($r('app.string.risk_warning')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) } }.flexGrow(Constants.FLEX_GROW) .alignItems(HorizontalAlign.Start) if (polymorphismGroup.indexOf(this.currentGroup) == -1) { Toggle({ type: ToggleType.Switch, isOn: this.toggleIsOn[item.index] }) - .selectedColor($r('sys.color.ohos_id_color_toolbar_icon_actived')) - .switchPointColor($r('sys.color.ohos_id_color_foreground_contrary')) + .selectedColor($r('sys.color.icon_emphasize')) + .switchPointColor($r('sys.color.comp_background_primary_contrary')) .padding({ right: 0 }) .width(Constants.AUTHORITY_TOGGLE_WIDTH) .height(Constants.AUTHORITY_TOGGLE_HEIGHT) @@ -326,16 +326,16 @@ struct applicationItem { } } .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) } else { Text(locationStatus[this.polymorphismIsOn[item.index]]) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) } Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_tertiary')) + .fillColor($r('sys.color.icon_tertiary')) .objectFit(ImageFit.Contain) .width(Constants.IMAGE_WIDTH) .height(Constants.IMAGE_HEIGHT) @@ -385,7 +385,7 @@ struct applicationItem { } : { angle: 90, direction: GradientDirection.Right, - colors: [[$r('sys.color.ohos_id_color_list_card_bg'), 1], [$r('sys.color.ohos_id_color_list_card_bg'), 1]] + colors: [[$r('sys.color.comp_background_list_card'), 1], [$r('sys.color.comp_background_list_card'), 1]] }) .onTouch(event => { if (event === undefined) { @@ -577,12 +577,12 @@ struct applicationItem { Row() { Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Text(this.currentGroup == 'CAMERA' ? $r('app.string.camera') : $r('app.string.microphone')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE).fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE).fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) Row() { Toggle({ type: ToggleType.Switch, isOn: this.globalIsOn }) - .selectedColor($r('sys.color.ohos_id_color_toolbar_icon_actived')) - .switchPointColor($r('sys.color.ohos_id_color_foreground_contrary')) + .selectedColor($r('sys.color.icon_emphasize')) + .switchPointColor($r('sys.color.comp_background_primary_contrary')) .padding({ right: 0 }) .onChange((isOn: boolean) => { if (isOn) { @@ -608,7 +608,7 @@ struct applicationItem { }.height(Constants.LISTITEM_ROW_HEIGHT) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) }.padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .margin({ top: Constants.TERTIARY_ROW_MARGIN_TOP }) } @@ -621,12 +621,12 @@ struct applicationItem { '' ) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) } else { Text(this.groupInfo.forbiddenDescription) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) } } else { @@ -636,7 +636,7 @@ struct applicationItem { $r('app.string.microphone_is_off') ) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) } }.padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) @@ -664,12 +664,12 @@ struct applicationItem { this.ListItemLayout(item) }, (item: ApplicationObj) => JSON.stringify(item)) } - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DIVIDER_MARGIN_RIGHT_APPLICATION, endMargin: Constants.DEFAULT_MARGIN_END }) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index 4c3420e..acbc9fb 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -59,9 +59,9 @@ struct locationInfoPage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } } @@ -96,17 +96,17 @@ struct applicationItem { .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) if (this.isRisk[item.index]) { Text($r('app.string.risk_warning')) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) } }.flexGrow(Constants.FLEX_GROW) .alignItems(HorizontalAlign.Start) Toggle({ type: ToggleType.Switch, isOn: this.toggleIsOn[item.index] }) - .selectedColor($r('sys.color.ohos_id_color_toolbar_icon_actived')) - .switchPointColor($r('sys.color.ohos_id_color_foreground_contrary')) + .selectedColor($r('sys.color.icon_emphasize')) + .switchPointColor($r('sys.color.comp_background_primary_contrary')) .padding({ right: 0 }) .width(Constants.AUTHORITY_TOGGLE_WIDTH) .height(Constants.AUTHORITY_TOGGLE_HEIGHT) @@ -249,12 +249,12 @@ struct applicationItem { '' ) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) } else { Text(this.permissionInfo.forbiddenDescription) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) } }.padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) @@ -279,12 +279,12 @@ struct applicationItem { this.ListItemLayout(item) }, (item: ApplicationObj) => JSON.stringify(item)) } - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DIVIDER_MARGIN_RIGHT_APPLICATION, endMargin: Constants.DEFAULT_MARGIN_END }) diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index 517f76c..46569fa 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -37,7 +37,7 @@ import { LocationCanvas } from '../common/components/location'; @Extend(Button)function customizeButton() { .buttonStyle(ButtonStyleMode.TEXTUAL) - .fontColor($r('sys.color.ohos_id_color_text_primary_activated')) + .fontColor($r('sys.color.font_emphasize')) .width(Constants.HALF_LENGTH) } @@ -91,12 +91,12 @@ struct dialogPlusPage { Image(this.currentGroup().icon) .width(Constants.DIALOG_ICON_WIDTH) .height(Constants.DIALOG_ICON_HEIGHT) - .fillColor($r('sys.color.ohos_id_color_text_primary')) + .fillColor($r('sys.color.font_primary')) .margin({ top: Constants.DIALOG_ICON_MARGIN_TOP }) if (this.grantGroups.length > 1) { Text(`${this.count + 1} / ${this.grantGroups.length}`) .fontSize(Constants.DIALOG_LABEL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .lineHeight(Constants.DIALOG_LABEL_LINE_HEIGHT) .margin({ top: Constants.DIALOG_LABEL_MARGIN_TOP }) } @@ -217,7 +217,7 @@ struct dialogPlusPage { ) }).customizeButton() Divider() - .color($r('sys.color.ohos_id_color_list_separator')) + .color($r('sys.color.comp_divider')) .vertical(true) .strokeWidth(Constants.DIALOG_DIVIDER) .height(Constants.DIVIDER_HEIGHT) diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index 53c29a3..d5ef035 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -91,7 +91,7 @@ struct globalSwitch { this.globalState == CAMERA ? $r('app.string.global_title_camera') : $r('app.string.global_title_camera_and_microphone')) .fontSize(Constants.TEXT_BIG_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) .width(Constants.FULL_WIDTH) @@ -100,7 +100,7 @@ struct globalSwitch { this.globalState == CAMERA ? $r('app.string.global_desc_camera') : $r('app.string.global_desc_camera_and_microphone')) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .lineHeight(Constants.TEXT_LINE_HEIGHT) } .clip(true) diff --git a/permissionmanager/src/main/ets/pages/other-permissions.ets b/permissionmanager/src/main/ets/pages/other-permissions.ets index ab25098..7e29d56 100644 --- a/permissionmanager/src/main/ets/pages/other-permissions.ets +++ b/permissionmanager/src/main/ets/pages/other-permissions.ets @@ -59,9 +59,9 @@ struct appNamePage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } /** @@ -91,10 +91,10 @@ struct appNameItem { Row() { Text(item.permissionLabel) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_tertiary')) + .fillColor($r('sys.color.icon_tertiary')) .objectFit(ImageFit.Contain) .height(Constants.IMAGE_HEIGHT) .width(Constants.IMAGE_WIDTH) @@ -125,7 +125,7 @@ struct appNameItem { } : { angle: 90, direction: GradientDirection.Right, - colors: [[$r('sys.color.ohos_id_color_list_card_bg'), 1], [$r('sys.color.ohos_id_color_list_card_bg'), 1]] + colors: [[$r('sys.color.comp_background_list_card'), 1], [$r('sys.color.comp_background_list_card'), 1]] }) .onTouch(event => { if (event === undefined) { @@ -148,12 +148,12 @@ struct appNameItem { ForEach(this.otherPermissionListItem, (item: OtherPermission) => { this.ListItemLayout(item) }, (item: OtherPermission) => JSON.stringify(item)) - }.backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + }.backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .padding(Constants.LIST_PADDING_TOP) .divider({ strokeWidth: Constants.DIVIDER, - color: $r('sys.color.ohos_id_color_list_separator'), + color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) diff --git a/permissionmanager/src/main/ets/pages/permission-access-record.ets b/permissionmanager/src/main/ets/pages/permission-access-record.ets index 7a96ce8..9e2e997 100644 --- a/permissionmanager/src/main/ets/pages/permission-access-record.ets +++ b/permissionmanager/src/main/ets/pages/permission-access-record.ets @@ -63,7 +63,7 @@ struct permissionRecordPage { .fontColor( this.currentIndex == index ? $r('sys.color.ohos_id_color_subtab_text_on') : - $r('sys.color.ohos_id_color_secondary') + $r('sys.color.icon_secondary') ) .fontWeight(this.currentIndex == index ? FontWeight.Bold : FontWeight.Regular) .lineHeight(Constants.TEXT_LINE_HEIGHT) @@ -74,7 +74,7 @@ struct permissionRecordPage { .fontWeight(FontWeight.Bold) .lineHeight(Constants.TAB_LINE_HEIGHT) .height(Constants.TAB_DECORATION_HEIGHT) - .backgroundColor($r('sys.color.ohos_id_color_subtab_line_on')) + .backgroundColor($r('sys.color.comp_background_emphasize')) } }.height(Constants.TAB_HEIGHT) .width(Constants.FULL_WIDTH) @@ -89,7 +89,7 @@ struct permissionRecordPage { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image(item.icon) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .customizeImage(Constants.MANAGEMENT_IMAGE_WIDTH, Constants.MANAGEMENT_IMAGE_HEIGHT) .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT_RECORD, @@ -102,17 +102,17 @@ struct permissionRecordPage { .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .lineHeight(Constants.TEXT_LINE_HEIGHT) .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) Text($r('app.string.visits', String(item.sum))) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) }.flexGrow(Constants.FLEX_GROW) .alignItems(HorizontalAlign.Start) Image(index == this.permissionIndex ? $r('app.media.xiangshangjiantou') : $r('app.media.xiangxiajiantou')) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .customizeImage(Constants.IMAGE_WIDTH_RECORD, Constants.IMAGE_HEIGHT_RECORD) } .width(Constants.FULL_WIDTH) @@ -135,7 +135,7 @@ struct permissionRecordPage { .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT }) Column() { Row().width(Constants.FULL_WIDTH).height(Constants.DIVIDER) - .backgroundColor($r('sys.color.ohos_id_color_list_separator')) + .backgroundColor($r('sys.color.comp_divider')) .position({ x: 0, y: 0 }) Text(permissionApplication.groupName) .width(Constants.MAXIMUM_HEADER_WIDTH) @@ -143,7 +143,7 @@ struct permissionRecordPage { .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .lineHeight(Constants.TEXT_LINE_HEIGHT) .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) Text( @@ -153,7 +153,7 @@ struct permissionRecordPage { ) .padding({ right: Constants.LISTITEM_PADDING_RIGHT_RECORD }) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) }.alignItems(HorizontalAlign.Start) .height(Constants.FULL_HEIGHT) @@ -187,8 +187,8 @@ struct permissionRecordPage { angle: 90, direction: GradientDirection.Right, colors: [ - [$r('sys.color.ohos_id_color_list_card_bg'), 1], - [$r('sys.color.ohos_id_color_list_card_bg'), 1] + [$r('sys.color.comp_background_list_card'), 1], + [$r('sys.color.comp_background_list_card'), 1] ] }) .onTouch(event => { @@ -208,7 +208,7 @@ struct permissionRecordPage { } }.padding(Constants.LIST_PADDING_TOP) .margin({ bottom: Constants.LISTITEM_MARGIN_BOTTOM }) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) } @@ -228,13 +228,13 @@ struct permissionRecordPage { .textOverflow({ overflow: TextOverflow.Ellipsis }) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .lineHeight(Constants.TEXT_LINE_HEIGHT) .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) Row() { ForEach(item.permissions, (permission: AppGroupRecordInfo) => { Image(permission.icon) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .customizeImage( Constants.IMAGE_WIDTH_RECORD_APPLICATION, Constants.IMAGE_HEIGHT_RECORD_APPLICATION @@ -247,7 +247,7 @@ struct permissionRecordPage { Image( index == this.applicationIndex ? $r('app.media.xiangshangjiantou') : $r('app.media.xiangxiajiantou') ) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .customizeImage(Constants.IMAGE_WIDTH_RECORD, Constants.IMAGE_HEIGHT_RECORD) } .width(Constants.FULL_WIDTH) @@ -263,7 +263,7 @@ struct permissionRecordPage { ListItem() { Row() { Image(permission.icon) - .fillColor($r('sys.color.ohos_id_color_secondary')) + .fillColor($r('sys.color.icon_secondary')) .customizeImage(Constants.MANAGEMENT_IMAGE_WIDTH, Constants.MANAGEMENT_IMAGE_HEIGHT) .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT_RECORD, @@ -271,18 +271,18 @@ struct permissionRecordPage { }) Column() { Row().width(Constants.FULL_WIDTH).height(Constants.DIVIDER) - .backgroundColor($r('sys.color.ohos_id_color_list_separator')) + .backgroundColor($r('sys.color.comp_divider')) .position({ x: 0, y: 0 }) Text(permission.groupName) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontWeight(FontWeight.Medium) - .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontColor($r('sys.color.font_primary')) .lineHeight(Constants.TEXT_LINE_HEIGHT) .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) Text($r('app.string.recent_visit', String(permission.count), this.getTime(permission.lastTime))) .padding({ right: Constants.LISTITEM_PADDING_RIGHT_RECORD }) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) }.alignItems(HorizontalAlign.Start) .height(Constants.FULL_HEIGHT) @@ -316,8 +316,8 @@ struct permissionRecordPage { angle: 90, direction: GradientDirection.Right, colors: [ - [$r('sys.color.ohos_id_color_list_card_bg'), 1], - [$r('sys.color.ohos_id_color_list_card_bg'), 1] + [$r('sys.color.comp_background_list_card'), 1], + [$r('sys.color.comp_background_list_card'), 1] ] }) .onTouch(event => { @@ -337,7 +337,7 @@ struct permissionRecordPage { } }.padding(Constants.LIST_PADDING_TOP) .margin({ bottom: Constants.LISTITEM_MARGIN_BOTTOM }) - .backgroundColor($r('sys.color.ohos_id_color_list_card_bg')) + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) } @@ -360,7 +360,7 @@ struct permissionRecordPage { Text($r('app.string.record_time_limit')) .margin({ left: Constants.DEFAULT_MARGIN_START }) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) }.constraintSize({ minHeight: Constants.SUBTITLE_MIN_HEIGHT }) .padding({ top: Constants.SUBTITLE_PADDING_TOP, bottom: Constants.SUBTITLE_PADDING_BOTTOM }) @@ -431,7 +431,7 @@ struct permissionRecordPage { .margin({ left: Constants.NORECORD_IMAGE_MARGIN_LEFT }) Text($r('app.string.no_record')).margin({ top: Constants.DIALOG_REQ_MARGIN_TOP }) .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.ohos_id_color_text_secondary')) + .fontColor($r('sys.color.font_secondary')) }.width(Constants.FULL_WIDTH).height(Constants.FULL_HEIGHT) .padding({ bottom: Constants.RECORD_PADDING_BOTTOM }) } @@ -443,9 +443,9 @@ struct permissionRecordPage { } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) - .backgroundColor($r('sys.color.ohos_id_color_sub_background')) + .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.ohos_id_color_sub_background')) + }.backgroundColor($r('sys.color.background_secondary')) } /** diff --git a/permissionmanager/src/main/ets/pages/securityDialog.ets b/permissionmanager/src/main/ets/pages/securityDialog.ets index 2ca2e07..668c032 100644 --- a/permissionmanager/src/main/ets/pages/securityDialog.ets +++ b/permissionmanager/src/main/ets/pages/securityDialog.ets @@ -106,7 +106,7 @@ struct SecurityDialog { SymbolGlyph($r('sys.symbol.person_shield_fill')) .width(Constants.SECURITY_ICON_WIDTH) .height(Constants.SECURITY_ICON_HEIGHT) - .fontSize(Constants.FONT_SIZE_28 / getFontSizeScale()) + .fontSize(Constants.FONT_SIZE_28) .fontColor([$r('sys.color.brand')]) .border({ width: Constants.BORDER_WIDTH_1, @@ -114,15 +114,32 @@ struct SecurityDialog { radius: $r('sys.float.ohos_id_corner_radius_default_m') }) .padding(Constants.PADDING_10) - Image(this.securityParams[this.index].icon) - .width(Constants.IMAGE_LENGTH_20) - .height(Constants.IMAGE_LENGTH_20) - .position({ x: Constants.IMAGE_POSITION_28, y: Constants.IMAGE_POSITION_28 }) - .border({ - width: Constants.BORDER_WIDTH_1, - color: $r('app.color.icon_border'), - radius: Constants.RADIUS_5 - }) + if (this.index === 1) { + Image(this.securityParams[this.index].icon) + .width(Constants.IMAGE_LENGTH_20) + .height(Constants.IMAGE_LENGTH_20) + .syncLoad(true) + .position({ x: Constants.IMAGE_POSITION_28, y: Constants.IMAGE_POSITION_28 }) + .border({ + width: Constants.BORDER_WIDTH_1, + color: $r('app.color.icon_border'), + radius: Constants.IMAGE_LENGTH_20 * 14 / 54 + }) + } else { + SymbolGlyph($r('sys.symbol.local_fill')) + .width(Constants.IMAGE_LENGTH_20) + .height(Constants.IMAGE_LENGTH_20) + .fontSize(Constants.FONT_SIZE_12) + .fontColor([Color.White]) + .backgroundColor($r('app.color.local_background_color')) + .padding(Constants.PADDING_4) + .position({ x: Constants.IMAGE_POSITION_28, y: Constants.IMAGE_POSITION_28 }) + .border({ + width: Constants.BORDER_WIDTH_1, + color: $r('app.color.icon_border'), + radius: Constants.IMAGE_LENGTH_20 * 14 / 54 + }) + } } .backgroundColor($r('app.color.icon_bg')) .borderRadius($r('sys.float.ohos_id_corner_radius_default_m')) diff --git a/permissionmanager/src/main/resources/base/element/color.json b/permissionmanager/src/main/resources/base/element/color.json index a5938cb..353356b 100644 --- a/permissionmanager/src/main/resources/base/element/color.json +++ b/permissionmanager/src/main/resources/base/element/color.json @@ -23,6 +23,10 @@ { "name": "start_window_background", "value": "#FFFFFF" + }, + { + "name": "local_background_color", + "value": "#3194F7" } ] } \ No newline at end of file -- Gitee