From f58c28410df9bcc6f17d016485fd1dc18d300d62 Mon Sep 17 00:00:00 2001
From: ave <ave@ave.zone>
Date: Sun, 22 Aug 2021 22:34:47 +0300
Subject: [PATCH] customtheme 87202: Fix logo bg color, drop bg field from
 ctcconfig

---
 .../patches/branding/customdynamicicon.sh     |  4 ----
 resources/scripts/ctcci/ctcci.py              |  4 ----
 resources/scripts/ctcci/ctcconfig.example.py  |  6 ++---
 resources/xmlpatches/customtheme/87202.xml    | 23 +++++++++++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/resources/patches/branding/customdynamicicon.sh b/resources/patches/branding/customdynamicicon.sh
index 750bb67..0bc68a7 100644
--- a/resources/patches/branding/customdynamicicon.sh
+++ b/resources/patches/branding/customdynamicicon.sh
@@ -1,7 +1,3 @@
-\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-hdpi/ic_launcher_background.png
-\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-xhdpi/ic_launcher_background.png
-\cp res/mipmap-xxxhdpi/ic_launcher_background.png res/mipmap-xxhdpi/ic_launcher_background.png
-
 \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-hdpi/ic_launcher_foreground.png
 \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-xhdpi/ic_launcher_foreground.png
 \cp res/mipmap-xxxhdpi/ic_launcher_foreground.png res/mipmap-xxhdpi/ic_launcher_foreground.png
diff --git a/resources/scripts/ctcci/ctcci.py b/resources/scripts/ctcci/ctcci.py
index 0e0b59f..b17add8 100755
--- a/resources/scripts/ctcci/ctcci.py
+++ b/resources/scripts/ctcci/ctcci.py
@@ -140,13 +140,9 @@ for patch_name in PATCHES:
                             os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "logo_debug.png"))
 
         if BRANCH in DYN_ICONS:
-            shutil.copyfile(DYN_ICONS[BRANCH]["bg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_background.png"))
             shutil.copyfile(DYN_ICONS[BRANCH]["fg"],
                             os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png"))
         elif "default" in ICONS:
-            shutil.copyfile(DYN_ICONS["default"]["bg"],
-                            os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_background.png"))
             shutil.copyfile(DYN_ICONS["default"]["fg"],
                             os.path.join(WORK_APK_PATH, "res", "mipmap-xxxhdpi", "ic_launcher_foreground.png"))
 
diff --git a/resources/scripts/ctcci/ctcconfig.example.py b/resources/scripts/ctcci/ctcconfig.example.py
index 45be563..6ad82bb 100644
--- a/resources/scripts/ctcci/ctcconfig.example.py
+++ b/resources/scripts/ctcci/ctcconfig.example.py
@@ -51,10 +51,8 @@ ICONS = {"ave": "/opt/ctc/gitrepo/resources/icons/ctclogoave.png",
          "default": "/opt/ctc/gitrepo/resources/icons/ctclogo.png"}
 
 # Custom dynamic icons, default = applied to all the ones not explicitly stated
-DYN_ICONS = {"ave": {"bg": "/opt/ctc/gitrepo/resources/icons/bg.png",
-                     "fg": "/opt/ctc/gitrepo/resources/icons/fg.png"},
-             "default": {"bg": "/opt/ctc/gitrepo/resources/icons/dcbg.png",
-                         "fg": "/opt/ctc/gitrepo/resources/icons/dcfg.png"}}
+DYN_ICONS = {"ave": {"fg": "/opt/ctc/gitrepo/resources/icons/fg.png"},
+             "default": {"fg": "/opt/ctc/gitrepo/resources/icons/dcfg.png"}}
 
 # Custom app names, default = applied to all the ones not explicitly stated
 # Needs to be one word, __ gets replaced with space
diff --git a/resources/xmlpatches/customtheme/87202.xml b/resources/xmlpatches/customtheme/87202.xml
index 90de9ff..a4a7e40 100644
--- a/resources/xmlpatches/customtheme/87202.xml
+++ b/resources/xmlpatches/customtheme/87202.xml
@@ -45,4 +45,27 @@
         <replace sel="resources/color[@name='brand_500_alpha_20']/text()">#335865f2</replace>
     </diff>
 
+    <diff file="res/mipmap-anydpi-v26/ic_logo_round.xml" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+        <replace sel="adaptive-icon/background/@android:drawable">@color/primary_500</replace>
+    </diff>
+
+    <diff file="res/mipmap-anydpi-v26/ic_logo_round_beta.xml" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+        <replace sel="adaptive-icon/background/@android:drawable">@color/primary_500</replace>
+    </diff>
+
+    <diff file="res/mipmap-anydpi-v26/ic_logo_round_canary.xml" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+        <replace sel="adaptive-icon/background/@android:drawable">@color/primary_500</replace>
+    </diff>
+
+    <diff file="res/mipmap-anydpi-v26/ic_logo_square.xml" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+        <replace sel="adaptive-icon/background/@android:drawable">@color/primary_500</replace>
+    </diff>
+
+    <diff file="res/mipmap-anydpi-v26/ic_logo_square_beta.xml" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+        <replace sel="adaptive-icon/background/@android:drawable">@color/primary_500</replace>
+    </diff>
+
+    <diff file="res/mipmap-anydpi-v26/ic_logo_square_canary.xml" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
+        <replace sel="adaptive-icon/background/@android:drawable">@color/primary_500</replace>
+    </diff>
 </diffs>