Add themed icons to icon picker, add option to force themed icons

2022-07-31 21:45:00 +02:00
parent b979c81501
commit 389b33aebe
12 changed files with 260 additions and 143 deletions
@@ -81,8 +81,7 @@ sealed class CustomIcon : CustomAttribute {
                }
                "custom_themed_icon" -> {
                    CustomThemedIcon(
-                        iconName = payload.getString("icon"),
-                        iconPackPackage = payload.getString("icon_pack")
+                        iconPackageName = payload.getString("icon"),
                    )
                }
                "default_icon" -> {
@@ -143,14 +142,12 @@ data class AdaptifiedLegacyIcon(
 }

 data class CustomThemedIcon(
-    val iconPackPackage: String,
-    val iconName: String,
+    val iconPackageName: String,
 ) : CustomIcon() {
    override fun toDatabaseValue(): String {
        return jsonObjectOf(
            "type" to "custom_themed_icon",
-            "icon" to iconName,
-            "icon_pack" to iconPackPackage,
+            "icon" to iconPackageName,
        ).toString()
    }
 }