Force LTR text direction for passwords and TOTP codes #6309
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package com.bitwarden.ui.platform.util | ||
|
|
||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.platform.LocalLayoutDirection | ||
| import androidx.compose.ui.text.TextStyle | ||
| import androidx.compose.ui.text.style.TextAlign | ||
| import androidx.compose.ui.text.style.TextDirection | ||
| import androidx.compose.ui.unit.LayoutDirection | ||
| import com.bitwarden.annotation.OmitFromCoverage | ||
|
|
||
| /** | ||
| * Returns a [TextStyle] that forces left-to-right text direction while maintaining | ||
| * locale-aware alignment. | ||
| * | ||
| * This extension is designed for sensitive alphanumeric content (passwords, TOTP codes) | ||
| * that must always read left-to-right regardless of system locale, but should align | ||
| * according to the layout direction (right-aligned in RTL locales, left-aligned in LTR). | ||
| * | ||
| * **Implementation:** | ||
| * - Sets `textDirection = TextDirection.Ltr` to force LTR reading order | ||
| * - Sets `textAlign` conditionally: | ||
| * - `TextAlign.End` in RTL layouts (aligns to right side) | ||
| * - `TextAlign.Start` in LTR layouts (aligns to left side) | ||
| * | ||
| * **Use cases:** | ||
| * - Password fields that should read "Pass123!" not "!321ssaP" in RTL locales | ||
| * - TOTP verification codes that should read "123 456" not "654 321" | ||
| * - Any alphanumeric content requiring LTR reading with locale-aware positioning | ||
| * | ||
| * @return A merged [TextStyle] with forced LTR direction and locale-aware alignment. | ||
| */ | ||
| @OmitFromCoverage | ||
| @Composable | ||
| fun TextStyle.withForcedLtr(): TextStyle { | ||
|
Collaborator
There was a problem hiding this comment. What do you think about adding the word |
||
| val layoutDirection = LocalLayoutDirection.current | ||
|
Collaborator
There was a problem hiding this comment. Can we pass this in? fun TextStyle.withForcedLtr(
layoutDirection: LayoutDirection = LocalLayoutDirection.current,
): TextStyle { |
||
| return merge( | ||
| TextStyle( | ||
| textDirection = TextDirection.Ltr, | ||
| textAlign = when (layoutDirection) { | ||
| LayoutDirection.Rtl -> TextAlign.End | ||
| LayoutDirection.Ltr -> TextAlign.Start | ||
|
Collaborator
There was a problem hiding this comment. Does it make more sense to explicitly call out
Contributor
Author
There was a problem hiding this comment. Yea, that's a little more concise. I'm for it. |
||
| }, | ||
| ), | ||
| ) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great docs!