[PM-25423] Add BidiTextManager for handling bidirectional text

app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt

@@ -22,8 +22,11 @@ import com.bitwarden.cxf.ui.composition.LocalCredentialExchangeImporter
 import com.bitwarden.cxf.ui.composition.LocalCredentialExchangeRequestValidator
 import com.bitwarden.cxf.validator.CredentialExchangeRequestValidator
 import com.bitwarden.cxf.validator.dsl.credentialExchangeRequestValidator
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
 import com.bitwarden.ui.platform.composition.LocalIntentManager
+import com.bitwarden.ui.platform.manager.BidiTextManager
 import com.bitwarden.ui.platform.manager.IntentManager
+import com.bitwarden.ui.platform.manager.dsl.bidiTextManager
 import com.x8bit.bitwarden.R
 import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager
 import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManagerImpl
@@ -79,6 +82,7 @@ fun LocalManagerProvider(
         },
     credentialExchangeRequestValidator: CredentialExchangeRequestValidator =
         credentialExchangeRequestValidator(activity = activity),
+    bidiTextManager: BidiTextManager = bidiTextManager(),
     authTabLaunchers: AuthTabLaunchers,
     content: @Composable () -> Unit,
 ) {
@@ -97,6 +101,7 @@ fun LocalManagerProvider(
         LocalCredentialExchangeImporter provides credentialExchangeImporter,
         LocalCredentialExchangeCompletionManager provides credentialExchangeCompletionManager,
         LocalCredentialExchangeRequestValidator provides credentialExchangeRequestValidator,
+        LocalBidiTextManager provides bidiTextManager,
         LocalAuthTabLaunchers provides authTabLaunchers,
         content = content,
     )

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/exportitems/component/AccountSummaryListItem.kt

@@ -23,6 +23,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import com.bitwarden.ui.R
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
 import com.bitwarden.ui.platform.base.util.cardStyle
 import com.bitwarden.ui.platform.base.util.hexToColor
 import com.bitwarden.ui.platform.base.util.toSafeOverlayColor
@@ -51,6 +52,7 @@ fun AccountSummaryListItem(
     clickable: Boolean,
     onClick: (userId: String) -> Unit = {},
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
     Row(
         modifier = modifier
             .testTag("AccountSummaryListItem")
@@ -95,7 +97,7 @@ fun AccountSummaryListItem(
             modifier = Modifier.weight(1f),
         ) {
             Text(
-                text = item.email,
+                text = bidiTextManager.unicodeWrap(item.email),
                 style = BitwardenTheme.typography.bodyLarge,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemCardContent.kt

@@ -26,6 +26,7 @@ import com.bitwarden.ui.platform.components.field.BitwardenTextField
 import com.bitwarden.ui.platform.components.header.BitwardenListHeaderText
 import com.bitwarden.ui.platform.components.model.CardStyle
 import com.bitwarden.ui.platform.components.text.BitwardenHyperTextLink
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
@@ -48,6 +49,7 @@ fun VaultItemCardContent(
     vaultCardItemTypeHandlers: VaultCardItemTypeHandlers,
     modifier: Modifier = Modifier,
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
     var isExpanded by rememberSaveable { mutableStateOf(value = false) }
     val applyIconBackground = cardState.paymentCardBrandIconData == null
     LazyColumn(modifier = modifier.fillMaxWidth()) {
@@ -72,7 +74,7 @@ fun VaultItemCardContent(
             item(key = "cardholderName") {
                 BitwardenTextField(
                     label = stringResource(id = BitwardenString.cardholder_name),
-                    value = cardholderName,
+                    value = bidiTextManager.unicodeWrap(cardholderName),
                     onValueChange = {},
                     readOnly = true,
                     singleLine = false,
@@ -94,7 +96,7 @@ fun VaultItemCardContent(
             item(key = "cardNumber") {
                 BitwardenPasswordField(
                     label = stringResource(id = BitwardenString.number),
-                    value = numberData.number,
+                    value = bidiTextManager.formatCardNumber(numberData.number),
                     onValueChange = {},
                     showPassword = numberData.isVisible,
                     showPasswordChange = vaultCardItemTypeHandlers.onShowNumberClick,
@@ -174,7 +176,7 @@ fun VaultItemCardContent(
             item(key = "securityCode") {
                 BitwardenPasswordField(
                     label = stringResource(id = BitwardenString.security_code),
-                    value = securityCodeData.code,
+                    value = bidiTextManager.forceLtr(securityCodeData.code),
                     onValueChange = {},
                     showPassword = securityCodeData.isVisible,
                     showPasswordChange = vaultCardItemTypeHandlers.onShowSecurityCodeClick,

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemIdentityContent.kt

@@ -20,6 +20,7 @@ import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.bitwarden.ui.platform.base.util.standardHorizontalMargin
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
 import com.bitwarden.ui.platform.base.util.toListItemCardStyle
 import com.bitwarden.ui.platform.components.button.BitwardenStandardIconButton
 import com.bitwarden.ui.platform.components.field.BitwardenTextField
@@ -47,6 +48,7 @@ fun VaultItemIdentityContent(
     vaultIdentityItemTypeHandlers: VaultIdentityItemTypeHandlers,
     modifier: Modifier = Modifier,
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
     var isExpanded by rememberSaveable { mutableStateOf(value = false) }
     LazyColumn(
         modifier = modifier.fillMaxWidth(),
@@ -138,7 +140,7 @@ fun VaultItemIdentityContent(
             item(key = "ssn") {
                 IdentityCopyField(
                     label = stringResource(id = BitwardenString.ssn),
-                    value = ssn,
+                    value = bidiTextManager.forceLtr(ssn),
                     copyContentDescription = stringResource(id = BitwardenString.copy_ssn),
                     textFieldTestTag = "IdentitySsnEntry",
                     copyActionTestTag = "IdentityCopySsnButton",
@@ -160,7 +162,7 @@ fun VaultItemIdentityContent(
             item(key = "passportNumber") {
                 IdentityCopyField(
                     label = stringResource(id = BitwardenString.passport_number),
-                    value = passportNumber,
+                    value = bidiTextManager.unicodeWrap(passportNumber),
                     copyContentDescription = stringResource(id = BitwardenString.copy_passport_number),
                     textFieldTestTag = "IdentityPassportNumberEntry",
                     copyActionTestTag = "IdentityCopyPassportNumberButton",
@@ -182,7 +184,7 @@ fun VaultItemIdentityContent(
             item(key = "licenseNumber") {
                 IdentityCopyField(
                     label = stringResource(id = BitwardenString.license_number),
-                    value = licenseNumber,
+                    value = bidiTextManager.unicodeWrap(licenseNumber),
                     copyContentDescription = stringResource(id = BitwardenString.copy_license_number),
                     textFieldTestTag = "IdentityLicenseNumberEntry",
                     copyActionTestTag = "IdentityCopyLicenseNumberButton",
@@ -204,7 +206,7 @@ fun VaultItemIdentityContent(
             item(key = "email") {
                 IdentityCopyField(
                     label = stringResource(id = BitwardenString.email),
-                    value = email,
+                    value = bidiTextManager.unicodeWrap(email),
                     copyContentDescription = stringResource(id = BitwardenString.copy_email),
                     textFieldTestTag = "IdentityEmailEntry",
                     copyActionTestTag = "IdentityCopyEmailButton",
@@ -226,7 +228,7 @@ fun VaultItemIdentityContent(
             item(key = "phone") {
                 IdentityCopyField(
                     label = stringResource(id = BitwardenString.phone),
-                    value = phone,
+                    value = bidiTextManager.formatPhoneNumber(phone),
                     copyContentDescription = stringResource(id = BitwardenString.copy_phone),
                     textFieldTestTag = "IdentityPhoneEntry",
                     copyActionTestTag = "IdentityCopyPhoneButton",
@@ -248,7 +250,7 @@ fun VaultItemIdentityContent(
             item(key = "address") {
                 IdentityCopyField(
                     label = stringResource(id = BitwardenString.address),
-                    value = address,
+                    value = bidiTextManager.unicodeWrap(address),
                     copyContentDescription = stringResource(id = BitwardenString.copy_address),
                     textFieldTestTag = "IdentityAddressEntry",
                     copyActionTestTag = "IdentityCopyAddressButton",

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemLoginContent.kt

@@ -32,6 +32,8 @@ import com.bitwarden.ui.platform.components.model.CardStyle
 import com.bitwarden.ui.platform.components.model.TooltipData
 import com.bitwarden.ui.platform.components.text.BitwardenClickableText
 import com.bitwarden.ui.platform.components.text.BitwardenHyperTextLink
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
+import com.bitwarden.ui.platform.manager.BidiTextManager
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
@@ -55,6 +57,7 @@ fun VaultItemLoginContent(
     vaultLoginItemTypeHandlers: VaultLoginItemTypeHandlers,
     modifier: Modifier = Modifier,
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
     var isExpanded by rememberSaveable { mutableStateOf(value = false) }
     LazyColumn(
         modifier = modifier.fillMaxWidth(),
@@ -174,6 +177,7 @@ fun VaultItemLoginContent(
             ) { index, uriData ->
                 UriField(
                     uriData = uriData,
+                    bidiTextManager = bidiTextManager,
                     onCopyUriClick = vaultLoginItemTypeHandlers.onCopyUriClick,
                     onLaunchUriClick = vaultLoginItemTypeHandlers.onLaunchUriClick,
                     cardStyle = uris.toListItemCardStyle(index = index, dividerPadding = 0.dp),
@@ -391,10 +395,11 @@ private fun PasswordField(
     cardStyle: CardStyle,
     modifier: Modifier = Modifier,
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
     if (passwordData.canViewPassword) {
         BitwardenPasswordField(
             label = stringResource(id = BitwardenString.password),
-            value = passwordData.password,
+            value = bidiTextManager.unicodeWrap(passwordData.password),
             showPasswordChange = { onShowPasswordClick(it) },
             showPassword = passwordData.isVisible,
             onValueChange = { },
@@ -429,7 +434,7 @@ private fun PasswordField(
     } else {
         BitwardenHiddenPasswordField(
             label = stringResource(id = BitwardenString.password),
-            value = passwordData.password,
+            value = bidiTextManager.unicodeWrap(passwordData.password),
             passwordFieldTestTag = "LoginPasswordEntry",
             cardStyle = cardStyle,
             modifier = modifier,
@@ -445,12 +450,15 @@ private fun TotpField(
     onAuthenticatorHelpToolTipClick: () -> Unit,
     modifier: Modifier = Modifier,
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
+
     if (enabled) {
         BitwardenTextField(
             label = stringResource(id = BitwardenString.authenticator_key),
-            value = totpCodeItemData.verificationCode
-                .chunked(AUTH_CODE_SPACING_INTERVAL)
-                .joinToString(" "),
+            value = bidiTextManager.formatVerificationCode(
+                totpCodeItemData.verificationCode,
+                chunkSize = AUTH_CODE_SPACING_INTERVAL,
+            ),
             onValueChange = { },
             textStyle = BitwardenTheme.typography.sensitiveInfoSmall,
             readOnly = true,
@@ -497,14 +505,15 @@ private fun TotpField(
 @Composable
 private fun UriField(
     uriData: VaultItemState.ViewState.Content.ItemType.Login.UriData,
+    bidiTextManager: BidiTextManager,
     onCopyUriClick: (String) -> Unit,
     onLaunchUriClick: (String) -> Unit,
     cardStyle: CardStyle,
     modifier: Modifier = Modifier,
 ) {
     BitwardenTextField(
         label = stringResource(id = BitwardenString.website_uri),
-        value = uriData.uri,
+        value = bidiTextManager.unicodeWrap(uriData.uri),
         onValueChange = { },
         readOnly = true,
         singleLine = false,

app/src/main/kotlin/com/x8bit/bitwarden/ui/vault/feature/verificationcode/VerificationCodeItem.kt

@@ -21,6 +21,7 @@ import com.bitwarden.ui.platform.components.icon.BitwardenIcon
 import com.bitwarden.ui.platform.components.icon.model.IconData
 import com.bitwarden.ui.platform.components.indicator.BitwardenCircularCountdownIndicator
 import com.bitwarden.ui.platform.components.model.CardStyle
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
@@ -55,6 +56,8 @@ fun VaultVerificationCodeItem(
     modifier: Modifier = Modifier,
     supportingLabel: String? = null,
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
+
     Row(
         modifier = modifier
             .defaultMinSize(minHeight = 60.dp)
@@ -106,7 +109,7 @@ fun VaultVerificationCodeItem(
 
         if (!hideAuthCode) {
             Text(
-                text = authCode.chunked(3).joinToString(" "),
+                text = bidiTextManager.formatVerificationCode(authCode, chunkSize = 3),
                 style = BitwardenTheme.typography.sensitiveInfoSmall,
                 color = BitwardenTheme.colorScheme.text.primary,
             )

app/src/test/kotlin/com/x8bit/bitwarden/ui/platform/base/BitwardenComposeTest.kt

@@ -6,6 +6,7 @@ import com.bitwarden.cxf.manager.CredentialExchangeCompletionManager
 import com.bitwarden.cxf.validator.CredentialExchangeRequestValidator
 import com.bitwarden.ui.platform.base.BaseComposeTest
 import com.bitwarden.ui.platform.feature.settings.appearance.model.AppTheme
+import com.bitwarden.ui.platform.manager.BidiTextManager
 import com.bitwarden.ui.platform.manager.IntentManager
 import com.bitwarden.ui.platform.theme.BitwardenTheme
 import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager
@@ -48,6 +49,7 @@ abstract class BitwardenComposeTest : BaseComposeTest() {
         credentialExchangeImporter: CredentialExchangeImporter = mockk(),
         credentialExchangeCompletionManager: CredentialExchangeCompletionManager = mockk(),
         credentialExchangeRequestValidator: CredentialExchangeRequestValidator = mockk(),
+        bidiTextManager: BidiTextManager = mockk(),
         test: @Composable () -> Unit,
     ) {
         setTestContent {
@@ -67,6 +69,7 @@ abstract class BitwardenComposeTest : BaseComposeTest() {
                 credentialExchangeImporter = credentialExchangeImporter,
                 credentialExchangeCompletionManager = credentialExchangeCompletionManager,
                 credentialExchangeRequestValidator = credentialExchangeRequestValidator,
+                bidiTextManager = bidiTextManager,
             ) {
                 BitwardenTheme(
                     theme = theme,

app/src/test/kotlin/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemScreenTest.kt

@@ -29,6 +29,7 @@ import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
 import com.bitwarden.ui.platform.components.icon.model.IconData
 import com.bitwarden.ui.platform.components.snackbar.model.BitwardenSnackbarData
 import com.bitwarden.ui.platform.manager.IntentManager
+import com.bitwarden.ui.platform.manager.dsl.bidiTextManager
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.util.asText
@@ -71,6 +72,7 @@ class VaultItemScreenTest : BitwardenComposeTest() {
     private var onNavigateToPasswordHistoryId: String? = null
 
     private val intentManager = mockk<IntentManager>(relaxed = true)
+    private val bidiTextManager = bidiTextManager()
 
     private val mutableEventFlow = bufferedMutableSharedFlow<VaultItemEvent>()
     private val mutableStateFlow = MutableStateFlow(DEFAULT_STATE)
@@ -83,6 +85,7 @@ class VaultItemScreenTest : BitwardenComposeTest() {
     fun setUp() {
         setContent(
             intentManager = intentManager,
+            bidiTextManager = bidiTextManager,
         ) {
             VaultItemScreen(
                 viewModel = viewModel,

authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/components/listitem/VaultVerificationCodeItem.kt

@@ -26,6 +26,7 @@ import com.bitwarden.ui.platform.components.icon.BitwardenIcon
 import com.bitwarden.ui.platform.components.icon.model.IconData
 import com.bitwarden.ui.platform.components.indicator.BitwardenCircularCountdownIndicator
 import com.bitwarden.ui.platform.components.model.CardStyle
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
 import com.bitwarden.ui.platform.resource.BitwardenDrawable
 import com.bitwarden.ui.platform.resource.BitwardenString
 import com.bitwarden.ui.platform.theme.BitwardenTheme
@@ -98,6 +99,8 @@ fun VaultVerificationCodeItem(
     cardStyle: CardStyle,
     modifier: Modifier = Modifier,
 ) {
+    val bidiTextManager = LocalBidiTextManager.current
+
     Row(
         modifier = modifier
             .testTag(tag = "Item")
@@ -154,7 +157,7 @@ fun VaultVerificationCodeItem(
 
         Text(
             modifier = Modifier.testTag(tag = "AuthCode"),
-            text = authCode.chunked(size = 3).joinToString(separator = " "),
+            text = bidiTextManager.formatVerificationCode(authCode, chunkSize = 3),
             style = BitwardenTheme.typography.sensitiveInfoSmall,
             color = BitwardenTheme.colorScheme.text.primary,
         )

authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/composition/LocalManagerProvider.kt

@@ -18,8 +18,11 @@ import com.bitwarden.authenticator.ui.platform.manager.exit.ExitManagerImpl
 import com.bitwarden.authenticator.ui.platform.manager.permissions.PermissionsManager
 import com.bitwarden.authenticator.ui.platform.manager.permissions.PermissionsManagerImpl
 import com.bitwarden.core.data.manager.BuildInfoManager
+import com.bitwarden.ui.platform.composition.LocalBidiTextManager
 import com.bitwarden.ui.platform.composition.LocalIntentManager
+import com.bitwarden.ui.platform.manager.BidiTextManager
 import com.bitwarden.ui.platform.manager.IntentManager
+import com.bitwarden.ui.platform.manager.dsl.bidiTextManager
 import java.time.Clock
 
 /**
@@ -34,13 +37,15 @@ fun LocalManagerProvider(
     intentManager: IntentManager = IntentManager.create(activity, clock, buildInfoManager),
     exitManager: ExitManager = ExitManagerImpl(activity),
     biometricsManager: BiometricsManager = BiometricsManagerImpl(activity),
+    bidiTextManager: BidiTextManager = bidiTextManager(),
     content: @Composable () -> Unit,
 ) {
     CompositionLocalProvider(
         LocalPermissionsManager provides permissionsManager,
         LocalIntentManager provides intentManager,
         LocalExitManager provides exitManager,
         LocalBiometricsManager provides biometricsManager,
+        LocalBidiTextManager provides bidiTextManager,
         content = content,
     )
 }

ui/src/main/kotlin/com/bitwarden/ui/platform/composition/LocalBidiTextManagerProvider.kt

@@ -0,0 +1,15 @@
+@file:OmitFromCoverage
+
+package com.bitwarden.ui.platform.composition
+
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.compositionLocalOf
+import com.bitwarden.annotation.OmitFromCoverage
+import com.bitwarden.ui.platform.manager.BidiTextManager
+
+/**
+ * CompositionLocal for [BidiTextManager].
+ */
+val LocalBidiTextManager: ProvidableCompositionLocal<BidiTextManager> = compositionLocalOf {
+    error("CompositionLocal BidiTextManager not present")
+}