Replaced welcome png files with vector image.

This way it looks cleaner and doesn't need different versions for light/dark. Tested by: - Manual testing. Signed-off-by: Kevin Deus <[email protected]>
openwallet-foundation-labs · Nov 22, 2024 · 97553c7 · 97553c7
1 parent cd1c59d
commit 97553c7
Show file tree

Hide file tree

Showing 4 changed files with 104 additions and 5 deletions.
diff --git a/...et/src/main/java/com/android/identity_credential/wallet/ui/destination/main/MainScreen.kt b/...et/src/main/java/com/android/identity_credential/wallet/ui/destination/main/MainScreen.kt
@@ -466,11 +466,7 @@ fun MainScreenNoDocumentsAvailable(
         )
     }
     Image(
-        painter = painterResource(
-            if (isSystemInDarkTheme())
-                R.drawable.welcome_image_dark
-            else
-                R.drawable.welcome_image_light),
+        painter = painterResource(R.drawable.welcome_image),
         contentDescription = stringResource(R.string.welcome_to_your_wallet_image),
         modifier = Modifier.padding(8.dp)
     )

diff --git a/wallet/src/main/res/drawable/welcome_image.xml b/wallet/src/main/res/drawable/welcome_image.xml
@@ -0,0 +1,103 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="364dp"
+    android:height="266dp"
+    android:viewportWidth="364"
+    android:viewportHeight="266">
+  <group>
+    <clip-path
+        android:pathData="M0,0h364v265.05h-364z"/>
+    <path
+        android:pathData="M182,250.82C116.71,250.82 63.7,197.73 63.7,132.52C63.7,67.32 116.71,14.22 182,14.22C247.29,14.22 300.3,67.32 300.3,132.52C300.3,197.73 247.29,250.82 182,250.82ZM182,15.99C158.95,15.99 136.42,22.83 117.26,35.63C98.09,48.44 83.16,66.64 74.34,87.93C65.52,109.22 63.21,132.65 67.71,155.26C72.2,177.86 83.3,198.63 99.6,214.93C115.9,231.22 136.66,242.32 159.27,246.82C181.87,251.32 205.3,249.01 226.6,240.19C247.89,231.37 266.09,216.43 278.89,197.27C291.7,178.1 298.53,155.57 298.53,132.52C298.51,101.63 286.22,72 264.38,50.15C242.53,28.3 212.9,16.01 182,15.99Z"
+        android:fillColor="#E8EAED"/>
+    <path
+        android:pathData="M182,250.82C116.71,250.82 63.7,197.73 63.7,132.52C63.7,67.32 116.71,14.22 182,14.22C247.29,14.22 300.3,67.32 300.3,132.52C300.3,197.73 247.29,250.82 182,250.82ZM182,15.99C158.95,15.99 136.42,22.83 117.26,35.63C98.09,48.44 83.16,66.64 74.34,87.93C65.52,109.22 63.21,132.65 67.71,155.26C72.2,177.86 83.3,198.63 99.6,214.93C115.9,231.22 136.66,242.32 159.27,246.82C181.87,251.32 205.3,249.01 226.6,240.19C247.89,231.37 266.09,216.43 278.89,197.27C291.7,178.1 298.53,155.57 298.53,132.52C298.51,101.63 286.22,72 264.38,50.15C242.53,28.3 212.9,16.01 182,15.99Z"
+        android:fillColor="#E8EAED"/>
+    <path
+        android:pathData="M255.04,192.3V166.68C255.02,166 254.75,165.35 254.27,164.87C253.79,164.39 253.14,164.11 252.46,164.09V143.56C252.79,143.57 253.12,143.52 253.42,143.4C253.73,143.28 254.01,143.1 254.24,142.86C254.47,142.63 254.66,142.35 254.77,142.04C254.89,141.74 254.95,141.41 254.93,141.08V130.83C254.92,130.15 254.64,129.5 254.16,129.02C253.68,128.54 253.03,128.26 252.35,128.24V74.43C252.36,72.74 252.03,71.07 251.39,69.51C250.75,67.95 249.81,66.53 248.62,65.34C247.42,64.15 246.01,63.2 244.45,62.56C242.89,61.91 241.22,61.58 239.53,61.59H121.85C120.17,61.58 118.5,61.91 116.94,62.56C115.38,63.2 113.97,64.15 112.78,65.34C111.58,66.54 110.64,67.95 110,69.51C109.36,71.07 109.03,72.74 109.04,74.43V223.82C109.92,224.5 110.75,225.17 111.62,225.83V74.43C111.64,71.72 112.72,69.12 114.63,67.2C116.55,65.28 119.14,64.2 121.85,64.18H239.64C242.35,64.2 244.94,65.28 246.86,67.2C248.77,69.12 249.86,71.71 249.87,74.43V228.15C250.75,227.54 251.64,226.92 252.46,226.28V194.89C253.14,194.87 253.79,194.59 254.27,194.11C254.75,193.63 255.02,192.98 255.04,192.3Z"
+        android:fillColor="#DADCE0"/>
+    <path
+        android:pathData="M343.74,187.79L338.97,192.57C338.81,192.74 338.62,192.87 338.41,192.96C338.19,193.05 337.96,193.1 337.73,193.1C337.5,193.1 337.27,193.05 337.06,192.96C336.85,192.87 336.66,192.74 336.5,192.57L331.73,187.79C331.57,187.63 331.43,187.44 331.34,187.22C331.25,187.01 331.2,186.78 331.2,186.55C331.2,186.32 331.25,186.09 331.34,185.88C331.43,185.66 331.57,185.47 331.73,185.31L336.5,180.54C336.65,180.37 336.85,180.24 337.06,180.15C337.27,180.05 337.5,180.01 337.73,180.01C337.96,180.01 338.2,180.05 338.41,180.15C338.62,180.24 338.81,180.37 338.97,180.54L343.74,185.31C343.91,185.47 344.04,185.66 344.13,185.88C344.23,186.09 344.27,186.32 344.27,186.55C344.27,186.78 344.23,187.01 344.13,187.22C344.04,187.44 343.91,187.63 343.74,187.79Z"
+        android:fillColor="#E8EAED"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M317.99,96.35C319.04,96.35 320.06,96.03 320.93,95.45C321.8,94.87 322.48,94.04 322.89,93.07C323.29,92.1 323.39,91.04 323.19,90.01C322.98,88.98 322.48,88.04 321.74,87.3C320.99,86.55 320.05,86.05 319.02,85.85C317.99,85.64 316.93,85.75 315.96,86.15C314.99,86.55 314.16,87.23 313.58,88.1C313,88.97 312.69,90 312.69,91.04C312.69,92.45 313.24,93.8 314.24,94.79C315.23,95.79 316.58,96.35 317.99,96.35Z"
+        android:fillColor="#EE675C"/>
+    <path
+        android:pathData="M281.03,20.83L278.54,23.33L285.37,30.21L287.86,27.71L281.03,20.83Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#34A853"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M327,146.85L327.51,143.39C328.96,143.56 330.32,144.16 331.42,145.1C332.07,145.67 332.88,146.03 333.73,146.13C334.58,146.26 335.45,146.15 336.25,145.81C337.58,145.22 339.06,145.04 340.49,145.29C341.94,145.45 343.31,146.04 344.4,147.01C345.06,147.57 345.86,147.93 346.71,148.04L346.2,151.49C344.75,151.34 343.38,150.75 342.28,149.79C341.63,149.24 340.83,148.88 339.98,148.75C339.13,148.63 338.26,148.74 337.47,149.08C336.13,149.63 334.66,149.8 333.23,149.6C331.79,149.38 330.44,148.8 329.3,147.89C328.64,147.35 327.84,147 327,146.85Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#34A853"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M328.34,54.08L325.87,51.61C326.86,50.55 328.14,49.81 329.54,49.48C330.37,49.25 331.13,48.83 331.75,48.24C332.38,47.64 332.81,46.87 332.99,46.02C333.32,44.6 334.05,43.31 335.11,42.31C336.1,41.24 337.39,40.5 338.81,40.19C339.64,39.97 340.4,39.54 341.02,38.95L343.49,41.43C342.51,42.5 341.21,43.24 339.78,43.55C338.95,43.77 338.2,44.19 337.58,44.78C336.92,45.36 336.48,46.14 336.34,47C335.98,48.41 335.25,49.69 334.22,50.71C333.2,51.74 331.92,52.47 330.52,52.83C329.7,53.06 328.95,53.49 328.34,54.08Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#E74133"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M305.24,207.7L298.36,214.57L300.86,217.07L307.73,210.2L305.24,207.7Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#FBBC05"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M34.18,236.34L27.32,243.23L29.81,245.73L36.67,238.85L34.18,236.34Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#FBBC05"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M329.26,237.35L326.76,239.85L333.63,246.73L336.13,244.23L329.26,237.35Z"
+        android:strokeAlpha="0.51"
+        android:fillColor="#3E82F1"
+        android:fillAlpha="0.51"/>
+    <path
+        android:pathData="M75.1,39.97L71.21,36.08C70.71,35.61 70.32,35.05 70.04,34.42C69.77,33.79 69.62,33.12 69.62,32.44C69.61,31.75 69.73,31.07 69.99,30.44C70.25,29.81 70.63,29.23 71.11,28.75C71.59,28.26 72.17,27.88 72.8,27.62C73.43,27.36 74.11,27.24 74.8,27.24C75.48,27.25 76.15,27.39 76.78,27.67C77.41,27.94 77.97,28.33 78.45,28.83L82.33,32.72C82.82,33.19 83.2,33.75 83.46,34.38C83.72,35 83.86,35.67 83.86,36.34C83.86,37.02 83.72,37.69 83.46,38.31C83.2,38.93 82.82,39.5 82.33,39.97C81.36,40.9 80.06,41.43 78.71,41.43C77.37,41.43 76.07,40.9 75.1,39.97Z"
+        android:fillColor="#E8EAED"/>
+    <path
+        android:pathData="M33.35,62.32L25.14,62.59C24.84,62.61 24.54,62.71 24.28,62.88C24.02,63.05 23.82,63.29 23.67,63.56C23.53,63.84 23.46,64.14 23.47,64.45C23.48,64.76 23.57,65.06 23.73,65.33L28.06,72.23C28.23,72.48 28.46,72.69 28.74,72.84C29.01,72.98 29.32,73.05 29.63,73.04C29.94,73.03 30.24,72.95 30.51,72.79C30.77,72.63 31,72.41 31.15,72.14L34.94,64.88C35.1,64.62 35.17,64.31 35.17,64C35.16,63.69 35.07,63.39 34.91,63.13C34.75,62.87 34.52,62.65 34.24,62.51C33.97,62.37 33.66,62.3 33.35,62.32L25.14,62.59C24.84,62.61 24.54,62.71 24.28,62.88C24.02,63.05 23.82,63.29 23.67,63.56C23.53,63.84 23.46,64.14 23.47,64.45C23.48,64.76 23.57,65.06 23.73,65.33L28.06,72.23C28.23,72.48 28.46,72.69 28.74,72.84C29.01,72.98 29.32,73.05 29.63,73.04C29.94,73.03 30.24,72.95 30.51,72.79C30.77,72.63 31,72.41 31.15,72.14L34.94,64.88C35.1,64.62 35.17,64.31 35.17,64C35.16,63.69 35.07,63.39 34.91,63.13C34.75,62.87 34.52,62.65 34.24,62.51C33.97,62.37 33.66,62.3 33.35,62.32Z"
+        android:fillColor="#5BB974"/>
+    <path
+        android:pathData="M31.28,173.08L26.5,177.85C26.35,178.01 26.15,178.15 25.94,178.24C25.73,178.33 25.5,178.38 25.27,178.38C25.04,178.38 24.81,178.33 24.59,178.24C24.38,178.15 24.19,178.01 24.03,177.85L19.26,173.08C18.93,172.75 18.75,172.3 18.75,171.84C18.75,171.37 18.93,170.93 19.26,170.59L24.03,165.82C24.19,165.65 24.38,165.52 24.59,165.43C24.81,165.34 25.04,165.29 25.27,165.29C25.5,165.29 25.73,165.34 25.94,165.43C26.15,165.52 26.35,165.65 26.5,165.82L31.27,170.59C31.6,170.92 31.78,171.37 31.79,171.83C31.79,172.3 31.61,172.74 31.28,173.08Z"
+        android:fillColor="#EE675C"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M75.89,229.48C74.84,228.48 74.1,227.19 73.77,225.77C73.55,224.94 73.13,224.18 72.53,223.56C71.93,222.95 71.16,222.52 70.33,222.32C68.91,221.99 67.61,221.25 66.62,220.19C65.54,219.2 64.8,217.89 64.5,216.46C64.27,215.63 63.85,214.87 63.26,214.25L65.72,211.77C66.8,212.76 67.54,214.06 67.84,215.48C68.06,216.31 68.49,217.07 69.08,217.69C69.68,218.32 70.45,218.75 71.29,218.93C72.71,219.26 74,220 75,221.06C76.05,222.06 76.79,223.35 77.11,224.77C77.33,225.6 77.76,226.36 78.35,226.98L75.89,229.48Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#34A853"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M12.37,22.97C13.66,22.33 15.09,22.03 16.52,22.09C17.37,22.19 18.23,22.03 18.99,21.65C19.77,21.31 20.43,20.72 20.84,19.97C21.65,18.77 22.74,17.8 24.02,17.14C25.31,16.5 26.74,16.19 28.17,16.26C29.02,16.35 29.88,16.2 30.64,15.81L32.23,19C30.95,19.64 29.52,19.94 28.09,19.88C27.24,19.78 26.38,19.93 25.62,20.32C24.83,20.66 24.18,21.25 23.77,22C22.96,23.2 21.87,24.17 20.59,24.83C19.3,25.47 17.88,25.77 16.44,25.72C15.59,25.62 14.73,25.77 13.97,26.16L12.37,22.97Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#FBBC05"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M44.17,107.33L37.31,114.2L39.76,116.7L46.62,109.83L44.17,107.33Z"
+        android:strokeAlpha="0.51"
+        android:fillColor="#3E82F1"
+        android:fillAlpha="0.51"/>
+    <path
+        android:pathData="M140.45,186.51L140.45,156.69A9.04,9.04 0,0 1,149.49 147.65L198.28,147.65A9.04,9.04 0,0 1,207.32 156.69L207.32,186.51A9.04,9.04 0,0 1,198.28 195.54L149.49,195.54A9.04,9.04 0,0 1,140.45 186.51z"
+        android:fillColor="#0B57D0"/>
+    <path
+        android:pathData="M155.12,200.06L155.12,170.24A10.64,10.64 0,0 1,165.75 159.61L214.55,159.61A10.64,10.64 0,0 1,225.18 170.24L225.18,200.06A10.64,10.64 0,0 1,214.55 210.7L165.75,210.7A10.64,10.64 0,0 1,155.12 200.06z"
+        android:strokeWidth="3.1993"
+        android:fillColor="#A4BDFF"
+        android:strokeColor="#ffffff"/>
+    <path
+        android:pathData="M177.23,175.76L177.23,182.37A3.36,3.36 0,0 1,173.87 185.73L167.26,185.73A3.36,3.36 0,0 1,163.9 182.37L163.9,175.76A3.36,3.36 0,0 1,167.26 172.4L173.87,172.4A3.36,3.36 0,0 1,177.23 175.76z"
+        android:fillColor="#0B57D0"/>
+    <path
+        android:pathData="M222.55,191.07L222.55,196.4L165.71,196.4C164.71,196.4 163.9,195.59 163.9,194.59L163.9,192.87C163.9,191.87 164.71,191.07 165.71,191.07L222.55,191.07Z"
+        android:fillColor="#0B57D0"/>
+    <path
+        android:pathData="M181.64,95.94m-15.54,0a15.54,15.54 0,1 1,31.09 0a15.54,15.54 0,1 1,-31.09 0"
+        android:fillColor="#0B57D0"/>
+    <path
+        android:pathData="M175.65,97.08L179.54,100.96L188.93,91.57"
+        android:strokeWidth="1.31765"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/wallet/src/main/res/drawable/welcome_image_dark.png b/wallet/src/main/res/drawable/welcome_image_dark.png
diff --git a/wallet/src/main/res/drawable/welcome_image_light.png b/wallet/src/main/res/drawable/welcome_image_light.png