From 466942a576fa56e21831e33af5936d4a4abec0ed Mon Sep 17 00:00:00 2001 From: mpbw2 <59324545+mpbw2@users.noreply.github.com> Date: Tue, 28 Jan 2025 09:01:45 -0500 Subject: [PATCH] proper margin fix --- .../feature/addedit/VaultAddEditLoginItems.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt index 1b5374547..1c80fe540 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditLoginItems.kt @@ -135,7 +135,8 @@ fun LazyListScope.vaultAddEditLoginItems( onNextCoachMark = onNextCoachMark, onCoachMarkDismissed = onCoachMarkDismissed, modifier = Modifier - .fillMaxWidth(), + .fillMaxWidth() + .standardHorizontalMargin(), ) } @@ -563,7 +564,7 @@ private fun CoachMarkScope<AddEditItemCoachMark>.TotpRow( onActionClick = onNextCoachMark, ) }, - modifier = Modifier.standardHorizontalMargin(), + modifier = modifier, ) { if (totpKey != null) { if (canViewTotp) { @@ -596,7 +597,8 @@ private fun CoachMarkScope<AddEditItemCoachMark>.TotpRow( }, textFieldTestTag = "LoginTotpEntry", cardStyle = CardStyle.Full, - modifier = modifier, + modifier = Modifier + .fillMaxWidth(), ) } else { BitwardenTextField( @@ -608,7 +610,8 @@ private fun CoachMarkScope<AddEditItemCoachMark>.TotpRow( readOnly = true, enabled = false, singleLine = true, - modifier = modifier, + modifier = Modifier + .fillMaxWidth(), ) } } else { @@ -617,11 +620,10 @@ private fun CoachMarkScope<AddEditItemCoachMark>.TotpRow( label = stringResource(id = R.string.setup_totp), icon = rememberVectorPainter(id = R.drawable.ic_light_bulb), onClick = onTotpSetupClick, + isEnabled = canViewTotp, modifier = Modifier .testTag("SetupTotpButton") - .fillMaxWidth() - .standardHorizontalMargin(), - isEnabled = canViewTotp, + .fillMaxWidth(), ) } }