From 484ae130250ba24a3f1d9518a9e190b17a28c6da Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 15 Jul 2023 18:10:10 +0200
Subject: [PATCH] Adjust themed icon scale

Close #467
---
 .../de/mm20/launcher2/icons/IconPackManager.kt    |  2 +-
 .../launcher2/icons/ThemedDynamicCalendarIcon.kt  | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt
index 1d56eefb..4bd88b5a 100644
--- a/services/icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt
+++ b/services/icons/src/main/java/de/mm20/launcher2/icons/IconPackManager.kt
@@ -259,7 +259,7 @@ class IconPackManager(
                     return StaticLauncherIcon(
                         foregroundLayer = TintedIconLayer(
                             icon = drawable.monochrome!!,
-                            scale = 1f,
+                            scale = 1.5f,
                         ),
                         backgroundLayer = ColorLayer(),
                     )
diff --git a/services/icons/src/main/java/de/mm20/launcher2/icons/ThemedDynamicCalendarIcon.kt b/services/icons/src/main/java/de/mm20/launcher2/icons/ThemedDynamicCalendarIcon.kt
index d22b24b0..c685637a 100644
--- a/services/icons/src/main/java/de/mm20/launcher2/icons/ThemedDynamicCalendarIcon.kt
+++ b/services/icons/src/main/java/de/mm20/launcher2/icons/ThemedDynamicCalendarIcon.kt
@@ -3,7 +3,10 @@ package de.mm20.launcher2.icons
 import android.content.res.Resources
 import android.graphics.drawable.AdaptiveIconDrawable
 import androidx.core.content.res.ResourcesCompat
+import de.mm20.launcher2.icons.compat.AdaptiveIconDrawableCompat
+import de.mm20.launcher2.icons.compat.toLauncherIcon
 import de.mm20.launcher2.icons.transformations.LauncherIconTransformation
+import de.mm20.launcher2.icons.transformations.transform
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.time.Instant
@@ -18,6 +21,16 @@ internal class ThemedDynamicCalendarIcon(
         val day = Instant.ofEpochMilli(time).atZone(ZoneId.systemDefault()).dayOfMonth
         val resId = resourceIds[day - 1]
 
+        val adaptiveIconCompat = AdaptiveIconDrawableCompat.from(resources, resId)
+
+        if (adaptiveIconCompat != null) {
+            var icon = adaptiveIconCompat.toLauncherIcon(themed = true)
+            for (transformation in transformations) {
+                icon = transformation.transform(icon)
+            }
+            return@withContext icon
+        }
+
         val drawable = try {
             ResourcesCompat.getDrawable(resources, resId, null)
         } catch (e: Resources.NotFoundException) {
@@ -39,7 +52,7 @@ internal class ThemedDynamicCalendarIcon(
             else -> StaticLauncherIcon(
                 foregroundLayer = TintedIconLayer(
                     icon = drawable,
-                    scale = 0.5f,
+                    scale = 0.65f,
                 ),
                 backgroundLayer = ColorLayer()
             )