[Fix] Align signals to left invalid issue before MIUI10 9.5.7

tianma8023 · May 27, 2019 · 5f4a190 · 5f4a190
1 parent 0bbd16d
commit 5f4a190
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 11 deletions.
diff --git a/app/src/main/java/com/tianma/tweaks/miui/utils/rom/MiuiVersion.java b/app/src/main/java/com/tianma/tweaks/miui/utils/rom/MiuiVersion.java
@@ -8,7 +8,7 @@
 
 public class MiuiVersion {
 
-    public final static MiuiVersion VERSION_19_5_7 = new MiuiVersion("19.5.7");
+    public final static MiuiVersion V_19_5_7 = new MiuiVersion("19.5.7");
 
     private static final String DATE_FORMAT = "yy.M.d";
 

diff --git a/app/src/main/java/com/tianma/tweaks/miui/xp/hook/BaseSubHook.java b/app/src/main/java/com/tianma/tweaks/miui/xp/hook/BaseSubHook.java
@@ -1,15 +1,23 @@
 package com.tianma.tweaks.miui.xp.hook;
 
+import com.tianma.tweaks.miui.utils.rom.MiuiVersion;
+
 import de.robv.android.xposed.XSharedPreferences;
 
 public abstract class BaseSubHook {
 
     protected ClassLoader mClassLoader;
     protected XSharedPreferences xsp;
+    protected MiuiVersion mMiuiVersion;
 
     public BaseSubHook(ClassLoader classLoader, XSharedPreferences xsp) {
+        this(classLoader, xsp, null);
+    }
+
+    public BaseSubHook(ClassLoader classLoader, XSharedPreferences xsp, MiuiVersion miuiVersion) {
         mClassLoader = classLoader;
         this.xsp = xsp;
+        mMiuiVersion = miuiVersion;
     }
 
     public abstract void startHook();

diff --git a/app/src/main/java/com/tianma/tweaks/miui/xp/hook/systemui/SystemUIHook.java b/app/src/main/java/com/tianma/tweaks/miui/xp/hook/systemui/SystemUIHook.java
@@ -39,7 +39,7 @@ public void onLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Throwa
                     return;
                 }
                 MiuiVersion miuiVersion = MiuiUtils.getMiuiVersion();
-                if (miuiVersion.getTime() >= MiuiVersion.VERSION_19_5_7.getTime()) {
+                if (miuiVersion.getTime() >= MiuiVersion.V_19_5_7.getTime()) {
                     new MiuiKeyguardVerticalClockHook(classLoader, xsp).startHook();
                     new MiuiKeyguardLeftTopClockHook(classLoader, xsp).startHook();
                     new ChooseKeyguardClockActivityHook(classLoader, xsp).startHook();
@@ -50,7 +50,7 @@ public void onLoadPackage(XC_LoadPackage.LoadPackageParam lpparam) throws Throwa
                 new StatusBarClockHook(classLoader, xsp).startHook();
                 new KeyguardClockContainerHook(classLoader, xsp).startHook();
 
-                new CollapsedStatusBarFragmentHook(classLoader, xsp).startHook();
+                new CollapsedStatusBarFragmentHook(classLoader, xsp, miuiVersion).startHook();
                 new SignalClusterViewHook(classLoader, xsp).startHook();
             }
         }

diff --git a/...ava/com/tianma/tweaks/miui/xp/hook/systemui/statusbar/CollapsedStatusBarFragmentHook.java b/...ava/com/tianma/tweaks/miui/xp/hook/systemui/statusbar/CollapsedStatusBarFragmentHook.java
@@ -7,6 +7,7 @@
 
 import com.tianma.tweaks.miui.utils.XLog;
 import com.tianma.tweaks.miui.utils.XSPUtils;
+import com.tianma.tweaks.miui.utils.rom.MiuiVersion;
 import com.tianma.tweaks.miui.xp.hook.BaseSubHook;
 import com.tianma.tweaks.miui.xp.hook.systemui.helper.ResHelpers;
 
@@ -21,8 +22,8 @@ public class CollapsedStatusBarFragmentHook extends BaseSubHook {
     private boolean mSignalAlignLeft;
     private boolean mAlwaysShowStatusBarClock;
 
-    public CollapsedStatusBarFragmentHook(ClassLoader classLoader, XSharedPreferences xsp) {
-        super(classLoader, xsp);
+    public CollapsedStatusBarFragmentHook(ClassLoader classLoader, XSharedPreferences xsp, MiuiVersion miuiVersion) {
+        super(classLoader, xsp, miuiVersion);
 
         mSignalAlignLeft = XSPUtils.isSignalAlignLeft(xsp);
         mAlwaysShowStatusBarClock = XSPUtils.alwaysShowStatusBarClock(xsp);
@@ -58,13 +59,19 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                             ViewGroup phoneStatusBarView = (ViewGroup) XposedHelpers.getObjectField(param.thisObject, "mStatusBar");
                             Resources res = phoneStatusBarView.getResources();
 
-                            View signalClusterView = phoneStatusBarView
-                                    .findViewById(ResHelpers.getId(res, "signal_cluster"));
-                            ((ViewGroup) signalClusterView.getParent()).removeView(signalClusterView);
+                            View signalClusterViewContainer = phoneStatusBarView
+                                    .findViewById(ResHelpers.getId(res, "signal_cluster_view"));
+                            ((ViewGroup) signalClusterViewContainer.getParent()).removeView(signalClusterViewContainer);
 
-                            ViewGroup contentsContainer = phoneStatusBarView
-                                    .findViewById(ResHelpers.getId(res, "phone_status_bar_contents_container"));
-                            contentsContainer.addView(signalClusterView, 0);
+                            if (mMiuiVersion.getTime() >= MiuiVersion.V_19_5_7.getTime()) {
+                                ViewGroup contentsContainer = phoneStatusBarView
+                                        .findViewById(ResHelpers.getId(res, "phone_status_bar_contents_container"));
+                                contentsContainer.addView(signalClusterViewContainer, 0);
+                            } else {
+                                ViewGroup statusBarContents = phoneStatusBarView
+                                        .findViewById(ResHelpers.getId(res, "status_bar_contents"));
+                                statusBarContents.addView(signalClusterViewContainer, 0);
+                            }
                         } catch (Throwable t) {
                             XLog.e("", t);
                         }