From e54bd475b987c7e22f20074ccb2a5d9c14b61569 Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Tue, 31 May 2022 10:49:27 +0800 Subject: [PATCH] dialogUI Signed-off-by: fanchenxuan --- .../GrantAbility/common/components/dialog.ets | 28 +++++---- .../common/model/permissionGroup.ets | 24 ++++---- .../GrantAbility/common/utils/constant.ets | 19 ++++-- .../ets/GrantAbility/common/utils/utils.ets | 2 +- .../ets/GrantAbility/pages/dialogPlus.ets | 3 +- .../MainAbility/common/components/backBar.ets | 1 + .../ets/MainAbility/common/utils/constant.ets | 19 +++--- .../pages/application-secondary.ets | 9 ++- .../pages/application-tertiary.ets | 59 +++++++++++-------- .../pages/authority-management.ets | 13 ++-- .../MainAbility/pages/authority-secondary.ets | 3 +- .../MainAbility/pages/authority-tertiary.ets | 3 +- .../main/resources/base/element/color.json | 20 ++++++- .../main/resources/base/element/string.json | 4 +- .../resources/base/media/ic_call_logs.svg | 2 +- .../main/resources/base/media/ic_ssensor.svg | 2 +- 16 files changed, 132 insertions(+), 79 deletions(-) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets index e0d006410..4a5984455 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/components/dialog.ets @@ -25,6 +25,8 @@ import { permissionGroups, showSubpermissionsGrop } from "../model/permissionGro @Extend(Button) function customizeButton() { .backgroundColor($r('app.color.default_background_color')) .fontColor($r('app.color.button_color')) + .fontWeight(FontWeight.Medium) + .height(Constants.BUTTON_HEIGHT) } @CustomDialog @@ -47,12 +49,14 @@ export struct privacyDialog { Image(this.grantGroups[this.count].icon) .width(Constants.DIALOG_ICON_WIDTH) .height(Constants.DIALOG_ICON_HEIGHT) + .fillColor($r("app.color.first_font_color")) .margin({ top: Constants.DIALOG_ICON_MARGIN_TOP }) Text(`${this.count + 1} / ${this.grantGroups.length}`) .fontSize(Constants.DIALOG_LABEL_FONT_SIZE) - .fontColor($r('app.color.secondary_font_color')) + .fontColor($r('app.color.text_secondary_color')) + .lineHeight(Constants.DIALOG_LABEL_LINE_HEIGHT) .margin({ top: Constants.DIALOG_LABEL_MARGIN_TOP }) @@ -61,7 +65,10 @@ export struct privacyDialog { Flex({ justifyContent: FlexAlign.Start }) { Text("是否允许" + this.appName + this.grantGroups[this.count].label).fontSize(Constants.DIALOG_REQ_FONT_SIZE) - .fontColor($r('app.color.secondary_font_color')) + .fontColor($r('app.color.first_font_color')) + .fontWeight(FontWeight.Medium) + .fontSize(Constants.DIALOG_REQ_FONT_SIZE) + .lineHeight(Constants.DIALOG_REQ_LINE_HEIGHT) .margin({ top: Constants.DIALOG_REQ_MARGIN_TOP, left: Constants.DIALOG_REQ_MARGIN_LEFT @@ -71,18 +78,21 @@ export struct privacyDialog { Row() { Flex({ justifyContent: FlexAlign.Start }) { Text(this.grantGroups[this.count].description).fontSize(Constants.DIALOG_DESP_FONT_SIZE) - .fontColor($r('app.color.secondary_font_color')) + .fontColor($r('app.color.text_secondary_color')) + .fontSize(Constants.DIALOG_DESP_FONT_SIZE) + .lineHeight(Constants.DIALOG_DESP_LINE_HEIGHT) .margin({ top: Constants.DIALOG_DESP_MARGIN_TOP, left: Constants.DIALOG_DESP_MARGIN_LEFT, - right: Constants.DIALOG_DESP_MARGIN_RIGHT + right: Constants.DIALOG_DESP_MARGIN_RIGHT, + bottom: Constants.DIALOG_DESP_MARGIN_BOTTOM }) } } } } Row() { - Flex({ justifyContent: FlexAlign.SpaceAround }) { + Flex({ justifyContent: FlexAlign.SpaceAround, alignItems: ItemAlign.Center }) { Button('禁止') .fontSize(Constants.BUTTON_FONT_SIZE) .onClick(() => { @@ -100,17 +110,13 @@ export struct privacyDialog { this.controller.close() } }).customizeButton() - }.margin({ - top: Constants.BUTTON_MARGIN_TOP - }) + } } } .backgroundColor($r('app.color.default_background_color')) .borderRadius(Constants.DIALOG_BORDER_RADIUS) - .constraintSize({ - minHeight: Constants.DIALOG_HEIGHT - }) .width(Constants.DIALOG_WIDTH) + .padding({ bottom: Constants.DIALOG_PADDING_BOTTOM }) } answerRequest() { diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/permissionGroup.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/permissionGroup.ets index fae6188cf..0f0b2d5e5 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/permissionGroup.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/model/permissionGroup.ets @@ -179,7 +179,7 @@ export const permissionGroups: any[] = [ "permissionName": "ohos.permission.DISTRIBUTED_DATASYNC", "groupName": "OTHER", "icon": $r("app.media.ic_multi_device_vector"), - "label": "使用多设备协同", + "label": "使用多设备协同？", "description": "发现并访问其他设备。", "groupId": 11 } @@ -190,7 +190,7 @@ export const groups: any[] = [ "name": "LOCATION", "groupName": "位置信息", "icon": $r('app.media.ic_public_gps'), - "label": "访问位置信息", + "label": "访问位置信息？", "description": "", "permissions": [ "ohos.permission.LOCATION_IN_BACKGROUND", @@ -201,7 +201,7 @@ export const groups: any[] = [ "name": "CAMERA", "groupName": "相机", "icon": $r('app.media.ic_public_camera'), - "label": "使用相机", + "label": "使用相机？", "description": "", "permissions": [ "ohos.permission.CAMERA" @@ -211,7 +211,7 @@ export const groups: any[] = [ "name": "MICROPHONE", "groupName": "麦克风", "icon": $r('app.media.ic_public_voice'), - "label": "使用麦克风", + "label": "使用麦克风？", "description": "", "permissions": [ "ohos.permission.MICROPHONE" @@ -221,7 +221,7 @@ export const groups: any[] = [ "name": "PHONE", "groupName": "电话", "icon": $r('app.media.ic_public_phone'), - "label": "使用拨打电话", + "label": "使用拨打电话？", "description": "", "permissions": [ "ohos.permission.ANSWER_CALL", @@ -232,7 +232,7 @@ export const groups: any[] = [ "name": "SMS", "groupName": "信息", "icon": $r('app.media.ic_public_message'), - "label": "访问信息", + "label": "访问信息？", "description": "", "permissions": [ "ohos.permission.READ_CELL_MESSAGES", @@ -247,7 +247,7 @@ export const groups: any[] = [ "name": "CONTACTS", "groupName": "通讯录", "icon": $r('app.media.ic_public_contacts_group'), - "label": "访问通讯录", + "label": "访问通讯录？", "description": "", "permissions": [ "ohos.permission.READ_CONTACTS", @@ -258,7 +258,7 @@ export const groups: any[] = [ "name": "CALL_LOG", "groupName": "通话记录", "icon": $r('app.media.ic_call_logs'), - "label": "访问通话记录", + "label": "访问通话记录？", "description": "", "permissions": [ "ohos.permission.READ_CALL_LOG", @@ -269,7 +269,7 @@ export const groups: any[] = [ "name": "MEDIA", "groupName": "媒体和文件", "icon": $r('app.media.ic_public_folder'), - "label": "访问媒体和文件", + "label": "访问媒体和文件？", "description": "", "permissions": [ "ohos.permission.MEDIA_LOCATION", @@ -281,7 +281,7 @@ export const groups: any[] = [ "name": "CALENDAR", "groupName": "日历", "icon": $r('app.media.ic_public_calendar'), - "label": "访问日历", + "label": "访问日历？", "description": "", "permissions": [ "ohos.permission.READ_CALENDAR", @@ -292,7 +292,7 @@ export const groups: any[] = [ "name": "SPORT", "groupName": "健身运动", "icon": $r('app.media.ic_sport'), - "label": "访问健身运动", + "label": "访问健身运动？", "description": "", "permissions": [ "ohos.permission.ACTIVITY_MOTION" @@ -302,7 +302,7 @@ export const groups: any[] = [ "name": "HEALTH", "groupName": "身体传感器", "icon": $r('app.media.ic_ssensor'), - "label": "使用身体传感器", + "label": "使用身体传感器？", "description": "", "permissions": [ "ohos.permission.READ_HEALTH_DATA" diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/constant.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/constant.ets index 07161d369..9a8dcbee0 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/constant.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/constant.ets @@ -17,30 +17,37 @@ export default class Constants { // icon of dialog static DIALOG_ICON_WIDTH = 24; static DIALOG_ICON_HEIGHT = 24; - static DIALOG_ICON_MARGIN_TOP = 24; + static DIALOG_ICON_MARGIN_TOP = 23; // label text of dialog - static DIALOG_LABEL_FONT_SIZE = 14; + static DIALOG_LABEL_FONT_SIZE = 10; static DIALOG_LABEL_MARGIN_TOP = 2; + static DIALOG_LABEL_LINE_HEIGHT = 14; // request text of dialog static DIALOG_REQ_FONT_SIZE = 16; static DIALOG_REQ_MARGIN_TOP = 16; static DIALOG_REQ_MARGIN_LEFT = 24; + static DIALOG_REQ_LINE_HEIGHT = 22; // description text of dialog static DIALOG_DESP_FONT_SIZE = 14; static DIALOG_DESP_MARGIN_TOP = 2; static DIALOG_DESP_MARGIN_LEFT = 24; - static DIALOG_DESP_MARGIN_RIGHT = 12; + static DIALOG_DESP_MARGIN_RIGHT = 24; + static DIALOG_DESP_MARGIN_BOTTOM = 8; + static DIALOG_DESP_LINE_HEIGHT = 19; static BUTTON_FONT_SIZE = 16; - static BUTTON_DIVIDER_FONT_SIZE = 30; + static BUTTON_DIVIDER_FONT_SIZE = 24; static BUTTON_MARGIN_TOP = 8; + static BUTTON_MARGIN_BOTTOM = 16; + static BUTTON_HEIGHT = 40; - static DIALOG_BORDER_RADIUS = 24; + static DIALOG_BORDER_RADIUS = 32; static DIALOG_HEIGHT = 186; - static DIALOG_WIDTH = "100%"; + static DIALOG_WIDTH = 395; + static DIALOG_PADDING_BOTTOM = 16; // initial check status static INIT_NEED_TO_WAIT = 0 diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets index e095e24eb..6c4de00a8 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/common/utils/utils.ets @@ -43,6 +43,6 @@ export class Log { } static error(log) { - console.info(`Error: ${TAG} ${log}`) + console.error(`Error: ${TAG} ${log}`) } } \ No newline at end of file diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets index 4c07af20f..49c285a8d 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/GrantAbility/pages/dialogPlus.ets @@ -26,7 +26,8 @@ struct dialogPlusPage { builder: privacyDialog({ cancel: this.privacyCancel, confirm: this.privacyAccept, count:$count, result: $result }), cancel: this.privacyExist, autoCancel: false, - alignment: DialogAlignment.Center + alignment: DialogAlignment.Center, + customStyle: true }) async privacyAccept(group, accessTokenId, permissionList, userFixedFlag) { var acManager = abilityAccessCtrl.createAtManager() diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/backBar.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/backBar.ets index 1920b99e5..db9331306 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/backBar.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/components/backBar.ets @@ -39,6 +39,7 @@ export struct backBar { .fontColor($r('app.color.text_color')) .fontSize(Constants.BACKBAR_TEXT_FONT_SIZE) .flexGrow(Constants.BACKBAR_TEXT_FLEX_GROW) + .fontWeight(FontWeight.Bold) .margin({ top: Constants.BACKBAR_TEXT_MARGIN_TOP }) } } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/constant.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/constant.ets index 8f832a0f6..7de7371e2 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/constant.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/common/utils/constant.ets @@ -91,7 +91,7 @@ export default class Constants { // public property style static LAYOUT_WEIGHT = 1; static FLEX_GROW = 1; - static TEXT_DECORATION_HEIGHT = 2; + static TEXT_DECORATION_HEIGHT = 1; static TEXT_MIDDLE_FONT_SIZE = 16; static TEXT_SMAL_FONT_SIZE = 14; static TEXT_SMALLER_FONT_SIZE = 12; @@ -99,10 +99,11 @@ export default class Constants { static LISTITEM_ROW_HEIGHT = 48; static LISTITEM_PADDING_LEFT = 24; static LIST_PADDING_LEFT = 12 - static LISTITEM_PADDING_RIGHT = 12; + static LISTITEM_PADDING_RIGHT = 24; static IMAGE_HEIGHT = 24; static IMAGE_WIDTH = 12; static BORDER_RADIUS = 24; + static TITLE_MARGIN_BOTTOM = 16; // application-secondary, authority-secondary static FLEX_MARGIN_TOP = 8; @@ -111,7 +112,7 @@ export default class Constants { static LIST_PADDING_BOTTOM = 4; static ROW_MARGIN_TOP = 9; static SECONDARY_TEXT_MARGIN_TOP = 19.5; - static SECONDARY_TEXT_MARGIN_LEFT = 48; + static SECONDARY_TEXT_MARGIN_LEFT = 24; static SECONDARY_LIST_PADDING_LEFT = 12; static SECONDARY_LIST_PADDING_RIGHT = 12; @@ -120,6 +121,9 @@ export default class Constants { static TERTIARY_IMAGE_HEIGHT = 64; static TERTIARY_IMAGE_MARGIN_LEFT = 12; static TERTIARY_IMAGE_MARGIN_RIGHT = 12; + static TERTIARY_LABEL_MARGIN_BOTTOM = 2; + static TERTIARY_MARGIN_LEFT = 12; + static TERTIARY_TEXT_MARGIN_LEFT = 24; static TERTIARY_HALF_WIDTH = '50%'; static TERTIARY_ROW_MARGIN_TOP = 24; static TERTIARY_PERMISSION_ROW_MARGIN_TOP = 12; @@ -162,7 +166,7 @@ export default class Constants { static MANAGEMENT_IMAGE_HEIGHT = 24; static MANAGEMENT_IMAGE_MARGIN_RIGHT = 16; static MANAGEMENT_ROW_HEIGHT = 56; - static MANAGEMENT_TEXT_DECORATION_WIDTH = '90%'; + static MANAGEMENT_TEXT_DECORATION_WIDTH = '95%'; static MANAGEMENT_TEXT_DECORATION_MARGIN_LEFT = 40; static MANAGEMENT_LODING_IMAGE_WIDTH = 48; static MANAGEMENT_LODING_IMAGE_HEIGHT = 48; @@ -177,6 +181,7 @@ export default class Constants { static APPLICATION_IMAGE_MARGIN_RIGHT = 16; static APPLICATION_TEXT_MARGIN_RIGHT = 4; static APPLICATION_LIST_PADDING_LEFT = 12; + static APPLICATION_LIST_PADDING_RIGHT = 12; static APPLICATION_LISTITEM_PADDING_LEFT = 12; static APPLICATION_LISTITEM_PADDING_RIGHT = 12; static APPLICATION_TEXTINPUT_PADDING_LEFT = 12; @@ -185,8 +190,8 @@ export default class Constants { static APPLICATION_COLUMN_HEIGHT = '93%'; static APPLICATION_ALPHABETINDEX_MARGIN_TOP = 12; static APPLICATION_ALPHABETINDEX_WIDTH = 24; - static APPLICATION_TEXT_DECORATION_WIDTH = '83%'; - static APPLICATION_TEXT_DECORATION_MARGIN_LEFT = 68; + static APPLICATION_TEXT_DECORATION_WIDTH = '90%'; + static APPLICATION_TEXT_DECORATION_MARGIN_LEFT = 60; // slice static SLICE_START = 0; @@ -195,7 +200,7 @@ export default class Constants { static SLICE_END_INDEX = 1; // tabBar - static BAR_WIDTH = 250; + static BAR_WIDTH = 285; // setTimeout static DELAY_TIME = 1000; diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets index 46eb4b611..87805e41d 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-secondary.ets @@ -57,6 +57,7 @@ struct appNamePlusPage { Text(item.groupName) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontColor($r('app.color.text_color')) + .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Image($r('app.media.rightarrow')) .objectFit(ImageFit.Contain) @@ -247,9 +248,11 @@ struct appNamePlusPage { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Text($r('app.string.allowed')) .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .fontColor($r('app.color.label_color_light')) + .fontWeight(FontWeight.Medium) .margin({ top: Constants.SECONDARY_TEXT_MARGIN_TOP, - left: Constants.SECONDARY_LIST_PADDING_RIGHT + left: Constants.SECONDARY_TEXT_MARGIN_LEFT }) } } @@ -282,9 +285,11 @@ struct appNamePlusPage { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Text($r('app.string.banned')) .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .fontColor($r('app.color.label_color_light')) + .fontWeight(FontWeight.Medium) .margin({ top: Constants.SECONDARY_TEXT_MARGIN_TOP, - left: Constants.SECONDARY_LIST_PADDING_RIGHT + left: Constants.SECONDARY_TEXT_MARGIN_LEFT }) } } diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets index a2decde5d..f0981bc3f 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/application-tertiary.ets @@ -97,6 +97,7 @@ struct mediaDocumentPage { mediaDocumentItem() }.width(Constants.FULL_WIDTH) } + .margin({ top: Constants.TITLE_MARGIN_BOTTOM }) .layoutWeight(Constants.LAYOUT_WEIGHT) } } @@ -269,39 +270,49 @@ struct mediaDocumentItem { Row() { Text(this.mediaListItem.labelId) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.text_color')) + .fontColor($r('app.color.label_color')) + .fontWeight(FontWeight.Bold) .textAlign(TextAlign.Start) } .width(Constants.TERTIARY_HALF_WIDTH) + .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) Row() { Text(this.mediaListItem.versionName) .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .fontColor($r('app.color.label_color_light')) .textAlign(TextAlign.Start) } .width(Constants.TERTIARY_HALF_WIDTH) } - } + }.margin({ left: Constants.TERTIARY_MARGIN_LEFT }) } - Row() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Row() { - Text(reason) - .fontSize(Constants.TEXT_SMAL_FONT_SIZE) - .textAlign(TextAlign.Start) - }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) + if(reason) { + Row() { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Row() { + Text(reason) + .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .fontColor($r('app.color.label_color_light')) + .textAlign(TextAlign.Start) + }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) + } } + .margin({ top: Constants.TERTIARY_ROW_MARGIN_TOP, left: Constants.TERTIARY_MARGIN_LEFT }) } - .margin({ top: Constants.TERTIARY_ROW_MARGIN_TOP }) Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(backTitle) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .fontColor($r('app.color.label_color_light')) + .fontWeight(FontWeight.Medium) .textAlign(TextAlign.Start) Text($r('app.string.access_permission')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.TEXT_SMAL_FONT_SIZE) + .fontColor($r('app.color.label_color_light')) + .fontWeight(FontWeight.Medium) .textAlign(TextAlign.Start) - }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) + }.margin({ left: Constants.TERTIARY_TEXT_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) } } .height(Constants.LISTITEM_ROW_HEIGHT) @@ -316,22 +327,18 @@ struct mediaDocumentItem { Row() { Text(item.name) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.text_color')) + .fontColor($r('app.color.label_color')) + .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) if (this.isCheckList[item.index] === true) { - Image($r('app.media.radioactive')) - .width(Constants.TERTIARY_RADIO_IMAGE_WIDTH) - .height(Constants.TERTIARY_RADIO_IMAGE_HEIGHT) - .margin({ - top: Constants.TERTIARY_RADIO_IMAGE_MARGIN_TOP - }) + Shape() { + Circle().width(24).height(24).fill('#1856d4').offset({ x: 0, y: 0 }) + Circle().width(16).height(16).fill('#ffffff').offset({ x: 4, y: 4 }) + } } else if (this.isCheckList[item.index] === false) { - Image($r('app.media.radiodefault')) - .width(Constants.TERTIARY_RADIO_IMAGE_WIDTH) - .height(Constants.TERTIARY_RADIO_IMAGE_HEIGHT) - .margin({ - top: Constants.TERTIARY_RADIO_IMAGE_MARGIN_TOP - }) + Shape() { + Circle().width(24).height(24).stroke('#000000').fill('#ffffff') + } } } .backgroundColor($r('app.color.default_background_color')) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets index e4f8723ca..171c7e6cd 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-management.ets @@ -73,7 +73,8 @@ struct authorityManagementPage { .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT }) Text(item.groupName) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.text_color')) + .fontWeight(FontWeight.Medium) + .fontColor($r('app.color.label_color')) .flexGrow(Constants.FLEX_GROW) Image($r('app.media.rightarrow')) .customizeImage(Constants.IMAGE_WIDTH, Constants.IMAGE_HEIGHT) @@ -109,7 +110,7 @@ struct authorityManagementPage { } }) } - }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.MANAGEMENT_ROW_PADDING_RIGHT }) + }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) } @State allApplicationPermissions: applicationPermissions[] = []; // All permissions apply @@ -473,6 +474,7 @@ struct authorityManagementPage { right: Constants.MANAGEMENT_ROW_PADDING_RIGHT, top: Constants.MANAGEMENT_ROW_PADDING_TOP }) + .height(Constants.FULL_HEIGHT) } }.width(Constants.FULL_WIDTH) } @@ -534,11 +536,12 @@ struct applicationItem { .margin({ right: Constants.APPLICATION_IMAGE_MARGIN_RIGHT }) Text(item.labelId) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.text_color')) + .fontWeight(FontWeight.Medium) + .fontColor($r('app.color.label_color')) .flexGrow(Constants.FLEX_GROW) Text(item.groupId.length + '项权限') .fontSize(Constants.TEXT_SMAL_FONT_SIZE) - .fontColor($r('app.color.text_secondary_color')) + .fontColor($r('app.color.label_color_lighter')) .margin({ right: Constants.APPLICATION_TEXT_MARGIN_RIGHT }) Image($r('app.media.rightarrow')) .customizeImage(Constants.IMAGE_WIDTH, Constants.IMAGE_HEIGHT) @@ -546,7 +549,7 @@ struct applicationItem { .width(Constants.FULL_WIDTH) .height(Constants.AUTHORITY_ROW_HEIGHT) .constraintSize({ minHeight: Constants.AUTHORITY_CONSTRAINTSIZE_MINHEIGHT }) - .padding({ left: Constants.APPLICATION_LIST_PADDING_LEFT}) + .padding({ left: Constants.APPLICATION_LIST_PADDING_LEFT, right: Constants.APPLICATION_LIST_PADDING_RIGHT }) } if (!index) { Row() { diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-secondary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-secondary.ets index 61df8d7fd..11d7b62b4 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-secondary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-secondary.ets @@ -104,7 +104,8 @@ struct appNameItem { Row() { Text(item.label) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.text_color')) + .fontColor($r('app.color.label_color')) + .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) Image($r('app.media.rightarrow')) .objectFit(ImageFit.Contain) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary.ets b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary.ets index 918218835..6912f74fa 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary.ets +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/ets/MainAbility/pages/authority-tertiary.ets @@ -134,7 +134,8 @@ struct applicationItem { .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) Text(item.labelId) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('app.color.text_color')) + .fontWeight(FontWeight.Medium) + .fontColor($r('app.color.label_color')) .flexGrow(Constants.FLEX_GROW) Toggle({ type: ToggleType.Switch, isOn: this.toggleIsOn[item.index] }) .selectedColor($r('app.color.toggle_color')) diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json index bfad4e8f8..bb43a9402 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/color.json @@ -4,9 +4,21 @@ "name": "text_color", "value": "#E5000000" }, + { + "name": "label_color", + "value": "#182431" + }, + { + "name": "label_color_light", + "value": "#99182431" + }, + { + "name": "label_color_lighter", + "value": "#66182431" + }, { "name": "background_color", - "value": "#f1f3f5" + "value": "#F4F5F7" }, { "name": "text_secondary_color", @@ -30,7 +42,11 @@ }, { "name": "button_color", - "value": "#0a59f7" + "value": "#007DFF" + }, + { + "name": "first_font_color", + "value": "#E6000000" }, { "name": "secondary_font_color", diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json index 513221be9..21b12d11c 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/element/string.json @@ -50,11 +50,11 @@ }, { "name": "application", - "value": "应用" + "value": " 应用 " }, { "name": "authority", - "value": "权限" + "value": " 权限 " }, { "name": "media_document", diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg index 792777f91..863cc3e31 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_call_logs.svg @@ -1,6 +1,6 @@ + viewBox="0 0 96 96" style="enable-background:new 0 0 96 96;" xml:space="preserve" fill="#000000" fill-opacity="0.6"> diff --git a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg index 1d6a07632..51b9c504f 100644 --- a/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg +++ b/frameworks/com.ohos.permissionmanager/permissionmanager/src/main/resources/base/media/ic_ssensor.svg @@ -1,5 +1,5 @@ - + HM/ic/24x24/ssensor -- Gitee