KotlinXposedHelper 化

app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt

@@ -206,7 +206,7 @@ class SettingsActivity : MIUIActivity() {
     }
 
     //关于页面
-    fun aboutItems(): ArrayList<BaseView> {
+    private fun aboutItems(): ArrayList<BaseView> {
         return ArrayList<BaseView>().apply {
             add(
                 AuthorV(
@@ -894,7 +894,7 @@ class SettingsActivity : MIUIActivity() {
     }
 
     //其他页面
-    fun otherItems(): ArrayList<BaseView> {
+    private fun otherItems(): ArrayList<BaseView> {
         return ArrayList<BaseView>().apply {
             add(TitleTextV(resId = R.string.scope_miuihome))
             add(

app/src/main/java/com/lt2333/simplicitytools/hook/MainHook.kt

@@ -15,41 +15,23 @@ class MainHook : IXposedHookLoadPackage {
             EzXHelperInit.setEzClassLoader(lpparam.classLoader)
             when (lpparam.packageName) {
                 //Android
-                "android" -> {
+                "android" -> Android().handleLoadPackage(lpparam)
-                    Android().handleLoadPackage(lpparam)
-                }
                 //系统界面
-                "com.android.systemui" -> {
+                "com.android.systemui" -> SystemUI().handleLoadPackage(lpparam)
-                    SystemUI().handleLoadPackage(lpparam)
-                }
                 //电量与性能
-                "com.miui.powerkeeper" -> {
+                "com.miui.powerkeeper" -> PowerKeeper().handleLoadPackage(lpparam)
-                    PowerKeeper().handleLoadPackage(lpparam)
-                }
                 //桌面
-                "com.miui.home" -> {
+                "com.miui.home" -> MiuiHome().handleLoadPackage(lpparam)
-                    MiuiHome().handleLoadPackage(lpparam)
-                }
                 //手机管家
-                "com.miui.securitycenter" -> {
+                "com.miui.securitycenter" -> SecurityCenter().handleLoadPackage(lpparam)
-                    SecurityCenter().handleLoadPackage(lpparam)
-                }
                 //相册编辑
-                "com.miui.mediaeditor" -> {
+                "com.miui.mediaeditor" -> MediaEditor().handleLoadPackage(lpparam)
-                    MediaEditor().handleLoadPackage(lpparam)
-                }
                 //系统更新
-                "com.android.updater" -> {
+                "com.android.updater" -> Updater().handleLoadPackage(lpparam)
-                    Updater().handleLoadPackage(lpparam)
-                }
                 //设置
-                "com.android.settings" -> {
+                "com.android.settings" -> Settings().handleLoadPackage(lpparam)
-                    Settings().handleLoadPackage(lpparam)
-                }
                 //主题壁纸
-                "com.android.thememanager" -> {
+                "com.android.thememanager" -> ThemeManager().handleLoadPackage(lpparam)
-                    ThemeManager().handleLoadPackage(lpparam)
-                }
             }
         }
     }

app/src/main/java/com/lt2333/simplicitytools/hook/app/securitycenter/LockOneHundred.kt

@@ -2,46 +2,28 @@ package com.lt2333.simplicitytools.hook.app.securitycenter
 
 import android.view.View
 import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.findClass
+import com.lt2333.simplicitytools.util.hookBeforeMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class LockOneHundred : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
 
         //防止点击重新检测
-        var classIfExists = XposedHelpers.findClassIfExists(
+        val mainContentFrameClass = "com.miui.securityscan.ui.main.MainContentFrame".findClass(lpparam.classLoader)
-            "com.miui.securityscan.ui.main.MainContentFrame",
+        mainContentFrameClass.hookBeforeMethod("onClick", View::class.java) {
-            lpparam.classLoader
-        )
-        XposedHelpers.findAndHookMethod(
-            classIfExists,
-            "onClick",
-            View::class.java,
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam) {
             if (XSPUtils.getBoolean("lock_one_hundred", false)) {
-                        param.result = null
+                it.result = null
             }
         }
-            })
 
         //锁定100分
-        var classIfExists2 = XposedHelpers.findClassIfExists(
+        var scoreManagerClass = "com.miui.securityscan.scanner.ScoreManager".findClass(lpparam.classLoader)
-            "com.miui.securityscan.scanner.ScoreManager",
+        scoreManagerClass.hookBeforeMethod("B") {
-            lpparam.classLoader
-        )
-        XposedHelpers.findAndHookMethod(
-            classIfExists2,
-            "B",
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam) {
             if (XSPUtils.getBoolean("lock_one_hundred", false)) {
-                        param.result = 0
+                it.result = 0
             }
         }
-            })
-
     }
 }

app/src/main/java/com/lt2333/simplicitytools/hook/app/securitycenter/SkipWaitingTime.kt

@@ -2,51 +2,37 @@ package com.lt2333.simplicitytools.hook.app.securitycenter
 
 import android.widget.TextView
 import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.findClass
+import com.lt2333.simplicitytools.util.hookBeforeMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class SkipWaitingTime : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
 
-        var classIfExists = XposedHelpers.findClassIfExists(
+        val textViewClass = "android.widget.TextView".findClass(lpparam.classLoader)
-            "android.widget.TextView",
+        textViewClass.hookBeforeMethod(
-            lpparam.classLoader
-        )
-        XposedHelpers.findAndHookMethod(
-            classIfExists,
             "setText",
             CharSequence::class.java,
             TextView.BufferType::class.java,
             Boolean::class.java,
-            Int::class.java,
+            Int::class.java
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam) {
-                    if (XSPUtils.getBoolean("skip_waiting_time", false)) {
-                        if (param.args.isNotEmpty() && param.args[0]?.toString()
-                                ?.startsWith("确定(") == true
         ) {
-                            param.args[0] = "确定"
-                        }
-                    }
-                }
-            })
-
-        val classIfExists2 = XposedHelpers.findClassIfExists(
-            "android.widget.TextView",
-            lpparam.classLoader
-        )
-        XposedHelpers.findAndHookMethod(
-            classIfExists2,
-            "setEnabled",
-            Boolean::class.java,
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam) {
             if (XSPUtils.getBoolean("skip_waiting_time", false)) {
-                        param.args[0] = true
+                if (it.args.isNotEmpty() && it.args[0]?.toString()?.startsWith("确定(") == true
+                ) {
+                    it.args[0] = "确定"
+                }
+            }
+        }
+
+        textViewClass.hookBeforeMethod(
+            "setEnabled",
+            Boolean::class.java
+        ) {
+            if (XSPUtils.getBoolean("skip_waiting_time", false)) {
+                it.args[0] = true
             }
         }
-            })
     }
 }

app/src/main/java/com/lt2333/simplicitytools/hook/app/settings/ShowNotificationImportance.kt

@@ -3,71 +3,32 @@ package com.lt2333.simplicitytools.hook.app.settings
 import android.app.NotificationChannel
 import com.lt2333.simplicitytools.util.*
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class ShowNotificationImportance : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        val channelNotificationSettingsClass = XposedHelpers.findClass(
+        val channelNotificationSettingsClass = "com.android.settings.notification.ChannelNotificationSettings".findClass(lpparam.classLoader)
-            "com.android.settings.notification.ChannelNotificationSettings",
+        channelNotificationSettingsClass.hookBeforeMethod("removeDefaultPrefs") {
-            lpparam.classLoader
+            if (!XSPUtils.getBoolean("show_notification_importance", false)) return@hookBeforeMethod
-        )
+            val importance = it.thisObject.callMethod("findPreference", "importance") ?: return@hookBeforeMethod
-
+            val mChannel = it.thisObject.getObjectField("mChannel") as NotificationChannel
-        channelNotificationSettingsClass.hookMethod("removeDefaultPrefs",
+            val index = importance.callMethod("findSpinnerIndexOfValue", mChannel.importance.toString()) as Int
-            object : XC_MethodHook() {
+            if (index < 0) return@hookBeforeMethod
-                override fun beforeHookedMethod(param: MethodHookParam) {
-                    if (!XSPUtils.getBoolean("show_notification_importance", false)) return
-
-                    val importance =
-                        param.thisObject.callMethod("findPreference", "importance") ?: return
-                    val mChannel =
-                        param.thisObject.getObjectField("mChannel") as NotificationChannel
-                    val index = importance.callMethod(
-                        "findSpinnerIndexOfValue",
-                        mChannel.importance.toString()
-                    ) as Int
-                    if (index < 0) return
-
             importance.callMethod("setValueIndex", index)
-
+            XposedHelpers.setAdditionalInstanceField(importance, "channelNotificationSettings", it.thisObject)
-                    XposedHelpers.setAdditionalInstanceField(
+            it.result = null
-                        importance,
-                        "channelNotificationSettings",
-                        param.thisObject
-                    )
-
-                    param.result = null
         }
-            })
 
-        val dropDownPreferenceClass = XposedHelpers.findClass(
+        val dropDownPreferenceClass = XposedHelpers.findClass("androidx.preference.Preference", lpparam.classLoader)
-            "androidx.preference.Preference",
+        dropDownPreferenceClass.hookAfterMethod("callChangeListener", Any::class.java) {
-            lpparam.classLoader
+            val channelNotificationSettings = XposedHelpers.getAdditionalInstanceField(it.thisObject, "channelNotificationSettings") ?: return@hookAfterMethod
-        )
+            val mChannel = channelNotificationSettings.getObjectField("mChannel") as NotificationChannel
-
+            mChannel.callMethod("setImportance", (it.args[0] as String).toInt())
-        dropDownPreferenceClass.hookMethod("callChangeListener",
+            val mBackend = channelNotificationSettings.getObjectField("mBackend") ?: return@hookAfterMethod
-            Any::class.java, object : XC_MethodHook() {
-                override fun afterHookedMethod(param: MethodHookParam) {
-                    val channelNotificationSettings = XposedHelpers.getAdditionalInstanceField(
-                        param.thisObject,
-                        "channelNotificationSettings"
-                    ) ?: return@afterHookedMethod
-
-                    val mChannel = XposedHelpers.getObjectField(
-                        channelNotificationSettings,
-                        "mChannel"
-                    ) as NotificationChannel
-
-                    mChannel.callMethod(
-                        "setImportance", (param.args[0] as String).toInt()
-                    )
-
-                    val mBackend = channelNotificationSettings.getObjectField("mBackend") ?: return
             val mPkg = channelNotificationSettings.getObjectField("mPkg") as String
             val mUid = channelNotificationSettings.getIntField("mUid")
             mBackend.callMethod("updateChannel", mPkg, mUid, mChannel)
         }
-            })
     }
 }

app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/HideNetworkSpeedSplitter.kt

@@ -2,25 +2,19 @@ package com.lt2333.simplicitytools.hook.app.systemui
 
 import android.widget.TextView
 import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.findClass
+import com.lt2333.simplicitytools.util.hookAfterMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class HideNetworkSpeedSplitter : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        val classIfExists = XposedHelpers.findClassIfExists(
+        val networkSpeedSplitterClass = "com.android.systemui.statusbar.views.NetworkSpeedSplitter".findClass(lpparam.classLoader)
-            "com.android.systemui.statusbar.views.NetworkSpeedSplitter",
+        networkSpeedSplitterClass.hookAfterMethod("init") {
-            lpparam.classLoader
-        )
-
-        XposedHelpers.findAndHookMethod(classIfExists, "init", object : XC_MethodHook() {
-            override fun afterHookedMethod(param: MethodHookParam) {
             if (XSPUtils.getBoolean("hide_network_speed_splitter", false)) {
-                    val textView = param.thisObject as TextView
+                val textView = it.thisObject as TextView
                 textView.text = " "
             }
         }
-        })
     }
 }

app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/NotificationWeather.kt

@@ -20,24 +20,15 @@ class NotificationWeather : IXposedHookLoadPackage {
             "com.android.systemui.qs.MiuiNotificationHeaderView".hookAfterMethod(lpparam.classLoader, "onFinishInflate") {
                 val viewGroup = it.thisObject as ViewGroup
                 val context = viewGroup.context
-                val layoutParam = loadClass("androidx.constraintlayout.widget.ConstraintLayout\$LayoutParams")
+                val layoutParam = loadClass("androidx.constraintlayout.widget.ConstraintLayout\$LayoutParams").getConstructor(Int::class.java, Int::class.java).newInstance(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) as ViewGroup.MarginLayoutParams
-                    .getConstructor(Int::class.java, Int::class.java).newInstance(
-                        ViewGroup.LayoutParams.WRAP_CONTENT,
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                    ) as ViewGroup.MarginLayoutParams
                 layoutParam.setObjectField("bottomToTop", context.resources.getIdentifier("date_time", "id", context.packageName))
                 layoutParam.setObjectField("startToEnd", context.resources.getIdentifier("big_time", "id", context.packageName))
-
+                layoutParam.marginStart = context.resources.getDimensionPixelSize(context.resources.getIdentifier("notification_panel_time_date_space", "dimen", context.packageName))
-                layoutParam.marginStart = context.resources.getDimensionPixelSize(
-                    context.resources.getIdentifier("notification_panel_time_date_space", "dimen", context.packageName)
-                )
-
                 mWeatherView = WeatherView(context, isDisplayCity).apply {
                     setTextAppearance(context.resources.getIdentifier("TextAppearance.QSControl.Date", "style", context.packageName))
                     layoutParams = layoutParam
                 }
                 viewGroup.addView(mWeatherView)
-
                 (mWeatherView as WeatherView).setOnClickListener {
                     try {
                         val intent = Intent().apply {

app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarCurrent.kt

@@ -2,27 +2,22 @@ package com.lt2333.simplicitytools.hook.app.systemui
 
 import android.view.ViewGroup
 import android.widget.TextView
+import com.lt2333.simplicitytools.util.findClass
+import com.lt2333.simplicitytools.util.hookAfterMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class StatusBarCurrent :IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        val classIfExists = XposedHelpers.findClassIfExists(
+        val miuiPhoneStatusBarViewClass =
-            "com.android.systemui.statusbar.phone.MiuiPhoneStatusBarView",
+            "com.android.systemui.statusbar.phone.MiuiPhoneStatusBarView".findClass(lpparam.classLoader)
-            lpparam.classLoader
+        miuiPhoneStatusBarViewClass.hookAfterMethod("onFinishInflate") { param ->
-        )
-        XposedHelpers.findAndHookMethod(classIfExists, "onFinishInflate", object : XC_MethodHook() {
-            override fun afterHookedMethod(param: MethodHookParam) {
             val viewGroup = param.thisObject as ViewGroup
-
             val textView = TextView(viewGroup.context).also {
                 it.text = "Text"
-                    it.textSize=14F
+                it.textSize = 14F
             }
             viewGroup.addView(textView)
         }
-        })
     }
 }

app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarLayout.kt

@@ -11,9 +11,10 @@ import android.widget.FrameLayout
 import android.widget.LinearLayout
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.findClass
+import com.lt2333.simplicitytools.util.getObjectField
+import com.lt2333.simplicitytools.util.hookAfterMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class StatusBarLayout : IXposedHookLoadPackage {
@@ -31,50 +32,32 @@ class StatusBarLayout : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         if (!XSPUtils.getBoolean("status_bar_time_center", false)) return
 
-        val classIfExists = XposedHelpers.findClassIfExists(
+        val collapsedStatusBarFragmentClass =
-            "com.android.systemui.statusbar.phone.CollapsedStatusBarFragment",
+            "com.android.systemui.statusbar.phone.CollapsedStatusBarFragment".findClass(lpparam.classLoader)
-            lpparam.classLoader
-        )
 
-        XposedHelpers.findAndHookMethod(
+        collapsedStatusBarFragmentClass.hookAfterMethod(
-            classIfExists,
             "onViewCreated",
             View::class.java,
-            Bundle::class.java,
+            Bundle::class.java
-            object : XC_MethodHook() {
+        ) { param ->
-                @Throws(Throwable::class)
-                override fun afterHookedMethod(param: MethodHookParam) {
-                    super.afterHookedMethod(param)
             val MiuiPhoneStatusBarView: ViewGroup =
-                        XposedHelpers.getObjectField(
+                param.thisObject.getObjectField("mStatusBar") as ViewGroup
-                            param.thisObject,
-                            "mStatusBar"
-                        ) as ViewGroup
             val context: Context = MiuiPhoneStatusBarView.context
             val res: Resources = MiuiPhoneStatusBarView.resources
-                    val status_bar_ID: Int =
+            val status_bar_ID: Int = res.getIdentifier("status_bar", "id", "com.android.systemui")
-                        res.getIdentifier("status_bar", "id", "com.android.systemui")
             val status_bar_contents_ID: Int =
                 res.getIdentifier("status_bar_contents", "id", "com.android.systemui")
             val system_icon_area_ID: Int =
                 res.getIdentifier("system_icon_area", "id", "com.android.systemui")
-
             val clock_ID: Int = res.getIdentifier("clock", "id", "com.android.systemui")
-                    val phone_status_bar_left_container_ID: Int = res.getIdentifier(
+            val phone_status_bar_left_container_ID: Int =
-                        "phone_status_bar_left_container",
+                res.getIdentifier("phone_status_bar_left_container", "id", "com.android.systemui")
-                        "id",
+            val fullscreen_notification_icon_area_ID: Int =
-                        "com.android.systemui"
+                res.getIdentifier("fullscreen_notification_icon_area", "id", "com.android.systemui")
-                    )
+            status_bar = MiuiPhoneStatusBarView.findViewById(status_bar_ID)
-                    val fullscreen_notification_icon_area_ID: Int = res.getIdentifier(
-                        "fullscreen_notification_icon_area",
-                        "id",
-                        "com.android.systemui"
-                    )
-                    status_bar =
-                        MiuiPhoneStatusBarView.findViewById(status_bar_ID)
             val status_bar_contents: ViewGroup =
                 MiuiPhoneStatusBarView.findViewById(status_bar_contents_ID)
-                    if (status_bar == null) return
+            if (status_bar == null) return@hookAfterMethod
             val Clock: View = MiuiPhoneStatusBarView.findViewById(clock_ID)
             val phone_status_bar_left_container: ViewGroup =
                 MiuiPhoneStatusBarView.findViewById(phone_status_bar_left_container_ID)
@@ -83,7 +66,6 @@ class StatusBarLayout : IXposedHookLoadPackage {
             val system_icon_area: ViewGroup =
                 MiuiPhoneStatusBarView.findViewById(system_icon_area_ID)
 
-
             (Clock.parent as ViewGroup).removeView(Clock)
             (phone_status_bar_left_container.parent as ViewGroup).removeView(
                 phone_status_bar_left_container
@@ -93,15 +75,13 @@ class StatusBarLayout : IXposedHookLoadPackage {
             )
             (system_icon_area.parent as ViewGroup).removeView(system_icon_area)
 
-
             val mConstraintLayoutLp = ConstraintLayout.LayoutParams(
                 ConstraintLayout.LayoutParams.MATCH_PARENT,
                 ConstraintLayout.LayoutParams.MATCH_PARENT
             )
 
-                    val mConstraintLayout = ConstraintLayout(context).also {
+            val mConstraintLayout =
-                        it.layoutParams = mConstraintLayoutLp
+                ConstraintLayout(context).also { it.layoutParams = mConstraintLayoutLp }
-                    }
 
             mConstraintLayout.addView(fullscreen_notification_icon_area)
 
@@ -110,17 +90,12 @@ class StatusBarLayout : IXposedHookLoadPackage {
                 ConstraintLayout.LayoutParams.MATCH_PARENT
             )
 
-                    fullscreen_notification_icon_area.layoutParams =
+            fullscreen_notification_icon_area.layoutParams = fullscreen_notification_icon_area_lp
-                        fullscreen_notification_icon_area_lp
 
             //增加一个左对齐布局
             mLeftLayout = LinearLayout(context)
             val LeftLp: LinearLayout.LayoutParams =
-                        LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.MATCH_PARENT, 1.0f)
-                            0,
-                            LinearLayout.LayoutParams.MATCH_PARENT,
-                            1.0f
-                        )
             mLeftLayout!!.layoutParams = LeftLp
             mLeftLayout!!.gravity = Gravity.START or Gravity.CENTER_VERTICAL
 
@@ -134,11 +109,7 @@ class StatusBarLayout : IXposedHookLoadPackage {
             mCenterLayout!!.gravity = Gravity.CENTER or Gravity.CENTER_VERTICAL
             mRightLayout = LinearLayout(context)
             val RightLp: LinearLayout.LayoutParams =
-                        LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.MATCH_PARENT, 1.0f)
-                            0,
-                            LinearLayout.LayoutParams.MATCH_PARENT,
-                            1.0f
-                        )
             mRightLayout!!.layoutParams = RightLp
             mRightLayout!!.gravity = Gravity.END or Gravity.CENTER_VERTICAL
             mLeftLayout!!.addView(phone_status_bar_left_container)
@@ -170,26 +141,17 @@ class StatusBarLayout : IXposedHookLoadPackage {
             }
 
         }
-            })
 
-        val classIfExists2 = XposedHelpers.findClassIfExists(
+        val phoneStatusBarViewClass =
-            "com.android.systemui.statusbar.phone.PhoneStatusBarView",
+            "com.android.systemui.statusbar.phone.PhoneStatusBarView".findClass(lpparam.classLoader)
-            lpparam.classLoader
-        )
 
-        XposedHelpers.findAndHookMethod(
+        phoneStatusBarViewClass.hookAfterMethod("updateLayoutForCutout") {
-            classIfExists2,
-            "updateLayoutForCutout",
-            object : XC_MethodHook() {
-                override fun afterHookedMethod(param: MethodHookParam) {
             if (XSPUtils.getBoolean("layout_compatibility_mode", false)) {
-                        val context = (param.thisObject as ViewGroup).context
+                val context = (it.thisObject as ViewGroup).context
                 updateLayout(context)
             }
         }
     }
-        )
-    }
 
 
     fun updateLayout(context: Context) {

app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/StatusBarTimeCustomization.kt

@@ -8,9 +8,10 @@ import android.util.AttributeSet
 import android.util.TypedValue
 import android.widget.TextView
 import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.findClass
+import com.lt2333.simplicitytools.util.hookAfterConstructor
+import com.lt2333.simplicitytools.util.hookAfterMethod
 import de.robv.android.xposed.IXposedHookLoadPackage
-import de.robv.android.xposed.XC_MethodHook
-import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 import java.lang.reflect.Method
 import java.text.SimpleDateFormat
@@ -18,151 +19,113 @@ import java.util.*
 
 class StatusBarTimeCustomization : IXposedHookLoadPackage {
     
+    private val isYear = XSPUtils.getBoolean("status_bar_time_year", false)
+    private val isMonth = XSPUtils.getBoolean("status_bar_time_month", false)
+    private val isDay = XSPUtils.getBoolean("status_bar_time_day", false)
+    private val isWeek = XSPUtils.getBoolean("status_bar_time_week", false)
+    private val isHideSpace = XSPUtils.getBoolean("status_bar_time_hide_space", false)
+    private val isDoubleLine = XSPUtils.getBoolean("status_bar_time_double_line", false)
+    private val isSecond = XSPUtils.getBoolean("status_bar_time_seconds", false)
+    private val isDoubleHour = XSPUtils.getBoolean("status_bar_time_double_hour", false)
+    private val isPeriod = XSPUtils.getBoolean("status_bar_time_period", true)
+    private val getClockSize = XSPUtils.getInt("status_bar_clock_size", 0)
+    private val isOpen = XSPUtils.getBoolean("custom_clock_switch", false)
+    private val getClockDoubleSize = XSPUtils.getInt("status_bar_clock_double_line_size", 0)
+    private var now_time: Date? = null
+    private var str = ""
 
-    val isYear = XSPUtils.getBoolean("status_bar_time_year", false)
+    @SuppressLint("SetTextI18n")
-    val isMonth = XSPUtils.getBoolean("status_bar_time_month", false)
-    val isDay = XSPUtils.getBoolean("status_bar_time_day", false)
-    val isWeek = XSPUtils.getBoolean("status_bar_time_week", false)
-    val isHideSpace = XSPUtils.getBoolean("status_bar_time_hide_space", false)
-    val isDoubleLine = XSPUtils.getBoolean("status_bar_time_double_line", false)
-    val isSecond = XSPUtils.getBoolean("status_bar_time_seconds", false)
-    val isDoubleHour = XSPUtils.getBoolean("status_bar_time_double_hour", false)
-    val isPeriod = XSPUtils.getBoolean("status_bar_time_period", true)
-    val getClockSize = XSPUtils.getInt("status_bar_clock_size", 0)
-    val isOpen = XSPUtils.getBoolean("custom_clock_switch", false)
-    val getClockDoubleSize = XSPUtils.getInt("status_bar_clock_double_line_size", 0)
-
-
-    var now_time: Date? = null
-    var str = ""
-
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         if (isOpen) {
             var c: Context? = null
-            val classIfExists = XposedHelpers.findClassIfExists(
+            val miuiClockClass = "com.android.systemui.statusbar.views.MiuiClock".findClass(lpparam.classLoader)
-                "com.android.systemui.statusbar.views.MiuiClock",
+            miuiClockClass.hookAfterConstructor(Context::class.java, AttributeSet::class.java, Integer.TYPE) {
-                lpparam.classLoader
-            )
-            XposedHelpers.findAndHookConstructor(classIfExists,
-                Context::class.java,
-                AttributeSet::class.java,
-                Integer.TYPE,
-                object : XC_MethodHook() {
-                    override fun afterHookedMethod(param: MethodHookParam) {
                 try {
-                            c = param.args[0] as Context
+                    c = it.args[0] as Context
-                            val textV = param.thisObject as TextView
+                    val textV = it.thisObject as TextView
                     textV.isSingleLine = false
-
                     if (isDoubleLine) {
                         str = "\n"
                         var clock_double_line_size = 7F
                         if (getClockDoubleSize != 0) {
-                                    clock_double_line_size =
+                            clock_double_line_size = getClockDoubleSize.toFloat()
-                                        getClockDoubleSize
-                                            .toFloat()
                         }
-                                textV.setTextSize(
+                        textV.setTextSize(TypedValue.COMPLEX_UNIT_DIP, clock_double_line_size)
-                                    TypedValue.COMPLEX_UNIT_DIP,
-                                    clock_double_line_size
-                                )
                     } else {
                         if (getClockSize != 0) {
-                                    val clock_size =
+                            val clock_size = getClockSize.toFloat()
-                                        getClockSize.toFloat()
                             textV.setTextSize(TypedValue.COMPLEX_UNIT_DIP, clock_size)
                         }
                     }
-
                     val d: Method = textV.javaClass.getDeclaredMethod("updateTime")
                     val r = Runnable {
                         d.isAccessible = true
                         d.invoke(textV)
                     }
-
                     class T : TimerTask() {
                         override fun run() {
                             Handler(textV.context.mainLooper).post(r)
                         }
                     }
                     if (textV.resources.getResourceEntryName(textV.id) == "clock")
-                                Timer().scheduleAtFixedRate(
+                        Timer().scheduleAtFixedRate(T(), 1000 - System.currentTimeMillis() % 1000, 1000)
-                                    T(),
-                                    1000 - System.currentTimeMillis() % 1000,
-                                    1000
-                                )
-
                 } catch (e: java.lang.Exception) {
                 }
             }
-                }
+            miuiClockClass.hookAfterMethod("updateTime") {
-            )
-            XposedHelpers.findAndHookMethod(classIfExists, "updateTime",
-                object : XC_MethodHook() {
-                    @SuppressLint("SetTextI18n", "SimpleDateFormat")
-                    override fun afterHookedMethod(param: MethodHookParam) {
                 try {
-                            val textV = param.thisObject as TextView
+                    val textV = it.thisObject as TextView
                     if (textV.resources.getResourceEntryName(textV.id) == "clock") {
-                                val t = Settings.System.getString(
+                        val t = Settings.System.getString(c!!.contentResolver, Settings.System.TIME_12_24)
-                                    c!!.contentResolver,
-                                    Settings.System.TIME_12_24
-                                )
                         now_time = Calendar.getInstance().time
-
                         textV.text = getDate(c!!, t) + str + getTime(c!!, t)
                     }
-
                 } catch (e: Exception) {
                 }
             }
-                })
         }
     }
 
 
     @SuppressLint("SimpleDateFormat")
     private fun getDate(context: Context, t: String): String {
-        var DatePattern = ""
+        var datePattern = ""
         val isZh = isZh(context)
 
         if (isYear) {
             if (isZh) {
-                DatePattern += "YY年"
+                datePattern += "YY年"
-//                if (!isHideSpace) DatePattern = "$DatePattern "
+//                if (!isHideSpace) datePattern = "$datePattern "
             } else {
-                DatePattern += "YY"
+                datePattern += "YY"
-                if (isMonth || isDay) DatePattern += "/"
+                if (isMonth || isDay) datePattern += "/"
             }
         }
         if (isMonth) {
             if (isZh) {
-                DatePattern += "M月"
+                datePattern += "M月"
-//                if (!isHideSpace) DatePattern = "$DatePattern "
+//                if (!isHideSpace) datePattern = "$datePattern "
             } else {
-                DatePattern += "M"
+                datePattern += "M"
-                if (isDay) DatePattern += "/"
+                if (isDay) datePattern += "/"
             }
         }
         if (isDay) {
-            if (isZh) {
+            datePattern += if (isZh) {
-                DatePattern += "d日"
+                "d日"
             } else {
-                DatePattern += "d"
+                "d"
             }
         }
-
         if (isWeek) {
-            if (!isHideSpace) DatePattern = "$DatePattern "
+            if (!isHideSpace) datePattern = "$datePattern "
-            DatePattern += "E"
+            datePattern += "E"
             if (!isDoubleLine) {
-                if (!isHideSpace) DatePattern = "$DatePattern "
+                if (!isHideSpace) datePattern = "$datePattern "
             }
         }
-
+        datePattern = SimpleDateFormat(datePattern).format(now_time)
-        DatePattern = SimpleDateFormat(DatePattern).format(now_time)
+        return datePattern
-
-        return DatePattern
     }
 
     @SuppressLint("SimpleDateFormat")
@@ -171,13 +134,9 @@ class StatusBarTimeCustomization : IXposedHookLoadPackage {
         val isZh = isZh(context)
         timePattern += if (t == "24") "HH:mm" else "h:mm"
         if (isSecond) timePattern += ":ss"
-
         timePattern = SimpleDateFormat(timePattern).format(now_time)
-
         if (isZh) timePattern = getPeriod(isZh) + timePattern else timePattern += getPeriod(isZh)
-
         timePattern = getDoubleHour() + timePattern
-
         return timePattern
     }
 
@@ -186,8 +145,7 @@ class StatusBarTimeCustomization : IXposedHookLoadPackage {
         var period = ""
         if (isPeriod) {
             if (isZh) {
-                val now = SimpleDateFormat("HH").format(now_time)
+                when (SimpleDateFormat("HH").format(now_time)) {
-                when (now) {
                     "00", "01", "02", "03", "04", "05" -> {
                         period = "凌晨"
                     }
@@ -222,8 +180,7 @@ class StatusBarTimeCustomization : IXposedHookLoadPackage {
     private fun getDoubleHour(): String {
         var doubleHour = ""
         if (isDoubleHour) {
-            val now = SimpleDateFormat("HH").format(now_time)
+            when (SimpleDateFormat("HH").format(now_time)) {
-            when (now) {
                 "23", "00" -> {
                     doubleHour = "子时"
                 }
@@ -268,7 +225,7 @@ class StatusBarTimeCustomization : IXposedHookLoadPackage {
         return doubleHour
     }
 
-    fun isZh(context: Context): Boolean {
+    private fun isZh(context: Context): Boolean {
         val locale = context.resources.configuration.locale
         val language = locale.language
         return language.endsWith("zh")