fix: round clip in some apps such as blocker

RichardLuo0 · Feb 18, 2025 · d0bd360 · d0bd360
1 parent a811c4e
commit d0bd360
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 5 deletions.
diff --git a/app/src/main/kotlin/com/richardluo/globalIconPack/NoForceShape.kt b/app/src/main/kotlin/com/richardluo/globalIconPack/NoForceShape.kt
@@ -166,12 +166,11 @@ class NoForceShape : Hook {
     UnClipAdaptiveIconDrawable(background, foreground) {
     override fun getIconMask(): Path = getFullBoundsPath()
 
-    override fun getConstantState(): ConstantState {
-      return UnmaskState(background, foreground)
-    }
+    override val cState: ConstantState by lazy { CState() }
+
+    override fun getConstantState(): ConstantState = cState
 
-    class UnmaskState(private val background: Drawable?, private val foreground: Drawable?) :
-      ConstantState() {
+    private inner class CState : ConstantState() {
       override fun newDrawable(): Drawable = UnmaskAdaptiveIconDrawable(background, foreground)
 
       override fun getChangingConfigurations(): Int = 0

diff --git a/app/src/main/kotlin/com/richardluo/globalIconPack/utils/IconHelper.kt b/app/src/main/kotlin/com/richardluo/globalIconPack/utils/IconHelper.kt
@@ -46,6 +46,17 @@ object IconHelper {
       super.setAlpha(alpha)
       paint.alpha = alpha
     }
+
+    override val cState by lazy { CState() }
+
+    override fun getConstantState(): ConstantState = cState
+
+    private inner class CState : ConstantState() {
+      override fun newDrawable(): Drawable =
+        CustomAdaptiveIconDrawable(background, foreground, back, upon, mask, iconScale)
+
+      override fun getChangingConfigurations(): Int = 0
+    }
   }
 
   interface Adaptively {
@@ -232,7 +243,9 @@ private val useUnClipAdaptive: Boolean by lazy {
   if (!isInMod) false
   else
     when (AndroidAppHelper.currentPackageName()) {
+      // Fix app list, black background sometimes
       "com.android.settings" -> false
+      // Fix splash screen
       "com.android.systemui" -> false
       "com.android.intentresolver" -> true
       else -> true

diff --git a/app/src/main/kotlin/com/richardluo/globalIconPack/utils/UnClipAdaptiveIconDrawable.kt b/app/src/main/kotlin/com/richardluo/globalIconPack/utils/UnClipAdaptiveIconDrawable.kt
@@ -76,4 +76,14 @@ open class UnClipAdaptiveIconDrawable(background: Drawable?, foreground: Drawabl
     RectF(bounds).apply {
       inset(-bounds.width() * getExtraInsetFraction(), -bounds.height() * getExtraInsetFraction())
     }
+
+  open val cState: ConstantState by lazy { CState() }
+
+  override fun getConstantState(): ConstantState = cState
+
+  private inner class CState : ConstantState() {
+    override fun newDrawable(): Drawable = UnClipAdaptiveIconDrawable(background, foreground)
+
+    override fun getChangingConfigurations(): Int = 0
+  }
 }