diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 3ed223a3..9943d4a1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,8 +20,7 @@ android { release { isMinifyEnabled = true isShrinkResources = true - setProguardFiles(listOf("proguard-rules.pro") - ) + setProguardFiles(listOf("proguard-rules.pro")) } } compileOptions { @@ -44,8 +43,7 @@ android { } applicationVariants.all { outputs.all { - (this as BaseVariantOutputImpl).outputFileName = - "WooBoxForMIUI-$versionName-$name.apk" + (this as BaseVariantOutputImpl).outputFileName = "WooBoxForMIUI-$versionName-$name.apk" } } } @@ -53,7 +51,7 @@ android { dependencies { //API compileOnly("de.robv.android.xposed:api:82") - implementation("com.github.kyuubiran:EzXHelper:0.8.6") + implementation("com.github.kyuubiran:EzXHelper:0.9.2") //UI implementation(project(":blockmiui")) implementation("androidx.constraintlayout:constraintlayout:2.1.3") diff --git a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt index ad6faef7..a6ed5853 100644 --- a/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt +++ b/app/src/main/java/com/lt2333/simplicitytools/activity/SettingsActivity.kt @@ -319,6 +319,10 @@ class SettingsActivity : MIUIActivity() { dataBindingSend = customMobileTypeTextBinding.bindingSend ) ) + TextWithSwitch( + TextV(resId = R.string.show_wifi_standard), + SwitchV("show_wifi_standard") + ) TextSummaryArrow( TextSummaryV( textId = R.string.custom_mobile_type_text diff --git a/app/src/main/java/com/lt2333/simplicitytools/hook/app/SystemUI.kt b/app/src/main/java/com/lt2333/simplicitytools/hook/app/SystemUI.kt index 4ad44979..10ddf4dc 100644 --- a/app/src/main/java/com/lt2333/simplicitytools/hook/app/SystemUI.kt +++ b/app/src/main/java/com/lt2333/simplicitytools/hook/app/SystemUI.kt @@ -43,6 +43,7 @@ object SystemUI: AppRegister() { CustomMobileTypeText, //自定义移动类型文本 CanNotificationSlide, //允许下滑通知打开小窗 LockScreenClockDisplaySeconds, // 锁屏时钟显示秒 + ShowWifiStandard, // 显示 WIFI 角标 ) } } \ No newline at end of file diff --git a/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/ShowWifiStandard.kt b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/ShowWifiStandard.kt new file mode 100644 index 00000000..766aab2e --- /dev/null +++ b/app/src/main/java/com/lt2333/simplicitytools/hook/app/systemui/ShowWifiStandard.kt @@ -0,0 +1,36 @@ +package com.lt2333.simplicitytools.hook.app.systemui + +import com.github.kyuubiran.ezxhelper.utils.* +import com.lt2333.simplicitytools.util.hasEnable +import com.lt2333.simplicitytools.util.xposed.base.HookRegister + + +object ShowWifiStandard : HookRegister() { + override fun init() { + findMethod("com.android.systemui.statusbar.StatusBarWifiView") { + name == "initViewState" && parameterCount == 1 + }.hookBefore { + hasEnable("show_wifi_standard") { + findMethod("com.android.systemui.statusbar.phone.StatusBarSignalPolicy\$WifiIconState") { + name == "copyTo" && parameterCount == 1 + }.hookBefore { + val wifiStandard = it.thisObject.getObjectAs("wifiStandard") + it.thisObject.putObject("showWifiStandard", wifiStandard != 0) + } + } + } + + findMethod("com.android.systemui.statusbar.StatusBarWifiView") { + name == "updateState" && parameterCount == 1 + }.hookBefore { + hasEnable("show_wifi_standard") { + findMethod("com.android.systemui.statusbar.phone.StatusBarSignalPolicy\$WifiIconState") { + name == "copyTo" && parameterCount == 1 + }.hookBefore { + val wifiStandard = it.thisObject.getObjectAs("wifiStandard") + it.thisObject.putObject("showWifiStandard", wifiStandard != 0) + } + } + } + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb8ba09e..fcd2b399 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -182,6 +182,7 @@ Left Right Big Mobile Type Icon + Show Wifi Standard Make most notifications can be slide to small window Battery percentage font size 0: do not change diff --git a/build.gradle.kts b/build.gradle.kts index 579499d0..aeb1c60c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.1.3") + classpath("com.android.tools.build:gradle:7.2.0") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") // NOTE: Do not place your application dependencies here; they belong