From a0463b52f0a705b3abf1ea936d09faa600fc45a9 Mon Sep 17 00:00:00 2001
From: Patrick Honkonen <phonkonen@bitwarden.com>
Date: Mon, 5 Jan 2026 13:57:24 -0500
Subject: [PATCH] Address review comments

- Rename extension to be more descriptive.
- Use `Left` and `Right` text alignments instead of `Start` and `End`.
---
 .../feature/verificationcode/VerificationCodeItem.kt     | 4 ++--
 .../components/listitem/VaultVerificationCodeItem.kt     | 4 ++--
 .../platform/components/field/BitwardenPasswordField.kt  | 4 ++--
 .../bitwarden/ui/platform/util/TypographyExtensions.kt   | 9 +++++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt
index 366f271423..375a04df74 100644
--- a/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt
+++ b/app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt
@@ -24,7 +24,7 @@ import com.bitwarden.ui.platform.components.model.CardStyle
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
-import com.bitwarden.ui.platform.util.withForcedLtr
+import com.bitwarden.ui.platform.util.withForcedLtrDirection
 
 /**
  * The verification code item displayed to the user.
@@ -108,7 +108,7 @@ fun VaultVerificationCodeItem(
         if (!hideAuthCode) {
             Text(
                 text = authCode.chunked(3).joinToString(" "),
-                style = BitwardenTheme.typography.sensitiveInfoSmall.withForcedLtr(),
+                style = BitwardenTheme.typography.sensitiveInfoSmall.withForcedLtrDirection(),
                 color = BitwardenTheme.colorScheme.text.primary,
             )
 
diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/listitem/VaultVerificationCodeItem.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/listitem/VaultVerificationCodeItem.kt
index 69b3423d30..7c0f408986 100644
--- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/listitem/VaultVerificationCodeItem.kt
+++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/listitem/VaultVerificationCodeItem.kt
@@ -29,7 +29,7 @@ import com.bitwarden.ui.platform.components.model.CardStyle
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
-import com.bitwarden.ui.platform.util.withForcedLtr
+import com.bitwarden.ui.platform.util.withForcedLtrDirection
 
 /**
  * The verification code item displayed to the user.
@@ -156,7 +156,7 @@ fun VaultVerificationCodeItem(
         Text(
             modifier = Modifier.testTag(tag = "AuthCode"),
             text = authCode.chunked(size = 3).joinToString(separator = " "),
-            style = BitwardenTheme.typography.sensitiveInfoSmall.withForcedLtr(),
+            style = BitwardenTheme.typography.sensitiveInfoSmall.withForcedLtrDirection(),
             color = BitwardenTheme.colorScheme.text.primary,
         )
 
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt
index 1d34b5a6ad..9898a33b21 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/components/field/BitwardenPasswordField.kt
@@ -60,7 +60,7 @@ import com.bitwarden.ui.platform.components.util.nonLetterColorVisualTransformat
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
-import com.bitwarden.ui.platform.util.withForcedLtr
+import com.bitwarden.ui.platform.util.withForcedLtrDirection
 
 /**
  * Represents a Bitwarden-styled password field that hoists show/hide password state to the caller.
@@ -156,7 +156,7 @@ fun BitwardenPasswordField(
             var focused by remember { mutableStateOf(value = false) }
             TextField(
                 colors = bitwardenTextFieldColors(),
-                textStyle = BitwardenTheme.typography.sensitiveInfoSmall.withForcedLtr(),
+                textStyle = BitwardenTheme.typography.sensitiveInfoSmall.withForcedLtrDirection(),
                 label = label?.let {
                     {
                         Row(verticalAlignment = Alignment.CenterVertically) {
diff --git a/ui/src/main/kotlin/com/bitwarden/ui/platform/util/TypographyExtensions.kt b/ui/src/main/kotlin/com/bitwarden/ui/platform/util/TypographyExtensions.kt
index 413a171909..212809b1be 100644
--- a/ui/src/main/kotlin/com/bitwarden/ui/platform/util/TypographyExtensions.kt
+++ b/ui/src/main/kotlin/com/bitwarden/ui/platform/util/TypographyExtensions.kt
@@ -31,14 +31,15 @@ import com.bitwarden.annotation.OmitFromCoverage
  */
 @OmitFromCoverage
 @Composable
-fun TextStyle.withForcedLtr(): TextStyle {
-    val layoutDirection = LocalLayoutDirection.current
+fun TextStyle.withForcedLtrDirection(
+    layoutDirection: LayoutDirection = LocalLayoutDirection.current,
+): TextStyle {
     return merge(
         TextStyle(
             textDirection = TextDirection.Ltr,
             textAlign = when (layoutDirection) {
-                LayoutDirection.Rtl -> TextAlign.End
-                LayoutDirection.Ltr -> TextAlign.Start
+                LayoutDirection.Rtl -> TextAlign.Right
+                LayoutDirection.Ltr -> TextAlign.Left
             },
         ),
     )