From dca88a58e71518e0ec89ed4f1d1b74feaa2075c2 Mon Sep 17 00:00:00 2001 From: Dave Severns <149429124+dseverns-livefront@users.noreply.github.com> Date: Tue, 19 Nov 2024 10:16:16 -0500 Subject: [PATCH] PM-15037 Update Import Logins for design audit (#4333) --- .../components/card/BitwardenContentCard.kt | 7 +++--- .../content/BitwardenContentBlock.kt | 2 +- .../importlogins/ImportLoginsScreen.kt | 2 ++ .../components/ImportLoginsInstructionStep.kt | 3 --- app/src/main/res/drawable/ic_number1.xml | 12 +++++----- app/src/main/res/drawable/ic_number2.xml | 22 ++++++------------- app/src/main/res/drawable/ic_number3.xml | 20 +++++++---------- app/src/main/res/drawable/ic_number4.xml | 20 +++++++---------- 8 files changed, 35 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt index 7b94d5cd8..423b2467c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt @@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.clip import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import com.x8bit.bitwarden.ui.platform.base.util.bottomDivider @@ -35,10 +36,8 @@ fun BitwardenContentCard( Column( modifier = modifier .fillMaxWidth() - .background( - color = BitwardenTheme.colorScheme.background.secondary, - shape = BitwardenTheme.shapes.content, - ), + .clip(shape = BitwardenTheme.shapes.content) + .background(color = BitwardenTheme.colorScheme.background.secondary), ) { contentItems.forEachIndexed { index, item -> Box( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt index c5a3d937d..c4f75a733 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt @@ -95,7 +95,7 @@ private fun BitwardenContentBlock( } Spacer(Modifier.height(12.dp)) } - Spacer(Modifier.width(16.dp)) + Spacer(Modifier.width(12.dp)) } } diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt index ed69a0603..9750c2460 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt @@ -524,6 +524,8 @@ private fun ImportLoginsSuccessBottomSheetContent( iconVectorResource = R.drawable.ic_shield, ), ), + bottomDividerPaddingStart = 48.dp, + showBottomDivider = true, modifier = Modifier.standardHorizontalMargin(), ) { contentData -> BitwardenContentBlock( diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt index ac60bd3e3..f49d9517b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.navigationBarsPadding -import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.Text @@ -68,8 +67,6 @@ fun ImportLoginsInstructionStep( ) { instructionStep -> InstructionRowItem( instructionStep = instructionStep, - modifier = modifier - .padding(all = 12.dp), ) } Spacer(Modifier.height(24.dp)) diff --git a/app/src/main/res/drawable/ic_number1.xml b/app/src/main/res/drawable/ic_number1.xml index 70c814975..07586068c 100644 --- a/app/src/main/res/drawable/ic_number1.xml +++ b/app/src/main/res/drawable/ic_number1.xml @@ -1,13 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M0,0.333h24v24h-24z"/> diff --git a/app/src/main/res/drawable/ic_number2.xml b/app/src/main/res/drawable/ic_number2.xml index 3937b2d4c..8c42b86c0 100644 --- a/app/src/main/res/drawable/ic_number2.xml +++ b/app/src/main/res/drawable/ic_number2.xml @@ -1,17 +1,9 @@ - - - - - - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + diff --git a/app/src/main/res/drawable/ic_number3.xml b/app/src/main/res/drawable/ic_number3.xml index 65d016ae6..1a882b95d 100644 --- a/app/src/main/res/drawable/ic_number3.xml +++ b/app/src/main/res/drawable/ic_number3.xml @@ -1,17 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> - - - - + android:pathData="M0,0.333h24v24h-24z"/> + diff --git a/app/src/main/res/drawable/ic_number4.xml b/app/src/main/res/drawable/ic_number4.xml index 229f2704a..9644de83e 100644 --- a/app/src/main/res/drawable/ic_number4.xml +++ b/app/src/main/res/drawable/ic_number4.xml @@ -1,17 +1,13 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> - - - - + android:pathData="M0,0.333h24v24h-24z"/> +