fix(NoForceShape): in recent app list, if mask is null, use system mask

RichardLuo0 · Feb 16, 2025 · 162eff3 · 162eff3
1 parent a43e964
commit 162eff3
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/app/src/main/kotlin/com/richardluo/globalIconPack/NoForceShape.kt b/app/src/main/kotlin/com/richardluo/globalIconPack/NoForceShape.kt
@@ -72,7 +72,12 @@ class NoForceShape : Hook {
       object : XC_MethodHook() {
         override fun beforeHookedMethod(param: MethodHookParam) {
           param.args[0].asType<Drawable?>()?.let {
-            if (it !is AdaptiveIconDrawable) param.args[0] = createUnMask(it)
+            param.args[0] =
+              when (it) {
+                is IconHelper.Adaptively -> it.makeAdaptive()
+                !is AdaptiveIconDrawable -> makeUnMask(it)
+                else -> it
+              }
           }
         }
       },
@@ -91,7 +96,12 @@ class NoForceShape : Hook {
       object : XC_MethodHook() {
         override fun beforeHookedMethod(param: MethodHookParam) {
           param.args[0].asType<Drawable?>()?.let {
-            if (it !is AdaptiveIconDrawable) param.args[0] = createUnMask(it)
+            param.args[0] =
+              when (it) {
+                is IconHelper.Adaptively -> it.makeAdaptive()
+                !is AdaptiveIconDrawable -> makeUnMask(it)
+                else -> it
+              }
           }
         }
       },
@@ -168,6 +178,6 @@ class NoForceShape : Hook {
     }
   }
 
-  fun createUnMask(drawable: Drawable) =
+  fun makeUnMask(drawable: Drawable) =
     UnmaskAdaptiveIconDrawable(null, IconHelper.createScaledDrawable(drawable))
 }