diff --git a/certmanager/src/main/ets/common/util/AlignUtils.ets b/certmanager/src/main/ets/common/util/AlignUtils.ets new file mode 100644 index 0000000000000000000000000000000000000000..325250fa7c211ab949b87e719615ff294147409c --- /dev/null +++ b/certmanager/src/main/ets/common/util/AlignUtils.ets @@ -0,0 +1,35 @@ +/** + * Copyright (c) 2025-2025 Huawei Device Co., Ltd. + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import Configuration, { LocaleResponse } from '@system.configuration' +import hilog from '@ohos.hilog'; + +const DOMAIN = 0x0000; +const TAG = 'AlignUtils'; + +export class AlignUtils { + public static isRtl(): boolean { + let isRtl: boolean = false; + try { + let localInfo: LocaleResponse = Configuration.getLocale(); + if (localInfo !== undefined && localInfo !== null) { + isRtl = localInfo.dir === 'rtl'; + } + } catch (error) { + hilog.error(DOMAIN, TAG, `get local error, code: ${error?.code}, message: ${error?.message}`); + } + return isRtl; + } +} \ No newline at end of file diff --git a/certmanager/src/main/ets/model/CertMangerModel.ets b/certmanager/src/main/ets/model/CertMangerModel.ets index 23f48526d718a4b003d0c8ec08475ecebf9ee8ed..5629925ab1584ad1bdb41132cca8253d5460c20b 100755 --- a/certmanager/src/main/ets/model/CertMangerModel.ets +++ b/certmanager/src/main/ets/model/CertMangerModel.ets @@ -325,6 +325,47 @@ export class CertMangerModel { } } + private setSubjectName(result: CertManager.CMResult, subjectNameMap: Map) { + if (result.certInfo === undefined) { + return; + } + if (result.certInfo.subjectName.length !== 0) { + let regex1: RegExp = new RegExp('(?<=CN=).*?(?=,)', 'g'); + let regex2: RegExp = new RegExp('(?<=OU=).*?(?=,)', 'g'); + let regex3: RegExp = new RegExp('(?<=O=).*', 'g'); + let subjectNameCN = result.certInfo.subjectName.match(regex1); + console.info('subjectNameCN is:' + subjectNameCN); + let subjectNameOU = result.certInfo.subjectName.match(regex2); + console.info('subjectNameOU is:' + subjectNameOU); + let subjectNameO = result.certInfo.subjectName.match(regex3); + console.info('subjectNameO is:' + subjectNameO); + subjectNameMap.set('常用名称:', String(subjectNameCN)); + subjectNameMap.set('组织:', String(subjectNameO)); + subjectNameMap.set('组织单位:', String(subjectNameOU)); + subjectNameMap.set('序列号:', String(result.certInfo.serial)); + } + } + + private setIssuerName(result: CertManager.CMResult, issuerNameMap: Map) { + if (result.certInfo === undefined) { + return; + } + if (result.certInfo.issuerName.length !== 0) { + let regex1: RegExp = new RegExp('(?<=CN=).*?(?=,)', 'g'); + let regex2: RegExp = new RegExp('(?<=OU=).*?(?=,)', 'g'); + let regex3: RegExp = new RegExp('(?<=O=).*', 'g'); + let issuerNameCN = result.certInfo.issuerName.match(regex1); + console.info('issuerNameCN is:' + issuerNameCN); + let issuerNameOU = result.certInfo.issuerName.match(regex2); + console.info('issuerNameOU is:' + issuerNameOU); + let issuerNameO = result.certInfo.issuerName.match(regex3); + console.info('issuerNameO is:' + issuerNameO); + issuerNameMap.set('常用名称:', String(issuerNameCN)); + issuerNameMap.set('组织:', String(issuerNameO)); + issuerNameMap.set('组织单位:', String(issuerNameOU)); + } + } + private async getSystemTrustedCertificate(certUri: string, callback: Function): Promise { console.info(TAG + 'getSystemTrustedCertificate start'); try { @@ -332,34 +373,10 @@ export class CertMangerModel { let subjectNameMap: Map = new Map(); let issuerNameMap: Map = new Map(); let dateMap: Map = new Map(); - let regex1: RegExp = new RegExp('(?<=CN=).*?(?=,)', 'g'); - let regex2: RegExp = new RegExp('(?<=OU=).*?(?=,)', 'g'); - let regex3: RegExp = new RegExp('(?<=O=).*', 'g'); if (result.certInfo !== undefined) { - if (result.certInfo.subjectName.length !== 0) { - let subjectNameCN = result.certInfo.subjectName.match(regex1); - console.info('subjectNameCN is:' + subjectNameCN); - let subjectNameOU = result.certInfo.subjectName.match(regex2); - console.info('subjectNameOU is:' + subjectNameOU); - let subjectNameO = result.certInfo.subjectName.match(regex3); - console.info('subjectNameO is:' + subjectNameO); - subjectNameMap.set('常用名称:', String(subjectNameCN)); - subjectNameMap.set('组织:', String(subjectNameO)); - subjectNameMap.set('组织单位:', String(subjectNameOU)); - subjectNameMap.set('序列号:', String(result.certInfo.serial)); - } - if (result.certInfo.issuerName.length !== 0) { - let issuerNameCN = result.certInfo.issuerName.match(regex1); - console.info('issuerNameCN is:' + issuerNameCN); - let issuerNameOU = result.certInfo.issuerName.match(regex2); - console.info('issuerNameOU is:' + issuerNameOU); - let issuerNameO = result.certInfo.issuerName.match(regex3); - console.info('issuerNameO is:' + issuerNameO); - issuerNameMap.set('常用名称:', String(issuerNameCN)); - issuerNameMap.set('组织:', String(issuerNameO)); - issuerNameMap.set('组织单位:', String(issuerNameOU)); - } + this.setSubjectName(result, subjectNameMap); + this.setIssuerName(result, issuerNameMap); dateMap.set('颁发时间:', String(result.certInfo.notBefore)); dateMap.set('有效期至:', String(result.certInfo.notAfter)); @@ -426,29 +443,8 @@ export class CertMangerModel { let regex3: RegExp = new RegExp('(?<=O=).*', 'g'); if (result.certInfo !== undefined) { - if (result.certInfo.subjectName.length !== 0) { - let subjectNameCN = result.certInfo.subjectName.match(regex1); - console.info('subjectNameCN is:' + subjectNameCN); - let subjectNameOU = result.certInfo.subjectName.match(regex2); - console.info('subjectNameOU is:' + subjectNameOU); - let subjectNameO = result.certInfo.subjectName.match(regex3); - console.info('SubjectNameO is:' + subjectNameO); - subjectNameMap.set('常用名称:', String(subjectNameCN)); - subjectNameMap.set('组织:', String(subjectNameO)); - subjectNameMap.set('组织单位:', String(subjectNameOU)); - subjectNameMap.set('序列号:', String(result.certInfo.serial)); - } - if (result.certInfo.issuerName.length !== 0) { - let issuerNameCN = result.certInfo.issuerName.match(regex1); - console.info('issuerNameCN is:' + issuerNameCN); - let issuerNameOU = result.certInfo.issuerName.match(regex2); - console.info('issuerNameOU is:' + issuerNameOU); - let issuerNameO = result.certInfo.issuerName.match(regex3); - console.info('issuerNameO is:' + issuerNameO); - issuerNameMap.set('常用名称:', String(issuerNameCN)); - issuerNameMap.set('组织:', String(issuerNameO)); - issuerNameMap.set('组织单位:', String(issuerNameOU)); - } + this.setSubjectName(result, subjectNameMap); + this.setIssuerName(result, issuerNameMap); dateMap.set('颁发时间:', String(result.certInfo.notBefore)); dateMap.set('有效期至:', String(result.certInfo.notAfter)); let certData: Uint8Array = result.certInfo.cert; diff --git a/certmanager/src/main/ets/pages/cerEvidenceFa.ets b/certmanager/src/main/ets/pages/cerEvidenceFa.ets index f5b4058d7dbf4457f035e4c2c5dc8305f2a7d861..47ed51d82d3a207efb87263de8a9961aa0d440f6 100755 --- a/certmanager/src/main/ets/pages/cerEvidenceFa.ets +++ b/certmanager/src/main/ets/pages/cerEvidenceFa.ets @@ -28,6 +28,7 @@ import { CredSystemDetailParam } from './detail/CredSystemDetailPage'; import { CredUserDetailParam } from './detail/CredUserDetailPage'; import { SheetParam } from '../common/util/SheetParam'; import { DialogComponent } from './detail/AuthorizedAppManagementPage'; +import { AlignUtils } from '../common/util/AlignUtils'; const COPIES_NUM: number = 12; @@ -111,7 +112,10 @@ export struct componentPublic { contentBuilder: () => { this.credDetailContent(); }, - contentAreaPadding: { right: $r('app.float.wh_value_0') }, + contentAreaPadding: { + left: $r('app.float.wh_value_0'), + right: $r('app.float.wh_value_0') + }, buttons: [ { value: $r('app.string.publicDetailsCancel'), @@ -219,20 +223,12 @@ export struct componentPublic { .fontSize($r('sys.float.ohos_id_text_size_dialog_tittle')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Medium) - .margin({ - left: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') - }) .alignSelf(ItemAlign.Start) Text(this.mShowAppCaPresenter.credInfo.alias) .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Medium) - .margin({ - left: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') - }) .alignSelf(ItemAlign.Start) Text($r('app.string.entryContains')) @@ -241,8 +237,6 @@ export struct componentPublic { .fontWeight(FontWeight.Regular) .margin({ top: $r('app.float.wh_value_24'), - left: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') }) .alignSelf(ItemAlign.Start) @@ -289,12 +283,14 @@ export struct componentPublic { }) .margin({ top: $r('app.float.wh_value_12'), - left: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') }) .height('48vp') } .width(WidthPercent.WH_100_100) + .padding({ + left: $r('app.float.wh_value_24'), + right: $r('app.float.wh_value_24') + }) .borderRadius($r('app.float.user_list_divider_borderRadius_value')) .backgroundColor($r('sys.color.ohos_id_color_dialog_bg')) } @@ -311,7 +307,6 @@ export struct componentPublic { left: $r('app.float.wh_value_24'), right: $r('app.float.wh_value_24') }) - .alignSelf(ItemAlign.Start) Text($r('app.string.warning_message')) .fontSize($r('sys.float.ohos_id_text_size_body1')) @@ -322,9 +317,10 @@ export struct componentPublic { left: $r('app.float.wh_value_24'), right: $r('app.float.wh_value_24') }) - .alignSelf(ItemAlign.Start) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) } .width(WidthPercent.WH_100_100) + .alignItems(HorizontalAlign.Start) .borderRadius($r('app.float.user_list_divider_borderRadius_value')) .backgroundColor($r('sys.color.ohos_id_color_dialog_bg')) } @@ -461,20 +457,12 @@ export struct componentSystem { .fontSize($r('sys.float.ohos_id_text_size_dialog_tittle')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Medium) - .margin({ - left: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') - }) .alignSelf(ItemAlign.Start) Text(this.systemCredPresenter.credInfo.alias) .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Medium) - .margin({ - left: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') - }) .alignSelf(ItemAlign.Start) Text($r('app.string.entryContains')) @@ -483,8 +471,6 @@ export struct componentSystem { .fontWeight(FontWeight.Regular) .margin({ top: $r('app.float.wh_value_24'), - left: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') }) .alignSelf(ItemAlign.Start) @@ -511,6 +497,10 @@ export struct componentSystem { .alignSelf(ItemAlign.Start) } .width(WidthPercent.WH_100_100) + .padding({ + left: $r('app.float.wh_value_24'), + right: $r('app.float.wh_value_24') + }) .borderRadius($r('app.float.user_list_divider_borderRadius_value')) .backgroundColor($r('sys.color.ohos_id_color_dialog_bg')) } @@ -527,7 +517,6 @@ export struct componentSystem { left: $r('app.float.wh_value_24'), right: $r('app.float.wh_value_24') }) - .alignSelf(ItemAlign.Start) Text($r('app.string.warning_message')) .fontSize($r('sys.float.ohos_id_text_size_body1')) @@ -538,9 +527,10 @@ export struct componentSystem { left: $r('app.float.wh_value_24'), right: $r('app.float.wh_value_24') }) - .alignSelf(ItemAlign.Start) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) } .width(WidthPercent.WH_100_100) + .alignItems(HorizontalAlign.Start) .borderRadius($r('app.float.user_list_divider_borderRadius_value')) .backgroundColor($r('sys.color.ohos_id_color_dialog_bg')) } diff --git a/certmanager/src/main/ets/pages/detail/CaSystemDetailPage.ets b/certmanager/src/main/ets/pages/detail/CaSystemDetailPage.ets index dd4dac291137d018bafff989957315981f492ea0..a182040e7d3b04223ec931c9cb5d78e172585639 100755 --- a/certmanager/src/main/ets/pages/detail/CaSystemDetailPage.ets +++ b/certmanager/src/main/ets/pages/detail/CaSystemDetailPage.ets @@ -18,6 +18,7 @@ import { NavEntryKey } from '../../common/NavEntryKey'; import { WidthPercent } from '../../common/util/ConfigData'; import CmShowSysCaPresenter from '../../presenter/CmShowSysCaPresenter'; import { SheetParam } from '../../common/util/SheetParam'; +import { AlignUtils } from '../../common/util/AlignUtils'; @Component export struct DialogSubjectComponent { @@ -60,10 +61,12 @@ export struct DialogSubjectComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_l') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.subjectNameCN) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text($r('app.string.DialogSubjectComponent_secText')) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) @@ -71,10 +74,12 @@ export struct DialogSubjectComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_m') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.subjectNameO) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text($r('app.string.DialogSubjectComponent_thdText')) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) @@ -82,10 +87,12 @@ export struct DialogSubjectComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_m') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.subjectNameOU) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text($r('app.string.DialogSubjectComponent_fouText')) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) @@ -93,11 +100,15 @@ export struct DialogSubjectComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_m') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.serial) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) - }.alignItems(HorizontalAlign.Start); + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width('100%') + .alignItems(HorizontalAlign.Start); } } @@ -136,10 +147,12 @@ export struct DialogIssuerComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_l') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.issuerNameCN) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text($r('app.string.DialogSubjectComponent_secText')) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) @@ -147,10 +160,12 @@ export struct DialogIssuerComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_m') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.issuerNameO) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text($r('app.string.DialogSubjectComponent_thdText')) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) @@ -158,11 +173,15 @@ export struct DialogIssuerComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_m') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.issuerNameOU) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) - }.alignItems(HorizontalAlign.Start); + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width('100%') + .alignItems(HorizontalAlign.Start); } } @@ -195,10 +214,12 @@ export struct DialogDateComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_l') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.notBefore) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text($r('app.string.DialogSubjectComponent_sixText')) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) @@ -206,11 +227,15 @@ export struct DialogDateComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_m') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.notAfter) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) - }.alignItems(HorizontalAlign.Start); + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width('100%') + .alignItems(HorizontalAlign.Start); } } @@ -227,14 +252,15 @@ export struct DialogFingerPrintComponent { .margin({ top: $r('app.float.sys_elements_margin_vertical_l') }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.fingerprintSha256) .fontSize($r('sys.float.ohos_id_text_size_body2')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Regular) - .margin({ - right: $r('app.float.wh_value_24') - }) - }.alignItems(HorizontalAlign.Start); + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width('100%') + .alignItems(HorizontalAlign.Start); } } diff --git a/certmanager/src/main/ets/pages/trustedCa.ets b/certmanager/src/main/ets/pages/trustedCa.ets index de474d8ee6dac7841e60478add0d29eebea0fabf..80df6ff4c8192cd7694f71687e566dbdfd125bc6 100755 --- a/certmanager/src/main/ets/pages/trustedCa.ets +++ b/certmanager/src/main/ets/pages/trustedCa.ets @@ -32,6 +32,7 @@ import { DialogIssuerComponent, DialogSubjectComponent } from './detail/CaSystemDetailPage'; +import { AlignUtils } from '../common/util/AlignUtils'; const COPIES_NUM: number = 12; @@ -59,7 +60,10 @@ struct ComponentSystem { contentBuilder: () => { this.systemDetailContent(); }, - contentAreaPadding: { right: $r('app.float.wh_value_0') }, + contentAreaPadding: { + left: $r('app.float.wh_value_0'), + right: $r('app.float.wh_value_0') + }, buttons: [{ value: $r('app.string.CustomDialogExample_Button_text'), buttonStyle: ButtonStyleMode.TEXTUAL, @@ -80,9 +84,9 @@ struct ComponentSystem { .height($r('app.float.wh_value_56')) .margin({ bottom: $r('app.float.wh_value_8'), - right: $r('app.float.wh_value_24') }) .alignSelf(ItemAlign.Start) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Text(this.setStatus.certInfo.certAlias) .fontSize($r('sys.float.ohos_id_text_size_body1')) @@ -90,17 +94,22 @@ struct ComponentSystem { .fontWeight(FontWeight.Medium) .margin({ bottom: $r('app.float.wh_value_24'), - right: $r('app.float.wh_value_24') }) .alignSelf(ItemAlign.Start) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Scroll(this.sysCaScroller) { List() { ListItem() { - Text($r('app.string.CustomDialogExample_firListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) + Column() { + Text($r('app.string.CustomDialogExample_firListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { @@ -108,10 +117,15 @@ struct ComponentSystem { }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { - Text($r('app.string.CustomDialogExample_secListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) + Column() { + Text($r('app.string.CustomDialogExample_secListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) .margin({ top: $r('app.float.wh_value_24') @@ -122,10 +136,15 @@ struct ComponentSystem { }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { - Text($r('app.string.CustomDialogExample_thdListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) + Column() { + Text($r('app.string.CustomDialogExample_thdListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) .margin({ top: $r('app.float.wh_value_24') @@ -136,10 +155,15 @@ struct ComponentSystem { }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { - Text($r('app.string.CustomDialogExample_fouListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) + Column() { + Text($r('app.string.CustomDialogExample_fouListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) .margin({ top: $r('app.float.wh_value_24') @@ -149,7 +173,6 @@ struct ComponentSystem { DialogFingerPrintComponent({ fingerprintSha256: this.setStatus.certInfo.fingerprintSha256 }); }.width(ComponentConfig.WH_100_100).align(Alignment.Start) } - .margin({ right: $r('app.float.wh_value_24') }) .scrollBar(BarState.Off) } .scrollable(ScrollDirection.Vertical) @@ -158,6 +181,7 @@ struct ComponentSystem { } .padding({ left: $r('app.float.wh_value_24'), + right: $r('app.float.wh_value_24') }) .width(WidthPercent.WH_100_100) .borderRadius($r('app.float.user_list_divider_borderRadius_value')) @@ -269,7 +293,10 @@ struct ComponentUser { contentBuilder: () => { this.userDetailContent(this.setStatus.certList[this.indexNum].status); }, - contentAreaPadding: { right: $r('app.float.wh_value_0') }, + contentAreaPadding: { + left: $r('app.float.wh_value_0'), + right: $r('app.float.wh_value_0') + }, buttons: [ { value: $r('app.string.CustomDialogExampleUser_Flex_firButton_text'), @@ -392,9 +419,9 @@ struct ComponentUser { .height($r('app.float.wh_value_56')) .margin({ bottom: $r('app.float.wh_value_8'), - right: $r('app.float.wh_value_24') }) .alignSelf(ItemAlign.Start) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) Flex({ justifyContent: FlexAlign.SpaceBetween, alignItems: ItemAlign.Center }) { Column() { @@ -402,6 +429,7 @@ struct ComponentUser { .fontSize($r('sys.float.ohos_id_text_size_body1')) .fontColor($r('sys.color.ohos_id_color_text_primary')) .fontWeight(FontWeight.Medium) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) }.alignItems(HorizontalAlign.Start); Toggle({ type: ToggleType.Switch, isOn: $$ }) @@ -425,13 +453,18 @@ struct ComponentUser { Scroll(this.userCaScroller) { List() { ListItem() { - Text($r('app.string.CustomDialogExample_firListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) - .margin({ - top: $r('app.float.wh_value_24') - }) + Column() { + Text($r('app.string.CustomDialogExample_firListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .margin({ + top: $r('app.float.wh_value_24') + }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { @@ -439,13 +472,18 @@ struct ComponentUser { }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { - Text($r('app.string.CustomDialogExample_secListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) - .margin({ - top: $r('app.float.wh_value_24') - }) + Column() { + Text($r('app.string.CustomDialogExample_secListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .margin({ + top: $r('app.float.wh_value_24') + }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { @@ -453,13 +491,18 @@ struct ComponentUser { }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { - Text($r('app.string.CustomDialogExample_thdListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) - .margin({ - top: $r('app.float.wh_value_24') - }) + Column() { + Text($r('app.string.CustomDialogExample_thdListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .margin({ + top: $r('app.float.wh_value_24') + }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { @@ -467,13 +510,18 @@ struct ComponentUser { }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { - Text($r('app.string.CustomDialogExample_fouListItem_text')) - .fontSize($r('sys.float.ohos_id_text_size_body1')) - .fontColor($r('sys.color.ohos_id_color_text_primary')) - .fontWeight(FontWeight.Medium) - .margin({ - top: $r('app.float.wh_value_24') - }) + Column(){ + Text($r('app.string.CustomDialogExample_fouListItem_text')) + .fontSize($r('sys.float.ohos_id_text_size_body1')) + .fontColor($r('sys.color.ohos_id_color_text_primary')) + .fontWeight(FontWeight.Medium) + .margin({ + top: $r('app.float.wh_value_24') + }) + .textAlign(AlignUtils.isRtl() ? TextAlign.End : TextAlign.Start) + } + .width(ComponentConfig.WH_100_100) + .alignItems(HorizontalAlign.Start) }.width(ComponentConfig.WH_100_100).align(Alignment.Start) ListItem() { @@ -482,9 +530,6 @@ struct ComponentUser { }); }.width(ComponentConfig.WH_100_100).align(Alignment.Start) } - .margin({ - right: $r('app.float.wh_value_24') - }) .scrollBar(BarState.Off) } .height($r('app.float.CustomDialogExample_list_height_value')) @@ -492,7 +537,8 @@ struct ComponentUser { .scrollBarWidth('3vp') } .padding({ - left: $r('app.float.wh_value_24') + left: $r('app.float.wh_value_24'), + right: $r('app.float.wh_value_24') }) .width(WidthPercent.WH_100_100) .borderRadius($r('app.float.user_list_divider_borderRadius_value'))