diff --git a/permissionmanager/src/main/ets/common/components/backBar.ets b/permissionmanager/src/main/ets/common/components/backBar.ets index fe38dca04ae2249649335a5ce905dfe6191475d8..79aab9ca15865c6a6cda614555745f3abee112fc 100644 --- a/permissionmanager/src/main/ets/common/components/backBar.ets +++ b/permissionmanager/src/main/ets/common/components/backBar.ets @@ -31,21 +31,17 @@ export struct backBar { Column() { Flex({ justifyContent: FlexAlign.Start, alignItems: ItemAlign.Center }) { Row() { - Image($r('app.media.ic_public_back')) - .fillColor($r('sys.color.icon_primary')) - .objectFit(ImageFit.Contain) - .height(Constants.BACKBAR_IMAGE_HEIGHT) + SymbolGlyph($r('sys.symbol.arrow_left')) .width(Constants.BACKBAR_IMAGE_WIDTH) - .draggable(false) + .height(Constants.BACKBAR_IMAGE_HEIGHT) + .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) .borderRadius($r('sys.float.ohos_id_corner_radius_clicked')) .alignItems(VerticalAlign.Center) .justifyContent(FlexAlign.Center) - .margin({ - left: Constants.DEFAULT_MARGIN_START, - right: Constants.BACKBAR_MARGIN_RIGHT - }) .backgroundColor(this.isBack ? $r('sys.color.interactive_click') : '') .onTouch(event => { if (event === undefined) { @@ -70,6 +66,7 @@ export struct backBar { .fontSize(Constants.TEXT_BIG_FONT_SIZE) .flexGrow(Constants.FLEX_GROW) .fontWeight(FontWeight.Bold) + .margin({ left: Constants.MARGIN_4, right: Constants.MARGIN_4 }) if (this.recordable) { Row() { Image($r('sys.media.ohos_ic_public_more')) @@ -83,9 +80,6 @@ export struct backBar { .borderRadius($r('sys.float.ohos_id_corner_radius_clicked')) .alignItems(VerticalAlign.Center) .justifyContent(FlexAlign.Center) - .margin({ - right: Constants.DEFAULT_MARGIN_END - }) .bindMenu(this.MenuBuilder()) .backgroundColor(this.isMore ? $r('sys.color.interactive_click') : '') .onTouch(event => { @@ -101,6 +95,7 @@ export struct backBar { }) } } + .margin({ left: Constants.DEFAULT_MARGIN_START, right: Constants.DEFAULT_MARGIN_END }) } .height(Constants.BACKBAR_HEIGHT) .constraintSize({ minHeight: Constants.BACKBAR_MINHEIGHT }) diff --git a/permissionmanager/src/main/ets/common/utils/constant.ets b/permissionmanager/src/main/ets/common/utils/constant.ets index e40a208482ebaaeb3db2805e564988806f6083c3..15552bc6a2cfb5703c5994d308511c0c00068fa7 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -72,6 +72,8 @@ export default class Constants { public static TEXT_SMALL_FONT_SIZE = 14; public static TEXT_SMALLER_FONT_SIZE = 12; public static FONT_SIZE_12 = '12vp'; + public static FONT_SIZE_18_vp = '18vp'; + public static FONT_SIZE_24_vp = '24vp'; public static FONT_SIZE_28 = '28vp'; public static TEXT_LINE_HEIGHT = 22; public static TEXT_LINE_HEIGHT_24 = 24; diff --git a/permissionmanager/src/main/ets/pages/application-secondary.ets b/permissionmanager/src/main/ets/pages/application-secondary.ets index 7d036fd3552f016cbfcf87749ab574f94798d9ad..0887bc06e3d3cc83988e588ae7d79d3c866f903c 100644 --- a/permissionmanager/src/main/ets/pages/application-secondary.ets +++ b/permissionmanager/src/main/ets/pages/application-secondary.ets @@ -57,12 +57,12 @@ struct appNamePlusPage { .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.icon_tertiary')) - .objectFit(ImageFit.Contain) - .height(Constants.IMAGE_HEIGHT) + SymbolGlyph($r('sys.symbol.chevron_forward')) .width(Constants.IMAGE_WIDTH) - .draggable(false) + .height(Constants.IMAGE_HEIGHT) + .fontSize(Constants.FONT_SIZE_18_vp) + .fontColor([$r('sys.color.icon_tertiary')]) + .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) .height(Constants.LISTITEM_ROW_HEIGHT) diff --git a/permissionmanager/src/main/ets/pages/authority-management.ets b/permissionmanager/src/main/ets/pages/authority-management.ets index c6443ee2f503b2e47196c4cf10bbd10df8de0f16..882f59bd069254f750ff2eaaad26ceeeb07f80d9 100644 --- a/permissionmanager/src/main/ets/pages/authority-management.ets +++ b/permissionmanager/src/main/ets/pages/authority-management.ets @@ -58,9 +58,12 @@ struct authorityManagementPage { .fontWeight(FontWeight.Medium) .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.icon_tertiary')) - .customizeImage(Constants.IMAGE_WIDTH, Constants.IMAGE_HEIGHT) + SymbolGlyph($r('sys.symbol.chevron_forward')) + .width(Constants.IMAGE_WIDTH) + .height(Constants.IMAGE_HEIGHT) + .fontSize(Constants.FONT_SIZE_18_vp) + .fontColor([$r('sys.color.icon_tertiary')]) + .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) .height(Constants.MANAGEMENT_ROW_HEIGHT) @@ -591,9 +594,12 @@ struct applicationItem { .fontSize(Constants.TEXT_SMALL_FONT_SIZE) .fontColor($r('sys.color.font_secondary')) .margin({ right: Constants.APPLICATION_TEXT_MARGIN_RIGHT }) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.icon_tertiary')) - .customizeImage(Constants.IMAGE_WIDTH, Constants.IMAGE_HEIGHT) + SymbolGlyph($r('sys.symbol.chevron_forward')) + .width(Constants.IMAGE_WIDTH) + .height(Constants.IMAGE_HEIGHT) + .fontSize(Constants.FONT_SIZE_18_vp) + .fontColor([$r('sys.color.icon_tertiary')]) + .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) .height(Constants.AUTHORITY_ROW_HEIGHT) diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index 4772e9ee2ce9b56e967001d51c545dc88f0099bb..9912b43a4f80b8d988de38884afd7abf9ac25c71 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -71,12 +71,12 @@ struct appNameItem { .fontColor($r('sys.color.font_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.icon_tertiary')) - .objectFit(ImageFit.Contain) - .height(Constants.IMAGE_HEIGHT) + SymbolGlyph($r('sys.symbol.chevron_forward')) .width(Constants.IMAGE_WIDTH) - .draggable(false) + .height(Constants.IMAGE_HEIGHT) + .fontSize(Constants.FONT_SIZE_18_vp) + .fontColor([$r('sys.color.icon_tertiary')]) + .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) .height(Constants.LISTITEM_ROW_HEIGHT) @@ -164,7 +164,7 @@ struct appNameItem { endMargin: Constants.DEFAULT_MARGIN_END }) }.margin({ top: Constants.ROW_MARGIN_TOP }) - .padding({ left: Constants.LIST_PADDING_LEFT, right: Constants.LISTITEM_PADDING_RIGHT }) + .padding({ left: Constants.LIST_PADDING_LEFT, 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 17382e75b2a785de650398a01fc5e257285f67b2..888075cca5651b747c528c501b76f0d7ee77b005 100644 --- a/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets +++ b/permissionmanager/src/main/ets/pages/authority-tertiary-groups.ets @@ -334,12 +334,12 @@ struct applicationItem { .fontColor($r('sys.color.font_secondary')) .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) } - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.icon_tertiary')) - .objectFit(ImageFit.Contain) + SymbolGlyph($r('sys.symbol.chevron_forward')) .width(Constants.IMAGE_WIDTH) .height(Constants.IMAGE_HEIGHT) - .draggable(false) + .fontSize(Constants.FONT_SIZE_18_vp) + .fontColor([$r('sys.color.icon_tertiary')]) + .fontWeight(FontWeight.Medium) } } .width(Constants.FULL_WIDTH) diff --git a/permissionmanager/src/main/ets/pages/other-permissions.ets b/permissionmanager/src/main/ets/pages/other-permissions.ets index 7e29d5668af3f887eb0960b04a025587bac71c83..70161a72b8f5e1fbd58d3a1755061f31f6e1fa35 100644 --- a/permissionmanager/src/main/ets/pages/other-permissions.ets +++ b/permissionmanager/src/main/ets/pages/other-permissions.ets @@ -93,12 +93,12 @@ struct appNameItem { .fontSize(Constants.TEXT_MIDDLE_FONT_SIZE) .fontColor($r('sys.color.font_primary')) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.icon_tertiary')) - .objectFit(ImageFit.Contain) - .height(Constants.IMAGE_HEIGHT) + SymbolGlyph($r('sys.symbol.chevron_forward')) .width(Constants.IMAGE_WIDTH) - .draggable(false) + .height(Constants.IMAGE_HEIGHT) + .fontSize(Constants.FONT_SIZE_18_vp) + .fontColor([$r('sys.color.icon_tertiary')]) + .fontWeight(FontWeight.Medium) } .width(Constants.FULL_WIDTH) .height(Constants.LISTITEM_ROW_HEIGHT) diff --git a/permissionmanager/src/main/resources/ug/element/string.json b/permissionmanager/src/main/resources/ug/element/string.json index f1739f99fde7d4648dce7f2e62fbc41cb26157bd..a2b23a62336e799c1919f7e451e42e69ed505699 100644 --- a/permissionmanager/src/main/resources/ug/element/string.json +++ b/permissionmanager/src/main/resources/ug/element/string.json @@ -162,7 +162,7 @@ }, { "name":"pasteBoard_app", - "value":"مەزمۇن مەنبەسى: %s." + "value":"مەزمۇن مەنبەسى: %s. " } ] } \ No newline at end of file