Add hide charging icon and WiFi standard icon

Update version to 1.3.3

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "com.lt2333.simplicitytools"
         minSdk = 31
         targetSdk = 32
-        versionCode = 33
-        versionName = "1.3.2"
+        versionCode = 34
+        versionName = "1.3.3"
     }
 
     buildTypes {

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

@@ -15,8 +15,6 @@ class SystemUI : IXposedHookLoadPackage {
         HideAlarmIcon().handleLoadPackage(lpparam)
         //隐藏电池
         HideBatteryIcon().handleLoadPackage(lpparam)
-        //隐藏电池/百分号
-        HideBatteryPercentageIcon().handleLoadPackage(lpparam)
         //隐藏蓝牙电量
         HideBluetoothHandsfreeBatteryIcon().handleLoadPackage(lpparam)
         //隐藏蓝牙图标

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

@@ -2,13 +2,15 @@ package com.lt2333.simplicitytools.hook.app.systemui
 
 import android.view.View
 import android.widget.FrameLayout
+import android.widget.ImageView
+import android.widget.TextView
 import com.lt2333.simplicitytools.util.XSPUtils
 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 HideBatteryIcon :IXposedHookLoadPackage {
+class HideBatteryIcon : IXposedHookLoadPackage {
     override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
         val classIfExists = XposedHelpers.findClassIfExists(
             "com.android.systemui.statusbar.views.MiuiBatteryMeterView",
@@ -19,14 +21,65 @@ class HideBatteryIcon :IXposedHookLoadPackage {
             "updateResources",
             object : XC_MethodHook() {
                 override fun afterHookedMethod(param: MethodHookParam) {
+
+                    //隐藏电池图标
                     if (XSPUtils.getBoolean("hide_battery_icon", false)) {
                         val mBatteryIconView = XposedHelpers.getObjectField(
                             param.thisObject,
-                            "mBatteryDigitalView"
-                        ) as FrameLayout
+                            "mBatteryIconView"
+                        ) as ImageView
                         mBatteryIconView.visibility = View.GONE
+
+                        if (XposedHelpers.getObjectField(param.thisObject, "mBatteryStyle") == 1) {
+                            (XposedHelpers.getObjectField(
+                                param.thisObject,
+                                "mBatteryDigitalView"
+                            ) as FrameLayout).visibility = View.GONE
+                        }
+
+                    }
+                    //隐藏电池内的百分比
+                    if (XSPUtils.getBoolean("hide_battery_percentage_icon", false)) {
+                        val mBatteryPercentMarkView = XposedHelpers.getObjectField(
+                            param.thisObject,
+                            "mBatteryPercentMarkView"
+                        ) as TextView
+                        mBatteryPercentMarkView.textSize = 0F
+                    }
+
+                    //隐藏电池百分号
+                    if (XSPUtils.getBoolean("hide_battery_percentage_icon", false)) {
+                        val mBatteryPercentMarkView = XposedHelpers.getObjectField(
+                            param.thisObject,
+                            "mBatteryPercentMarkView"
+                        ) as TextView
+                        mBatteryPercentMarkView.textSize = 0F
+                    }
+
+
+
+
+                    XposedHelpers.findAndHookMethod(classIfExists,"updateChargeAndText",object :XC_MethodHook(){
+                        override fun afterHookedMethod(param: MethodHookParam) {
+                            //隐藏电池充电图标
+                            if (XSPUtils.getBoolean("hide_battery_charging_icon", false)) {
+                                (XposedHelpers.getObjectField(
+                                    param.thisObject,
+                                    "mBatteryChargingInView"
+                                ) as ImageView).visibility = View.GONE
+
+                                (XposedHelpers.getObjectField(
+                                    param.thisObject,
+                                    "mBatteryChargingView"
+                                ) as ImageView).visibility = View.GONE
+
                             }
                         }
                     })
+
+                }
+            })
+
+
     }
 }

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

@@ -1,40 +0,0 @@
-package com.lt2333.simplicitytools.hook.app.systemui
-
-import android.view.View
-import android.widget.FrameLayout
-import android.widget.TextView
-import com.lt2333.simplicitytools.util.XSPUtils
-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 HideBatteryPercentageIcon :IXposedHookLoadPackage {
-    override fun handleLoadPackage(lpparam: XC_LoadPackage.LoadPackageParam) {
-        val classIfExists = XposedHelpers.findClassIfExists(
-            "com.android.systemui.statusbar.views.MiuiBatteryMeterView",
-            lpparam.classLoader
-        )
-        XposedHelpers.findAndHookMethod(
-            classIfExists,
-            "updateResources",
-            object : XC_MethodHook() {
-                override fun afterHookedMethod(param: MethodHookParam) {
-                    if (XSPUtils.getBoolean("hide_battery_percentage_icon", false)) {
-                        val mBatteryPercentMarkView = XposedHelpers.getObjectField(
-                            param.thisObject,
-                            "mBatteryPercentMarkView"
-                        ) as TextView
-                        mBatteryPercentMarkView.textSize = 0F
-                    }
-                    if (XSPUtils.getBoolean("hide_battery_icon", false)) {
-                        val mBatteryIconView = XposedHelpers.getObjectField(
-                            param.thisObject,
-                            "mBatteryDigitalView"
-                        ) as FrameLayout
-                        mBatteryIconView.visibility = View.GONE
-                    }
-                }
-            })
-    }
-}

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

@@ -2,6 +2,7 @@ package com.lt2333.simplicitytools.hook.app.systemui
 
 import android.view.View
 import android.widget.ImageView
+import android.widget.TextView
 import com.lt2333.simplicitytools.util.XSPUtils
 import de.robv.android.xposed.IXposedHookLoadPackage
 import de.robv.android.xposed.XC_MethodHook
@@ -20,12 +21,21 @@ class HideWifiActivityIcon : IXposedHookLoadPackage {
             "com.android.systemui.statusbar.phone.StatusBarSignalPolicy\$WifiIconState",
             object : XC_MethodHook() {
                 override fun afterHookedMethod(param: MethodHookParam) {
+                    //隐藏WIFI箭头
                     if (XSPUtils.getBoolean("hide_wifi_activity_icon", false)) {
                         (XposedHelpers.getObjectField(
                             param.thisObject,
                             "mWifiActivityView"
                         ) as ImageView).visibility = View.INVISIBLE
                     }
+
+                    //隐藏WIFI标准图标
+                    if (XSPUtils.getBoolean("hide_wifi_standard_icon", false)) {
+                        (XposedHelpers.getObjectField(
+                            param.thisObject,
+                            "mWifiStandardView"
+                        ) as TextView).visibility = View.INVISIBLE
+                    }
                 }
             })
 

app/src/main/res/values-zh-rCN/strings.xml

@@ -130,4 +130,6 @@
     <string name="are_you_sure_reboot">确定重启系统？</string>
     <string name="cancel">取消</string>
     <string name="are_you_sure_reboot_scope">确定重启全部作用域？</string>
+    <string name="hide_battery_charging_icon">隐藏 充电 图标</string>
+    <string name="hide_wifi_standard_icon">隐藏 WIFI标准 图标</string>
 </resources>

app/src/main/res/values-zh-rHK/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Simplicity Tools</string>
     <string name="performance">性能</string>
@@ -130,4 +130,6 @@
     <string name="are_you_sure_reboot">確定重啟系統？</string>
     <string name="cancel">取消</string>
     <string name="are_you_sure_reboot_scope">確定重啟全部作用域？</string>
+    <string name="hide_battery_charging_icon">隱藏 充電 圖標</string>
+    <string name="hide_wifi_standard_icon">隱藏 WIFI標準 圖標</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Simplicity Tools</string>
     <string name="performance">性能</string>
@@ -130,4 +130,6 @@
     <string name="are_you_sure_reboot">確定重啟系統？</string>
     <string name="cancel">取消</string>
     <string name="are_you_sure_reboot_scope">確定重啟全部作用域？</string>
+    <string name="hide_battery_charging_icon">隱藏 充電 圖示</string>
+    <string name="hide_wifi_standard_icon">隱藏 WIFI標準 圖示</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -130,4 +130,6 @@
     <string name="are_you_sure_reboot">Are you sure to reboot?</string>
     <string name="cancel">Cancel</string>
     <string name="are_you_sure_reboot_scope">Are you sure to reboot all scope?</string>
+    <string name="hide_battery_charging_icon">Hide charging icon</string>
+    <string name="hide_wifi_standard_icon">Hide WIFI standard icon</string>
 </resources>