mirror of
https://github.com/bitwarden/android.git
synced 2026-10-23 03:23:53 -05:00
Address review comments
- Rename extension to be more descriptive. - Use `Left` and `Right` text alignments instead of `Start` and `End`.
This commit is contained in:
4 files changed
+11
-10
No files matched your search
+2
-2
@@ -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,
|
||||
)
|
||||
|
||||
|
||||
+2
-2
@@ -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,
|
||||
)
|
||||
|
||||
|
||||
+2
-2
@@ -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) {
|
||||
|
||||
@@ -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
|
||||
},
|
||||
),
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user