diff --git a/permissionmanager/src/main/ets/common/components/dialog.ets b/permissionmanager/src/main/ets/common/components/dialog.ets index df940fd91396887c97647e3af64c8be4d94d3c55..2a1770a28bef65ed2c40a1b88b9b528fdb6c9f6e 100644 --- a/permissionmanager/src/main/ets/common/components/dialog.ets +++ b/permissionmanager/src/main/ets/common/components/dialog.ets @@ -59,6 +59,7 @@ export struct globalDialog { Text(globalThis.currentPermissionGroup == 'CAMERA' ? $r('app.string.close_camera') : $r('app.string.close_microphone')) .fontSize(Constants.TEXT_BIG_FONT_SIZE) .fontColor($r('app.color.label_color')) + .fontWeight(FontWeight.Medium) .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) .height(Constants.ROW_HEIGHT) .width(Constants.FULL_WIDTH) diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index 30751737a23d2464e6a705d9af0eb8c1e9133042..0352e1c4b659ef29336ad8d51266c24d2c3b38c9 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -307,6 +307,7 @@ export default class Constants { static DIALOG_REQ_FONT_SIZE = 16; static DIALOG_REQ_MARGIN_TOP = 16; static DIALOG_REQ_MARGIN_LEFT = 24; + static DIALOG_REQ_MARGIN_RIGHT = 24; static DIALOG_REQ_LINE_HEIGHT = 22; // description text of dialog diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index fc32f90bef7aaea9cf07ad9ee2fb5dee88a2d03a..8aad7aa8e3137d8b2329e10b7aa30f6926fe3ed6 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -193,10 +193,12 @@ struct applicationItem { Text(item.labelId) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontColor($r('app.color.text_color')) + .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) if (polymorphismGroup.indexOf(globalThis.currentPermissionGroup) == -1) { Toggle({ type: ToggleType.Switch, isOn: this.toggleIsOn[item.index] }) - .selectedColor($r('app.color.toggle_color')) + .selectedColor($r('app.color.button_color')) + .padding({ right: 0 }) .width(Constants.AUTHORITY_TOGGLE_WIDTH) .height(Constants.AUTHORITY_TOGGLE_HEIGHT) .onChange((isOn: boolean) => { @@ -445,6 +447,7 @@ struct applicationItem { Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Text(globalThis.currentPermissionGroup == "CAMERA" ? $r('app.string.camera') : $r('app.string.microphone')) .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE).fontColor($r('app.color.label_color')) + .fontWeight(FontWeight.Medium) Row() { Toggle({ type: ToggleType.Switch, isOn: this.globalIsOn }) .selectedColor($r('app.color.button_color')) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index fdb1d01a5a5902242fce500399967a246d53f5ae..33b2ae8cf898c018fc464b409ddddd13b10f1640 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -139,7 +139,8 @@ struct applicationItem { .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')) + .selectedColor($r('app.color.button_color')) + .padding({ right: 0 }) .width(Constants.AUTHORITY_TOGGLE_WIDTH) .height(Constants.AUTHORITY_TOGGLE_HEIGHT) .onChange((isOn: boolean) => { diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index 5aef9dff3fc336b248d2fca8ce4dcf7dc0efa650..2904b7e5849ab7e4b178df153ff747ae77d4617c 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -96,7 +96,8 @@ struct PermissionDialog { .lineHeight(Constants.DIALOG_REQ_LINE_HEIGHT) .margin({ top: Constants.DIALOG_REQ_MARGIN_TOP, - left: Constants.DIALOG_REQ_MARGIN_LEFT + left: Constants.DIALOG_REQ_MARGIN_LEFT, + right: Constants.DIALOG_REQ_MARGIN_RIGHT }) } } diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index b0c85d5cf0756e35bf5cb9e217c94b7b8bc52f85..1a53b4ddd5306504af936caf30b8dc83cd200308 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -31,7 +31,7 @@ const CAMERA = 'camera' @Entry @Component -export struct globalSwitch { +struct globalSwitch { privacyDialogController: CustomDialogController = new CustomDialogController({ builder: globalDialog(), autoCancel: false, @@ -58,6 +58,7 @@ struct globalDialog { $r('app.string.global_title_camera_and_microphone')) .fontSize(Constants.TEXT_BIG_FONT_SIZE) .fontColor($r('app.color.label_color')) + .fontWeight(FontWeight.Medium) .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) .height(Constants.ROW_HEIGHT) .width(Constants.FULL_WIDTH) diff --git a/permissionmanager/src/main/resources/zh_CN/element/string.json b/permissionmanager/src/main/resources/zh_CN/element/string.json index 3e85ef9bffeabb6701ae2ec5d4d83ed8f3110495..ee41e2f36ec72c757261297da58834967a519fb9 100644 --- a/permissionmanager/src/main/resources/zh_CN/element/string.json +++ b/permissionmanager/src/main/resources/zh_CN/element/string.json @@ -194,11 +194,11 @@ }, { "name": "close_microphone_desc", - "value": "关闭后,所有应用服务都将无法正常使用麦克风通话、录制音频或进行语音唤醒。如需恢复,请打开麦克风开关。" + "value": "关闭后,所有应用服务都将无法正常使用麦克风通话、录制音频或进行语音唤醒。若需恢复,请打开麦克风开关。" }, { "name": "close_camera_desc", - "value": "关闭后,所有应用服务都将无法正常使用摄像头拍摄照片、视频或进行人脸识别。如需恢复,请打开摄像头开关。" + "value": "关闭后,所有应用服务都将无法正常使用摄像头拍摄照片、视频或进行人脸识别。若需恢复,请打开摄像头开关。" } ] } \ No newline at end of file