From 1c28045bf422847105a81e89a000323529a0f157 Mon Sep 17 00:00:00 2001
From: Niels van Velzen <git@ndat.nl>
Date: Thu, 28 Sep 2023 20:09:49 +0200
Subject: [PATCH] Use layer-list for app_banner drawable

---
 .../drawable-v24/app_banner_background.xml    | 11 ++++++
 ...p_banner.xml => app_banner_foreground.xml} |  4 +--
 app/src/main/res/drawable/app_banner.xml      | 35 +++----------------
 .../res/drawable/app_banner_background.xml    | 11 ++++++
 .../res/drawable/app_banner_foreground.xml    | 28 +++++++++++++++
 5 files changed, 56 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/res/drawable-v24/app_banner_background.xml
 rename app/src/main/res/drawable-v24/{app_banner.xml => app_banner_foreground.xml} (98%)
 create mode 100644 app/src/main/res/drawable/app_banner_background.xml
 create mode 100644 app/src/main/res/drawable/app_banner_foreground.xml

diff --git a/app/src/main/res/drawable-v24/app_banner_background.xml b/app/src/main/res/drawable-v24/app_banner_background.xml
new file mode 100644
index 0000000000..8061f0b69f
--- /dev/null
+++ b/app/src/main/res/drawable-v24/app_banner_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="320dp"
+    android:height="180dp"
+    android:viewportWidth="320"
+    android:viewportHeight="180">
+    <path
+        android:fillColor="@color/logo_background"
+        android:pathData="M0,0h320v180h-320z" />
+</vector>
diff --git a/app/src/main/res/drawable-v24/app_banner.xml b/app/src/main/res/drawable-v24/app_banner_foreground.xml
similarity index 98%
rename from app/src/main/res/drawable-v24/app_banner.xml
rename to app/src/main/res/drawable-v24/app_banner_foreground.xml
index c2f273c45c..ff2d68e38a 100644
--- a/app/src/main/res/drawable-v24/app_banner.xml
+++ b/app/src/main/res/drawable-v24/app_banner_foreground.xml
@@ -1,12 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="320dp"
     android:height="180dp"
     android:viewportWidth="320"
     android:viewportHeight="180">
-    <path
-        android:fillColor="@color/logo_background"
-        android:pathData="M0,0h320v180h-320z" />
     <path android:pathData="m63.761,45.877c-11.678,0 -49.27,68.152 -43.538,79.661s81.407,11.377 87.076,0 -31.862,-79.661 -43.538,-79.661zM63.766,63.355c7.651,0 32.241,44.737 28.527,52.196 -3.714,7.457 -53.296,7.541 -57.054,0s20.876,-52.196 28.527,-52.196zM63.761,79.688c-3.876,0 -16.352,22.619 -14.448,26.437s27.016,3.777 28.897,0 -10.572,-26.435 -14.448,-26.437z">
         <aapt:attr name="android:fillColor">
             <gradient
diff --git a/app/src/main/res/drawable/app_banner.xml b/app/src/main/res/drawable/app_banner.xml
index 2ae1f64cf3..9b2860621c 100644
--- a/app/src/main/res/drawable/app_banner.xml
+++ b/app/src/main/res/drawable/app_banner.xml
@@ -1,30 +1,5 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="320dp"
-    android:height="180dp"
-    android:viewportWidth="320"
-    android:viewportHeight="180">
-    <path
-        android:fillColor="#000B25"
-        android:pathData="M0,0h320v180h-320z" />
-    <path android:pathData="m63.761,45.877c-11.678,0 -49.27,68.152 -43.538,79.661s81.407,11.377 87.076,0 -31.862,-79.661 -43.538,-79.661zM63.766,63.355c7.651,0 32.241,44.737 28.527,52.196 -3.714,7.457 -53.296,7.541 -57.054,0s20.876,-52.196 28.527,-52.196zM63.761,79.688c-3.876,0 -16.352,22.619 -14.448,26.437s27.016,3.777 28.897,0 -10.572,-26.435 -14.448,-26.437z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="108.26714"
-                android:endY="124.14592"
-                android:startX="35.09854"
-                android:startY="81.90271"
-                android:type="linear">
-                <item
-                    android:color="#AA5CC3"
-                    android:offset="0" />
-                <item
-                    android:color="#00A4DC"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="m189.717,67.665a1.689,1.689 0,0 0,-1.701 1.689l0,38.301a1.691,1.691 0,0 0,2.901 1.21,1.64 1.64,0 0,0 0.478,-1.21l0,-38.301a1.689,1.689 0,0 0,-1.678 -1.689zM202.669,67.665a1.689,1.689 0,0 0,-1.701 1.689l0,38.301a1.691,1.691 0,0 0,2.901 1.21,1.64 1.64,0 0,0 0.478,-1.21l0,-38.301a1.689,1.689 0,0 0,-1.678 -1.689zM255.261,67.89a8.741,8.741 135,0 0,-0.108 0c-2.296,-0.008 -4.128,0.64 -5.499,1.942 -1.37,1.302 -2.055,3.135 -2.055,5.499l0,5.8l-4.111,0a1.579,1.579 0,0 0,-1.127 0.423,1.517 1.517,0 0,0 -0.449,1.155 1.557,1.557 0,0 0,0.449 1.098,1.485 1.485,0 0,0 1.127,0.478l4.111,0l0,23.371a1.689,1.689 0,1 0,3.379 0l0,-23.371l6.305,0a1.559,1.559 0,0 0,1.098 -0.449,1.566 1.566,0 0,0 0,-2.253 1.553,1.553 0,0 0,-1.098 -0.451l-6.309,0l0,-5.8c-0.002,-1.389 0.328,-2.478 0.986,-3.267 0.656,-0.788 1.589,-1.184 2.799,-1.189a7.964,7.964 0,0 1,1.972 0.337,3.567 3.567,0 0,0 1.238,0.281 1.397,1.397 0,0 0,1.014 -0.45,1.53 1.53,0 0,0 0.45,-1.126c0.002,-0.713 -0.449,-1.229 -1.35,-1.549a8.741,8.741 0,0 0,-2.821 -0.478zM144.965,69.916a1.706,1.706 0,0 0,-0.096 0.002,1.813 1.813,0 0,0 -1.295,0.478 1.6,1.6 0,0 0,-0.506 1.212l0,26.25c-0.001,2.591 -0.808,4.685 -2.421,6.28 -1.613,1.595 -3.716,2.393 -6.308,2.393a7.696,7.696 0,0 1,-4.551 -1.437,9.118 9.118,0 0,1 -3.098,-3.857c-0.449,-0.637 -0.977,-0.957 -1.576,-0.957a1.754,1.754 0,0 0,-1.155 0.451,1.407 1.407,0 0,0 -0.537,1.126 1.689,1.689 0,0 0,0.283 0.901,12.704 12.704,0 0,0 4.336,5.209 10.848,10.848 135,0 0,6.306 1.944c2.366,0 4.476,-0.519 6.329,-1.557a11.187,11.187 0,0 0,4.361 -4.308,12.268 12.268,0 0,0 1.578,-6.195l0,-26.242a1.65,1.65 0,0 0,-0.48 -1.212,1.706 1.706,0 0,0 -1.171,-0.48zM266.241,71.552c-0.752,-0.001 -1.344,0.177 -1.775,0.534 -0.431,0.358 -0.647,0.874 -0.647,1.549l0,0.569c0,0.675 0.205,1.193 0.62,1.549 0.406,0.356 0.993,0.537 1.744,0.537s1.316,-0.178 1.718,-0.534 0.591,-0.874 0.591,-1.549l0,-0.569c0,-1.39 -0.751,-2.086 -2.252,-2.086zM167.631,79.893a12.363,12.363 0,0 0,-6.477 1.83c-2.027,1.221 -3.651,2.986 -4.871,5.294s-1.83,5.002 -1.83,8.081c0.001,2.929 0.62,5.509 1.858,7.742a13.18,13.18 0,0 0,5.18 5.21c2.216,1.239 4.769,1.858 7.66,1.858a12.431,12.431 0,0 0,5.766 -1.409,14.164 14.164,0 0,0 4.534,-3.603 1.67,1.67 0,0 0,0.569 -1.183,1.543 1.543,0 0,0 -1.464,-1.464 1.896,1.896 0,0 0,-1.183 0.506,9.992 9.992,0 0,1 -3.436,2.873 10.239,10.239 0,0 1,-4.843 1.126c-2.328,0.001 -4.346,-0.515 -6.054,-1.549a10.411,10.411 0,0 1,-3.942 -4.224c-0.919,-1.782 -1.378,-3.8 -1.378,-6.052l21.286,0a1.663,1.663 0,0 0,1.183 -0.48,1.53 1.53,0 0,0 0.506,-1.159c-0.037,-2.781 -0.675,-5.183 -1.915,-7.205a12.473,12.473 0,0 0,-4.814 -4.619,13.273 13.273,0 0,0 -6.335,-1.574zM290.227,79.893a11.725,11.725 0,0 0,-5.835 1.604c-1.896,1.071 -3.35,2.413 -4.361,4.027l0,-3.098a1.689,1.689 0,1 0,-3.378 0l0,25.235a1.689,1.689 0,1 0,3.378 0l0,-16.388a6.871,6.871 0,0 1,1.352 -4.082,10.102 10.102,0 0,1 8.11,-4.139c2.553,-0.003 4.44,0.756 5.66,2.275 1.22,1.519 1.83,3.5 1.83,5.94l0,16.388a1.638,1.638 0,0 0,1.689 1.689,1.669 1.669,0 0,0 1.183,-0.48 1.593,1.593 0,0 0,0.506 -1.21l0,-16.556c0,-3.378 -0.817,-6.09 -2.45,-8.138 -1.633,-2.045 -4.195,-3.068 -7.685,-3.068zM234.218,80.053a1.706,1.706 0,0 0,-1.714 1.698l0,16.79a7.099,7.099 0,0 1,-1.267 4.027,9.458 9.458,0 0,1 -3.379,3.034 9.101,9.101 0,0 1,-4.421 1.155c-2.514,-0.001 -4.363,-0.696 -5.546,-2.086s-1.775,-3.436 -1.775,-6.14l0,-16.78a1.689,1.689 0,1 0,-3.379 0l0,17.281c0,3.34 0.845,5.986 2.535,7.939 1.69,1.953 4.167,2.93 7.433,2.93a11.86,11.86 135,0 0,5.745 -1.437,10.309 10.309,0 0,0 4.054,-3.792l0,1.968c0.002,3.38 -0.909,6.046 -2.73,7.998 -1.822,1.952 -4.29,2.928 -7.406,2.928 -2.179,-0.001 -4.47,-0.659 -6.871,-1.972a1.5,1.5 0,0 0,-0.675 -0.169,1.42 1.42,0 0,0 -0.844,0.283 1.528,1.528 0,0 0,-0.569 0.844,3.402 3.402,0 0,0 -0.114,0.569c0,0.6 0.394,1.145 1.183,1.635a11.703,11.703 135,0 0,3.413 1.35,18.341 18.341,135 0,0 4.42,0.508c2.59,0 4.918,-0.544 6.983,-1.632a11.676,11.676 0,0 0,4.843 -4.788c1.164,-2.105 1.746,-4.638 1.746,-7.601l0,-24.839a1.65,1.65 0,0 0,-0.48 -1.212,1.706 1.706,0 0,0 -1.186,-0.486zM266.196,80.062a1.689,1.689 0,0 0,-1.701 1.689l0,25.905a1.691,1.691 0,0 0,2.901 1.21l-0.006,0a1.64,1.64 0,0 0,0.484 -1.21l0,-25.905a1.689,1.689 0,0 0,-1.678 -1.689zM167.633,83.158a10.239,10.239 0,0 1,4.361 0.986,9.19 9.19,0 0,1 3.519,2.873 8.895,8.895 0,0 1,1.691 4.427l0,0.451l-19.204,0c0.526,-2.821 1.718,-4.983 3.576,-6.484s3.877,-2.253 6.056,-2.253z" />
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/app_banner_background" />
+    <item android:drawable="@drawable/app_banner_foreground" />
+</layer-list>
diff --git a/app/src/main/res/drawable/app_banner_background.xml b/app/src/main/res/drawable/app_banner_background.xml
new file mode 100644
index 0000000000..0eae91dbdd
--- /dev/null
+++ b/app/src/main/res/drawable/app_banner_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="320dp"
+    android:height="180dp"
+    android:viewportWidth="320"
+    android:viewportHeight="180">
+    <path
+        android:fillColor="#000B25"
+        android:pathData="M0,0h320v180h-320z" />
+</vector>
diff --git a/app/src/main/res/drawable/app_banner_foreground.xml b/app/src/main/res/drawable/app_banner_foreground.xml
new file mode 100644
index 0000000000..18102a5977
--- /dev/null
+++ b/app/src/main/res/drawable/app_banner_foreground.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="320dp"
+    android:height="180dp"
+    android:viewportWidth="320"
+    android:viewportHeight="180">
+    <path android:pathData="m63.761,45.877c-11.678,0 -49.27,68.152 -43.538,79.661s81.407,11.377 87.076,0 -31.862,-79.661 -43.538,-79.661zM63.766,63.355c7.651,0 32.241,44.737 28.527,52.196 -3.714,7.457 -53.296,7.541 -57.054,0s20.876,-52.196 28.527,-52.196zM63.761,79.688c-3.876,0 -16.352,22.619 -14.448,26.437s27.016,3.777 28.897,0 -10.572,-26.435 -14.448,-26.437z">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:endX="108.26714"
+                android:endY="124.14592"
+                android:startX="35.09854"
+                android:startY="81.90271"
+                android:type="linear">
+                <item
+                    android:color="#AA5CC3"
+                    android:offset="0" />
+                <item
+                    android:color="#00A4DC"
+                    android:offset="1" />
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="m189.717,67.665a1.689,1.689 0,0 0,-1.701 1.689l0,38.301a1.691,1.691 0,0 0,2.901 1.21,1.64 1.64,0 0,0 0.478,-1.21l0,-38.301a1.689,1.689 0,0 0,-1.678 -1.689zM202.669,67.665a1.689,1.689 0,0 0,-1.701 1.689l0,38.301a1.691,1.691 0,0 0,2.901 1.21,1.64 1.64,0 0,0 0.478,-1.21l0,-38.301a1.689,1.689 0,0 0,-1.678 -1.689zM255.261,67.89a8.741,8.741 135,0 0,-0.108 0c-2.296,-0.008 -4.128,0.64 -5.499,1.942 -1.37,1.302 -2.055,3.135 -2.055,5.499l0,5.8l-4.111,0a1.579,1.579 0,0 0,-1.127 0.423,1.517 1.517,0 0,0 -0.449,1.155 1.557,1.557 0,0 0,0.449 1.098,1.485 1.485,0 0,0 1.127,0.478l4.111,0l0,23.371a1.689,1.689 0,1 0,3.379 0l0,-23.371l6.305,0a1.559,1.559 0,0 0,1.098 -0.449,1.566 1.566,0 0,0 0,-2.253 1.553,1.553 0,0 0,-1.098 -0.451l-6.309,0l0,-5.8c-0.002,-1.389 0.328,-2.478 0.986,-3.267 0.656,-0.788 1.589,-1.184 2.799,-1.189a7.964,7.964 0,0 1,1.972 0.337,3.567 3.567,0 0,0 1.238,0.281 1.397,1.397 0,0 0,1.014 -0.45,1.53 1.53,0 0,0 0.45,-1.126c0.002,-0.713 -0.449,-1.229 -1.35,-1.549a8.741,8.741 0,0 0,-2.821 -0.478zM144.965,69.916a1.706,1.706 0,0 0,-0.096 0.002,1.813 1.813,0 0,0 -1.295,0.478 1.6,1.6 0,0 0,-0.506 1.212l0,26.25c-0.001,2.591 -0.808,4.685 -2.421,6.28 -1.613,1.595 -3.716,2.393 -6.308,2.393a7.696,7.696 0,0 1,-4.551 -1.437,9.118 9.118,0 0,1 -3.098,-3.857c-0.449,-0.637 -0.977,-0.957 -1.576,-0.957a1.754,1.754 0,0 0,-1.155 0.451,1.407 1.407,0 0,0 -0.537,1.126 1.689,1.689 0,0 0,0.283 0.901,12.704 12.704,0 0,0 4.336,5.209 10.848,10.848 135,0 0,6.306 1.944c2.366,0 4.476,-0.519 6.329,-1.557a11.187,11.187 0,0 0,4.361 -4.308,12.268 12.268,0 0,0 1.578,-6.195l0,-26.242a1.65,1.65 0,0 0,-0.48 -1.212,1.706 1.706,0 0,0 -1.171,-0.48zM266.241,71.552c-0.752,-0.001 -1.344,0.177 -1.775,0.534 -0.431,0.358 -0.647,0.874 -0.647,1.549l0,0.569c0,0.675 0.205,1.193 0.62,1.549 0.406,0.356 0.993,0.537 1.744,0.537s1.316,-0.178 1.718,-0.534 0.591,-0.874 0.591,-1.549l0,-0.569c0,-1.39 -0.751,-2.086 -2.252,-2.086zM167.631,79.893a12.363,12.363 0,0 0,-6.477 1.83c-2.027,1.221 -3.651,2.986 -4.871,5.294s-1.83,5.002 -1.83,8.081c0.001,2.929 0.62,5.509 1.858,7.742a13.18,13.18 0,0 0,5.18 5.21c2.216,1.239 4.769,1.858 7.66,1.858a12.431,12.431 0,0 0,5.766 -1.409,14.164 14.164,0 0,0 4.534,-3.603 1.67,1.67 0,0 0,0.569 -1.183,1.543 1.543,0 0,0 -1.464,-1.464 1.896,1.896 0,0 0,-1.183 0.506,9.992 9.992,0 0,1 -3.436,2.873 10.239,10.239 0,0 1,-4.843 1.126c-2.328,0.001 -4.346,-0.515 -6.054,-1.549a10.411,10.411 0,0 1,-3.942 -4.224c-0.919,-1.782 -1.378,-3.8 -1.378,-6.052l21.286,0a1.663,1.663 0,0 0,1.183 -0.48,1.53 1.53,0 0,0 0.506,-1.159c-0.037,-2.781 -0.675,-5.183 -1.915,-7.205a12.473,12.473 0,0 0,-4.814 -4.619,13.273 13.273,0 0,0 -6.335,-1.574zM290.227,79.893a11.725,11.725 0,0 0,-5.835 1.604c-1.896,1.071 -3.35,2.413 -4.361,4.027l0,-3.098a1.689,1.689 0,1 0,-3.378 0l0,25.235a1.689,1.689 0,1 0,3.378 0l0,-16.388a6.871,6.871 0,0 1,1.352 -4.082,10.102 10.102,0 0,1 8.11,-4.139c2.553,-0.003 4.44,0.756 5.66,2.275 1.22,1.519 1.83,3.5 1.83,5.94l0,16.388a1.638,1.638 0,0 0,1.689 1.689,1.669 1.669,0 0,0 1.183,-0.48 1.593,1.593 0,0 0,0.506 -1.21l0,-16.556c0,-3.378 -0.817,-6.09 -2.45,-8.138 -1.633,-2.045 -4.195,-3.068 -7.685,-3.068zM234.218,80.053a1.706,1.706 0,0 0,-1.714 1.698l0,16.79a7.099,7.099 0,0 1,-1.267 4.027,9.458 9.458,0 0,1 -3.379,3.034 9.101,9.101 0,0 1,-4.421 1.155c-2.514,-0.001 -4.363,-0.696 -5.546,-2.086s-1.775,-3.436 -1.775,-6.14l0,-16.78a1.689,1.689 0,1 0,-3.379 0l0,17.281c0,3.34 0.845,5.986 2.535,7.939 1.69,1.953 4.167,2.93 7.433,2.93a11.86,11.86 135,0 0,5.745 -1.437,10.309 10.309,0 0,0 4.054,-3.792l0,1.968c0.002,3.38 -0.909,6.046 -2.73,7.998 -1.822,1.952 -4.29,2.928 -7.406,2.928 -2.179,-0.001 -4.47,-0.659 -6.871,-1.972a1.5,1.5 0,0 0,-0.675 -0.169,1.42 1.42,0 0,0 -0.844,0.283 1.528,1.528 0,0 0,-0.569 0.844,3.402 3.402,0 0,0 -0.114,0.569c0,0.6 0.394,1.145 1.183,1.635a11.703,11.703 135,0 0,3.413 1.35,18.341 18.341,135 0,0 4.42,0.508c2.59,0 4.918,-0.544 6.983,-1.632a11.676,11.676 0,0 0,4.843 -4.788c1.164,-2.105 1.746,-4.638 1.746,-7.601l0,-24.839a1.65,1.65 0,0 0,-0.48 -1.212,1.706 1.706,0 0,0 -1.186,-0.486zM266.196,80.062a1.689,1.689 0,0 0,-1.701 1.689l0,25.905a1.691,1.691 0,0 0,2.901 1.21l-0.006,0a1.64,1.64 0,0 0,0.484 -1.21l0,-25.905a1.689,1.689 0,0 0,-1.678 -1.689zM167.633,83.158a10.239,10.239 0,0 1,4.361 0.986,9.19 9.19,0 0,1 3.519,2.873 8.895,8.895 0,0 1,1.691 4.427l0,0.451l-19.204,0c0.526,-2.821 1.718,-4.983 3.576,-6.484s3.877,-2.253 6.056,-2.253z" />
+</vector>