From ba26e58190f461fd35be426fac9e1608b127089c Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Thu, 23 Mar 2023 15:01:56 +0100
Subject: [PATCH] Merge drawable-v24 into drawable folder since minVersion is
 now 24

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
---
 .../ic_avatar_background.xml                  |  0
 .../ic_launcher_background.xml                |  0
 .../drawable-v24/ic_launcher_background.xml   | 26 --------
 .../res/drawable/ic_launcher_background.xml   | 59 ++++++++-----------
 4 files changed, 24 insertions(+), 61 deletions(-)
 rename app/src/main/res/{drawable-v24 => drawable}/ic_avatar_background.xml (100%)
 rename app/src/main/res/{drawable-v24 => drawable}/ic_launcher_background.xml (100%)
 delete mode 100644 app/src/qa/res/drawable-v24/ic_launcher_background.xml

diff --git a/app/src/main/res/drawable-v24/ic_avatar_background.xml b/app/src/main/res/drawable/ic_avatar_background.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_avatar_background.xml
rename to app/src/main/res/drawable/ic_avatar_background.xml
diff --git a/app/src/main/res/drawable-v24/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
similarity index 100%
rename from app/src/main/res/drawable-v24/ic_launcher_background.xml
rename to app/src/main/res/drawable/ic_launcher_background.xml
diff --git a/app/src/qa/res/drawable-v24/ic_launcher_background.xml b/app/src/qa/res/drawable-v24/ic_launcher_background.xml
deleted file mode 100644
index 3f3d4b826..000000000
--- a/app/src/qa/res/drawable-v24/ic_launcher_background.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="0.08035714"
-      android:scaleY="0.08035714">
-    <path
-        android:pathData="M0,0h1344v1344h-1344z"
-        android:strokeLineJoin="round"
-        android:fillType="evenOdd">
-      <aapt:attr name="android:fillColor">
-        <gradient 
-            android:startY="1344.0002"
-            android:startX="163.34073"
-            android:endY="1.2959057E-4"
-            android:endX="1343.9999"
-            android:type="linear">
-          <item android:offset="0" android:color="#FF0082C9"/>
-          <item android:offset="1" android:color="#FF1CAFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
-</vector>
diff --git a/app/src/qa/res/drawable/ic_launcher_background.xml b/app/src/qa/res/drawable/ic_launcher_background.xml
index a931ebc5f..3f3d4b826 100644
--- a/app/src/qa/res/drawable/ic_launcher_background.xml
+++ b/app/src/qa/res/drawable/ic_launcher_background.xml
@@ -1,37 +1,26 @@
-<!--
-  ~ /*
-  ~  * Nextcloud Talk application
-  ~  *
-  ~  * @author Mario Danic
-  ~  * Copyright (C) 2017-2020 Mario Danic <mario@lovelyhq.com>
-  ~  *
-  ~  * This program is free software: you can redistribute it and/or modify
-  ~  * it under the terms of the GNU General Public License as published by
-  ~  * the Free Software Foundation, either version 3 of the License, or
-  ~  * at your option) any later version.
-  ~  *
-  ~  * This program is distributed in the hope that it will be useful,
-  ~  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  ~  * GNU General Public License for more details.
-  ~  *
-  ~  * You should have received a copy of the GNU General Public License
-  ~  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  ~  */
-  -->
-
-<vector android:autoMirrored="true" android:height="108dp"
-    android:viewportHeight="1344" android:viewportWidth="1344"
-    android:width="108dp" xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillType="evenOdd"
-        android:pathData="M0,0h1344v1344h-1344z" android:strokeLineJoin="round">
-        <aapt:attr name="android:fillColor">
-            <gradient android:endX="1343.9999"
-                android:endY="1.2959057E-4" android:startX="163.34073"
-                android:startY="1344.0002" android:type="linear">
-                <item android:color="#FF0082C9" android:offset="0"/>
-                <item android:color="#FF1CAFFF" android:offset="1"/>
-            </gradient>
-        </aapt:attr>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.08035714"
+      android:scaleY="0.08035714">
+    <path
+        android:pathData="M0,0h1344v1344h-1344z"
+        android:strokeLineJoin="round"
+        android:fillType="evenOdd">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="1344.0002"
+            android:startX="163.34073"
+            android:endY="1.2959057E-4"
+            android:endX="1343.9999"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF0082C9"/>
+          <item android:offset="1" android:color="#FF1CAFFF"/>
+        </gradient>
+      </aapt:attr>
     </path>
+  </group>
 </vector>