From 64f1abcfa34bf4d1dec6b5b000631b9d1a803eb1 Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Wed, 18 Sep 2024 11:56:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E9=87=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../GlobalSwitchSheetDialog.ets | 39 +-- .../PermissionStateSheetDialog.ets | 94 ++++--- .../common/components/alphabeticalIndex.ets | 4 +- .../main/ets/common/components/backBar.ets | 31 ++- .../main/ets/common/components/location.ets | 16 +- .../src/main/ets/common/components/search.ets | 14 +- .../src/main/ets/common/utils/constant.ets | 239 ++++-------------- .../main/ets/pages/application-secondary.ets | 94 ++++--- .../main/ets/pages/application-tertiary.ets | 110 ++++---- .../main/ets/pages/authority-management.ets | 161 +++++++----- .../main/ets/pages/authority-secondary.ets | 71 +++--- .../ets/pages/authority-tertiary-groups.ets | 128 ++++++---- .../src/main/ets/pages/authority-tertiary.ets | 75 +++--- .../src/main/ets/pages/dialogPlus.ets | 26 +- .../src/main/ets/pages/globalSwitch.ets | 8 +- .../src/main/ets/pages/other-permissions.ets | 27 +- .../ets/pages/permission-access-record.ets | 198 ++++++++------- .../src/main/ets/pages/securityDialog.ets | 20 +- 18 files changed, 679 insertions(+), 676 deletions(-) diff --git a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets index ec94b0a..0550539 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/GlobalSwitchSheetDialog.ets @@ -219,10 +219,10 @@ struct applicationItem { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Column() { Text(this.currentGroup == 'CAMERA' ? $r('app.string.close_camera') : $r('app.string.close_microphone')) - .fontSize(Constants.TEXT_BIG_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_20) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) - .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_28) .width(Constants.FULL_WIDTH) .padding({ top: Constants.PADDING_14, bottom: Constants.PADDING_14 }) Text( @@ -230,9 +230,9 @@ struct applicationItem { $r('app.string.close_camera_desc') : $r('app.string.close_microphone_desc') ) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) - .lineHeight(Constants.TEXT_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) } .clip(true) } @@ -311,7 +311,7 @@ struct applicationItem { .fontColor($r('sys.color.font_primary')) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_BIG_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_20) .flexGrow(Constants.FLEX_GROW) .fontWeight(FontWeight.Bold) .padding({left: Constants.PADDING_10, top: Constants.PADDING_20}) @@ -322,7 +322,8 @@ 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.font_primary')) + .fontSize(Constants.FONT_SIZE_16) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) Row() { Toggle({ type: ToggleType.Switch, isOn: this.globalIsOn }) @@ -347,23 +348,29 @@ struct applicationItem { } } }) - Row().onClick(() => { - if (this.dialogController !== null) { - this.dialogController.open(); - } - }) + Row() + .onClick(() => { + if (this.dialogController !== null) { + this.dialogController.open(); + } + }) .width(Constants.DEFAULT_SLIDER_WIDTH).height(Constants.DEFAULT_SLIDER_HEIGHT) .position({ x: this.globalIsOn ? 0 : Constants.OFFSET, y: 0 }) - }.clip(true) - }.height(Constants.LISTITEM_ROW_HEIGHT) + } + .clip(true) + } + .height(Constants.HEIGHT_48) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) - }.padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) + } + .padding({ top: Constants.PADDING_4, bottom: Constants.PADDING_4 }) .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .margin({ top: Constants.MARGIN_16 }) } - }.padding({ left: Constants.AUTHORITY_LISTITEM_PADDING_LEFT }) - }.flexGrow(Constants.FLEX_GROW) + } + .padding({ left: Constants.DEFAULT_PADDING_START }) + } + .flexGrow(Constants.FLEX_GROW) } } } diff --git a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets index ca51c5c..fabf66a 100644 --- a/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets +++ b/permissionmanager/src/main/ets/PermissionSheet/PermissionStateSheetDialog.ets @@ -686,12 +686,13 @@ struct mediaDocumentItem { .fontColor($r('sys.color.font_primary')) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_BIG_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_20) .flexGrow(Constants.FLEX_GROW) .fontWeight(FontWeight.Bold) .padding({ left: Constants.PADDING_24, top: Constants.PADDING_20, bottom: Constants.PADDING_20 }) .width('80%') - }.width(Constants.FULL_WIDTH) + } + .width(Constants.FULL_WIDTH) } .alignItems(HorizontalAlign.Start) .width(Constants.FULL_WIDTH) @@ -699,35 +700,36 @@ struct mediaDocumentItem { Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Image(this.applicationInfo.icon) - .width(Constants.TERTIARY_IMAGE_WIDTH) - .height(Constants.TERTIARY_IMAGE_HEIGHT) - .margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) + .width(Constants.IMAGE_LENGTH_64) + .height(Constants.IMAGE_LENGTH_64) + .margin({ left: Constants.DEFAULT_MARGIN_START, right: Constants.DEFAULT_MARGIN_END }) Column() { Row() { Text(this.label) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Bold) .textAlign(TextAlign.Start) } - .width(Constants.TERTIARY_HALF_WIDTH) - .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) + .width(Constants.HALF_LENGTH) + .margin({ bottom: Constants.MARGIN_2 }) Row() { Text($r('app.string.version')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) Text(this.version) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) } - .width(Constants.TERTIARY_HALF_WIDTH) + .width(Constants.HALF_LENGTH) } - }.margin({ left: Constants.TERTIARY_MARGIN_LEFT }) + } + .margin({ left: Constants.DEFAULT_MARGIN_START }) } if (this.isRisk) { Row() { @@ -735,16 +737,18 @@ struct mediaDocumentItem { Row() { Image($r('app.media.ic_public_fail')) .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 }) + .width(Constants.IMAGE_LENGTH_24) + .height(Constants.IMAGE_LENGTH_24) + .margin({ right: Constants.DEFAULT_MARGIN_END }) Text($r('app.string.risk_warning')) .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 }) + } + .margin({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) } - }.backgroundColor($r('sys.color.interactive_click')) + } + .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 }) @@ -754,15 +758,20 @@ struct mediaDocumentItem { Span(this.backTitle) Span($r('app.string.access_permission')) } - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.icon_secondary')) .fontWeight(FontWeight.Medium) .textAlign(TextAlign.Start) - .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) - }.width(Constants.FULL_WIDTH) - .constraintSize({ minHeight: Constants.SUBTITLE_MIN_HEIGHT }) - .padding({ top: Constants.SUBTITLE_PADDING_TOP, bottom: Constants.SUBTITLE_PADDING_BOTTOM, - left: Constants.TERTIARY_TEXT_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_24) + } + .width(Constants.FULL_WIDTH) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_48 }) + .padding({ + top: Constants.PADDING_16, + bottom: Constants.PADDING_8, + left: Constants.PADDING_24, + right: Constants.DEFAULT_PADDING_END + }) Column() { List() { @@ -772,7 +781,7 @@ struct mediaDocumentItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(this.getCheckboxInfo(permission).label) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) @@ -781,7 +790,7 @@ struct mediaDocumentItem { .hitTestBehavior(HitTestMode.None) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) .onClick(async () => { await this.grantFolderPermission(permission) }) @@ -792,7 +801,7 @@ struct mediaDocumentItem { right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) - .margin({ top: Constants.TERTIARY_LISTITEM_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_1 }) .linearGradient((this.isCheck === permission) ? { angle: 90, direction: GradientDirection.Right, @@ -822,7 +831,7 @@ struct mediaDocumentItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(item.name) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) @@ -833,7 +842,7 @@ struct mediaDocumentItem { .width(Constants.SHAPE_DIA) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) .onClick(async () => { await this.grantOtherPermissions(item); }) @@ -866,13 +875,13 @@ struct mediaDocumentItem { this.isTouch = -1; } }) - .margin({ top: Constants.TERTIARY_LISTITEM_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_1 }) }, (item: MediaDocObj) => JSON.stringify(item)) } } .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .backgroundColor($r('sys.color.comp_background_list_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), @@ -884,7 +893,7 @@ struct mediaDocumentItem { Column() { Row() { Text($r('app.string.precise_location')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) @@ -909,24 +918,27 @@ 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 }) + } + .width(Constants.FULL_WIDTH) + .height(Constants.HEIGHT_48) + } + .margin({ top: Constants.DEFAULT_MARGIN_TOP, bottom: Constants.MARGIN_8 }) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END, - top: Constants.TERTIARY_LIST_PADDING_TOP, - bottom: Constants.TERTIARY_LIST_PADDING_BOTTOM + top: Constants.PADDING_4, + bottom: Constants.PADDING_4 }) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .backgroundColor($r('sys.color.comp_background_list_card')) Row() { Text($r('app.string.get_the_exact_position')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) - }.width(Constants.FULL_WIDTH) + .lineHeight(Constants.TEXT_LINE_HEIGHT_19) + } + .width(Constants.FULL_WIDTH) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END, @@ -934,8 +946,8 @@ struct mediaDocumentItem { } } .padding({ - left: Constants.LIST_PADDING_LEFT, - right: Constants.LIST_PADDING_LEFT + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END }) .width(Constants.FULL_WIDTH) .enabled(!this.isRisk && !this.noForeground) diff --git a/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets b/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets index c6ec8b8..234d3dd 100644 --- a/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets +++ b/permissionmanager/src/main/ets/common/components/alphabeticalIndex.ets @@ -52,7 +52,7 @@ export struct alphabetIndexerComponent { } }) .height(Constants.FULL_HEIGHT) - .constraintSize({ maxHeight: Constants.ALPHABETINDEXER_HEIGHT }) - .width(Constants.APPLICATION_ALPHABETINDEX_WIDTH) + .width(Constants.WIDTH_24) + .constraintSize({ maxHeight: Constants.MAX_HEIGHT_448 }) } } \ No newline at end of file diff --git a/permissionmanager/src/main/ets/common/components/backBar.ets b/permissionmanager/src/main/ets/common/components/backBar.ets index 79aab9c..5f2be17 100644 --- a/permissionmanager/src/main/ets/common/components/backBar.ets +++ b/permissionmanager/src/main/ets/common/components/backBar.ets @@ -32,13 +32,14 @@ export struct backBar { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { SymbolGlyph($r('sys.symbol.arrow_left')) - .width(Constants.BACKBAR_IMAGE_WIDTH) - .height(Constants.BACKBAR_IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_24) + .height(Constants.IMAGE_LENGTH_24) .fontSize(Constants.FONT_SIZE_24_vp) .fontColor([$r('sys.color.icon_primary')]) .fontWeight(FontWeight.Medium) - }.width(Constants.CLICK_SHADOW_LENGTH) - .height(Constants.CLICK_SHADOW_LENGTH) + } + .width(Constants.WIDTH_48) + .height(Constants.HEIGHT_48) .borderRadius($r('sys.float.ohos_id_corner_radius_clicked')) .alignItems(VerticalAlign.Center) .justifyContent(FlexAlign.Center) @@ -63,7 +64,7 @@ export struct backBar { .fontColor($r('sys.color.font_primary')) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_BIG_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_20) .flexGrow(Constants.FLEX_GROW) .fontWeight(FontWeight.Bold) .margin({ left: Constants.MARGIN_4, right: Constants.MARGIN_4 }) @@ -72,11 +73,12 @@ export struct backBar { Image($r('sys.media.ohos_ic_public_more')) .fillColor($r('sys.color.icon_primary')) .objectFit(ImageFit.Contain) - .height(Constants.BACKBAR_IMAGE_WIDTH) - .width(Constants.BACKBAR_IMAGE_HEIGHT) + .height(Constants.IMAGE_LENGTH_24) + .width(Constants.IMAGE_LENGTH_24) .draggable(false) - }.width(Constants.CLICK_SHADOW_LENGTH) - .height(Constants.CLICK_SHADOW_LENGTH) + } + .width(Constants.WIDTH_48) + .height(Constants.HEIGHT_48) .borderRadius($r('sys.float.ohos_id_corner_radius_clicked')) .alignItems(VerticalAlign.Center) .justifyContent(FlexAlign.Center) @@ -97,8 +99,8 @@ export struct backBar { } .margin({ left: Constants.DEFAULT_MARGIN_START, right: Constants.DEFAULT_MARGIN_END }) } - .height(Constants.BACKBAR_HEIGHT) - .constraintSize({ minHeight: Constants.BACKBAR_MINHEIGHT }) + .height(Constants.HEIGHT_56) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_56 }) .alignItems(HorizontalAlign.Start) .justifyContent(FlexAlign.Center) .backgroundColor($r('sys.color.background_secondary')) @@ -108,11 +110,12 @@ export struct backBar { Flex({ direction: FlexDirection.Column, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Row() { Text($r('app.string.permission_access_record')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) - }.constraintSize({ minWidth: Constants.MAXIMUM_HEADER_WIDTH }) - .height(Constants.LISTITEM_ROW_HEIGHT) + } + .constraintSize({ minWidth: Constants.MAXIMUM_HEADER_WIDTH }) + .height(Constants.HEIGHT_48) .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .linearGradient((this.isTouch === 'true') ? { diff --git a/permissionmanager/src/main/ets/common/components/location.ets b/permissionmanager/src/main/ets/common/components/location.ets index 6974671..4b1b66f 100644 --- a/permissionmanager/src/main/ets/common/components/location.ets +++ b/permissionmanager/src/main/ets/common/components/location.ets @@ -18,9 +18,9 @@ import Constants from '../utils/constant'; @Extend(Button)function locationButton() { .backgroundColor($r('sys.color.ohos_id_color_dialog_bg')) .fontWeight(FontWeight.Medium) - .fontSize(Constants.TEXT_SMALLER_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_12) .height(Constants.LOCATION_BUTTON_HEIGHT) - .borderRadius(Constants.LOCATION_BUTTON_RADIUS) + .borderRadius(Constants.RADIUS_16) } @Component @@ -52,7 +52,7 @@ export struct LocationCanvas { }) Image($r('app.media.ic_public_gps_filled')) .fillColor($r('sys.color.brand')) - .width(Constants.LOCATION_ICON_WIDTH) + .width(Constants.IMAGE_LENGTH_24) .height(Constants.LOCATION_ICON_HEIGHT) .position({ x: Constants.LOCATION_ICON_POSITION_X, y: Constants.LOCATION_ICON_POSITION_Y }) .opacity( @@ -110,15 +110,17 @@ export struct LocationCanvas { .fontColor($r('sys.color.font_secondary')) .onClick(() => { this.locationFlag = Constants.LOCATION_BOTH_PRECISE }) } - }.position({ x: 0, y: 0 }) + } + .position({ x: 0, y: 0 }) .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) .alignItems(VerticalAlign.Top) .justifyContent(FlexAlign.Center) - .padding({ top: Constants.LOCATION_BUTTON_POSITION_Y }) - }.width(Constants.FULL_WIDTH) + .padding({ top: Constants.PADDING_16 }) + } + .width(Constants.FULL_WIDTH) .height(Constants.LOCATION_CANVAS_HEIGHT) - .margin({ top: Constants.LOCATION_CANVAS_MARGIN_TOP, bottom: Constants.LOCATION_CANVAS_MARGIN_BOTTOM }) + .margin({ top: Constants.MARGIN_4, bottom: Constants.MARGIN_8 }) .clip(true) } } diff --git a/permissionmanager/src/main/ets/common/components/search.ets b/permissionmanager/src/main/ets/common/components/search.ets index 032351e..b59cb48 100644 --- a/permissionmanager/src/main/ets/common/components/search.ets +++ b/permissionmanager/src/main/ets/common/components/search.ets @@ -31,20 +31,20 @@ export struct textInput { Flex({ alignContent: FlexAlign.Start }) { TextInput({ placeholder: $r('app.string.textInput_placeholder') }) .backgroundColor($r('sys.color.comp_background_list_card')) - .padding({ left: Constants.TEXTINPUT_PADDING_LEFT }) + .padding({ left: Constants.PADDING_36 }) .type(InputType.Normal) .border({ - width: Constants.TEXTINPUT_BORDER_WIDTH, color: $r('app.color.label_color_20'), radius: Constants.TEXTINPUT_BORDER_RADIUS + width: Constants.BORDER_WIDTH_1_5, color: $r('app.color.label_color_20'), radius: Constants.RADIUS_20 }) .placeholderColor(Color.Grey) .placeholderFont({ - size: Constants.TEXT_MIDDLE_FONT_SIZE, + size: Constants.FONT_SIZE_16, weight: FontWeight.Normal, family: 'sans-serif', style: FontStyle.Normal }) .caretColor($r('sys.color.font_secondary')) - .height(Constants.TEXTINPUT_HEIGHT) + .height(Constants.HEIGHT_40) .onChange((value: string) => { if (value === '' || value === null) { this.applicationItem = this.oldApplicationItem; @@ -62,9 +62,9 @@ export struct textInput { Button().defaultFocus(true).opacity(0).position({ x: '-100%' }) Image($r('app.media.ic_public_search_filled')) .objectFit(ImageFit.Contain) - .width(Constants.TEXTINPUT_IMAGE_WIDTH) - .height(Constants.TEXTINPUT_IMAGE_HEIGHT) - .position({ x: Constants.TEXTINPUT_IMAGE_MARGIN_LEFT, y: Constants.TEXTINPUT_IMAGE_MARGIN_TOP }) + .width(Constants.IMAGE_LENGTH_16) + .height(Constants.IMAGE_LENGTH_16) + .position({ x: Constants.DEFAULT_MARGIN_START, y: Constants.DEFAULT_MARGIN_TOP }) } } } diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index 15552bc..25440fd 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -14,26 +14,6 @@ */ export default class Constants { - // alphabetIndexer - public static ALPHABETINDEXER_HEIGHT = 448; - - // backBar - public static BACKBAR_HEIGHT = 56; - public static BACKBAR_MINHEIGHT = 56; - public static BACKBAR_IMAGE_HEIGHT = 24; - public static BACKBAR_IMAGE_WIDTH = 24; - public static BACKBAR_MARGIN_RIGHT = 4; - - // search textInput - public static TEXTINPUT_PADDING_LEFT = 36; - public static TEXTINPUT_BORDER_RADIUS = 20; - public static TEXTINPUT_BORDER_WIDTH = 1.5; - public static TEXTINPUT_HEIGHT = 40; - public static TEXTINPUT_IMAGE_WIDTH = 16; - public static TEXTINPUT_IMAGE_HEIGHT = 16; - public static TEXTINPUT_IMAGE_MARGIN_LEFT = 12; - public static TEXTINPUT_IMAGE_MARGIN_TOP = 12; - // grid useSizeType public static GUTTER = 0; public static XS_COLUMNS = 2; @@ -66,53 +46,62 @@ export default class Constants { public static APPLICATION = 0; public static LAYOUT_WEIGHT = 1; public static FLEX_GROW = 1; - public static HEADLINE_HEIGHT = 56; - public static TEXT_BIG_FONT_SIZE = 20; - 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_12 = '12vp'; + public static FONT_SIZE_10 = 10; + public static FONT_SIZE_12 = 12; + public static FONT_SIZE_12_vp = '12vp'; + public static FONT_SIZE_14 = 14; + public static FONT_SIZE_16 = 16; public static FONT_SIZE_18_vp = '18vp'; + public static FONT_SIZE_20 = 20; public static FONT_SIZE_24_vp = '24vp'; - public static FONT_SIZE_28 = '28vp'; - public static TEXT_LINE_HEIGHT = 22; + public static FONT_SIZE_28_vp = '28vp'; + public static TEXT_LINE_HEIGHT_14 = 14; + public static TEXT_LINE_HEIGHT_19 = 19; + public static TEXT_LINE_HEIGHT_22 = 22; public static TEXT_LINE_HEIGHT_24 = 24; public static TEXT_LINE_HEIGHT_27 = 27; - public static TEXT_BIG_LINE_HEIGHT = 28; - public static TEXT_SMALL_LINE_HEIGHT = 19; - public static CONSTRAINTSIZE_MINHEIGHT = 48; - public static LISTITEM_ROW_HEIGHT = 48; - public static LISTITEM_PADDING_LEFT = 24; - public static LIST_PADDING_LEFT = 12 - public static LISTITEM_PADDING_RIGHT = 24; - public static LISTITEM_PADDING_RIGHT_RECORD = 50; - public static LISTITEM_MARGIN_BOTTOM = 12; - public static LISTITEM_HEIGHT_PERMISSION = 64; - public static LISTITEM_HEIGHT_APPLICATION = 72; + public static TEXT_LINE_HEIGHT_28 = 28; + public static IMAGE_LENGTH_12 = 12; + public static IMAGE_LENGTH_16 = 16; public static IMAGE_LENGTH_20 = 20; - public static IMAGE_HEIGHT = 24; - public static IMAGE_WIDTH = 12; - public static IMAGE_HEIGHT_RECORD = 12; - public static IMAGE_WIDTH_RECORD = 24; - public static IMAGE_HEIGHT_RECORD_APPLICATION = 16; - public static IMAGE_WIDTH_RECORD_APPLICATION = 16; + public static IMAGE_LENGTH_24 = 24; + public static IMAGE_LENGTH_40 = 40; + public static IMAGE_LENGTH_48 = 48; + public static IMAGE_LENGTH_64 = 64; + public static IMAGE_LENGTH_100 = 100; + public static IMAGE_LENGTH_120 = 120; + public static IMAGE_LENGTH_200 = 200; public static IMAGE_POSITION_28 = 28; public static BORDER_WIDTH_1 = '1px'; - public static TITLE_MARGIN_BOTTOM = 16; - public static SUBTITLE_MIN_HEIGHT = 48; - public static SUBTITLE_LINE_HEIGHT = 24; - public static SUBTITLE_PADDING_TOP = 16; - public static SUBTITLE_PADDING_BOTTOM = 8; - public static TAB_HEIGHT = 56; + public static BORDER_WIDTH_1_5 = 1.5; public static TAB_LINE_HEIGHT = 100; - public static TAB_INNER_PADDING = 8; public static TAB_DECORATION_HEIGHT = 2; public static TAB_DECORATION_POSITION_Y = 6; + public static WIDTH_24 = 24; + public static WIDTH_36 = 36; + public static WIDTH_48 = 48; + public static WIDTH_250 = 250; + public static HEIGHT_20 = 20; + public static HEIGHT_24 = 24; + public static HEIGHT_40 = 40; + public static HEIGHT_48 = 48; + public static HEIGHT_56 = 56; + public static HEIGHT_64 = 64; + public static HEIGHT_72 = 72; public static RADIUS_5 = 5; + public static RADIUS_16 = 16; + public static RADIUS_20 = 20; + public static MARGIN_1 = 1; + public static MARGIN_2 = 2; public static MARGIN_4 = 4; public static MARGIN_8 = 8; public static MARGIN_16 = 16; public static MARGIN_24 = 24; + public static MARGIN_40 = 40; + public static MARGIN_52 = 52; + public static MARGIN_68 = 68; + public static MARGIN_96 = 96; + public static MARGIN_176 = 176; public static PADDING_4 = 4; public static PADDING_8 = 8; public static PADDING_10 = 10; @@ -120,6 +109,12 @@ export default class Constants { public static PADDING_16 = 16; public static PADDING_20 = 20; public static PADDING_24 = 24; + public static PADDING_36 = 36; + public static PADDING_50 = 50; + public static MIN_HEIGHT_48 = 48; + public static MIN_HEIGHT_56 = 56; + public static MIN_HEIGHT_72 = 72; + public static MAX_HEIGHT_448 = 448; public static DEFAULT_PADDING_START = 12; public static DEFAULT_PADDING_END = 12; public static DEFAULT_PADDING_TOP = 12; @@ -131,94 +126,16 @@ export default class Constants { public static DEFAULT_SLIDER_WIDTH = 60; public static DEFAULT_SLIDER_HEIGHT = 40; public static OFFSET = 100; - public static CLICK_SHADOW_LENGTH = 48; + public static SHAPE_DIA = 20; public static SCROLL_BAR_WIDTH_DEFAULT = 4; public static SCROLL_BAR_WIDTH_ACTIVE = 8; public static DIVIDER = '1px'; public static DIALOG_DIVIDER = '2px'; - public static DIVIDER_HEIGHT = 24; - public static DIVIDER_MARGIN_RIGHT_PERMISSION = 52; - public static DIVIDER_MARGIN_RIGHT_APPLICATION = 68; + public static DIALOG_TITLE_MAX_LINES = 2; public static DIALOG_TITLE_MAX_SCALE = 2; public static DIALOG_TEXT_MAX_SCALE = 3.2; - - // application-secondary, authority-secondary - public static FLEX_MARGIN_TOP = 8; - public static FLEX_MARGIN_BOTTOM = 8; - public static LIST_PADDING_TOP = 4; - public static LIST_PADDING_BOTTOM = 4; - public static LIST_MARGIN_BOTTOM = 12; + public static DIALOG_ICON_MARGIN_TOP = 23; public static ROW_MARGIN_TOP = 9; - public static SECONDARY_TEXT_MARGIN_LEFT = 24; - public static SECONDARY_LIST_PADDING_LEFT = 12; - public static SECONDARY_LIST_PADDING_RIGHT = 12; - - // application-tertiary - public static TERTIARY_IMAGE_WIDTH = 64; - public static TERTIARY_IMAGE_HEIGHT = 64; - public static TERTIARY_IMAGE_MARGIN_LEFT = 12; - public static TERTIARY_IMAGE_MARGIN_RIGHT = 12; - public static TERTIARY_LABEL_MARGIN_BOTTOM = 2; - public static TERTIARY_MARGIN_LEFT = 12; - public static TERTIARY_TEXT_MARGIN_LEFT = 24; - public static TERTIARY_HALF_WIDTH = '50%'; - public static TERTIARY_ROW_MARGIN_TOP = 24; - public static TERTIARY_RADIO_IMAGE_WIDTH = 24; - public static TERTIARY_RADIO_IMAGE_HEIGHT = 24; - public static TERTIARY_LISTITEM_MARGIN_TOP = 1; - public static TERTIARY_LIST_PADDING_TOP = 4; - public static TERTIARY_LIST_PADDING_BOTTOM = 4; - public static LOCATION_MARGIN_TOP = 12; - public static LOCATION_MARGIN_BOTTOM = 8; - - // authority-tertiary - public static AUTHORITY_IMAGE_WIDTH = 40; - public static AUTHORITY_IMAGE_HEIGHT = 40; - public static AUTHORITY_IMAGE_MARGIN_RIGHT = 16; - public static AUTHORITY_TOGGLE_WIDTH = 36; - public static AUTHORITY_TOGGLE_HEIGHT = 20; - public static AUTHORITY_ROW_HEIGHT = 72; - public static AUTHORITY_CONSTRAINTSIZE_MINHEIGHT = 72; - public static AUTHORITY_LISTITEM_PADDING_LEFT = 12; - public static AUTHORITY_LISTITEM_PADDING_RIGHT = 12; - public static AUTHORITY_TEXTINPUT_PADDING_LEFT = 12; - public static AUTHORITY_TEXTINPUT_PADDING_RIGHT = 24; - public static AUTHORITY_TEXT_MARGIN_TOP = 24; - public static AUTHORITY_ROW_MARGIN_BOTTOM = 24; - public static AUTHORITY_LIST_MARGIN_BOTTOM = 96; - public static AUTHORITY_LIST_MARGIN_BOTTOM_GLOBAL = 176; - public static NORECORD_IMAGE_WIDTH = 120; - public static NORECORD_IMAGE_HEIGHT = 120; - public static NORECORD_IMAGE_MARGIN_LEFT = 40; - public static SEARCHNORESULT_IMAGE_WIDTH = 200; - public static SEARCHNORESULT_IMAGE_HEIGHT = 200; - public static AUTHORITY_ALPHABETINDEX_WIDTH = 24; - public static AUTHORITY_ALPHABETINDEX_PADDING_TOP = 16; - - // authority-management - public static MANAGEMENT_IMAGE_WIDTH = 24; - public static MANAGEMENT_IMAGE_HEIGHT = 24; - public static MANAGEMENT_IMAGE_MARGIN_RIGHT = 16; - public static MANAGEMENT_IMAGE_MARGIN_RIGHT_RECORD = 24; - public static MANAGEMENT_IMAGE_MARGIN_LEFT = 8; - public static MANAGEMENT_ROW_HEIGHT = 56; - public static MANAGEMENT_ROW_PADDING_LEFT = 12; - public static MANAGEMENT_ROW_PADDING_RIGHT = 12; - public static MANAGEMENT_ROW_PADDING_TOP = 8; - public static MANAGEMENT_ROW_PADDING_BOTTOM = 50; - public static MANAGEMENT_ROW_MARGIN_TOP = 12; - public static APPLICATION_IMAGE_WIDTH = 40; - public static APPLICATION_IMAGE_HEIGHT = 40; - public static APPLICATION_IMAGE_MARGIN_RIGHT = 16; - public static APPLICATION_TEXT_MARGIN_RIGHT = 4; - public static APPLICATION_LIST_MARGIN_BOTTOM = 40; - public static APPLICATION_TEXTINPUT_PADDING_LEFT = 12; - public static APPLICATION_TEXTINPUT_PADDING_TOP = 8; - public static APPLICATION_TEXTINPUT_PADDING_RIGHT = 24; - public static APPLICATION_ALPHABETINDEX_MARGIN_TOP = 12; - public static APPLICATION_ALPHABETINDEX_WIDTH = 24; - public static LOADING_WIDTH = 100; - public static BAR_WIDTH = 250; //group number public static FIXED_GROUP = 1; @@ -232,9 +149,6 @@ export default class Constants { public static PERMISSION_ONLY_THIS_TIME = 2; public static PERMISSION_ALLOWED_ONLY_DURING_USE = 3; - //shape - public static SHAPE_DIA = 20; - public static PERMISSION_INDEX = 0; public static PERMISSION_NUM = 0; @@ -255,51 +169,6 @@ export default class Constants { public static RECORD_PADDING_BOTTOM = '20%' - //////////////security_dialog/////////////// - - // icon - public static SECURITY_ICON_WIDTH = 48; - public static SECURITY_ICON_HEIGHT = 48; - public static PADDING_TWICE = 2; - - // header - public static SECURITY_HEADER_MAX_LINES = 2; - public static SECURITY_HEADER_MAX_SCALE = 2; - - //////////////////////////////////////////// - - // icon of dialog - public static DIALOG_ICON_WIDTH = 24; - public static DIALOG_ICON_HEIGHT = 24; - public static DIALOG_ICON_MARGIN_TOP = 23; - - // label text of dialog - public static DIALOG_LABEL_FONT_SIZE = 10; - public static DIALOG_LABEL_MARGIN_TOP = 2; - public static DIALOG_LABEL_LINE_HEIGHT = 14; - - // request text of dialog - public static DIALOG_REQ_FONT_SIZE = 16; - public static DIALOG_REQ_MARGIN_TOP = 16; - public static DIALOG_REQ_MARGIN_LEFT = 24; - public static DIALOG_REQ_MARGIN_RIGHT = 24; - public static DIALOG_REQ_LINE_HEIGHT = 22; - - // description text of dialog - public static DIALOG_DESP_FONT_SIZE = 14; - public static DIALOG_DESP_MARGIN_TOP = 2; - public static DIALOG_DESP_MARGIN_LEFT = 24; - public static DIALOG_DESP_MARGIN_RIGHT = 24; - public static DIALOG_DESP_MARGIN_BOTTOM = 8; - public static DIALOG_DESP_LINE_HEIGHT = 19; - - public static BUTTON_MARGIN_TOP = 8; - public static BUTTON_MARGIN_LEFT = 16; - public static BUTTON_MARGIN_RIGHT = 16; - public static BUTTON_HEIGHT = 40; - - public static DIALOG_PRIVACY_BORDER_RADIUS = 32; - // initial check status public static INIT_NEED_TO_WAIT = 0 public static INIT_NEED_TO_VERIFY = 1 @@ -320,18 +189,13 @@ export default class Constants { //location canvas public static LOCATION_CANVAS_HEIGHT = 172; - public static LOCATION_CANVAS_MARGIN_TOP = 4; - public static LOCATION_CANVAS_MARGIN_BOTTOM = 8; public static LOCATION_CANVAS_INITIAL_SCALE = 1; public static LOCATION_CANVAS_ZOOM_SCALE = 1.3; public static LOCATION_BUTTON_HEIGHT = 32; - public static LOCATION_BUTTON_RADIUS = 16; - public static LOCATION_BUTTON_POSITION_Y = 16; public static LOCATION_ICON_POSITION_X = 228; public static LOCATION_ICON_POSITION_Y = 86.5; public static LOCATION_CIRCLE_POSITION_X = 194; public static LOCATION_CIRCLE_POSITION_Y = 62.5; - public static LOCATION_ICON_WIDTH = 24; public static LOCATION_ICON_HEIGHT = 29; public static LOCATION_CIRCLE_DIA = 94; public static LOCATION_CIRCLE_OPACITY = 0.3; @@ -343,9 +207,6 @@ export default class Constants { public static DYNAMIC_OPER = 1 public static INVALID_OPER = 2 - //global dialog - public static ROW_HEIGHT = 56 - public static ACCESS_TOKEN = 'ohos.security.accesstoken.tokencallback' public static SEC_COMP_DIALOG_CALLBACK = 'ohos.security.ISecCompDialogCallback' diff --git a/permissionmanager/src/main/ets/pages/application-secondary.ets b/permissionmanager/src/main/ets/pages/application-secondary.ets index 0887bc0..9fce2ff 100644 --- a/permissionmanager/src/main/ets/pages/application-secondary.ets +++ b/permissionmanager/src/main/ets/pages/application-secondary.ets @@ -53,19 +53,19 @@ struct appNamePlusPage { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(item.groupName) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) SymbolGlyph($r('sys.symbol.chevron_forward')) - .width(Constants.IMAGE_WIDTH) - .height(Constants.IMAGE_HEIGHT) + .height(Constants.IMAGE_LENGTH_24) + .width(Constants.IMAGE_LENGTH_12) .fontSize(Constants.FONT_SIZE_18_vp) .fontColor([$r('sys.color.icon_tertiary')]) .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) } }.onClick(() => { GlobalContext.store('currentPermissionGroup', item.group); @@ -81,7 +81,8 @@ struct appNamePlusPage { }); }) } - }.padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) + } + .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .linearGradient((this.isTouch === item.group) ? { angle: 90, @@ -300,28 +301,33 @@ struct appNamePlusPage { Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Text($r('app.string.no_permission')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .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) - .constraintSize({minHeight: Constants.CONSTRAINTSIZE_MINHEIGHT }) + } + .margin({ top: Constants.MARGIN_8, bottom: Constants.MARGIN_8 }) + } + .height(Constants.FULL_HEIGHT) + } + .flexGrow(Constants.FLEX_GROW) + .constraintSize({minHeight: Constants.MIN_HEIGHT_48 }) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) } } } - }.padding({ left: Constants.LISTITEM_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + } + .padding({ left: Constants.PADDING_24, right: Constants.PADDING_24 }) } .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 }) - .padding({ - left: Constants.SECONDARY_LIST_PADDING_LEFT, - right: Constants.SECONDARY_LIST_PADDING_RIGHT - }) + .padding({ top: Constants.PADDING_4, bottom: Constants.PADDING_4 }) + } + .margin({ top: Constants.ROW_MARGIN_TOP }) + .padding({ + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END + }) } else { Scroll() { List() { @@ -329,14 +335,18 @@ struct appNamePlusPage { ListItem() { Row() { Text($r('app.string.allowed')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) .fontWeight(FontWeight.Medium) - .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) - }.constraintSize({ minHeight: Constants.SUBTITLE_MIN_HEIGHT }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_24) + } + .constraintSize({ minHeight: Constants.MIN_HEIGHT_48 }) .width(Constants.FULL_WIDTH) - .padding({ top: Constants.SUBTITLE_PADDING_TOP, bottom: Constants.SUBTITLE_PADDING_BOTTOM, - left: Constants.SECONDARY_TEXT_MARGIN_LEFT}) + .padding({ + top: Constants.PADDING_16, + bottom: Constants.PADDING_8, + left: Constants.PADDING_24 + }) } ListItem() { @@ -348,17 +358,18 @@ struct appNamePlusPage { } .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) - }.margin({ top: Constants.ROW_MARGIN_TOP }) + } + .margin({ top: Constants.ROW_MARGIN_TOP }) .padding({ - left: Constants.SECONDARY_LIST_PADDING_LEFT, - right: Constants.SECONDARY_LIST_PADDING_RIGHT + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END }) } } @@ -366,14 +377,18 @@ struct appNamePlusPage { ListItem() { Row() { Text($r('app.string.banned')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) .fontWeight(FontWeight.Medium) - .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) - }.constraintSize({ minHeight: Constants.SUBTITLE_MIN_HEIGHT }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_24) + } + .constraintSize({ minHeight: Constants.MIN_HEIGHT_48 }) .width(Constants.FULL_WIDTH) - .padding({ top: Constants.SUBTITLE_PADDING_TOP, bottom: Constants.SUBTITLE_PADDING_BOTTOM, - left: Constants.SECONDARY_TEXT_MARGIN_LEFT}) + .padding({ + top: Constants.PADDING_16, + bottom: Constants.PADDING_8, + left: Constants.PADDING_24 + }) } ListItem() { @@ -385,22 +400,24 @@ struct appNamePlusPage { } .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) - }.margin({ top: Constants.ROW_MARGIN_TOP }) + } + .margin({ top: Constants.ROW_MARGIN_TOP }) .padding({ - left: Constants.SECONDARY_LIST_PADDING_LEFT, - right: Constants.SECONDARY_LIST_PADDING_RIGHT + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END }) } } } - }.scrollBar(BarState.Off) + } + .scrollBar(BarState.Off) } } .width(Constants.FULL_WIDTH) @@ -413,7 +430,8 @@ struct appNamePlusPage { .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .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 336604c..a128b1d 100644 --- a/permissionmanager/src/main/ets/pages/application-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/application-tertiary.ets @@ -70,9 +70,10 @@ struct mediaDocumentPage { isRefreshReason: $isRefreshReason, folderStatus: $folderStatus }) - }.width(Constants.FULL_WIDTH) + } + .width(Constants.FULL_WIDTH) } - .margin({ top: Constants.TITLE_MARGIN_BOTTOM }) + .margin({ top: Constants.MARGIN_16 }) .layoutWeight(Constants.LAYOUT_WEIGHT) } } @@ -80,7 +81,8 @@ struct mediaDocumentPage { .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .backgroundColor($r('sys.color.background_secondary')) } } @@ -357,34 +359,35 @@ struct mediaDocumentItem { Row() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Image(this.applicationInfo.icon) - .width(Constants.TERTIARY_IMAGE_WIDTH) - .height(Constants.TERTIARY_IMAGE_HEIGHT) - .margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) + .width(Constants.IMAGE_LENGTH_64) + .height(Constants.IMAGE_LENGTH_64) + .margin({ left: Constants.DEFAULT_MARGIN_START, right: Constants.DEFAULT_MARGIN_END }) Column() { Row() { Text(this.label) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Bold) .textAlign(TextAlign.Start) } - .width(Constants.TERTIARY_HALF_WIDTH) - .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) + .width(Constants.HALF_LENGTH) + .margin({ bottom: Constants.MARGIN_2 }) Row() { Text($r('app.string.version')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) Text(this.version) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) .textAlign(TextAlign.Start) } - .width(Constants.TERTIARY_HALF_WIDTH) + .width(Constants.HALF_LENGTH) } - }.margin({ left: Constants.TERTIARY_MARGIN_LEFT }) + } + .margin({ left: Constants.DEFAULT_MARGIN_START }) } if (this.reason || this.permissionLabels.length > 0) { Row() { @@ -399,14 +402,15 @@ struct mediaDocumentItem { } Span(this.reason) } - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.icon_secondary')) .textAlign(TextAlign.Start) - }.margin({ left: Constants.TERTIARY_IMAGE_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT }) + } + .margin({ left: Constants.DEFAULT_MARGIN_START, right: Constants.DEFAULT_MARGIN_END }) } } .margin({ - top: Constants.TERTIARY_ROW_MARGIN_TOP, + top: Constants.MARGIN_24, left: Constants.DEFAULT_MARGIN_START, bottom: Constants.DEFAULT_MARGIN_BOTTOM }) @@ -417,16 +421,18 @@ struct mediaDocumentItem { Row() { Image($r('app.media.ic_public_fail')) .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 }) + .width(Constants.IMAGE_LENGTH_24) + .height(Constants.IMAGE_LENGTH_24) + .margin({ right: Constants.DEFAULT_MARGIN_END }) Text($r('app.string.risk_warning')) .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 }) + } + .margin({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) } - }.backgroundColor($r('sys.color.interactive_click')) + } + .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 }) @@ -436,15 +442,20 @@ struct mediaDocumentItem { Span(this.backTitle) Span($r('app.string.access_permission')) } - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.icon_secondary')) - .fontWeight(FontWeight.Medium) - .textAlign(TextAlign.Start) - .lineHeight(Constants.SUBTITLE_LINE_HEIGHT) - }.width(Constants.FULL_WIDTH) - .constraintSize({ minHeight: Constants.SUBTITLE_MIN_HEIGHT }) - .padding({ top: Constants.SUBTITLE_PADDING_TOP, bottom: Constants.SUBTITLE_PADDING_BOTTOM, - left: Constants.TERTIARY_TEXT_MARGIN_LEFT, right: Constants.TERTIARY_IMAGE_MARGIN_RIGHT}) + .fontSize(Constants.FONT_SIZE_14) + .fontColor($r('sys.color.icon_secondary')) + .fontWeight(FontWeight.Medium) + .textAlign(TextAlign.Start) + .lineHeight(Constants.TEXT_LINE_HEIGHT_24) + } + .width(Constants.FULL_WIDTH) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_48 }) + .padding({ + top: Constants.PADDING_16, + bottom: Constants.PADDING_8, + left: Constants.PADDING_24, + right: Constants.DEFAULT_PADDING_END + }) Column() { List() { if (this.currentGroup === 'FOLDER') { @@ -453,7 +464,7 @@ struct mediaDocumentItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(this.getCheckboxInfo(permission).label) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) @@ -462,7 +473,7 @@ struct mediaDocumentItem { .hitTestBehavior(HitTestMode.None) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) .onClick(() => { if (this.folderStatus[this.getCheckboxInfo(permission).index]) { this.revokeUserGrantedPermission(accessTokenId, permission, Constants.PERMISSION_FLAG); @@ -479,7 +490,7 @@ struct mediaDocumentItem { right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) - .margin({ top: Constants.TERTIARY_LISTITEM_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_1 }) .linearGradient((this.isCheck === permission) ? { angle: 90, direction: GradientDirection.Right, @@ -509,7 +520,7 @@ struct mediaDocumentItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(item.name) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) @@ -520,7 +531,7 @@ struct mediaDocumentItem { .width(Constants.SHAPE_DIA) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) .onClick(() => { this.selected = item.index; item.permissions.forEach((permission): boolean => { @@ -581,13 +592,13 @@ struct mediaDocumentItem { this.isTouch = -1; } }) - .margin({ top: Constants.TERTIARY_LISTITEM_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_1 }) }, (item: MediaDocObj) => JSON.stringify(item)) } } .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .backgroundColor($r('sys.color.comp_background_list_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), @@ -599,7 +610,7 @@ struct mediaDocumentItem { Column() { Row() { Text($r('app.string.precise_location')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) @@ -619,24 +630,27 @@ struct mediaDocumentItem { } }) .padding({ right: 0 }) - }.width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) - }.margin({ top: Constants.LOCATION_MARGIN_TOP, bottom: Constants.LOCATION_MARGIN_BOTTOM }) + } + .width(Constants.FULL_WIDTH) + .height(Constants.HEIGHT_48) + } + .margin({ top: Constants.DEFAULT_MARGIN_TOP, bottom: Constants.MARGIN_8 }) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END, - top: Constants.TERTIARY_LIST_PADDING_TOP, - bottom: Constants.TERTIARY_LIST_PADDING_BOTTOM + top: Constants.PADDING_4, + bottom: Constants.PADDING_4 }) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .backgroundColor($r('sys.color.comp_background_list_card')) Row() { Text($r('app.string.get_the_exact_position')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) - }.width(Constants.FULL_WIDTH) + .lineHeight(Constants.TEXT_LINE_HEIGHT_19) + } + .width(Constants.FULL_WIDTH) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END, @@ -644,8 +658,8 @@ struct mediaDocumentItem { } } .padding({ - left: Constants.LIST_PADDING_LEFT, - right: Constants.LIST_PADDING_LEFT + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END }) .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index 882f59b..03a408c 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -51,22 +51,22 @@ struct authorityManagementPage { Row() { Image(item.icon) .fillColor($r('sys.color.icon_secondary')) - .customizeImage(Constants.MANAGEMENT_IMAGE_WIDTH, Constants.MANAGEMENT_IMAGE_HEIGHT) - .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT }) + .customizeImage(Constants.IMAGE_LENGTH_24, Constants.IMAGE_LENGTH_24) + .margin({ right: Constants.MARGIN_16 }) Text(item.groupName) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) SymbolGlyph($r('sys.symbol.chevron_forward')) - .width(Constants.IMAGE_WIDTH) - .height(Constants.IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_12) + .height(Constants.IMAGE_LENGTH_24) .fontSize(Constants.FONT_SIZE_18_vp) .fontColor([$r('sys.color.icon_tertiary')]) .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) - .height(Constants.MANAGEMENT_ROW_HEIGHT) + .height(Constants.HEIGHT_56) } }.onClick(() => { if (item.group === 'OTHER' || showSubPermissionsGroup.indexOf(item.group) !== -1) { @@ -111,7 +111,8 @@ struct authorityManagementPage { } }) } - }.padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) + } + .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .linearGradient((this.isTouch === item.group) ? { angle: 90, @@ -151,28 +152,29 @@ struct authorityManagementPage { justifyContent: FlexAlign.Center, direction: FlexDirection.Column }) { Text(index ? $r('app.string.application') : $r('app.string.permission')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor( this.currentIndex == index ? $r('sys.color.ohos_id_color_subtab_text_on') : $r('sys.color.icon_secondary') ) .fontWeight(this.currentIndex == index ? FontWeight.Bold : FontWeight.Regular) - .lineHeight(Constants.TEXT_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) .baselineOffset(Constants.TAB_DECORATION_POSITION_Y) if (this.currentIndex == index) { Text(index ? $r('app.string.application') : $r('app.string.permission')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Bold) .lineHeight(Constants.TAB_LINE_HEIGHT) .height(Constants.TAB_DECORATION_HEIGHT) .fontColor($r('sys.color.ohos_id_color_subtab_text_on')) .backgroundColor($r('sys.color.ohos_id_color_subtab_text_on')) } - }.height(Constants.TAB_HEIGHT) + } + .height(Constants.HEIGHT_56) .width(Constants.FULL_WIDTH) - .padding({ left: this.isVertical ? Constants.TAB_INNER_PADDING : Constants.DEFAULT_PADDING_START, - right: this.isVertical ? Constants.TAB_INNER_PADDING : Constants.DEFAULT_PADDING_END }) + .padding({ left: this.isVertical ? Constants.PADDING_8 : Constants.DEFAULT_PADDING_START, + right: this.isVertical ? Constants.PADDING_8 : Constants.DEFAULT_PADDING_END }) } /** @@ -452,14 +454,15 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.comp_background_list_card')) + } + .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 }) + .padding(Constants.PADDING_4) + .margin({ bottom: Constants.DEFAULT_MARGIN_BOTTOM }) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), - startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, + startMargin: Constants.MARGIN_52, endMargin: Constants.DEFAULT_MARGIN_END }) } @@ -471,14 +474,15 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.comp_background_list_card')) + } + .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 }) + .padding(Constants.PADDING_4) + .margin({ bottom: Constants.DEFAULT_MARGIN_BOTTOM }) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), - startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, + startMargin: Constants.MARGIN_52, endMargin: Constants.DEFAULT_MARGIN_END }) } @@ -493,14 +497,15 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.comp_background_list_card')) + } + .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 }) + .padding(Constants.PADDING_4) + .margin({ bottom: Constants.DEFAULT_MARGIN_BOTTOM }) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), - startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, + startMargin: Constants.MARGIN_52, endMargin: Constants.DEFAULT_MARGIN_END }) } @@ -513,41 +518,50 @@ struct authorityManagementPage { (item: GroupPermission) => { this.ListItemLayout(item) }, (item: GroupPermission) => JSON.stringify(item) ) - }.backgroundColor($r('sys.color.comp_background_list_card')) + } + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), - startMargin: Constants.DIVIDER_MARGIN_RIGHT_PERMISSION, + startMargin: Constants.MARGIN_52, endMargin: Constants.DEFAULT_MARGIN_END }) - }.margin({ bottom: Constants.AUTHORITY_ROW_MARGIN_BOTTOM }) - }.height(Constants.FULL_HEIGHT) + } + .margin({ bottom: Constants.MARGIN_24 }) + } + .height(Constants.FULL_HEIGHT) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .clip(true) - }.padding({ - left: Constants.MANAGEMENT_ROW_PADDING_LEFT, - right: Constants.MANAGEMENT_ROW_PADDING_RIGHT, + } + .padding({ + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END, }) - }.scrollBar(BarState.Off) - .margin({ top: Constants.MANAGEMENT_ROW_PADDING_TOP }) - }.width(Constants.FULL_WIDTH) + } + .scrollBar(BarState.Off) + .margin({ top: Constants.MARGIN_8 }) + } + .width(Constants.FULL_WIDTH) } - }.tabBar(this.TabBuilder(0)) + } + .tabBar(this.TabBuilder(0)) + TabContent() { applicationItem() }.tabBar(this.TabBuilder(1)) } .barMode(BarMode.Fixed) - .barWidth(Constants.BAR_WIDTH) + .barWidth(Constants.WIDTH_250) .onChange((index) => { this.currentIndex = index }) } else { - LoadingProgress().width(Constants.LOADING_WIDTH) + LoadingProgress().width(Constants.IMAGE_LENGTH_100) } - }.height(Constants.FULL_HEIGHT) + } + .height(Constants.FULL_HEIGHT) } } } @@ -558,7 +572,8 @@ struct authorityManagementPage { .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .backgroundColor($r('sys.color.background_secondary')) } } @@ -577,40 +592,42 @@ struct applicationItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image(item.icon) - .customizeImage(Constants.APPLICATION_IMAGE_WIDTH, Constants.APPLICATION_IMAGE_HEIGHT) - .margin({ right: Constants.APPLICATION_IMAGE_MARGIN_RIGHT }) + .customizeImage(Constants.IMAGE_LENGTH_40, Constants.IMAGE_LENGTH_40) + .margin({ right: Constants.MARGIN_16 }) Text(item.label) .width(Constants.OFFSET) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) Text(String(item.groupId.length)) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) Text($r('app.string.right')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .margin({ right: Constants.APPLICATION_TEXT_MARGIN_RIGHT }) + .margin({ right: Constants.MARGIN_4 }) SymbolGlyph($r('sys.symbol.chevron_forward')) - .width(Constants.IMAGE_WIDTH) - .height(Constants.IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_12) + .height(Constants.IMAGE_LENGTH_24) .fontSize(Constants.FONT_SIZE_18_vp) .fontColor([$r('sys.color.icon_tertiary')]) .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) - .height(Constants.AUTHORITY_ROW_HEIGHT) - .constraintSize({ minHeight: Constants.AUTHORITY_CONSTRAINTSIZE_MINHEIGHT }) + .height(Constants.HEIGHT_72) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_72 }) } - }.onClick(() => { + } + .onClick(() => { GlobalContext.store('applicationInfo', item); router.pushUrl({ url: 'pages/application-secondary' }); }) } - }.padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) + } + .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .linearGradient((this.isTouch === item.bundleName) ? { angle: 90, @@ -641,10 +658,11 @@ struct applicationItem { applicationItem: $applicationItem, searchResult: $searchResult }) - }.padding({ - left: Constants.APPLICATION_TEXTINPUT_PADDING_LEFT, - top: Constants.APPLICATION_TEXTINPUT_PADDING_TOP, - right: Constants.APPLICATION_TEXTINPUT_PADDING_RIGHT + } + .padding({ + left: Constants.DEFAULT_PADDING_START, + top: Constants.PADDING_8, + right: Constants.PADDING_24 }) Row() { Flex({ alignItems: ItemAlign.Start }) { @@ -654,23 +672,25 @@ struct applicationItem { Row() { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Image($r('app.media.searchnoresult')) - .customizeImage(Constants.SEARCHNORESULT_IMAGE_WIDTH, Constants.SEARCHNORESULT_IMAGE_HEIGHT) + .customizeImage(Constants.IMAGE_LENGTH_200, Constants.IMAGE_LENGTH_200) } - }.margin({ top: Constants.MANAGEMENT_ROW_MARGIN_TOP }) - .padding({ left: Constants.MANAGEMENT_ROW_PADDING_LEFT }) + } + .margin({ top: Constants.DEFAULT_MARGIN_TOP }) + .padding({ left: Constants.DEFAULT_PADDING_START }) } else { Row() { List({ scroller: this.scroller }) { ForEach(sortByName(this.applicationItem), (item: AppInfo) => { this.ListItemLayout(item) }, (item: AppInfo) => JSON.stringify(item)) - }.backgroundColor($r('sys.color.comp_background_list_card')) + } + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), - startMargin: Constants.DIVIDER_MARGIN_RIGHT_APPLICATION, + startMargin: Constants.MARGIN_68, endMargin: Constants.DEFAULT_MARGIN_END }) .onScrollIndex((start, end) => { @@ -681,20 +701,23 @@ struct applicationItem { this.selectedIndex = index >= 0 ? index : 0; } }) - }.margin({ left: Constants.MANAGEMENT_ROW_PADDING_LEFT }) + } + .margin({ left: Constants.DEFAULT_MARGIN_START }) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) .clip(true) } - }.height(Constants.FULL_HEIGHT) - }.margin({ top: Constants.MANAGEMENT_ROW_MARGIN_TOP, bottom: Constants.APPLICATION_LIST_MARGIN_BOTTOM }) + } + .height(Constants.FULL_HEIGHT) + } + .margin({ top: Constants.DEFAULT_MARGIN_TOP, bottom: Constants.MARGIN_40 }) Column() { alphabetIndexerComponent({ applicationItem: $applicationItem, index: $selectedIndex }) } .margin({ - top: Constants.APPLICATION_ALPHABETINDEX_MARGIN_TOP, - bottom: Constants.APPLICATION_LIST_MARGIN_BOTTOM + top: Constants.DEFAULT_MARGIN_TOP, + bottom: Constants.MARGIN_40 }) - .width(Constants.APPLICATION_ALPHABETINDEX_WIDTH) + .width(Constants.WIDTH_24) } } } diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index 9912b43..3e1cc79 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -42,14 +42,16 @@ struct appNamePage { appNameItem() } } - }.layoutWeight(Constants.LAYOUT_WEIGHT) + } + .layoutWeight(Constants.LAYOUT_WEIGHT) } } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .backgroundColor($r('sys.color.background_secondary')) } } @@ -67,19 +69,19 @@ struct appNameItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(item.label) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) SymbolGlyph($r('sys.symbol.chevron_forward')) - .width(Constants.IMAGE_WIDTH) - .height(Constants.IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_12) + .height(Constants.IMAGE_LENGTH_24) .fontSize(Constants.FONT_SIZE_18_vp) .fontColor([$r('sys.color.icon_tertiary')]) .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) } }.onClick(() => { let dataList = this.list.filter((ele) => { @@ -91,7 +93,8 @@ struct appNameItem { }); }) } - }.padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) + } + .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .linearGradient((this.isTouch === item.permissionName) ? { angle: 90, @@ -137,34 +140,36 @@ struct appNameItem { Row() { Column() { Row() { - List() { - if (this.calendarListItem.length > 0) { - ForEach(this.calendarListItem, (item: CalendarObj) => { - this.ListItemLayout(item) - }, (item: CalendarObj) => JSON.stringify(item)) - } else { - ListItem() { - Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { - Text($r('app.string.no_permission')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) - .fontColor($r('sys.color.font_primary')) - } + List() { + if (this.calendarListItem.length > 0) { + ForEach(this.calendarListItem, (item: CalendarObj) => { + this.ListItemLayout(item) + }, (item: CalendarObj) => JSON.stringify(item)) + } else { + ListItem() { + Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { + Text($r('app.string.no_permission')) + .fontSize(Constants.FONT_SIZE_16) + .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.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.comp_divider'), - startMargin: Constants.DEFAULT_MARGIN_START, - endMargin: Constants.DEFAULT_MARGIN_END - }) - }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.LIST_PADDING_LEFT, right: Constants.DEFAULT_PADDING_END }) + .width(Constants.FULL_WIDTH) + .height(Constants.HEIGHT_48) + .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) + } + } + .backgroundColor($r('sys.color.comp_background_list_card')) + .borderRadius($r('sys.float.ohos_id_corner_radius_card')) + .padding(Constants.PADDING_4) + .divider({ + strokeWidth: Constants.DIVIDER, + color: $r('sys.color.comp_divider'), + startMargin: Constants.DEFAULT_MARGIN_START, + endMargin: Constants.DEFAULT_MARGIN_END + }) + } + .margin({ top: Constants.ROW_MARGIN_TOP }) + .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) } .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets index 888075c..859eb70 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -70,7 +70,8 @@ struct locationInfoPage { Column() { applicationItem({ polymorphismIsOn: $polymorphismIsOn, folderStatusArray: $folderStatusArray }) - }.width(Constants.FULL_WIDTH) + } + .width(Constants.FULL_WIDTH) } .layoutWeight(Constants.LAYOUT_WEIGHT) } @@ -79,7 +80,8 @@ struct locationInfoPage { .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .backgroundColor($r('sys.color.background_secondary')) } onPageShow() { @@ -226,10 +228,10 @@ struct applicationItem { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Column() { Text(this.currentGroup == 'CAMERA' ? $r('app.string.close_camera') : $r('app.string.close_microphone')) - .fontSize(Constants.TEXT_BIG_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_20) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) - .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_28) .width(Constants.FULL_WIDTH) .padding({ top: Constants.PADDING_14, bottom: Constants.PADDING_14 }) Text( @@ -237,9 +239,9 @@ struct applicationItem { $r('app.string.close_camera_desc') : $r('app.string.close_microphone_desc') ) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) - .lineHeight(Constants.TEXT_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) } .clip(true) } @@ -253,32 +255,33 @@ struct applicationItem { Row() { Image(item.icon) .objectFit(ImageFit.Contain) - .width(Constants.AUTHORITY_IMAGE_WIDTH) - .height(Constants.AUTHORITY_IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_40) + .height(Constants.IMAGE_LENGTH_40) .draggable(false) - .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) + .margin({ right: Constants.MARGIN_16 }) Column() { Text(item.label) .width(Constants.MAXIMUM_HEADER_WIDTH) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) if (this.isRisk[item.index]) { Text($r('app.string.risk_warning')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) } - }.flexGrow(Constants.FLEX_GROW) + } + .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.icon_emphasize')) .switchPointColor($r('sys.color.comp_background_primary_contrary')) .padding({ right: 0 }) - .width(Constants.AUTHORITY_TOGGLE_WIDTH) - .height(Constants.AUTHORITY_TOGGLE_HEIGHT) + .width(Constants.WIDTH_36) + .height(Constants.HEIGHT_20) .onChange((isOn: boolean) => { if (item.permission === undefined) { return; @@ -325,26 +328,26 @@ struct applicationItem { Span($r('app.string.ban')) } } - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) - .fontColor($r('sys.color.font_secondary')) - .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) + .fontSize(Constants.FONT_SIZE_14) + .fontColor($r('sys.color.font_secondary')) + .margin({ right: Constants.MARGIN_16 }) } else { Text(locationStatus[this.polymorphismIsOn[item.index]]) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) + .margin({ right: Constants.MARGIN_16 }) } SymbolGlyph($r('sys.symbol.chevron_forward')) - .width(Constants.IMAGE_WIDTH) - .height(Constants.IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_12) + .height(Constants.IMAGE_LENGTH_24) .fontSize(Constants.FONT_SIZE_18_vp) .fontColor([$r('sys.color.icon_tertiary')]) .fontWeight(FontWeight.Medium) } } .width(Constants.FULL_WIDTH) - .height(Constants.AUTHORITY_ROW_HEIGHT) - .constraintSize({ minHeight: Constants.AUTHORITY_CONSTRAINTSIZE_MINHEIGHT }) + .height(Constants.HEIGHT_72) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_72 }) } }.onClick(() => { if (polymorphismGroup.indexOf(this.currentGroup) !== -1) { @@ -374,7 +377,8 @@ struct applicationItem { } }) } - }.padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) + } + .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) .enabled(!this.isRisk[item.index]) .opacity(this.isRisk[item.index] ? $r('sys.float.ohos_id_alpha_disabled') : 1) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) @@ -567,9 +571,10 @@ struct applicationItem { applicationItem: $applicationList, searchResult: $searchResult }) - }.padding({ - left: Constants.AUTHORITY_TEXTINPUT_PADDING_LEFT, - right: Constants.AUTHORITY_TEXTINPUT_PADDING_RIGHT + } + .padding({ + left: Constants.DEFAULT_PADDING_START, + right: Constants.PADDING_24 }) Flex({ alignItems:ItemAlign.Start, justifyContent: FlexAlign.Start }) { Column() { @@ -577,7 +582,8 @@ 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.font_primary')) + .fontSize(Constants.FONT_SIZE_16) + .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) Row() { Toggle({ type: ToggleType.Switch, isOn: this.globalIsOn }) @@ -599,18 +605,22 @@ struct applicationItem { } } }) - Row().onClick(() => { - this.dialogController?.open(); - }) + Row() + .onClick(() => { + this.dialogController?.open(); + }) .width(Constants.DEFAULT_SLIDER_WIDTH).height(Constants.DEFAULT_SLIDER_HEIGHT) .position({ x: this.globalIsOn ? 0 : Constants.OFFSET, y: 0 }) - }.clip(true) - }.height(Constants.LISTITEM_ROW_HEIGHT) + } + .clip(true) + } + .height(Constants.HEIGHT_48) .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) - }.padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) + } + .padding({ top: Constants.PADDING_4, bottom: Constants.PADDING_4 }) .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .margin({ top: Constants.TERTIARY_ROW_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_24 }) } Flex({ justifyContent: FlexAlign.Start }) { if (this.globalIsOn) { @@ -620,14 +630,14 @@ struct applicationItem { $r(this.groupInfo.enableDescription, String(this.getGrantApplicationNumber())) : '' ) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_24 }) } else { Text(this.groupInfo.forbiddenDescription) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_24 }) } } else { Text( @@ -635,12 +645,13 @@ struct applicationItem { $r('app.string.camera_is_off') : $r('app.string.microphone_is_off') ) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_24 }) } - }.padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) - .margin({ bottom: Constants.AUTHORITY_ROW_MARGIN_BOTTOM }) + } + .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) + .margin({ bottom: Constants.MARGIN_24 }) Row() { Column() { if (!this.applicationList.length) { @@ -651,8 +662,8 @@ struct applicationItem { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Image($r('app.media.searchnoresult')) .objectFit(ImageFit.Contain) - .width(Constants.SEARCHNORESULT_IMAGE_WIDTH) - .height(Constants.SEARCHNORESULT_IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_200) + .height(Constants.IMAGE_LENGTH_200) .draggable(false) } } @@ -666,11 +677,11 @@ struct applicationItem { } .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), - startMargin: Constants.DIVIDER_MARGIN_RIGHT_APPLICATION, + startMargin: Constants.MARGIN_68, endMargin: Constants.DEFAULT_MARGIN_END }) .onScrollIndex((start, end) => { @@ -683,20 +694,25 @@ struct applicationItem { }) } } - }.width(Constants.FULL_WIDTH) + } + .width(Constants.FULL_WIDTH) .margin({ bottom: globalGroup.includes(this.currentGroup) && this.isMuteSupported === true ? - Constants.AUTHORITY_LIST_MARGIN_BOTTOM_GLOBAL : - Constants.AUTHORITY_LIST_MARGIN_BOTTOM + Constants.MARGIN_176 : + Constants.MARGIN_96 }) } - }.padding({ left: Constants.AUTHORITY_LISTITEM_PADDING_LEFT }) + } + .padding({ left: Constants.DEFAULT_PADDING_START }) Column() { alphabetIndexerComponent({ applicationItem: $applicationList, index: $selectedIndex }) - }.width(Constants.AUTHORITY_ALPHABETINDEX_WIDTH) - .padding({ top: Constants.AUTHORITY_ALPHABETINDEX_PADDING_TOP }) - .margin({ bottom: Constants.APPLICATION_LIST_MARGIN_BOTTOM }) - }.flexGrow(Constants.FLEX_GROW) - }.height(Constants.FULL_HEIGHT) + } + .width(Constants.WIDTH_24) + .padding({ top: Constants.PADDING_16 }) + .margin({ bottom: Constants.MARGIN_40 }) + } + .flexGrow(Constants.FLEX_GROW) + } + .height(Constants.FULL_HEIGHT) } } diff --git a/permissionmanager/src/main/ets/pages/authority-tertiary.ets b/permissionmanager/src/main/ets/pages/authority-tertiary.ets index acbc9fb..d166ac6 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary.ets @@ -61,7 +61,8 @@ struct locationInfoPage { .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .backgroundColor($r('sys.color.background_secondary')) } } @@ -87,29 +88,30 @@ struct applicationItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image(item.icon) - .customizeImage(Constants.AUTHORITY_IMAGE_WIDTH, Constants.AUTHORITY_IMAGE_HEIGHT) - .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) + .customizeImage(Constants.IMAGE_LENGTH_40, Constants.IMAGE_LENGTH_40) + .margin({ right: Constants.MARGIN_16 }) Column() { Text(item.label) .width(Constants.MAXIMUM_HEADER_WIDTH) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) if (this.isRisk[item.index]) { Text($r('app.string.risk_warning')) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) } - }.flexGrow(Constants.FLEX_GROW) + } + .flexGrow(Constants.FLEX_GROW) .alignItems(HorizontalAlign.Start) Toggle({ type: ToggleType.Switch, isOn: this.toggleIsOn[item.index] }) .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) + .width(Constants.WIDTH_36) + .height(Constants.HEIGHT_20) .onChange((isOn: boolean) => { if (item.permission === undefined) { return; @@ -127,13 +129,13 @@ struct applicationItem { }) } .width(Constants.FULL_WIDTH) - .height(Constants.AUTHORITY_ROW_HEIGHT) - .constraintSize({ minHeight: Constants.AUTHORITY_CONSTRAINTSIZE_MINHEIGHT }) + .height(Constants.HEIGHT_72) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_72 }) } - }.onClick(() => { - }) + } } - }.padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) + } + .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) .enabled(!this.isRisk[item.index]) .opacity(this.isRisk[item.index] ? $r('sys.float.ohos_id_alpha_disabled') : 1) } @@ -235,9 +237,10 @@ struct applicationItem { applicationItem: $applicationList, searchResult: $searchResult }) - }.padding({ - left: Constants.AUTHORITY_TEXTINPUT_PADDING_LEFT, - right: Constants.AUTHORITY_TEXTINPUT_PADDING_RIGHT + } + .padding({ + left: Constants.DEFAULT_PADDING_START, + right: Constants.PADDING_24 }) Flex({ alignItems:ItemAlign.Start, justifyContent: FlexAlign.Start }) { Column() { @@ -248,17 +251,18 @@ struct applicationItem { $r(this.permissionInfo.enableDescription, String(this.permissionNum)) : '' ) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_24 }) } else { Text(this.permissionInfo.forbiddenDescription) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .margin({ top: Constants.AUTHORITY_TEXT_MARGIN_TOP }) + .margin({ top: Constants.MARGIN_24 }) } - }.padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) - .margin({ bottom: Constants.AUTHORITY_ROW_MARGIN_BOTTOM }) + } + .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.DEFAULT_PADDING_END }) + .margin({ bottom: Constants.MARGIN_24 }) Row() { Column() { if (!this.applicationList.length) { @@ -268,7 +272,7 @@ struct applicationItem { Row() { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { Image($r('app.media.searchnoresult')) - .customizeImage(Constants.SEARCHNORESULT_IMAGE_WIDTH, Constants.SEARCHNORESULT_IMAGE_HEIGHT) + .customizeImage(Constants.IMAGE_LENGTH_200, Constants.IMAGE_LENGTH_200) } } } @@ -281,11 +285,11 @@ struct applicationItem { } .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 }) + .padding({ top: Constants.PADDING_4, bottom: Constants.PADDING_4 }) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), - startMargin: Constants.DIVIDER_MARGIN_RIGHT_APPLICATION, + startMargin: Constants.MARGIN_68, endMargin: Constants.DEFAULT_MARGIN_END }) .onScrollIndex((start, end) => { @@ -298,16 +302,21 @@ struct applicationItem { }) } } - }.width(Constants.FULL_WIDTH) - .margin({ bottom: Constants.AUTHORITY_LIST_MARGIN_BOTTOM }) + } + .width(Constants.FULL_WIDTH) + .margin({ bottom: Constants.MARGIN_96 }) } - }.padding({ left: Constants.AUTHORITY_LISTITEM_PADDING_LEFT }) + } + .padding({ left: Constants.DEFAULT_PADDING_START }) Column() { alphabetIndexerComponent({ applicationItem: $applicationList, index: $selectedIndex }) - }.width(Constants.AUTHORITY_ALPHABETINDEX_WIDTH) - .padding({ top: Constants.AUTHORITY_ALPHABETINDEX_PADDING_TOP }) - .margin({ bottom: Constants.APPLICATION_LIST_MARGIN_BOTTOM }) - }.flexGrow(Constants.FLEX_GROW) - }.height(Constants.FULL_HEIGHT) + } + .width(Constants.WIDTH_24) + .padding({ top: Constants.PADDING_16 }) + .margin({ bottom: Constants.MARGIN_40 }) + } + .flexGrow(Constants.FLEX_GROW) + } + .height(Constants.FULL_HEIGHT) } } diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets index 46569fa..527f8e1 100644 --- a/permissionmanager/src/main/ets/pages/dialogPlus.ets +++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets @@ -89,16 +89,16 @@ struct dialogPlusPage { Column() { if ((this.initStatus != Constants.INIT_NEED_TO_WAIT) && this.verify()) { Image(this.currentGroup().icon) - .width(Constants.DIALOG_ICON_WIDTH) - .height(Constants.DIALOG_ICON_HEIGHT) + .width(Constants.IMAGE_LENGTH_24) + .height(Constants.IMAGE_LENGTH_24) .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) + .fontSize(Constants.FONT_SIZE_10) .fontColor($r('sys.color.font_secondary')) - .lineHeight(Constants.DIALOG_LABEL_LINE_HEIGHT) - .margin({ top: Constants.DIALOG_LABEL_MARGIN_TOP }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_14) + .margin({ top: Constants.MARGIN_2 }) } Scroll() { Column() { @@ -110,7 +110,7 @@ struct dialogPlusPage { .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Bold) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .maxLines(Constants.SECURITY_HEADER_MAX_LINES) + .maxLines(Constants.DIALOG_TITLE_MAX_LINES) .minFontSize( getLimitFontSize(getFontSizeScale(), Constants.DIALOG_TITLE_MAX_SCALE, @@ -125,7 +125,7 @@ struct dialogPlusPage { ) .heightAdaptivePolicy(TextHeightAdaptivePolicy.MIN_FONT_SIZE_FIRST) } - .constraintSize({ minHeight: Constants.HEADLINE_HEIGHT }) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_56 }) .justifyContent(FlexAlign.Center) .padding({ top: Constants.DEFAULT_PADDING_TOP, @@ -164,9 +164,9 @@ struct dialogPlusPage { .fontSize($r('sys.float.Body_L')) .maxFontScale(Constants.DIALOG_TEXT_MAX_SCALE) .margin({ - left: Constants.DIALOG_DESP_MARGIN_LEFT, - right: Constants.DIALOG_DESP_MARGIN_RIGHT, - bottom: Constants.DIALOG_DESP_MARGIN_BOTTOM + left: Constants.MARGIN_24, + right: Constants.MARGIN_24, + bottom: Constants.MARGIN_8 }) } } @@ -220,7 +220,7 @@ struct dialogPlusPage { .color($r('sys.color.comp_divider')) .vertical(true) .strokeWidth(Constants.DIALOG_DIVIDER) - .height(Constants.DIVIDER_HEIGHT) + .height(Constants.HEIGHT_24) .opacity(0.2) .margin({ left: Constants.MARGIN_8, right: Constants.MARGIN_8 }) Button( @@ -236,8 +236,8 @@ struct dialogPlusPage { ) }).customizeButton() }.margin({ - left: Constants.BUTTON_MARGIN_LEFT, - right: Constants.BUTTON_MARGIN_RIGHT, + left: Constants.MARGIN_16, + right: Constants.MARGIN_16, bottom: Constants.MARGIN_8 }) } diff --git a/permissionmanager/src/main/ets/pages/globalSwitch.ets b/permissionmanager/src/main/ets/pages/globalSwitch.ets index d5ef035..f863736 100644 --- a/permissionmanager/src/main/ets/pages/globalSwitch.ets +++ b/permissionmanager/src/main/ets/pages/globalSwitch.ets @@ -90,18 +90,18 @@ struct globalSwitch { Text(this.globalState == MICROPHONE ? $r('app.string.global_title_microphone') : this.globalState == CAMERA ? $r('app.string.global_title_camera') : $r('app.string.global_title_camera_and_microphone')) - .fontSize(Constants.TEXT_BIG_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_20) .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) - .lineHeight(Constants.TEXT_BIG_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_28) .width(Constants.FULL_WIDTH) .padding({ top: Constants.PADDING_14, bottom: Constants.PADDING_14 }) Text(this.globalState == MICROPHONE ? $r('app.string.global_desc_microphone') : this.globalState == CAMERA ? $r('app.string.global_desc_camera') : $r('app.string.global_desc_camera_and_microphone')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) - .lineHeight(Constants.TEXT_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) } .clip(true) } diff --git a/permissionmanager/src/main/ets/pages/other-permissions.ets b/permissionmanager/src/main/ets/pages/other-permissions.ets index 70161a7..e61883e 100644 --- a/permissionmanager/src/main/ets/pages/other-permissions.ets +++ b/permissionmanager/src/main/ets/pages/other-permissions.ets @@ -54,14 +54,16 @@ struct appNamePage { appNameItem() } } - }.layoutWeight(Constants.LAYOUT_WEIGHT) + } + .layoutWeight(Constants.LAYOUT_WEIGHT) } } .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .backgroundColor($r('sys.color.background_secondary')) } /** @@ -90,18 +92,18 @@ struct appNameItem { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Text(item.permissionLabel) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) SymbolGlyph($r('sys.symbol.chevron_forward')) - .width(Constants.IMAGE_WIDTH) - .height(Constants.IMAGE_HEIGHT) + .width(Constants.IMAGE_LENGTH_12) + .height(Constants.IMAGE_LENGTH_24) .fontSize(Constants.FONT_SIZE_18_vp) .fontColor([$r('sys.color.icon_tertiary')]) .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_ROW_HEIGHT) + .height(Constants.HEIGHT_48) } }.onClick(() => { router.pushUrl({ @@ -116,7 +118,8 @@ struct appNameItem { }); }) } - }.padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) + } + .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) .borderRadius($r('sys.float.ohos_id_corner_radius_default_l')) .linearGradient((this.isTouch === item.permission) ? { angle: 90, @@ -148,17 +151,19 @@ struct appNameItem { ForEach(this.otherPermissionListItem, (item: OtherPermission) => { this.ListItemLayout(item) }, (item: OtherPermission) => JSON.stringify(item)) - }.backgroundColor($r('sys.color.comp_background_list_card')) + } + .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) - .padding(Constants.LIST_PADDING_TOP) + .padding(Constants.PADDING_4) .divider({ strokeWidth: Constants.DIVIDER, color: $r('sys.color.comp_divider'), startMargin: Constants.DEFAULT_MARGIN_START, endMargin: Constants.DEFAULT_MARGIN_END }) - }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.LIST_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + } + .margin({ top: Constants.ROW_MARGIN_TOP }) + .padding({ left: Constants.DEFAULT_PADDING_START, right: Constants.PADDING_24 }) } .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) diff --git a/permissionmanager/src/main/ets/pages/permission-access-record.ets b/permissionmanager/src/main/ets/pages/permission-access-record.ets index 9e2e997..696bab8 100644 --- a/permissionmanager/src/main/ets/pages/permission-access-record.ets +++ b/permissionmanager/src/main/ets/pages/permission-access-record.ets @@ -59,27 +59,30 @@ struct permissionRecordPage { direction: FlexDirection.Column }) { Text(index ? $r('app.string.application') : $r('app.string.permission')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontColor( this.currentIndex == index ? $r('sys.color.ohos_id_color_subtab_text_on') : $r('sys.color.icon_secondary') ) .fontWeight(this.currentIndex == index ? FontWeight.Bold : FontWeight.Regular) - .lineHeight(Constants.TEXT_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) .baselineOffset(Constants.TAB_DECORATION_POSITION_Y) if (this.currentIndex == index) { Text(index ? $r('app.string.application') : $r('app.string.permission')) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Bold) .lineHeight(Constants.TAB_LINE_HEIGHT) .height(Constants.TAB_DECORATION_HEIGHT) .backgroundColor($r('sys.color.comp_background_emphasize')) } - }.height(Constants.TAB_HEIGHT) + } + .height(Constants.HEIGHT_56) .width(Constants.FULL_WIDTH) - .padding({ left: this.isVertical ? Constants.TAB_INNER_PADDING : Constants.DEFAULT_PADDING_START, - right: this.isVertical ? Constants.TAB_INNER_PADDING : Constants.DEFAULT_PADDING_END }) + .padding({ + left: this.isVertical ? Constants.PADDING_8 : Constants.DEFAULT_PADDING_START, + right: this.isVertical ? Constants.PADDING_8 : Constants.DEFAULT_PADDING_END + }) } @Builder PermissionListItemLayout(item: GroupRecordInfo, index: number) { @@ -90,35 +93,37 @@ struct permissionRecordPage { Row() { Image(item.icon) .fillColor($r('sys.color.icon_secondary')) - .customizeImage(Constants.MANAGEMENT_IMAGE_WIDTH, Constants.MANAGEMENT_IMAGE_HEIGHT) + .customizeImage(Constants.IMAGE_LENGTH_24, Constants.IMAGE_LENGTH_24) .margin({ - right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT_RECORD, - left: Constants.MANAGEMENT_IMAGE_MARGIN_LEFT + right: Constants.MARGIN_24, + left: Constants.MARGIN_8 }) Column() { Text(item.groupName) .width(Constants.MAXIMUM_HEADER_WIDTH) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) - .lineHeight(Constants.TEXT_LINE_HEIGHT) - .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) + .margin({ bottom: Constants.MARGIN_2 }) Text($r('app.string.visits', String(item.sum))) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) - }.flexGrow(Constants.FLEX_GROW) + .lineHeight(Constants.TEXT_LINE_HEIGHT_19) + } + .flexGrow(Constants.FLEX_GROW) .alignItems(HorizontalAlign.Start) Image(index == this.permissionIndex ? $r('app.media.xiangshangjiantou') : $r('app.media.xiangxiajiantou')) .fillColor($r('sys.color.icon_secondary')) - .customizeImage(Constants.IMAGE_WIDTH_RECORD, Constants.IMAGE_HEIGHT_RECORD) + .customizeImage(Constants.IMAGE_LENGTH_24, Constants.IMAGE_LENGTH_12) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_HEIGHT_PERMISSION) + .height(Constants.HEIGHT_64) } - }.onClick(() => { + } + .onClick(() => { this.permissionIndex = this.permissionIndex == index ? -1 : index this.permissionApplications = this.applicationInfos.filter((appInfo) => { return appInfo.groupNames.includes(item.groupName); @@ -131,8 +136,8 @@ struct permissionRecordPage { ListItem() { Row() { Image(permissionApplication.icon) - .customizeImage(Constants.APPLICATION_IMAGE_WIDTH, Constants.APPLICATION_IMAGE_HEIGHT) - .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT }) + .customizeImage(Constants.IMAGE_LENGTH_40, Constants.IMAGE_LENGTH_40) + .margin({ right: Constants.MARGIN_16 }) Column() { Row().width(Constants.FULL_WIDTH).height(Constants.DIVIDER) .backgroundColor($r('sys.color.comp_divider')) @@ -141,26 +146,28 @@ struct permissionRecordPage { .width(Constants.MAXIMUM_HEADER_WIDTH) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) - .lineHeight(Constants.TEXT_LINE_HEIGHT) - .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) + .margin({ bottom: Constants.MARGIN_2 }) Text( $r('app.string.recent_visit', String(this.getAppRecords(permissionApplication, item.groupName, true)), this.getTime(this.getAppRecords(permissionApplication, item.groupName, false))) ) - .padding({ right: Constants.LISTITEM_PADDING_RIGHT_RECORD }) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .padding({ right: Constants.PADDING_50 }) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) - }.alignItems(HorizontalAlign.Start) + .lineHeight(Constants.TEXT_LINE_HEIGHT_19) + } + .alignItems(HorizontalAlign.Start) .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .justifyContent(FlexAlign.Center) } - }.height(Constants.LISTITEM_HEIGHT_APPLICATION) + } + .height(Constants.HEIGHT_72) .onClick(() => { let info: AppInfoSimple = new AppInfoSimple( permissionApplication.name, @@ -206,8 +213,9 @@ struct permissionRecordPage { } } } - }.padding(Constants.LIST_PADDING_TOP) - .margin({ bottom: Constants.LISTITEM_MARGIN_BOTTOM }) + } + .padding(Constants.PADDING_4) + .margin({ bottom: Constants.DEFAULT_MARGIN_BOTTOM }) .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) } @@ -219,41 +227,43 @@ struct permissionRecordPage { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { Image(item.icon) - .customizeImage(Constants.APPLICATION_IMAGE_WIDTH, Constants.APPLICATION_IMAGE_HEIGHT) - .margin({ right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT }) + .customizeImage(Constants.IMAGE_LENGTH_40, Constants.IMAGE_LENGTH_40) + .margin({ right: Constants.MARGIN_16 }) Column() { Text(item.groupName) .width(Constants.MAXIMUM_HEADER_WIDTH) .maxLines(Constants.MAXIMUM_HEADER_LINES) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) - .lineHeight(Constants.TEXT_LINE_HEIGHT) - .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) + .margin({ bottom: Constants.MARGIN_2 }) Row() { ForEach(item.permissions, (permission: AppGroupRecordInfo) => { Image(permission.icon) .fillColor($r('sys.color.icon_secondary')) .customizeImage( - Constants.IMAGE_WIDTH_RECORD_APPLICATION, - Constants.IMAGE_HEIGHT_RECORD_APPLICATION + Constants.IMAGE_LENGTH_16, + Constants.IMAGE_LENGTH_16 ) - .margin({ right: Constants.APPLICATION_TEXT_MARGIN_RIGHT }) + .margin({ right: Constants.MARGIN_4 }) }, (item: AppGroupRecordInfo) => JSON.stringify(item)) } - }.flexGrow(Constants.FLEX_GROW) + } + .flexGrow(Constants.FLEX_GROW) .alignItems(HorizontalAlign.Start) Image( index == this.applicationIndex ? $r('app.media.xiangshangjiantou') : $r('app.media.xiangxiajiantou') ) .fillColor($r('sys.color.icon_secondary')) - .customizeImage(Constants.IMAGE_WIDTH_RECORD, Constants.IMAGE_HEIGHT_RECORD) + .customizeImage(Constants.IMAGE_LENGTH_24, Constants.IMAGE_LENGTH_12) } .width(Constants.FULL_WIDTH) - .height(Constants.LISTITEM_HEIGHT_APPLICATION) + .height(Constants.HEIGHT_72) } - }.onClick(() => { + } + .onClick(() => { this.applicationIndex = this.applicationIndex == index ? -1 : index }) .padding({ left: $r('sys.float.ohos_id_card_margin_start'), right: $r('sys.float.ohos_id_card_margin_end') }) @@ -264,32 +274,34 @@ struct permissionRecordPage { Row() { Image(permission.icon) .fillColor($r('sys.color.icon_secondary')) - .customizeImage(Constants.MANAGEMENT_IMAGE_WIDTH, Constants.MANAGEMENT_IMAGE_HEIGHT) + .customizeImage(Constants.IMAGE_LENGTH_24, Constants.IMAGE_LENGTH_24) .margin({ - right: Constants.MANAGEMENT_IMAGE_MARGIN_RIGHT_RECORD, - left: Constants.MANAGEMENT_IMAGE_MARGIN_LEFT + right: Constants.MARGIN_24, + left: Constants.MARGIN_8 }) Column() { Row().width(Constants.FULL_WIDTH).height(Constants.DIVIDER) .backgroundColor($r('sys.color.comp_divider')) .position({ x: 0, y: 0 }) Text(permission.groupName) - .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_16) .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) - .lineHeight(Constants.TEXT_LINE_HEIGHT) - .margin({ bottom: Constants.TERTIARY_LABEL_MARGIN_BOTTOM }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_22) + .margin({ bottom: Constants.MARGIN_2 }) 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) + .padding({ right: Constants.PADDING_50 }) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) - }.alignItems(HorizontalAlign.Start) + .lineHeight(Constants.TEXT_LINE_HEIGHT_19) + } + .alignItems(HorizontalAlign.Start) .height(Constants.FULL_HEIGHT) .width(Constants.FULL_WIDTH) .justifyContent(FlexAlign.Center) } - }.height(Constants.LISTITEM_HEIGHT_PERMISSION) + } + .height(Constants.HEIGHT_64) .onClick(() => { let info: AppInfoSimple = new AppInfoSimple( item.name, @@ -335,8 +347,9 @@ struct permissionRecordPage { } } } - }.padding(Constants.LIST_PADDING_TOP) - .margin({ bottom: Constants.LISTITEM_MARGIN_BOTTOM }) + } + .padding(Constants.PADDING_4) + .margin({ bottom: Constants.DEFAULT_MARGIN_BOTTOM }) .backgroundColor($r('sys.color.comp_background_list_card')) .borderRadius($r('sys.float.ohos_id_corner_radius_card')) } @@ -359,11 +372,12 @@ struct permissionRecordPage { Flex({ justifyContent: FlexAlign.Start }) { Text($r('app.string.record_time_limit')) .margin({ left: Constants.DEFAULT_MARGIN_START }) - .fontSize(Constants.TEXT_SMALL_FONT_SIZE) + .fontSize(Constants.FONT_SIZE_14) .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 }) + .lineHeight(Constants.TEXT_LINE_HEIGHT_24) + } + .constraintSize({ minHeight: Constants.MIN_HEIGHT_48 }) + .padding({ top: Constants.PADDING_16, bottom: Constants.PADDING_8 }) if (this.groups.length) { Stack() { Tabs() { @@ -376,18 +390,23 @@ struct permissionRecordPage { ForEach(this.groups, (item: GroupRecordInfo, index) => { this.PermissionListItemLayout(item, index as number) }, (item: GroupRecordInfo) => JSON.stringify(item)) - }.padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) + } + .padding({ top: Constants.PADDING_4, bottom: Constants.PADDING_4 }) .height(Constants.FULL_HEIGHT) - }.padding({ - left: Constants.MANAGEMENT_ROW_PADDING_LEFT, - right: Constants.MANAGEMENT_ROW_PADDING_RIGHT, - top: Constants.MANAGEMENT_ROW_PADDING_TOP, - bottom: Constants.MANAGEMENT_ROW_PADDING_BOTTOM + } + .padding({ + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END, + top: Constants.MARGIN_8, + bottom: Constants.PADDING_50 }) - }.scrollBar(BarState.Off) - }.width(Constants.FULL_WIDTH) + } + .scrollBar(BarState.Off) + } + .width(Constants.FULL_WIDTH) } - }.tabBar(this.TabBuilder(0)) + } + .tabBar(this.TabBuilder(0)) TabContent() { Row() { Column() { @@ -399,40 +418,48 @@ struct permissionRecordPage { this.ApplicationListItemLayout(item, index as number) }, (item: AppRecordInfo) => JSON.stringify(item)) } - .padding({ top: Constants.LIST_PADDING_TOP, bottom: Constants.LIST_PADDING_BOTTOM }) + .padding({ top: Constants.PADDING_4, bottom: Constants.PADDING_4 }) .height(Constants.FULL_HEIGHT) } - }.padding({ - left: Constants.MANAGEMENT_ROW_PADDING_LEFT, - right: Constants.MANAGEMENT_ROW_PADDING_RIGHT, - top: Constants.MANAGEMENT_ROW_PADDING_TOP, - bottom: Constants.MANAGEMENT_ROW_PADDING_BOTTOM + } + .padding({ + left: Constants.DEFAULT_PADDING_START, + right: Constants.DEFAULT_PADDING_END, + top: Constants.MARGIN_8, + bottom: Constants.PADDING_50 }) - }.scrollBar(BarState.Off) - }.width(Constants.FULL_WIDTH) + } + .scrollBar(BarState.Off) + } + .width(Constants.FULL_WIDTH) } - }.tabBar(this.TabBuilder(1)) + } + .tabBar(this.TabBuilder(1)) } .barMode(BarMode.Fixed) - .barWidth(Constants.BAR_WIDTH) + .barWidth(Constants.WIDTH_250) .onChange((index) => { this.currentIndex = index; if (!this.show) { this.show = true; } }) - }.height(Constants.FULL_HEIGHT) + } + .height(Constants.FULL_HEIGHT) } else { Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center, direction: FlexDirection.Column }) { Image($r('app.media.noRecord')) - .customizeImage(Constants.NORECORD_IMAGE_WIDTH, Constants.NORECORD_IMAGE_HEIGHT) - .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) + .customizeImage(Constants.IMAGE_LENGTH_120, Constants.IMAGE_LENGTH_120) + .margin({ left: Constants.MARGIN_40 }) + Text($r('app.string.no_record')) + .margin({ top: Constants.MARGIN_16 }) + .fontSize(Constants.FONT_SIZE_14) .fontColor($r('sys.color.font_secondary')) - }.width(Constants.FULL_WIDTH).height(Constants.FULL_HEIGHT) + } + .width(Constants.FULL_WIDTH) + .height(Constants.FULL_HEIGHT) .padding({ bottom: Constants.RECORD_PADDING_BOTTOM }) } } @@ -445,7 +472,8 @@ struct permissionRecordPage { .width(Constants.FULL_WIDTH) .backgroundColor($r('sys.color.background_secondary')) } - }.backgroundColor($r('sys.color.background_secondary')) + } + .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 803443e..0f6bf78 100644 --- a/permissionmanager/src/main/ets/pages/securityDialog.ets +++ b/permissionmanager/src/main/ets/pages/securityDialog.ets @@ -102,14 +102,14 @@ struct SecurityDialog { Column() { Column() { SymbolGlyph($r('sys.symbol.person_shield_fill')) - .width(Constants.SECURITY_ICON_WIDTH) - .height(Constants.SECURITY_ICON_HEIGHT) - .fontSize(Constants.FONT_SIZE_28) + .width(Constants.IMAGE_LENGTH_48) + .height(Constants.IMAGE_LENGTH_48) + .fontSize(Constants.FONT_SIZE_28_vp) .fontColor([$r('sys.color.brand')]) .border({ width: Constants.BORDER_WIDTH_1, color: $r('app.color.icon_border'), - radius: Constants.SECURITY_ICON_WIDTH * 14 / 54 + radius: Constants.IMAGE_LENGTH_48 * 14 / 54 }) .padding(Constants.PADDING_10) if (this.index === 1) { @@ -127,7 +127,7 @@ struct SecurityDialog { SymbolGlyph($r('sys.symbol.local_fill')) .width(Constants.IMAGE_LENGTH_20) .height(Constants.IMAGE_LENGTH_20) - .fontSize(Constants.FONT_SIZE_12) + .fontSize(Constants.FONT_SIZE_12_vp) .fontColor([Color.White]) .backgroundColor($r('app.color.local_background_color')) .padding(Constants.PADDING_4) @@ -149,22 +149,22 @@ struct SecurityDialog { .fontSize($r('sys.float.Title_S')) .fontWeight(FontWeight.Bold) .textOverflow({ overflow: TextOverflow.Ellipsis }) - .maxLines(Constants.SECURITY_HEADER_MAX_LINES) + .maxLines(Constants.DIALOG_TITLE_MAX_LINES) .minFontSize( getLimitFontSize(getFontSizeScale(), - Constants.SECURITY_HEADER_MAX_SCALE, + Constants.DIALOG_TITLE_MAX_SCALE, $r('sys.float.Subtitle_M'), $r('sys.float.Title_S')) ) .maxFontSize( getLimitFontSize(getFontSizeScale(), - Constants.SECURITY_HEADER_MAX_SCALE, + Constants.DIALOG_TITLE_MAX_SCALE, $r('sys.float.Title_S'), $r('sys.float.Title_S')) ) .heightAdaptivePolicy(TextHeightAdaptivePolicy.MIN_FONT_SIZE_FIRST) } - .constraintSize({ minHeight: Constants.HEADLINE_HEIGHT }) + .constraintSize({ minHeight: Constants.MIN_HEIGHT_56 }) .justifyContent(FlexAlign.Center) .padding({ top: Constants.DEFAULT_PADDING_TOP, @@ -175,7 +175,7 @@ struct SecurityDialog { .textAlign(TextAlign.Start) .fontColor($r('sys.color.font_primary')) .fontSize($r('sys.float.Body_L')) - .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT) + .lineHeight(Constants.TEXT_LINE_HEIGHT_19) .maxFontScale(Constants.DIALOG_TEXT_MAX_SCALE) } } -- Gitee