mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-11-21 08:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-15037 Update Import Logins for design audit (#4333)

Browse source
This commit is contained in:
Dave Severns 2024-11-19 10:16:16 -05:00 committed by GitHub
parent da878a9fab
commit dca88a58e7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 35 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/card/BitwardenContentCard.kt
View file

@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.x8bit.bitwarden.ui.platform.base.util.bottomDivider import com.x8bit.bitwarden.ui.platform.base.util.bottomDivider
@ -35,10 +36,8 @@ fun <T> BitwardenContentCard(
Column( Column(
modifier = modifier modifier = modifier
.fillMaxWidth() .fillMaxWidth()
.background( .clip(shape = BitwardenTheme.shapes.content)
color = BitwardenTheme.colorScheme.background.secondary, .background(color = BitwardenTheme.colorScheme.background.secondary),
shape = BitwardenTheme.shapes.content,
),
) { ) {
contentItems.forEachIndexed { index, item -> contentItems.forEachIndexed { index, item ->
Box( Box(

2
app/src/main/java/com/x8bit/bitwarden/ui/platform/components/content/BitwardenContentBlock.kt
View file

@ -95,7 +95,7 @@ private fun BitwardenContentBlock(
} }
Spacer(Modifier.height(12.dp)) Spacer(Modifier.height(12.dp))
} }
Spacer(Modifier.width(16.dp)) Spacer(Modifier.width(12.dp))
} }
} }

2
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt
View file

@ -524,6 +524,8 @@ private fun ImportLoginsSuccessBottomSheetContent(
iconVectorResource = R.drawable.ic_shield, iconVectorResource = R.drawable.ic_shield,
), ),
), ),
bottomDividerPaddingStart = 48.dp,
showBottomDivider = true,
modifier = Modifier.standardHorizontalMargin(), modifier = Modifier.standardHorizontalMargin(),
) { contentData -> ) { contentData ->
BitwardenContentBlock( BitwardenContentBlock(

3
app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/components/ImportLoginsInstructionStep.kt
View file

@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Text import androidx.compose.material3.Text
@ -68,8 +67,6 @@ fun ImportLoginsInstructionStep(
) { instructionStep -> ) { instructionStep ->
InstructionRowItem( InstructionRowItem(
instructionStep = instructionStep, instructionStep = instructionStep,
modifier = modifier
.padding(all = 12.dp),
) )
} }
Spacer(Modifier.height(24.dp)) Spacer(Modifier.height(24.dp))

12
app/src/main/res/drawable/ic_number1.xml
View file

@ -1,13 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp" android:width="24dp"
android:height="17dp" android:height="24dp"
android:viewportWidth="16" android:viewportWidth="24"
android:viewportHeight="17"> android:viewportHeight="24">
<group> <group>
<clip-path <clip-path
android:pathData="M0,0.333h16v16h-16z"/> android:pathData="M0,0.333h24v24h-24z"/>
<path <path
android:pathData="M7.68,14.333V4.762L5.572,5.306V3.725L8.496,2.433H9.771V14.333H7.68Z" android:pathData="M11.68,18.333V8.762L9.572,9.306V7.725L12.496,6.433H13.771V18.333H11.68Z"
android:fillColor="#175DDC"/> android:fillColor="#175DDC"/>
</group> </group>
</vector> </vector>

22
app/src/main/res/drawable/ic_number2.xml
View file

@ -1,17 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp" android:width="24dp"
android:height="17dp" android:height="24dp"
android:viewportWidth="16" android:viewportWidth="24"
android:viewportHeight="17"> android:viewportHeight="24">
<group> <path
<clip-path android:pathData="M8.012,18.333V16.854C8.771,16.254 9.496,15.653 10.188,15.052C10.879,14.452 11.502,13.857 12.058,13.267C12.613,12.678 13.049,12.1 13.367,11.533C13.684,10.967 13.843,10.423 13.843,9.901C13.843,9.561 13.78,9.244 13.656,8.949C13.531,8.655 13.333,8.417 13.061,8.235C12.8,8.054 12.449,7.963 12.007,7.963C11.576,7.963 11.208,8.06 10.902,8.252C10.607,8.445 10.386,8.706 10.239,9.034C10.091,9.352 10.018,9.714 10.018,10.123H8.046C8.068,9.261 8.255,8.541 8.607,7.963C8.958,7.385 9.434,6.955 10.035,6.671C10.635,6.377 11.31,6.229 12.058,6.229C12.862,6.229 13.548,6.377 14.115,6.671C14.681,6.966 15.118,7.38 15.424,7.912C15.73,8.445 15.883,9.074 15.883,9.799C15.883,10.332 15.781,10.859 15.577,11.38C15.384,11.891 15.112,12.389 14.761,12.877C14.409,13.352 14.013,13.817 13.571,14.271C13.14,14.712 12.692,15.137 12.228,15.545C11.763,15.942 11.315,16.31 10.885,16.65H16.206V18.333H8.012Z"
android:pathData="M0,0.333h16v16h-16z"/> android:fillColor="#175DDC"/>
<group>
<clip-path
android:pathData="M0,0.333h16v16h-16z"/>
<path
android:pathData="M4.012,14.333V12.854C4.772,12.253 5.497,11.653 6.188,11.052C6.88,10.451 7.503,9.856 8.058,9.267C8.614,8.678 9.05,8.1 9.367,7.533C9.685,6.966 9.843,6.422 9.843,5.901C9.843,5.561 9.781,5.244 9.656,4.949C9.532,4.654 9.333,4.416 9.061,4.235C8.801,4.054 8.449,3.963 8.007,3.963C7.577,3.963 7.208,4.059 6.902,4.252C6.608,4.445 6.387,4.705 6.239,5.034C6.092,5.351 6.018,5.714 6.018,6.122H4.046C4.069,5.261 4.256,4.541 4.607,3.963C4.959,3.385 5.435,2.954 6.035,2.671C6.636,2.376 7.31,2.229 8.058,2.229C8.863,2.229 9.549,2.376 10.115,2.671C10.682,2.966 11.118,3.379 11.424,3.912C11.73,4.445 11.883,5.074 11.883,5.799C11.883,6.332 11.781,6.859 11.577,7.38C11.385,7.89 11.113,8.389 10.761,8.876C10.41,9.352 10.013,9.817 9.571,10.27C9.141,10.712 8.693,11.137 8.228,11.545C7.764,11.942 7.316,12.31 6.885,12.65H12.206V14.333H4.012Z"
android:fillColor="#175DDC"/>
</group>
</group>
</vector> </vector>

20
app/src/main/res/drawable/ic_number3.xml
View file

@ -1,17 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp" android:width="24dp"
android:height="17dp" android:height="24dp"
android:viewportWidth="16" android:viewportWidth="24"
android:viewportHeight="17"> android:viewportHeight="24">
<group> <group>
<clip-path <clip-path
android:pathData="M0,0.333h16v16h-16z"/> android:pathData="M0,0.333h24v24h-24z"/>
<group> <path
<clip-path android:pathData="M12.477,18.538C11.707,18.538 11.004,18.402 10.369,18.129C9.734,17.846 9.224,17.421 8.839,16.854C8.465,16.277 8.267,15.551 8.244,14.679H10.25C10.262,15.075 10.352,15.438 10.522,15.767C10.703,16.084 10.958,16.339 11.287,16.531C11.616,16.713 12.012,16.803 12.477,16.803C12.919,16.803 13.293,16.719 13.599,16.549C13.917,16.378 14.155,16.146 14.313,15.851C14.472,15.557 14.551,15.228 14.551,14.866C14.551,14.424 14.443,14.061 14.228,13.778C14.013,13.483 13.718,13.262 13.344,13.115C12.97,12.967 12.545,12.894 12.069,12.894H11.185V11.21H12.069C12.693,11.21 13.203,11.069 13.599,10.785C13.996,10.491 14.194,10.066 14.194,9.51C14.194,9.046 14.041,8.672 13.735,8.388C13.441,8.105 13.016,7.963 12.46,7.963C11.882,7.963 11.423,8.133 11.083,8.473C10.755,8.813 10.573,9.233 10.539,9.731H8.533C8.567,9.017 8.748,8.4 9.077,7.878C9.417,7.346 9.876,6.938 10.454,6.654C11.032,6.371 11.707,6.229 12.477,6.229C13.282,6.229 13.962,6.371 14.517,6.654C15.073,6.938 15.492,7.317 15.775,7.793C16.07,8.269 16.217,8.791 16.217,9.357C16.217,9.799 16.132,10.202 15.962,10.564C15.792,10.927 15.56,11.233 15.265,11.483C14.982,11.72 14.648,11.896 14.262,12.009C14.704,12.1 15.095,12.276 15.435,12.536C15.786,12.797 16.059,13.132 16.251,13.54C16.455,13.936 16.557,14.401 16.557,14.934C16.557,15.58 16.399,16.18 16.081,16.736C15.775,17.279 15.316,17.716 14.704,18.045C14.104,18.373 13.361,18.538 12.477,18.538Z"
android:pathData="M0,0.333h16v16h-16z"/> android:fillColor="#175DDC"/>
<path
android:pathData="M8.478,14.537C7.707,14.537 7.004,14.401 6.37,14.129C5.735,13.846 5.225,13.421 4.84,12.854C4.466,12.276 4.267,11.551 4.245,10.678H6.251C6.262,11.075 6.353,11.437 6.523,11.766C6.704,12.083 6.959,12.338 7.288,12.531C7.616,12.712 8.013,12.803 8.478,12.803C8.92,12.803 9.294,12.718 9.6,12.548C9.917,12.378 10.155,12.146 10.314,11.851C10.472,11.556 10.552,11.228 10.552,10.865C10.552,10.423 10.444,10.06 10.229,9.777C10.013,9.482 9.719,9.261 9.345,9.114C8.971,8.967 8.546,8.893 8.07,8.893H7.186V7.21H8.07C8.693,7.21 9.203,7.068 9.6,6.785C9.996,6.49 10.195,6.065 10.195,5.51C10.195,5.045 10.042,4.671 9.736,4.388C9.441,4.105 9.016,3.963 8.461,3.963C7.883,3.963 7.424,4.133 7.084,4.473C6.755,4.813 6.574,5.232 6.54,5.731H4.534C4.568,5.017 4.749,4.399 5.078,3.878C5.418,3.345 5.877,2.937 6.455,2.654C7.033,2.371 7.707,2.229 8.478,2.229C9.282,2.229 9.962,2.371 10.518,2.654C11.073,2.937 11.492,3.317 11.776,3.793C12.07,4.269 12.218,4.79 12.218,5.357C12.218,5.799 12.133,6.201 11.963,6.564C11.793,6.927 11.56,7.233 11.266,7.482C10.982,7.72 10.648,7.896 10.263,8.009C10.705,8.1 11.096,8.275 11.436,8.536C11.787,8.797 12.059,9.131 12.252,9.539C12.456,9.936 12.558,10.4 12.558,10.933C12.558,11.579 12.399,12.18 12.082,12.735C11.776,13.279 11.317,13.715 10.705,14.044C10.104,14.373 9.362,14.537 8.478,14.537Z"
android:fillColor="#175DDC"/>
</group>
</group> </group>
</vector> </vector>

20
app/src/main/res/drawable/ic_number4.xml
View file

@ -1,17 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp" android:width="24dp"
android:height="17dp" android:height="24dp"
android:viewportWidth="16" android:viewportWidth="24"
android:viewportHeight="17"> android:viewportHeight="24">
<group> <group>
<clip-path <clip-path
android:pathData="M0,0.333h16v16h-16z"/> android:pathData="M0,0.333h24v24h-24z"/>
<group> <path
<clip-path android:pathData="M13.71,18.333V16.072H7.811V14.44L13.42,6.433H15.733V14.287H17.347V16.072H15.733V18.333H13.71ZM10.003,14.287H13.828V8.677L10.003,14.287Z"
android:pathData="M0,0.333h16v16h-16z"/> android:fillColor="#175DDC"/>
<path
android:pathData="M9.71,14.333V12.072H3.811V10.44L9.421,2.433H11.733V10.287H13.348V12.072H11.733V14.333H9.71ZM6.004,10.287H9.829V4.677L6.004,10.287Z"
android:fillColor="#175DDC"/>
</group>
</group> </group>
</vector> </vector>