From 092a0895800ed4e05a14444f88812663bce40865 Mon Sep 17 00:00:00 2001
From: Mattis <mkcoolusa@gmail.com>
Date: Fri, 31 Mar 2023 17:17:36 +0200
Subject: [PATCH] New monochrome icon and removal of duplicate debug icons

---
 .../drawable/ic_launcher_foreground_debug.xml    | 15 ---------------
 .../ic_launcher_foreground_monochrome_debug.xml  | 15 ---------------
 .../drawable/ic_launcher_foreground_nightly.xml  | 16 ++++++++++++++++
 .../res/mipmap-anydpi-v26/ic_launcher.xml        |  1 +
 .../res/mipmap-anydpi-v26/ic_launcher_round.xml  |  1 +
 5 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 mastodon/src/nightly/res/drawable/ic_launcher_foreground_debug.xml
 delete mode 100644 mastodon/src/nightly/res/drawable/ic_launcher_foreground_monochrome_debug.xml
 create mode 100644 mastodon/src/nightly/res/drawable/ic_launcher_foreground_nightly.xml

diff --git a/mastodon/src/nightly/res/drawable/ic_launcher_foreground_debug.xml b/mastodon/src/nightly/res/drawable/ic_launcher_foreground_debug.xml
deleted file mode 100644
index d939ad5c7..000000000
--- a/mastodon/src/nightly/res/drawable/ic_launcher_foreground_debug.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M50.8,42.1c-2.3,0 -4.1,0.9 -5.3,2.7l-1.1,1.9l-1.1,-1.9c-1.2,-1.8 -2.9,-2.7 -5.3,-2.7c-2,0 -3.6,0.7 -4.9,2.1c-1.2,1.4 -1.8,3.2 -1.8,5.6v11.5l4.6,0V50.2c0,-2.4 1,-3.5 3,-3.5c2.2,0 3.3,1.4 3.3,4.2v6.1h4.5v-6.1c0,-2.8 1.1,-4.2 3.3,-4.2c2,0 3,1.2 3,3.5v11.2h4.6V49.8c0,-2.3 -0.6,-4.2 -1.8,-5.6C54.4,42.8 52.8,42.1 50.8,42.1z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M63.5,57.8h0.7c0,0 0,0 0,0c-0.6,-0.3 -1,-0.8 -1.3,-1.3c-0.3,-0.6 -0.5,-1.3 -0.5,-2.1c0,-0.8 0.2,-1.5 0.5,-2c0.3,-0.6 0.8,-1 1.3,-1.3c0.6,-0.3 1.2,-0.5 1.8,-0.5c0.7,0 1.3,0.2 1.8,0.5c0.6,0.3 1,0.8 1.3,1.3c0.3,0.6 0.5,1.3 0.5,2c0,0.2 0,0.4 0,0.6l0.7,0.7c0.3,0 0.7,0 1.1,0l1.5,-1.5l0.2,-0.2c-0.1,-1.2 -0.3,-2.2 -0.9,-3.2c-0.6,-1.1 -1.4,-1.9 -2.5,-2.5c-1.1,-0.6 -2.3,-0.9 -3.6,-0.9c-1.4,0 -2.6,0.3 -3.6,0.9c-1.1,0.6 -1.9,1.4 -2.5,2.5C59.3,51.8 59,53 59,54.3c0,1.3 0.3,2.5 0.9,3.6c0.6,1.1 1.4,1.9 2.5,2.5c0.4,0.2 0.7,0.4 1.1,0.5v-1.7V57.8z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M73.3,57.8l1.2,-1.2l-1,-1l-1.6,1.6c-0.3,-0.1 -0.7,-0.1 -1,-0.1s-0.7,0 -1,0.1l-1.6,-1.6l-1,1l1.2,1.2c-0.5,0.4 -1,0.9 -1.3,1.4H65v1.5h1.5c0,0.2 -0.1,0.5 -0.1,0.7v0.7H65v1.5h1.5v0.7c0,0.2 0,0.5 0.1,0.7H65v1.5h2.1c0.8,1.3 2.2,2.2 3.8,2.2c1.6,0 3,-0.9 3.8,-2.2h2.1v-1.5h-1.5c0,-0.2 0.1,-0.5 0.1,-0.7v-0.7h1.5v-1.5h-1.5v-0.7c0,-0.2 0,-0.5 -0.1,-0.7h1.5v-1.5h-2.1C74.3,58.6 73.9,58.2 73.3,57.8zM72.3,65.1h-2.9v-1.5h2.9V65.1zM72.3,62.1h-2.9v-1.5h2.9V62.1z"
-      android:fillColor="#33D17A"/>
-</vector>
diff --git a/mastodon/src/nightly/res/drawable/ic_launcher_foreground_monochrome_debug.xml b/mastodon/src/nightly/res/drawable/ic_launcher_foreground_monochrome_debug.xml
deleted file mode 100644
index d939ad5c7..000000000
--- a/mastodon/src/nightly/res/drawable/ic_launcher_foreground_monochrome_debug.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M50.8,42.1c-2.3,0 -4.1,0.9 -5.3,2.7l-1.1,1.9l-1.1,-1.9c-1.2,-1.8 -2.9,-2.7 -5.3,-2.7c-2,0 -3.6,0.7 -4.9,2.1c-1.2,1.4 -1.8,3.2 -1.8,5.6v11.5l4.6,0V50.2c0,-2.4 1,-3.5 3,-3.5c2.2,0 3.3,1.4 3.3,4.2v6.1h4.5v-6.1c0,-2.8 1.1,-4.2 3.3,-4.2c2,0 3,1.2 3,3.5v11.2h4.6V49.8c0,-2.3 -0.6,-4.2 -1.8,-5.6C54.4,42.8 52.8,42.1 50.8,42.1z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M63.5,57.8h0.7c0,0 0,0 0,0c-0.6,-0.3 -1,-0.8 -1.3,-1.3c-0.3,-0.6 -0.5,-1.3 -0.5,-2.1c0,-0.8 0.2,-1.5 0.5,-2c0.3,-0.6 0.8,-1 1.3,-1.3c0.6,-0.3 1.2,-0.5 1.8,-0.5c0.7,0 1.3,0.2 1.8,0.5c0.6,0.3 1,0.8 1.3,1.3c0.3,0.6 0.5,1.3 0.5,2c0,0.2 0,0.4 0,0.6l0.7,0.7c0.3,0 0.7,0 1.1,0l1.5,-1.5l0.2,-0.2c-0.1,-1.2 -0.3,-2.2 -0.9,-3.2c-0.6,-1.1 -1.4,-1.9 -2.5,-2.5c-1.1,-0.6 -2.3,-0.9 -3.6,-0.9c-1.4,0 -2.6,0.3 -3.6,0.9c-1.1,0.6 -1.9,1.4 -2.5,2.5C59.3,51.8 59,53 59,54.3c0,1.3 0.3,2.5 0.9,3.6c0.6,1.1 1.4,1.9 2.5,2.5c0.4,0.2 0.7,0.4 1.1,0.5v-1.7V57.8z"
-      android:fillColor="#33D17A"/>
-  <path
-      android:pathData="M73.3,57.8l1.2,-1.2l-1,-1l-1.6,1.6c-0.3,-0.1 -0.7,-0.1 -1,-0.1s-0.7,0 -1,0.1l-1.6,-1.6l-1,1l1.2,1.2c-0.5,0.4 -1,0.9 -1.3,1.4H65v1.5h1.5c0,0.2 -0.1,0.5 -0.1,0.7v0.7H65v1.5h1.5v0.7c0,0.2 0,0.5 0.1,0.7H65v1.5h2.1c0.8,1.3 2.2,2.2 3.8,2.2c1.6,0 3,-0.9 3.8,-2.2h2.1v-1.5h-1.5c0,-0.2 0.1,-0.5 0.1,-0.7v-0.7h1.5v-1.5h-1.5v-0.7c0,-0.2 0,-0.5 -0.1,-0.7h1.5v-1.5h-2.1C74.3,58.6 73.9,58.2 73.3,57.8zM72.3,65.1h-2.9v-1.5h2.9V65.1zM72.3,62.1h-2.9v-1.5h2.9V62.1z"
-      android:fillColor="#33D17A"/>
-</vector>
diff --git a/mastodon/src/nightly/res/drawable/ic_launcher_foreground_nightly.xml b/mastodon/src/nightly/res/drawable/ic_launcher_foreground_nightly.xml
new file mode 100644
index 000000000..e3c116912
--- /dev/null
+++ b/mastodon/src/nightly/res/drawable/ic_launcher_foreground_nightly.xml
@@ -0,0 +1,16 @@
+<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="#FF000000"
+      android:pathData="M54,90L54,90c-19.9,0 -36,-16.1 -36,-36l0,0c0,-19.9 16.1,-36 36,-36l0,0c19.9,0 36,16.1 36,36l0,0C90,73.9 73.9,90 54,90z"
+      android:fillAlpha="0"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M39.3,41.6c-2.1,0 -3.8,0.7 -5.1,2.2c-1.2,1.4 -1.9,3.4 -1.9,5.8v11.9l4.7,0V49.9c0,-2.4 1,-3.7 3.1,-3.7c2.3,0 3.4,1.5 3.4,4.4v6.3h4.7v-6.3c0,-2.9 1.1,-4.4 3.4,-4.4c2.1,0 3.1,1.2 3.1,3.7v11.6h4.7V49.5c0,-2.4 -0.6,-4.4 -1.9,-5.8c-1.3,-1.4 -3,-2.2 -5.1,-2.2c-2.4,0 -4.3,0.9 -5.5,2.8l-1.2,2l-1.2,-2C43.6,42.5 41.7,41.6 39.3,41.6z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M70.8,46.5c-0.2,-0.1 -0.4,0 -0.4,0.2c-0.1,0.2 -0.1,0.4 0.1,0.5c1.4,1.2 2.2,2.9 2.2,4.8c0,3.5 -2.8,6.3 -6.3,6.3c-1.5,0 -3,-0.6 -4.1,-1.6c-0.1,-0.1 -0.3,-0.1 -0.5,0c-0.1,0.1 -0.2,0.3 -0.1,0.5c1.3,2.7 3.9,4.3 6.9,4.3c4.2,0 7.7,-3.4 7.7,-7.7C76.1,50.5 74,47.6 70.8,46.5z"/>
+</vector>
diff --git a/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml b/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml
index 036d09bc5..aa3ebda0e 100644
--- a/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_nightly"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml b/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 036d09bc5..aa3ebda0e 100644
--- a/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/mastodon/src/nightly/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
     <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground_nightly"/>
 </adaptive-icon>
\ No newline at end of file