Include unthemed icon variant in icon picker for icon packs that support themed icons

2023-04-04 22:23:43 +02:00
parent 6353b38a70
commit 8ae3d74512
3 changed files with 39 additions and 12 deletions
@@ -82,13 +82,15 @@ sealed class CustomIcon : CustomAttribute {
                        CustomIconPackIcon(
                            iconPackageName = legacyComponentName.packageName,
                            iconActivityName = legacyComponentName.className,
-                            iconPackPackage = payload.getString("icon_pack")
+                            iconPackPackage = payload.getString("icon_pack"),
+                            allowThemed = payload.optBoolean("allow_themed", true),
                        )
                    } else {
                        CustomIconPackIcon(
                            iconPackageName = payload.optString("package").takeIf { it.isNotEmpty() } ?: return null,
                            iconActivityName = payload.optString("activity").takeIf { it.isNotEmpty() },
-                            iconPackPackage = payload.getString("icon_pack")
+                            iconPackPackage = payload.getString("icon_pack"),
+                            allowThemed = payload.optBoolean("allow_themed", true),
                        )
                    }
                }
@@ -118,6 +120,7 @@ data class CustomIconPackIcon(
    val iconPackPackage: String,
    val iconPackageName: String,
    val iconActivityName: String?,
+    val allowThemed: Boolean = true,
 ) : CustomIcon() {
    override fun toDatabaseValue(): String {
        return jsonObjectOf(
@@ -125,6 +128,7 @@ data class CustomIconPackIcon(
            "package" to iconPackageName,
            "activity" to iconActivityName,
            "icon_pack" to iconPackPackage,
+            "allow_themed" to allowThemed,
        ).toString()
    }
 }