Use same small icon for all built-in branding styles

Author: LisoUseInAIKyrios

extensions/shared/library/src/main/java/app/revanced/extension/shared/patches/CustomBrandingPatch.java

@@ -43,27 +43,11 @@ public enum BrandingTheme {
          */
         CUSTOM;
 
-        private final String alias;
-
-        BrandingTheme() {
-            alias = name().toLowerCase(Locale.US);
-        }
-
         private String packageAndNameIndexToClassAlias(String packageName, int appIndex) {
             if (appIndex <= 0) {
                 throw new IllegalArgumentException("App index starts at index 1");
             }
-            return packageName + ".revanced_" + alias + '_' + appIndex;
-        }
-
-        private int getNotificationIcon() {
-            // Original icon is quantum_ic_video_youtube_white_24
-            final int iconResource = Utils.getResourceIdentifier(
-                    "revanced_notification_icon_" + alias, "drawable");
-            if (iconResource == 0) {
-                Logger.printException(() -> "Could not load notification small icon");
-            }
-            return iconResource;
+            return packageName + ".revanced_" + name().toLowerCase(Locale.US) + '_' + appIndex;
         }
     }
 
@@ -74,7 +58,16 @@ private int getNotificationIcon() {
         if (branding == BrandingTheme.ORIGINAL) {
             notificationSmallIcon = 0;
         } else {
-            notificationSmallIcon = branding.getNotificationIcon();
+            // Original icon is quantum_ic_video_youtube_white_24
+            String iconName = "revanced_notification_icon";
+            if (branding == BrandingTheme.CUSTOM) {
+                iconName += "_custom";
+            }
+
+            notificationSmallIcon = Utils.getResourceIdentifier(iconName, "drawable");
+            if (notificationSmallIcon == 0) {
+                Logger.printException(() -> "Could not load notification small icon");
+            }
         }
     }
 

patches/src/main/kotlin/app/revanced/patches/shared/layout/branding/BaseCustomBrandingPatch.kt

@@ -58,15 +58,15 @@ private const val LAUNCHER_RESOURCE_NAME_PREFIX = "revanced_launcher_"
 private const val LAUNCHER_ADAPTIVE_BACKGROUND_PREFIX = "revanced_adaptive_background_"
 private const val LAUNCHER_ADAPTIVE_FOREGROUND_PREFIX = "revanced_adaptive_foreground_"
 private const val LAUNCHER_ADAPTIVE_MONOCHROME_PREFIX = "revanced_adaptive_monochrome_"
-private const val NOTIFICATION_ICON_PREFIX = "revanced_notification_icon_"
+private const val NOTIFICATION_ICON_NAME = "revanced_notification_icon"
 
 private val USER_CUSTOM_ADAPTIVE_FILE_NAMES = arrayOf(
     "$LAUNCHER_ADAPTIVE_BACKGROUND_PREFIX$CUSTOM_USER_ICON_STYLE_NAME.png",
     "$LAUNCHER_ADAPTIVE_FOREGROUND_PREFIX$CUSTOM_USER_ICON_STYLE_NAME.png"
 )
 
 private const val USER_CUSTOM_MONOCHROME_FILE_NAME = "$LAUNCHER_ADAPTIVE_MONOCHROME_PREFIX$CUSTOM_USER_ICON_STYLE_NAME.xml"
-private const val USER_CUSTOM_NOTIFICATION_ICON_FILE_NAME = "$NOTIFICATION_ICON_PREFIX$CUSTOM_USER_ICON_STYLE_NAME.xml"
+private const val USER_CUSTOM_NOTIFICATION_ICON_FILE_NAME = "${NOTIFICATION_ICON_NAME}_$CUSTOM_USER_ICON_STYLE_NAME.xml"
 
 internal const val EXTENSION_CLASS_DESCRIPTOR = "Lapp/revanced/extension/shared/patches/CustomBrandingPatch;"
 
@@ -210,7 +210,6 @@ internal fun baseCustomBrandingPatch(
                     "$LAUNCHER_ADAPTIVE_BACKGROUND_PREFIX$style.xml",
                     "$LAUNCHER_ADAPTIVE_FOREGROUND_PREFIX$style.xml",
                     "$LAUNCHER_ADAPTIVE_MONOCHROME_PREFIX$style.xml",
-                    "$NOTIFICATION_ICON_PREFIX$style.xml"
                 ),
                 ResourceGroup(
                     "mipmap-anydpi",
@@ -219,9 +218,16 @@ internal fun baseCustomBrandingPatch(
             )
         }
 
-        // Copy template user icon, because the aliases must be added even if no user icon is provided.
+
         copyResources(
             "custom-branding",
+            // Push notification 'small' icon.
+            ResourceGroup(
+                "drawable",
+                "$NOTIFICATION_ICON_NAME.xml"
+            ),
+
+            // Copy template user icon, because the aliases must be added even if no user icon is provided.
             ResourceGroup(
                 "drawable",
                 USER_CUSTOM_MONOCHROME_FILE_NAME,