From 04dc9d37b3553917b417eec302928c727768ed8a Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Sat, 14 Sep 2024 14:10:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=8C=91=E5=8D=955.0release?= =?UTF-8?q?=E3=80=91LT=E6=88=AA=E5=9B=BE=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fanchenxuan --- .../main/ets/common/components/backBar.ets | 19 +++++++------------ .../src/main/ets/common/utils/constant.ets | 2 ++ .../main/ets/pages/application-secondary.ets | 10 +++++----- .../main/ets/pages/authority-management.ets | 18 ++++++++++++------ .../main/ets/pages/authority-secondary.ets | 12 ++++++------ .../ets/pages/authority-tertiary-groups.ets | 8 ++++---- .../src/main/ets/pages/other-permissions.ets | 10 +++++----- .../main/resources/bo_CN/element/string.json | 15 ++++++++++++--- .../src/main/resources/ug/element/string.json | 2 +- 9 files changed, 54 insertions(+), 42 deletions(-) diff --git a/permissionmanager/src/main/ets/common/components/backBar.ets b/permissionmanager/src/main/ets/common/components/backBar.ets index 5cda7e1..7353ea7 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.ohos_id_color_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.ohos_id_color_click_effect') : '') .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.ohos_id_color_click_effect') : '') .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 29bd8a1..368692b 100644 --- a/permissionmanager/src/main/ets/common/utils/constant.ets +++ b/permissionmanager/src/main/ets/common/utils/constant.ets @@ -71,6 +71,8 @@ export default class Constants { public static TEXT_MIDDLE_FONT_SIZE = 16; public static TEXT_SMALL_FONT_SIZE = 14; public static TEXT_SMALLER_FONT_SIZE = 12; + public static FONT_SIZE_18_vp = '18vp'; + public static FONT_SIZE_24_vp = '24vp'; public static FONT_SIZE_28 = 28; 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 27774b4..0d30e38 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.ohos_id_color_text_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_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 baeaa21..714b16a 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.ohos_id_color_text_primary')) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_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.ohos_id_color_text_secondary')) .margin({ right: Constants.APPLICATION_TEXT_MARGIN_RIGHT }) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_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 caa90d2..f31db23 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.ohos_id_color_text_primary')) .fontWeight(FontWeight.Medium) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_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 16f8f38..4ed5a33 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.ohos_id_color_text_secondary')) .margin({ right: Constants.AUTHORITY_IMAGE_MARGIN_RIGHT }) } - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_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 ab25098..87c7ff3 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.ohos_id_color_text_primary')) .flexGrow(Constants.FLEX_GROW) - Image($r('app.media.ic_public_arrow_right')) - .fillColor($r('sys.color.ohos_id_color_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/bo_CN/element/string.json b/permissionmanager/src/main/resources/bo_CN/element/string.json index 8f193e8..da5a95f 100644 --- a/permissionmanager/src/main/resources/bo_CN/element/string.json +++ b/permissionmanager/src/main/resources/bo_CN/element/string.json @@ -50,7 +50,10 @@ }, { "name":"ban", - "value":"བཀག་འགོག" + "value":"མི་ཆོག", + "attr":{ + "priority":"LT" + } }, { "name":"group_label_document_folder", @@ -78,7 +81,10 @@ }, { "name":"per_inquiry", - "value":"ཐེངས་སོ་སོར་བློ་འདྲི་བ།" + "value":"ཐེངས་རེར་བློ་འདྲི་བ།", + "attr":{ + "priority":"LT" + } }, { "name":"group_label_download_folder", @@ -94,7 +100,10 @@ }, { "name":"This_time_only", - "value":"ཐེངས་གཅིག་ཁ་ནར་ཆོག་པ།" + "value":"ཐེངས་འདི་ཁ་ོནར་ཆོག་པ།", + "attr":{ + "priority":"LT" + } }, { "name":"group_label_health", diff --git a/permissionmanager/src/main/resources/ug/element/string.json b/permissionmanager/src/main/resources/ug/element/string.json index f1739f9..a2b23a6 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 -- Gitee From b2b5cd5a7783ba20f707297773f5bffc208d7aed Mon Sep 17 00:00:00 2001 From: fanchenxuan Date: Sat, 14 Sep 2024 07:05:25 +0000 Subject: [PATCH 2/2] update permissionmanager/src/main/ets/pages/authority-secondary.ets. Signed-off-by: fanchenxuan --- permissionmanager/src/main/ets/pages/authority-secondary.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/permissionmanager/src/main/ets/pages/authority-secondary.ets b/permissionmanager/src/main/ets/pages/authority-secondary.ets index f31db23..35dec42 100644 --- a/permissionmanager/src/main/ets/pages/authority-secondary.ets +++ b/permissionmanager/src/main/ets/pages/authority-secondary.ets @@ -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.DEFAULT_PADDING_END }) + .padding({ left: Constants.LIST_PADDING_LEFT, right: Constants.DEFAULT_PADDING_END }) } .width(Constants.FULL_WIDTH) .height(Constants.FULL_HEIGHT) -- Gitee