diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsScreen.kt
index 817475a0c..55c22924f 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/pendingrequests/PendingRequestsScreen.kt
@@ -311,7 +311,7 @@ private fun PendingRequestsEmpty(
Spacer(modifier = Modifier.height(16.dp))
Spacer(modifier = Modifier.weight(1f))
Image(
- painter = rememberVectorPainter(id = R.drawable.ic_pending_requests),
+ painter = rememberVectorPainter(id = R.drawable.pending_requests),
contentDescription = null,
modifier = Modifier
.padding(vertical = 16.dp)
diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt
index 3ceadae80..f2c7d1939 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreen.kt
@@ -3,10 +3,10 @@ package com.x8bit.bitwarden.ui.platform.feature.settings.autofill.blockautofill
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.scaleIn
import androidx.compose.animation.scaleOut
+import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
@@ -215,24 +215,13 @@ private fun BlockAutoFillNoItems(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
) {
- Box(contentAlignment = Alignment.Center) {
- Icon(
- painter = rememberVectorPainter(
- id = R.drawable.ic_blocked_uri_background,
- ),
- contentDescription = null,
- tint = BitwardenTheme.colorScheme.icon.reversed,
- )
-
- Icon(
- painter = rememberVectorPainter(
- id = R.drawable.ic_blocked_uri_foreground,
- ),
- contentDescription = null,
- tint = BitwardenTheme.colorScheme.icon.primary,
- )
- }
-
+ Image(
+ painter = rememberVectorPainter(
+ id = R.drawable.blocked_uri,
+ ),
+ contentDescription = null,
+ modifier = Modifier.align(Alignment.CenterHorizontally),
+ )
Spacer(modifier = Modifier.height(32.dp))
Text(
diff --git a/app/src/main/res/drawable-night/account_setup.xml b/app/src/main/res/drawable-night/account_setup.xml
index 59ba45bac..12c522878 100644
--- a/app/src/main/res/drawable-night/account_setup.xml
+++ b/app/src/main/res/drawable-night/account_setup.xml
@@ -1,58 +1,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:height="201dp"
+ android:viewportWidth="200"
+ android:viewportHeight="201">
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-night/blocked_uri.xml b/app/src/main/res/drawable-night/blocked_uri.xml
new file mode 100644
index 000000000..01f9998f3
--- /dev/null
+++ b/app/src/main/res/drawable-night/blocked_uri.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-night/img_setup_complete.xml b/app/src/main/res/drawable-night/img_setup_complete.xml
index a4bf97120..f2b8d9b7f 100644
--- a/app/src/main/res/drawable-night/img_setup_complete.xml
+++ b/app/src/main/res/drawable-night/img_setup_complete.xml
@@ -1,44 +1,61 @@
+ android:viewportHeight="201">
+
+
+
-
+
+ android:pathData="M191.67,69.42C191.67,83.22 180.47,94.42 166.67,94.42C152.86,94.42 141.67,83.22 141.67,69.42C141.67,55.61 152.86,44.42 166.67,44.42C180.47,44.42 191.67,55.61 191.67,69.42Z"
+ android:fillColor="#FFBF00"/>
+
+
diff --git a/app/src/main/res/drawable-night/lock.xml b/app/src/main/res/drawable-night/lock.xml
index 7a8422080..914b4cf4e 100644
--- a/app/src/main/res/drawable-night/lock.xml
+++ b/app/src/main/res/drawable-night/lock.xml
@@ -1,66 +1,40 @@
+ android:viewportHeight="201">
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/open_email.xml b/app/src/main/res/drawable-night/open_email.xml
index ad658bd04..dd53e3b41 100644
--- a/app/src/main/res/drawable-night/open_email.xml
+++ b/app/src/main/res/drawable-night/open_email.xml
@@ -1,54 +1,48 @@
+ android:width="200dp"
+ android:height="201dp"
+ android:viewportWidth="200"
+ android:viewportHeight="201">
+
+
+
+
+ android:pathData="M164.58,100.67C164.58,117.93 150.59,131.92 133.33,131.92C116.07,131.92 102.08,117.93 102.08,100.67C102.08,83.41 116.07,69.42 133.33,69.42C150.59,69.42 164.58,83.41 164.58,100.67Z"
+ android:fillColor="#79A1E9"/>
+ android:pathData="M197.93,161.26L163.54,128.79L159.38,132.96L191.85,167.34C193.46,169.05 196.16,169.09 197.82,167.43L198.01,167.24C199.67,165.58 199.63,162.88 197.93,161.26Z"
+ android:fillColor="#175DDC"/>
-
-
-
-
diff --git a/app/src/main/res/drawable-night/pending_requests.xml b/app/src/main/res/drawable-night/pending_requests.xml
new file mode 100644
index 000000000..670c537d8
--- /dev/null
+++ b/app/src/main/res/drawable-night/pending_requests.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-night/vault.xml b/app/src/main/res/drawable-night/vault.xml
index 3369ba706..635dc0678 100644
--- a/app/src/main/res/drawable-night/vault.xml
+++ b/app/src/main/res/drawable-night/vault.xml
@@ -1,74 +1,74 @@
+ android:viewportHeight="201">
+
+
+
+
+
+
+
+
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-night/welcome_1.xml b/app/src/main/res/drawable-night/welcome_1.xml
new file mode 100644
index 000000000..3f5e7b6ca
--- /dev/null
+++ b/app/src/main/res/drawable-night/welcome_1.xml
@@ -0,0 +1,80 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-night/welcome_2.xml b/app/src/main/res/drawable-night/welcome_2.xml
new file mode 100644
index 000000000..8f155e882
--- /dev/null
+++ b/app/src/main/res/drawable-night/welcome_2.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-night/welcome_3.xml b/app/src/main/res/drawable-night/welcome_3.xml
new file mode 100644
index 000000000..0238feb37
--- /dev/null
+++ b/app/src/main/res/drawable-night/welcome_3.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable-night/welcome_4.xml b/app/src/main/res/drawable-night/welcome_4.xml
new file mode 100644
index 000000000..a2fa9ef7a
--- /dev/null
+++ b/app/src/main/res/drawable-night/welcome_4.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/account_setup.xml b/app/src/main/res/drawable/account_setup.xml
index 6804a7cc3..2f5454144 100644
--- a/app/src/main/res/drawable/account_setup.xml
+++ b/app/src/main/res/drawable/account_setup.xml
@@ -1,58 +1,51 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:height="201dp"
+ android:viewportWidth="200"
+ android:viewportHeight="201">
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/blocked_uri.xml b/app/src/main/res/drawable/blocked_uri.xml
new file mode 100644
index 000000000..53e78dc83
--- /dev/null
+++ b/app/src/main/res/drawable/blocked_uri.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_blocked_uri_background.xml b/app/src/main/res/drawable/ic_blocked_uri_background.xml
deleted file mode 100644
index e125d705c..000000000
--- a/app/src/main/res/drawable/ic_blocked_uri_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_blocked_uri_foreground.xml b/app/src/main/res/drawable/ic_blocked_uri_foreground.xml
deleted file mode 100644
index b650a63be..000000000
--- a/app/src/main/res/drawable/ic_blocked_uri_foreground.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_pending_requests.xml b/app/src/main/res/drawable/ic_pending_requests.xml
deleted file mode 100644
index 1bf251555..000000000
--- a/app/src/main/res/drawable/ic_pending_requests.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/img_setup_complete.xml b/app/src/main/res/drawable/img_setup_complete.xml
index 4cf89f5dd..659dd784e 100644
--- a/app/src/main/res/drawable/img_setup_complete.xml
+++ b/app/src/main/res/drawable/img_setup_complete.xml
@@ -1,44 +1,61 @@
+ android:viewportHeight="201">
+
+ android:pathData="M18.75,56.92C18.75,54.62 20.62,52.75 22.92,52.75H177.08C179.38,52.75 181.25,54.62 181.25,56.92V81.92C181.25,84.22 179.38,86.08 177.08,86.08H22.92C20.62,86.08 18.75,84.22 18.75,81.92V56.92Z"
+ android:fillColor="#DBE5F6"/>
-
+
-
+ android:pathData="M191.67,131.92C191.67,145.72 180.47,156.92 166.67,156.92C152.86,156.92 141.67,145.72 141.67,131.92C141.67,118.11 152.86,106.92 166.67,106.92C180.47,106.92 191.67,118.11 191.67,131.92Z"
+ android:fillColor="#FFBF00"/>
+
+
+
+
+
diff --git a/app/src/main/res/drawable/lock.xml b/app/src/main/res/drawable/lock.xml
index b409a4304..4f050beb6 100644
--- a/app/src/main/res/drawable/lock.xml
+++ b/app/src/main/res/drawable/lock.xml
@@ -1,66 +1,40 @@
+ android:viewportHeight="201">
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/open_email.xml b/app/src/main/res/drawable/open_email.xml
index 46fce951a..2f9cee1a4 100644
--- a/app/src/main/res/drawable/open_email.xml
+++ b/app/src/main/res/drawable/open_email.xml
@@ -1,54 +1,48 @@
+ android:width="192dp"
+ android:height="193dp"
+ android:viewportWidth="192"
+ android:viewportHeight="193">
+
-
-
-
-
-
+
+
+
+ android:pathData="M158,96.67C158,113.24 144.57,126.67 128,126.67C111.43,126.67 98,113.24 98,96.67C98,80.1 111.43,66.67 128,66.67C144.57,66.67 158,80.1 158,96.67Z"
+ android:fillColor="#AAC3EF"/>
+
diff --git a/app/src/main/res/drawable/pending_requests.xml b/app/src/main/res/drawable/pending_requests.xml
new file mode 100644
index 000000000..cadc96df6
--- /dev/null
+++ b/app/src/main/res/drawable/pending_requests.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/vault.xml b/app/src/main/res/drawable/vault.xml
index 6a7569b74..93f358428 100644
--- a/app/src/main/res/drawable/vault.xml
+++ b/app/src/main/res/drawable/vault.xml
@@ -1,74 +1,74 @@
+ android:viewportHeight="201">
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/welcome_1.xml b/app/src/main/res/drawable/welcome_1.xml
index a8050d264..2f4a4c1d0 100644
--- a/app/src/main/res/drawable/welcome_1.xml
+++ b/app/src/main/res/drawable/welcome_1.xml
@@ -1,73 +1,80 @@
+ android:width="152dp"
+ android:height="152dp"
+ android:viewportWidth="152"
+ android:viewportHeight="152">
+
+
+ android:pathData="M82.33,28.5C82.33,23.25 86.59,19 91.83,19H142.5C147.75,19 152,23.25 152,28.5V60.17C152,65.41 147.75,69.67 142.5,69.67H91.83C86.59,69.67 82.33,65.41 82.33,60.17V28.5Z"
+ android:fillColor="#DBE5F6"/>
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/welcome_2.xml b/app/src/main/res/drawable/welcome_2.xml
index a9607bd74..93aa6f022 100644
--- a/app/src/main/res/drawable/welcome_2.xml
+++ b/app/src/main/res/drawable/welcome_2.xml
@@ -1,58 +1,28 @@
+ android:viewportHeight="201">
+
+
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/welcome_3.xml b/app/src/main/res/drawable/welcome_3.xml
index a7486fce9..315e64a4f 100644
--- a/app/src/main/res/drawable/welcome_3.xml
+++ b/app/src/main/res/drawable/welcome_3.xml
@@ -1,46 +1,40 @@
+ android:width="188dp"
+ android:height="189dp"
+ android:viewportWidth="188"
+ android:viewportHeight="189">
+
+
-
-
-
+ android:pathData="M47,143.63C47,142.54 46.12,141.67 45.04,141.67L17.63,141.67C16.54,141.67 15.67,142.54 15.67,143.63L15.67,171.04C15.67,172.12 16.54,173 17.63,173C18.71,173 19.58,172.12 19.58,171.04L19.58,145.58L45.04,145.58C46.12,145.58 47,144.71 47,143.63Z"
+ android:fillColor="#020F66"
+ android:fillType="evenOdd"/>
+ android:pathData="M141,45.71C141,46.79 141.88,47.67 142.96,47.67L170.38,47.67C171.46,47.67 172.33,46.79 172.33,45.71L172.33,18.29C172.33,17.21 171.46,16.33 170.38,16.33C169.29,16.33 168.42,17.21 168.42,18.29L168.42,43.75L142.96,43.75C141.88,43.75 141,44.63 141,45.71Z"
+ android:fillColor="#020F66"
+ android:fillType="evenOdd"/>
-
+ android:pathData="M44.29,126C42.72,123.51 41.33,120.89 40.14,118.17H147.86C146.67,120.89 145.28,123.51 143.71,126H44.29Z"
+ android:fillColor="#99BAF4"
+ android:fillType="evenOdd"/>
diff --git a/app/src/main/res/drawable/welcome_4.xml b/app/src/main/res/drawable/welcome_4.xml
index ef9698221..4b3937287 100644
--- a/app/src/main/res/drawable/welcome_4.xml
+++ b/app/src/main/res/drawable/welcome_4.xml
@@ -1,56 +1,73 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:viewportHeight="201">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreenTest.kt
index dbc006d4c..c5e9dbe4c 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreenTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/autofill/blockautofill/BlockAutoFillScreenTest.kt
@@ -7,6 +7,7 @@ import androidx.compose.ui.test.isDialog
import androidx.compose.ui.test.onNodeWithContentDescription
import androidx.compose.ui.test.onNodeWithText
import androidx.compose.ui.test.performClick
+import androidx.compose.ui.test.performScrollTo
import com.x8bit.bitwarden.data.platform.repository.util.bufferedMutableSharedFlow
import com.x8bit.bitwarden.ui.platform.base.BaseComposeTest
import com.x8bit.bitwarden.ui.platform.base.util.asText
@@ -60,6 +61,7 @@ class BlockAutoFillScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText("New blocked URI")
+ .performScrollTo()
.assertIsDisplayed()
}
@@ -85,6 +87,7 @@ class BlockAutoFillScreenTest : BaseComposeTest() {
composeTestRule
.onNodeWithText("New blocked URI")
+ .performScrollTo()
.assertIsDisplayed()
}
@@ -92,6 +95,7 @@ class BlockAutoFillScreenTest : BaseComposeTest() {
fun `on add URI button click should send AddUriClick`() {
composeTestRule
.onNodeWithText("New blocked URI")
+ .performScrollTo()
.performClick()
verify { viewModel.trySendAction(BlockAutoFillAction.AddUriClick) }
}