From 12793de6047e0b5c7e8e4b4fd6e49c181324b406 Mon Sep 17 00:00:00 2001
From: ByteHamster <ByteHamster@users.noreply.github.com>
Date: Sat, 28 Jan 2023 11:43:35 +0100
Subject: Use rasterized icon on splash (#6287)

---
 .../res/drawable-nodpi/launcher_animate_bg.png     | Bin 0 -> 37291 bytes
 .../res/drawable-nodpi/launcher_animate_wave1.png  | Bin 0 -> 20533 bytes
 .../res/drawable-nodpi/launcher_animate_wave2.png  | Bin 0 -> 31797 bytes
 core/src/main/res/drawable/launcher_animate.xml    |  45 +++++++++++++++++++++
 core/src/main/res/drawable/splash_icon.xml         |  35 ----------------
 core/src/main/res/values/styles.xml                |   2 +-
 6 files changed, 46 insertions(+), 36 deletions(-)
 create mode 100644 core/src/main/res/drawable-nodpi/launcher_animate_bg.png
 create mode 100644 core/src/main/res/drawable-nodpi/launcher_animate_wave1.png
 create mode 100644 core/src/main/res/drawable-nodpi/launcher_animate_wave2.png
 create mode 100644 core/src/main/res/drawable/launcher_animate.xml
 delete mode 100644 core/src/main/res/drawable/splash_icon.xml

(limited to 'core')

diff --git a/core/src/main/res/drawable-nodpi/launcher_animate_bg.png b/core/src/main/res/drawable-nodpi/launcher_animate_bg.png
new file mode 100644
index 000000000..00eb3a2d6
Binary files /dev/null and b/core/src/main/res/drawable-nodpi/launcher_animate_bg.png differ
diff --git a/core/src/main/res/drawable-nodpi/launcher_animate_wave1.png b/core/src/main/res/drawable-nodpi/launcher_animate_wave1.png
new file mode 100644
index 000000000..432e497c3
Binary files /dev/null and b/core/src/main/res/drawable-nodpi/launcher_animate_wave1.png differ
diff --git a/core/src/main/res/drawable-nodpi/launcher_animate_wave2.png b/core/src/main/res/drawable-nodpi/launcher_animate_wave2.png
new file mode 100644
index 000000000..16d4e5023
Binary files /dev/null and b/core/src/main/res/drawable-nodpi/launcher_animate_wave2.png differ
diff --git a/core/src/main/res/drawable/launcher_animate.xml b/core/src/main/res/drawable/launcher_animate.xml
new file mode 100644
index 000000000..189a01d26
--- /dev/null
+++ b/core/src/main/res/drawable/launcher_animate.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<animation-list
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:oneshot="false">
+
+    <item android:duration="1000">
+        <aapt:attr name="android:drawable">
+            <layer-list>
+                <item android:drawable="@drawable/launcher_animate_bg" />
+                <item android:drawable="@drawable/launcher_animate_wave1" />
+                <item android:drawable="@drawable/launcher_animate_wave2" />
+            </layer-list>
+        </aapt:attr>
+    </item>
+
+    <item android:duration="80">
+        <aapt:attr name="android:drawable">
+            <layer-list>
+                <item android:drawable="@drawable/launcher_animate_bg" />
+                <item android:drawable="@drawable/launcher_animate_wave1" />
+            </layer-list>
+        </aapt:attr>
+    </item>
+
+    <item android:duration="200">
+        <aapt:attr name="android:drawable">
+            <layer-list>
+                <item android:drawable="@drawable/launcher_animate_bg" />
+            </layer-list>
+        </aapt:attr>
+    </item>
+
+    <item android:duration="80">
+        <aapt:attr name="android:drawable">
+            <layer-list>
+                <item android:drawable="@drawable/launcher_animate_bg" />
+                <item android:drawable="@drawable/launcher_animate_wave1" />
+            </layer-list>
+        </aapt:attr>
+    </item>
+
+</animation-list>
+
+
diff --git a/core/src/main/res/drawable/splash_icon.xml b/core/src/main/res/drawable/splash_icon.xml
deleted file mode 100644
index acd17670e..000000000
--- a/core/src/main/res/drawable/splash_icon.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-
-    <aapt:attr name="android:drawable">
-        <vector
-            android:height="80dp" android:width="80dp"
-            android:viewportHeight="72" android:viewportWidth="72">
-            <group android:name="icon" android:pivotX="36" android:pivotY="36">
-                <path android:fillColor="@color/accent_light"
-                      android:pathData="M 36 23.4 A 12.6 12.6 90 0 0 23.4 36 A 12.6 12.6 90 0 0 30.96 47.515 L 34.46 37.61 C 34.04 37.19 33.76 36.63 33.76 36 c 0 -1.225 0.98 -2.24 2.24 -2.24 c 1.225 0 2.24 0.98 2.24 2.24 c 0 0.63 -0.245 1.19 -0.665 1.61 L 41.04 47.515 A 12.6 12.6 90 0 0 48.6 36 A 12.6 12.6 90 0 0 36 23.4 Z m 0 2.975 c 5.32 0 9.625 4.305 9.625 9.625 c 0 3.395 -1.75 6.37 -4.41 8.085 L 40.725 42.65 C 42.79 41.18 44.155 38.765 44.155 36 c 0 -4.515 -3.64 -8.155 -8.1602 -8.1364 c -4.515 0 -8.155 3.64 -8.155 8.155 c 0 2.765 1.365 5.18 3.43 6.65 L 30.785 44.085 C 28.125 42.37 26.375 39.395 26.375 36 C 26.375 30.68 30.68 26.375 36 26.375 Z m 0 3.71 c 3.29 0 5.915 2.66 5.915 5.915 c 0 1.785 -0.77 3.36 -1.995 4.445 l -0.56 -1.54 c 0.665 -0.77 1.085 -1.785 1.085 -2.905 c 0 -2.45 -1.995 -4.445 -4.445 -4.445 c -2.45 0 -4.445 1.995 -4.445 4.445 c 0 1.12 0.385 2.1 1.085 2.905 l -0.56 1.54 C 30.855 39.36 30.085 37.785 30.085 36 c 0 -3.29 2.66 -5.915 5.915 -5.915 z m 0 8.715 l -1.715 4.83 c 0.56 0.105 1.12 0.175 1.715 0.175 c 0.595 0 1.155 -0.07 1.715 -0.175 z m -2.31 6.58 l -0.98 2.8 a 12.6 12.6 90 0 0 3.29 0.455 a 12.6 12.6 90 0 0 3.29 -0.455 l -0.98 -2.8 c -0.735 0.175 -1.505 0.28 -2.31 0.28 c -0.805 0 -1.575 -0.105 -2.31 -0.28 z" />
-            </group>
-        </vector>
-    </aapt:attr>
-
-    <target android:name="icon">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:duration="1000"
-                android:repeatCount="infinite"
-                android:repeatMode="reverse">
-                <propertyValuesHolder android:propertyName="scaleX"
-                                      android:valueType="floatType"
-                                      android:valueFrom="1.0"
-                                      android:valueTo="1.1" />
-                <propertyValuesHolder android:propertyName="scaleY"
-                                      android:valueType="floatType"
-                                      android:valueFrom="1.0"
-                                      android:valueTo="1.1" />
-            </objectAnimator>
-        </aapt:attr>
-    </target>
-
-</animated-vector>
\ No newline at end of file
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index d436abaeb..1cdb1c0c2 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -218,7 +218,7 @@
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
         <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
-        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_icon</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/launcher_animate</item>
     </style>
 
     <style name="Theme.AntennaPod.VideoPlayer" parent="@style/Theme.AntennaPod.Dark">
-- 
cgit v1.2.3