From 3f30653dce346079613704705839387fd34d8556 Mon Sep 17 00:00:00 2001 From: rekirt Date: Tue, 27 May 2025 14:55:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?ux=E9=80=82=E9=85=8Dverde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: rekirt --- entry/src/main/ets/common/Constants.ets | 8 ++++++ .../main/ets/pages/SelectVerificationCode.ets | 20 ++++++++------- .../src/main/ets/pages/TextBoxShowCursor.ets | 25 +++++++++++++------ .../main/resources/base/element/float.json | 2 +- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/entry/src/main/ets/common/Constants.ets b/entry/src/main/ets/common/Constants.ets index d05832f..8e8af56 100644 --- a/entry/src/main/ets/common/Constants.ets +++ b/entry/src/main/ets/common/Constants.ets @@ -112,6 +112,14 @@ export default class Constants { * Line height. */ public static readonly LINE_HEIGHT: number = 1; + /** + * Item divider. + */ + public static readonly ITEM_CODE_WIDTH: number = 60; + /** + * Item divider. + */ + public static readonly ITEM_FOLD_CODE_WIDTH: number = 51; /** * Item divider. */ diff --git a/entry/src/main/ets/pages/SelectVerificationCode.ets b/entry/src/main/ets/pages/SelectVerificationCode.ets index 230b16f..1b1adb2 100644 --- a/entry/src/main/ets/pages/SelectVerificationCode.ets +++ b/entry/src/main/ets/pages/SelectVerificationCode.ets @@ -285,15 +285,17 @@ struct SelectVerificationCode { .fontColor($r('sys.color.font_primary')) .fontSize($r('app.float.font_size')) .fontWeight(FontWeight.Medium) - Text($r('app.string.change_another')) - .fontSize($r('app.float.font_size')) - .fontWeight(FontWeight.Regular) - .fontColor($r('sys.color.brand')) - .textAlign(TextAlign.Center) - .margin({ right: $r('app.float.change_margin') }) - SymbolGlyph($r('sys.symbol.arrow_clockwise')) - .fontSize($r('app.float.change')) - .fontColor([$r('sys.color.brand')]) + Row() { + Text($r('app.string.change_another')) + .fontSize($r('app.float.font_size')) + .fontWeight(FontWeight.Regular) + .fontColor($r('sys.color.brand')) + .textAlign(TextAlign.Center) + .margin({ right: $r('app.float.change_margin') }) + SymbolGlyph($r('sys.symbol.arrow_clockwise')) + .fontSize($r('app.float.change')) + .fontColor([$r('sys.color.brand')]) + } } .margin({ top: $r('app.float.word_margin_top'), diff --git a/entry/src/main/ets/pages/TextBoxShowCursor.ets b/entry/src/main/ets/pages/TextBoxShowCursor.ets index f1cc4be..68aa5e8 100644 --- a/entry/src/main/ets/pages/TextBoxShowCursor.ets +++ b/entry/src/main/ets/pages/TextBoxShowCursor.ets @@ -13,10 +13,10 @@ * limitations under the License. */ -import { BusinessError } from '@kit.BasicServicesKit'; +import { BusinessError, deviceInfo } from '@kit.BasicServicesKit'; import { hilog } from '@kit.PerformanceAnalysisKit'; import { inputMethod } from '@kit.IMEKit'; -import { window } from '@kit.ArkUI'; +import { display, window } from '@kit.ArkUI'; import Constants, { BreakpointType } from '../common/Constants'; @Extend(Text) @@ -140,6 +140,20 @@ struct TextBoxShowCursor { } } + getCursorTranslateX(): number { + let foldStatus = display.getFoldStatus(); + if (deviceInfo.productSeries === 'VDE' && foldStatus === display.FoldStatus.FOLD_STATUS_EXPANDED) { + return Constants.ITEM_DIVIDER + this.codeText.length * Constants.ITEM_CODE_WIDTH; + } + if (foldStatus === display.FoldStatus.FOLD_STATUS_FOLDED) { + return Constants.ITEM_DIVIDER + this.codeText.length * Constants.ITEM_FOLD_CODE_WIDTH; + } + return (this.codeText.length === Constants.ZERO ? Constants.ITEM_DIVIDER : this.codeText.length * + (this.codeText.length > Constants.TWO ? + (this.codeText.length === Constants.ITEM_DIVIDER ? Constants.FIFTY_EIGHT_POINT_FIVE : + Constants.FIFTY_NINE) : Constants.SIXTY)) + } + /** * In some verification code scenarios, the functions of selecting and copying entered verification codes must be * disabled. @@ -208,12 +222,7 @@ struct TextBoxShowCursor { }) } .visibility(this.flag ? Visibility.Visible : Visibility.Hidden) - .translate({ - x: (this.codeText.length === Constants.ZERO ? Constants.ITEM_DIVIDER : this.codeText.length * - (this.codeText.length > Constants.TWO ? - (this.codeText.length === Constants.ITEM_DIVIDER ? Constants.FIFTY_EIGHT_POINT_FIVE : - Constants.FIFTY_NINE) : Constants.SIXTY)) - }) + .translate({ x: this.getCursorTranslateX() }) .hitTestBehavior(HitTestMode.Transparent) .onClick(() => { try { diff --git a/entry/src/main/resources/base/element/float.json b/entry/src/main/resources/base/element/float.json index d353d58..ae26328 100644 --- a/entry/src/main/resources/base/element/float.json +++ b/entry/src/main/resources/base/element/float.json @@ -130,7 +130,7 @@ }, { "name": "change_margin", - "value": "-65vp" + "value": "8vp" }, { "name": "word_margin_top", -- Gitee From 5d19a753048d8ccc089313e5453fdc34f21b51d4 Mon Sep 17 00:00:00 2001 From: rekirt Date: Wed, 28 May 2025 15:28:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?ux=E9=80=82=E9=85=8Dverde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: rekirt --- entry/src/main/ets/common/Constants.ets | 4 ++++ entry/src/main/ets/pages/TextBoxShowCursor.ets | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/entry/src/main/ets/common/Constants.ets b/entry/src/main/ets/common/Constants.ets index 8e8af56..7449e9d 100644 --- a/entry/src/main/ets/common/Constants.ets +++ b/entry/src/main/ets/common/Constants.ets @@ -112,6 +112,10 @@ export default class Constants { * Line height. */ public static readonly LINE_HEIGHT: number = 1; + /** + * Item code start. + */ + public static readonly ITEM_CODE_START: number = 30; /** * Item divider. */ diff --git a/entry/src/main/ets/pages/TextBoxShowCursor.ets b/entry/src/main/ets/pages/TextBoxShowCursor.ets index 68aa5e8..d4d1a48 100644 --- a/entry/src/main/ets/pages/TextBoxShowCursor.ets +++ b/entry/src/main/ets/pages/TextBoxShowCursor.ets @@ -143,7 +143,7 @@ struct TextBoxShowCursor { getCursorTranslateX(): number { let foldStatus = display.getFoldStatus(); if (deviceInfo.productSeries === 'VDE' && foldStatus === display.FoldStatus.FOLD_STATUS_EXPANDED) { - return Constants.ITEM_DIVIDER + this.codeText.length * Constants.ITEM_CODE_WIDTH; + return Constants.ITEM_CODE_START + this.codeText.length * Constants.ITEM_CODE_WIDTH; } if (foldStatus === display.FoldStatus.FOLD_STATUS_FOLDED) { return Constants.ITEM_DIVIDER + this.codeText.length * Constants.ITEM_FOLD_CODE_WIDTH; @@ -162,7 +162,7 @@ struct TextBoxShowCursor { @Builder buildVerifyCodeComponent() { Stack() { - Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center }) { + Flex({ direction: FlexDirection.Row, justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) { ForEach(this.codeIndexArray, (item: number) => { Text(this.codeText[item]) .verifyCodeUnitStyle() -- Gitee