Merge pull request #45 from YuKongA/main

app/build.gradle.kts

@@ -6,8 +6,8 @@ plugins {
 }
 
 android {
-    compileSdk = 31
+    compileSdk = 32
-
+    buildToolsVersion = "32.0.0"
     defaultConfig {
         applicationId = "com.lt2333.simplicitytools"
         minSdk = 31

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

@@ -398,7 +398,7 @@ class SettingsActivity : MIUIActivity() {
     }
 
     //系统框架页面
-    fun androidItems(): ArrayList<BaseView> {
+    private fun androidItems(): ArrayList<BaseView> {
         return ArrayList<BaseView>().apply {
             add(
                 TextSummaryWithSwitchV(
@@ -440,7 +440,7 @@ class SettingsActivity : MIUIActivity() {
     }
 
     //系统界面页面
-    fun systemuiItems(): ArrayList<BaseView> {
+    private fun systemuiItems(): ArrayList<BaseView> {
         return ArrayList<BaseView>().apply {
             add(TitleTextV(resId = R.string.statusbar))
             add(

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

@@ -8,7 +8,7 @@ import de.robv.android.xposed.XSharedPreferences
 import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 class MainHook : IXposedHookLoadPackage {
-    var prefs = XSharedPreferences(BuildConfig.APPLICATION_ID, "config")
+    private var prefs = XSharedPreferences(BuildConfig.APPLICATION_ID, "config")
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
         if (prefs.getBoolean("main_switch", true)) {
             EzXHelperInit.initHandleLoadPackage(lpparam)

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

@@ -10,7 +10,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class Android : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        XposedBridge.log("成功Hook: "+javaClass.simpleName)
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         //核心破解
         CorePatch().handleLoadPackage(lpparam)
         //允许截图

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

@@ -7,7 +7,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 class MediaEditor : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
-        XposedBridge.log("成功Hook: "+javaClass.simpleName)
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         //解锁裁切最小值
         UnlockUnlimitedCropping().handleLoadPackage(lpparam)
     }

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

@@ -7,7 +7,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 class MiuiHome : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
-        XposedBridge.log("成功Hook: " + javaClass.simpleName)
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         //时钟显示时钟
         AlwaysDisplayTime().handleLoadPackage(lpparam)
     }

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

@@ -9,7 +9,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 class PowerKeeper : IXposedHookLoadPackage {
 
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
-        XposedBridge.log("成功Hook: "+javaClass.simpleName)
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         //锁定最高刷新率
         LockMaxFps().handleLoadPackage(lpparam)
         //防止恢复电池优化白名单

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

@@ -9,7 +9,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 class SecurityCenter : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
-        XposedBridge.log("成功Hook: " + javaClass.simpleName)
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         //跳过 5/10秒等待时间
         SkipWaitingTime().handleLoadPackage(lpparam)
         //锁定 100分

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

@@ -2,10 +2,12 @@ package com.lt2333.simplicitytools.hook.app
 
 import com.lt2333.simplicitytools.hook.app.settings.ShowNotificationImportance
 import de.robv.android.xposed.IXposedHookLoadPackage
+import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.callbacks.XC_LoadPackage
 
 class Settings: IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         ShowNotificationImportance().handleLoadPackage(lpparam)
     }
 }

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

@@ -8,7 +8,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 class SystemUI : IXposedHookLoadPackage {
 
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
-        XposedBridge.log("成功Hook: " + javaClass.simpleName)
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         //隐藏飞行模式图标
         HideAirplaneIcon().handleLoadPackage(lpparam)
         //隐藏闹钟图标

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

@@ -7,7 +7,7 @@ import de.robv.android.xposed.callbacks.XC_LoadPackage.LoadPackageParam
 
 class ThemeManager : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: LoadPackageParam) {
-        XposedBridge.log("成功Hook: " + javaClass.simpleName)
+        XposedBridge.log("Simplicitytools: 成功 Hook "+javaClass.simpleName)
         //移除主题壁纸的广告
         RemoveAds().handleLoadPackage(lpparam)
     }

app/src/main/java/com/lt2333/simplicitytools/hook/app/android/RemoveSmallWindowRestrictions.kt

@@ -1,5 +1,6 @@
 package com.lt2333.simplicitytools.hook.app.android
 
+import android.content.Context
 import com.lt2333.simplicitytools.util.hasEnable
 import com.lt2333.simplicitytools.util.hookAfterMethod
 import com.lt2333.simplicitytools.util.hookBeforeMethod
@@ -22,7 +23,7 @@ class RemoveSmallWindowRestrictions : IXposedHookLoadPackage {
             }
         }
 
-        "android.util.MiuiMultiWindowAdapter".hookAfterMethod(lpparam.classLoader, "getFreeformBlackListFromCloud") {
+        "android.util.MiuiMultiWindowAdapter".hookAfterMethod(lpparam.classLoader, "getFreeformBlackListFromCloud", Context::class.java) {
             hasEnable("remove_small_window_restrictions") {
                 it.result = (it.result as MutableList<*>).apply { clear() }
             }

app/src/main/java/com/lt2333/simplicitytools/hook/app/thememanager/RemoveAds.kt

@@ -1,29 +1,17 @@
 package com.lt2333.simplicitytools.hook.app.thememanager
 
-import com.lt2333.simplicitytools.util.XSPUtils
+import com.lt2333.simplicitytools.util.findClass
+import com.lt2333.simplicitytools.util.hasEnable
+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 RemoveAds : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        val classIfExists = XposedHelpers.findClassIfExists(
+        "com.android.thememanager.basemodule.ad.model.AdInfoResponse".hookBeforeMethod(lpparam.classLoader, "isAdValid", "com.android.thememanager.basemodule.ad.model.AdInfo".findClass(lpparam.classLoader)) {
-            "com.android.thememanager.basemodule.ad.model.AdInfoResponse", lpparam?.classLoader
+            hasEnable("remove_thememanager_ads") {
-        )
+                it.result = false
-        val valueClass: Class<*> = XposedHelpers.findClass(
-            "com.android.thememanager.basemodule.ad.model.AdInfo", lpparam?.classLoader
-        )
-        XposedHelpers.findAndHookMethod(
-            classIfExists,
-            "isAdValid",
-            valueClass,
-            object : XC_MethodHook() {
-                override fun beforeHookedMethod(param: MethodHookParam?) {
-                    if (XSPUtils.getBoolean("remove_thememanager_ads", false)) {
-                        param?.result = false
             }
         }
-            })
     }
 }

app/src/main/java/com/lt2333/simplicitytools/util/KotlinXposedHelper.kt

@@ -1,6 +1,5 @@
 package com.lt2333.simplicitytools.util
 
-import android.content.Context
 import android.content.res.XResources
 import android.util.Log
 import dalvik.system.BaseDexClassLoader
@@ -9,7 +8,6 @@ import de.robv.android.xposed.XC_MethodReplacement
 import de.robv.android.xposed.XposedBridge
 import de.robv.android.xposed.XposedHelpers
 import de.robv.android.xposed.callbacks.XC_LayoutInflated
-import de.robv.android.xposed.callbacks.XC_LoadPackage
 import java.lang.reflect.Field
 import java.lang.reflect.Member
 import java.util.*

build.gradle.kts

@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.1.1")
+        classpath("com.android.tools.build:gradle:7.1.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -17,3 +17,8 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+android.enableAppCompileTimeRClass=true
+android.nonTransitiveRClass=true
+org.gradle.caching=true
+org.gradle.parallel=true
+org.gradle.vfs.watch=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sun Feb 13 16:53:34 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

settings.gradle.kts

@@ -3,7 +3,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        jcenter() // Warning: this repository is going to shut down soon
+        maven("https://api.xposed.info")
     }
 }
 rootProject.name = "Simplicity Tools"