Fix System Launcher Layout issues and exceptions

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/base/pack/home/HomeBaseHookNew.kt

@@ -125,6 +125,7 @@ abstract class HomeBaseHookNew : BaseHook() {
                 param.result = DisplayUtils.dp2px(
                     mPrefsMap.getInt(key, defaultValue).toFloat()
                 )
+                logD(TAG, lpparam.packageName, "Invoke setDimensionPixelSizeFormPrefs with $key, $defaultValue - result: ${param.result}")
             }
         }
     }

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/home/folder/UnlockBlurSupported.java

@@ -21,20 +21,41 @@
 import android.graphics.Rect;
 import android.view.View;
 
-import com.sevtinge.hyperceiler.hook.module.base.BaseHook;
+import com.sevtinge.hyperceiler.hook.module.base.pack.home.HomeBaseHookNew;
 
 import de.robv.android.xposed.XposedHelpers;
 
-public class UnlockBlurSupported extends BaseHook {
+public class UnlockBlurSupported extends HomeBaseHookNew {
+
+    Class<?> mDeviceConfig;
+    String mBlurUtilitiesCls;
+    String mLauncherFolder2x2IconContainer;
+
+    @SuppressWarnings("unused")
+    @Version(isPad = false, min = 600000000)
+    private void initOS3Hook() {
+        mDeviceConfig = findClassIfExists(DEVICE_CONFIG_NEW);
+        mBlurUtilitiesCls = "com.miui.home.common.utils.BlurUtilities";
+        mLauncherFolder2x2IconContainer = "com.miui.home.folder.LauncherFolder2x2IconContainer";
+        initBaseCore();
+    }
+
     @Override
-    public void init() throws NoSuchMethodException {
-        findAndHookMethod("com.miui.home.launcher.common.BlurUtilities",
+    public void initBase() {
+        mDeviceConfig = findClassIfExists(DEVICE_CONFIG_OLD);
+        mBlurUtilitiesCls = "com.miui.home.launcher.common.BlurUtilities";
+        mLauncherFolder2x2IconContainer = "com.miui.home.launcher.folder.LauncherFolder2x2IconContainer";
+        initBaseCore();
+    }
+
+    private void initBaseCore() {
+        findAndHookMethod(mBlurUtilitiesCls,
                 "isBlurSupported",
                 new MethodHook() {
                     @Override
                     protected void before(MethodHookParam param) {
                         boolean isDefaultIcon = (boolean) XposedHelpers.callStaticMethod(
-                                findClassIfExists("com.miui.home.launcher.DeviceConfig"),
+                            mDeviceConfig,
                                 "isDefaultIcon");
                         if (!isDefaultIcon)
                             param.setResult(true);
@@ -43,7 +64,7 @@ protected void before(MethodHookParam param) {
         );
 
         try {
-            findAndHookMethod("com.miui.home.launcher.folder.LauncherFolder2x2IconContainer",
+            findAndHookMethod(mLauncherFolder2x2IconContainer,
                     "resolveTopPadding", Rect.class, new MethodHook() {
                         @Override
                         protected void before(MethodHookParam param) {
@@ -58,16 +79,16 @@ protected void before(MethodHookParam param) {
                     }
             );
         } catch (Error | Exception ignore) {
-            findAndHookMethod("com.miui.home.launcher.DeviceConfig", "isUseDefaultIconFolder1x1", new MethodHook() {
+            findAndHookMethod(mDeviceConfig, "isUseDefaultIconFolder1x1", new MethodHook() {
                 @Override
-                protected void before(MethodHookParam param) throws Throwable {
+                protected void before(MethodHookParam param) {
                     param.setResult(true);
                 }
             });
 
-            findAndHookMethod("com.miui.home.launcher.DeviceConfig", "isUseDefaultIconFolderLarge", new MethodHook() {
+            findAndHookMethod(mDeviceConfig, "isUseDefaultIconFolderLarge", new MethodHook() {
                 @Override
-                protected void before(MethodHookParam param) throws Throwable {
+                protected void before(MethodHookParam param) {
                     param.setResult(true);
                 }
             });

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/home/gesture/CornerSlide.java

@@ -23,24 +23,37 @@
 import android.os.Bundle;
 import android.view.MotionEvent;
 
-import com.sevtinge.hyperceiler.hook.module.base.BaseHook;
+import com.sevtinge.hyperceiler.hook.module.base.pack.home.HomeBaseHookNew;
 import com.sevtinge.hyperceiler.hook.module.skip.GlobalActions;
 
 import de.robv.android.xposed.XposedHelpers;
 
-public class CornerSlide extends BaseHook {
+public class CornerSlide extends HomeBaseHookNew {
     public int inDirection = 0;
 
+    private Class<?> canTriggerAssistantActionParam3;
+
     Context mContext;
 
+    @SuppressWarnings("unused")
+    @Version(isPad = false, min = 600000000)
+    private void initOS3Hook() {
+        canTriggerAssistantActionParam3 = long.class;
+        initBaseCore();
+    }
+
     @Override
-    public void init() throws NoSuchMethodException {
+    public void initBase() {
+        canTriggerAssistantActionParam3 = int.class;
+        initBaseCore();
+    }
+    public void initBaseCore() {
         findAndHookMethod("com.android.systemui.shared.recents.system.AssistManager",
             "isSupportGoogleAssist", int.class,
             MethodHook.returnConstant(true));
         Class<?> FsGestureAssistHelper = findClassIfExists("com.miui.home.recents.FsGestureAssistHelper");
         findAndHookMethod(FsGestureAssistHelper, "canTriggerAssistantAction",
-            float.class, float.class, int.class,
+            float.class, float.class, canTriggerAssistantActionParam3,
             new MethodHook() {
                 @Override
                 protected void before(MethodHookParam param) {

library/hook/src/main/java/com/sevtinge/hyperceiler/hook/module/rules/home/layout/LayoutRules.kt

@@ -33,6 +33,10 @@ import io.github.kyuubiran.ezxhelper.core.finder.MethodFinder.`-Static`.methodFi
 import io.github.kyuubiran.ezxhelper.xposed.dsl.HookFactory.`-Static`.createAfterHook
 import kotlin.math.max
 
+private const val M_WORKSPACE_TOP_PADDING = "mWorkspaceTopPadding"
+
+private const val GET_VALUE = "getValue"
+
 object LayoutRules : HomeBaseHookNew() {
     private const val PHONE_RULES = "com.miui.home.launcher.compat.PhoneDeviceRules"
     private const val PHONE_RULES_NEW = "com.miui.home.common.gridconfig.PhoneDeviceRules"
@@ -59,6 +63,7 @@ object LayoutRules : HomeBaseHookNew() {
     private var currentCellWidth = 0
     private var currentCellHeight = 0
 
+    @Suppress("unused")
     @Version(isPad = false, min = 600000000)
     private fun isOS3Hook() {
         if (isUnlockGridsHook) {
@@ -218,45 +223,42 @@ object LayoutRules : HomeBaseHookNew() {
         override fun after(param: MethodHookParam) {
             val rules = param.thisObject
 
-            val maxGridWidth = rules.getIntField("mScreenWidth")
+//            logD(
+//                TAG,
+//                lpparam.packageName,
+//                "rules object: $rules Class fields: ${rules.javaClass.declaredFields.joinToString()}"
+//            )
+
+            val mScreenWidth = rules.getIntField("mScreenWidth")
+            val mScreenHeight = rules.getIntField("mScreenHeight")
             val mCellWidth = rules.getIntField("mCellWidth")
             val mCellHeight = rules.getIntField("mCellHeight")
             val mWorkspaceCellSideDefault = rules.getIntField("mWorkspaceCellSideDefault")
             val mCellCountY = rules.getIntField("mCellCountY")
-            val mWorkspaceTopPadding = rules.callMethodAs<Int>("getWorkspacePaddingTop")
+            val mWorkspaceTopPadding =
+                rules.getObjectFieldAs<Any>(M_WORKSPACE_TOP_PADDING)
+                    .callMethodAs<Int>(GET_VALUE)
             val mWorkspaceCellPaddingBottom =
                 rules.getObjectFieldAs<Any>("mWorkspaceCellPaddingBottom")
-                    .callMethodAs<Int>("getValue")
+                    .callMethodAs<Int>(GET_VALUE)
 
             val sWorkspacePaddingTop = if (isSetWSPaddingTopHook) {
                 DisplayUtils.dp2px(
-                    mPrefsMap.getInt(
-                        "home_layout_workspace_padding_top",
-                        0
-                    ).toFloat()
-                )
+                    mPrefsMap.getInt("home_layout_workspace_padding_top", 0))
             } else {
                 -1
             }
 
             val sWorkspacePaddingBottom = if (isSetWSPaddingBottomHook) {
                 DisplayUtils.dp2px(
-                    mPrefsMap.getInt(
-                        "home_layout_workspace_padding_bottom",
-                        0
-                    ).toFloat()
-                )
+                    mPrefsMap.getInt("home_layout_workspace_padding_bottom", 0))
             } else {
                 -1
             }
 
             val sWorkspaceCellSide = if (isSetWSPaddingSideHook) {
                 DisplayUtils.dp2px(
-                    mPrefsMap.getInt(
-                        "home_layout_workspace_padding_horizontal",
-                        0
-                    ).toFloat()
-                )
+                    mPrefsMap.getInt("home_layout_workspace_padding_horizontal", 0))
             } else {
                 -1
             }
@@ -275,34 +277,35 @@ object LayoutRules : HomeBaseHookNew() {
             currentCellWidth = mCellWidth
             currentCellHeight = mCellHeight
 
-            val cellWorkspaceHeight = mCellWidth * mCellCountY
+            //val cellWorkspaceHeight = mCellHeight * mCellCountY
 
             if (isUnlockGridsHook || isSetWSPaddingSideHook) {
-                currentCellWidth = (maxGridWidth - if (isSetWSPaddingSideHook) {
+                currentCellWidth = (mScreenWidth - if (isSetWSPaddingSideHook) {
                     sWorkspaceCellSide
                 } else {
                     mWorkspaceCellSideDefault
                 }) / currentCellCountX
             }
 
             if (isUnlockGridsHook || isSetWSPaddingTopHook || isSetWSPaddingBottomHook) {
-                currentCellHeight = (cellWorkspaceHeight + if (isSetWSPaddingTopHook) {
-                    mWorkspaceTopPadding - sWorkspacePaddingTop
+                currentCellHeight = (mScreenHeight - if (isSetWSPaddingTopHook) {
+                    sWorkspacePaddingTop
                 } else {
                     0
-                } + if (isSetWSPaddingBottomHook) {
-                    mWorkspaceCellPaddingBottom - sWorkspacePaddingBottom
+                } - if (isSetWSPaddingBottomHook) {
+                    sWorkspacePaddingBottom
                 } else {
                     0
                 }) / currentCellCountY
             }
 
-            val cellSize = max(currentCellWidth, currentCellHeight)
-            rules.setIntField("mCellWidth", cellSize)
-            rules.setIntField("mCellHeight", cellSize)
+            //val cellSize = max(currentCellWidth, currentCellHeight)
+            rules.setIntField("mCellWidth", currentCellWidth)
+            rules.setIntField("mCellHeight", currentCellHeight)
 
             if (isSetWSPaddingTopHook) {
-                rules.getObjectFieldAs<Any>("mWorkspaceTopPadding")
+                //rules.setIntField("mWorkspaceTopPadding", sWorkspacePaddingTop)
+                rules.getObjectFieldAs<Any>(M_WORKSPACE_TOP_PADDING)
                     .callMethod("setValue", sWorkspacePaddingTop)
             }
 
@@ -314,22 +317,23 @@ object LayoutRules : HomeBaseHookNew() {
             if (isSetWSPaddingSideHook) {
                 rules.setIntField(
                     "mWorkspaceCellSide",
-                    (mCellWidth - currentCellWidth * currentCellCountX) / 2
+                    (mScreenWidth - currentCellWidth * currentCellCountX) / 2
                 )
             }
 
             logI(
                 TAG, lpparam.packageName,
                 """ |
-                    |Applied layout rules:
+                    |Applied layout rules (new Hook):
                     |  cellCountX    => $currentCellCountX
                     |  cellCountY    => $currentCellCountY
-                    |  paddingTop    => $sWorkspacePaddingTop
-                    |  paddingBottom => $sWorkspacePaddingBottom
+                    |  paddingTop    => $sWorkspacePaddingTop (was: $mWorkspaceTopPadding)
+                    |  paddingBottom => $sWorkspacePaddingBottom (was: $mWorkspaceCellPaddingBottom)
                     |  cellSide      => $sWorkspaceCellSide
                     |  cellSizeO     => $mCellWidth
                     |  cellWidth     => $currentCellWidth
                     |  cellHeight    => $currentCellHeight
+                    |  Screen HxW    => $mScreenHeight x $mScreenWidth
                 """.trimMargin()
             )
         }
@@ -343,40 +347,30 @@ object LayoutRules : HomeBaseHookNew() {
             val mWorkspaceCellSideDefault = rules.getIntField("mWorkspaceCellSideDefault")
             val mCellSize = rules.getIntField("mCellSize")
             val mCellCountY = rules.getIntField("mCellCountY")
-            val mWorkspaceTopPadding = rules.callMethodAs<Int>("getWorkspacePaddingTop")
+            val mWorkspaceTopPadding =
+                rules.getObjectFieldAs<Any>(M_WORKSPACE_TOP_PADDING)
+                    .callMethodAs<Int>(GET_VALUE)
             val mWorkspaceCellPaddingBottom =
                 rules.getObjectFieldAs<Any>("mWorkspaceCellPaddingBottom")
-                    .callMethodAs<Int>("getValue")
+                    .callMethodAs<Int>(GET_VALUE)
 
             val sWorkspacePaddingTop = if (isSetWSPaddingTopHook) {
                 DisplayUtils.dp2px(
-                    mPrefsMap.getInt(
-                        "home_layout_workspace_padding_top",
-                        0
-                    ).toFloat()
-                )
+                    mPrefsMap.getInt("home_layout_workspace_padding_top", 0))
             } else {
                 -1
             }
 
             val sWorkspacePaddingBottom = if (isSetWSPaddingBottomHook) {
                 DisplayUtils.dp2px(
-                    mPrefsMap.getInt(
-                        "home_layout_workspace_padding_bottom",
-                        0
-                    ).toFloat()
-                )
+                    mPrefsMap.getInt("home_layout_workspace_padding_bottom", 0))
             } else {
                 -1
             }
 
             val sWorkspaceCellSide = if (isSetWSPaddingSideHook) {
                 DisplayUtils.dp2px(
-                    mPrefsMap.getInt(
-                        "home_layout_workspace_padding_horizontal",
-                        0
-                    ).toFloat()
-                )
+                    mPrefsMap.getInt("home_layout_workspace_padding_horizontal", 0))
             } else {
                 -1
             }
@@ -420,7 +414,7 @@ object LayoutRules : HomeBaseHookNew() {
             rules.setIntField("mCellSize", max(currentCellWidth, currentCellHeight))
 
             if (isSetWSPaddingTopHook) {
-                rules.getObjectFieldAs<Any>("mWorkspaceTopPadding")
+                rules.getObjectFieldAs<Any>(M_WORKSPACE_TOP_PADDING)
                     .callMethod("setValue", sWorkspacePaddingTop)
             }
 
@@ -442,7 +436,7 @@ object LayoutRules : HomeBaseHookNew() {
                     |Applied layout rules:
                     |  cellCountX    => $currentCellCountX
                     |  cellCountY    => $currentCellCountY
-                    |  paddingTop    => $sWorkspacePaddingTop
+                    |  paddingTop    => $sWorkspacePaddingTop (was: $mWorkspaceTopPadding)
                     |  paddingBottom => $sWorkspacePaddingBottom
                     |  cellSide      => $sWorkspaceCellSide
                     |  cellSizeO     => $mCellSize