From d23df55fee0674714ab080a7f728b1c4aafc725c Mon Sep 17 00:00:00 2001
From: Emma <MarmadileManteater@proton.me>
Date: Tue, 30 Jan 2024 07:11:03 -0500
Subject: [PATCH] Adjust icons and add proper media notification icon

---
 .../freetube/FreeTubeJavaScriptInterface.kt   |   2 +-
 .../res/drawable/ic_launcher_background.xml   | 185 ++----------------
 .../res/drawable/ic_launcher_foreground.xml   |  40 +---
 .../drawable/ic_media_notification_icon.xml   |  21 ++
 4 files changed, 48 insertions(+), 200 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/ic_media_notification_icon.xml

diff --git a/android/app/src/main/java/io/freetubeapp/freetube/FreeTubeJavaScriptInterface.kt b/android/app/src/main/java/io/freetubeapp/freetube/FreeTubeJavaScriptInterface.kt
index 9f17c28d48109..13aff695c6845 100644
--- a/android/app/src/main/java/io/freetubeapp/freetube/FreeTubeJavaScriptInterface.kt
+++ b/android/app/src/main/java/io/freetubeapp/freetube/FreeTubeJavaScriptInterface.kt
@@ -156,7 +156,7 @@ class FreeTubeJavaScriptInterface {
     val mediaStyle = Notification.MediaStyle().setMediaSession(session.sessionToken)
     val notification = Notification.Builder(context, CHANNEL_ID)
       .setStyle(mediaStyle)
-      .setSmallIcon(androidx.media3.ui.R.drawable.exo_icon_play)
+      .setSmallIcon(R.drawable.ic_media_notification_icon)
       .build()
 
     // use the set metadata function without pushing a notification
diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml
index 07d5da9cbf141..a4453903f4284 100644
--- a/android/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_background.xml
@@ -1,170 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+  android:viewportWidth="64"
+  android:viewportHeight="64"
+  android:width="64dp"
+  android:height="64dp">
+  <path
+    android:pathData="M8.2 5C5.8732 5 4 6.8732001 4 9.2000001V21.8 44.2 56.8C4 59.1268 5.8732 61 8.2 61H20.8 33.960547 43.2C52.5072 61 60 53.5072 60 44.2V36.921093 21.8 9.2000001C60 6.8732001 58.1268 5 55.8 5H43.2 20.8Z"
+    android:fillColor="#000000"
+    android:fillAlpha="0.2" />
+  <path
+    android:pathData="M8.2 4C5.8732 4 4 5.8732001 4 8.2000001V20.8 43.2 55.8C4 58.1268 5.8732 60 8.2 60H20.8 33.960547 43.2C52.5072 60 60 52.5072 60 43.2V35.921093 20.8 8.2000001C60 5.8732001 58.1268 4 55.8 4H43.2 20.8Z"
+    android:fillColor="#E4E4E4" />
+  <path
+    android:pathData="M8.1992188 4C5.8724189 4 4 5.8724189 4 8.1992188L4 9.1992188C4 6.8724189 5.8724189 5 8.1992188 5L55.800781 5C58.127581 5 60 6.8724189 60 9.1992188L60 8.1992188C60 5.8724189 58.127581 4 55.800781 4L8.1992188 4z"
+    android:fillColor="#FFFFFF"
+    android:fillAlpha="0.2" />
 </vector>
diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
index 2b068d11462a4..0d5f3fc8f4521 100644
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,30 +1,10 @@
-<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">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+  android:viewportWidth="64"
+  android:viewportHeight="64"
+  android:width="64dp"
+  android:height="64dp">
+  <path android:fillColor="#000000" android:fillAlpha="0.1" android:strokeAlpha="0.1" android:strokeWidth="0.784519" android:pathData="M 18.326366,17.254906 c -1.195215,0 -2.157429,0.99992 -2.157429,2.241704 v 23.535578 c 0,3.362226 4.314857,5.60349 6.472286,5.60349 h 2.157426 V 46.393976 43.032188 19.49661 c 0,-1.241784 -0.962212,-2.241704 -2.157426,-2.241704 z m 11.055286,0 c -1.235245,0 -2.229445,0.962213 -2.229445,2.157429 v 4.314856 c 0,1.195215 0.9942,2.157427 2.229445,2.157427 h 13.378199 c 3.344531,0 5.574378,-4.314856 5.574378,-6.472283 v -2.157429 h -2.229445 -3.344933 z m -1.193635,10.98327 a 1.0130623,0.89550711 0 0 0 -1.03581,0.896375 v 5.773573 5.773572 a 1.0130623,0.89550711 0 0 0 1.518476,0.773792 l 5.657119,-2.886786 5.655587,-2.886786 a 1.0130623,0.89550711 0 0 0 0,-1.550651 L 34.327802,31.24601 28.670683,28.359226 a 1.0130623,0.89550711 0 0 0 -0.482666,-0.12105 z"/>
+  <path android:fillColor="#f04242" android:strokeWidth="0.784519" android:pathData="M 18.326366,16.470386 c -1.195215,0 -2.157429,0.999702 -2.157429,2.241485 V 42.24745 c 0,3.362226 4.314857,5.603709 6.472286,5.603709 h 2.157426 V 45.609676 42.24745 18.711871 c 0,-1.241783 -0.962212,-2.241485 -2.157426,-2.241485 z"/>
+  <path android:fillColor="#f04242" android:strokeWidth="0.784519" android:pathData="M 27.152207,22.942671 c 0,1.195214 0.994442,2.157428 2.229687,2.157428 h 13.378119 c 3.344529,0 5.574216,-4.314857 5.574216,-6.472284 V 16.470386 H 46.104542 42.760013 29.381894 c -1.235245,0 -2.229687,0.962214 -2.229687,2.157429 z"/>
+  <path android:fillColor="#14a4df" android:strokeWidth="0.784519" android:pathData="M 28.188772,27.453898 a 1.0130623,0.89550711 0 0 0 -1.036564,0.896414 v 5.773134 5.773132 a 1.0130623,0.89550711 0 0 0 1.518946,0.774261 l 5.655999,-2.886564 5.656,-2.886568 a 1.0130623,0.89550711 0 0 0 0,-1.550402 l -5.656,-2.886567 -5.655999,-2.886566 a 1.0130623,0.89550711 0 0 0 -0.482382,-0.120274 z"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_media_notification_icon.xml b/android/app/src/main/res/drawable/ic_media_notification_icon.xml
new file mode 100644
index 0000000000000..2d2afb0d9c444
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_media_notification_icon.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="64dp"
+  android:height="64dp"
+  android:viewportWidth="64"
+  android:viewportHeight="64">
+
+  <path
+    android:fillColor="#f04242"
+    android:strokeWidth="1.45267"
+    android:pathData="M 6.7254451,2.7624871 c -2.1983806,0 -3.9681979,1.86353 -3.9681979,4.178321 V 50.813154 c 0,6.26748 7.9363928,10.445797 11.9045908,10.445797 H 18.63003 V 57.080634 50.813154 6.9408081 c 0,-2.314791 -1.769814,-4.178321 -3.968192,-4.178321 z" />
+  <path
+    android:fillColor="#f04242"
+    android:strokeWidth="1.45267"
+    android:pathData="M 22.958972,14.827384 c 0,2.227981 1.829094,4.02163 4.101102,4.02163 h 24.606614 c 6.151652,0 10.252754,-8.043264 10.252754,-12.0648939 V 2.7624871 H 57.81834 51.666688 27.060074 c -2.272008,0 -4.101102,1.793649 -4.101102,4.021633 z" />
+  <path
+    android:fillColor="#14a4df"
+    android:strokeWidth="1.45267"
+    android:pathData="M 24.865544,23.236699 a 1.8633436,1.6693024 0 0 0 -1.906571,1.670993 v 10.761619 10.761616 a 1.8633436,1.6693024 0 0 0 2.793825,1.443288 l 10.40318,-5.380803 10.403182,-5.380811 a 1.8633436,1.6693024 0 0 0 0,-2.890083 l -10.403182,-5.38081 -10.40318,-5.380807 a 1.8633436,1.6693024 0 0 0 -0.887254,-0.224202 z" />
+
+</vector>