Update version to 2.1,fix more bugs.

.idea/misc.xml

@@ -7,6 +7,7 @@
         <entry key="app/src/main/res/drawable-night/permotion_round.xml" value="0.256" />
         <entry key="app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.44871794871794873" />
         <entry key="app/src/main/res/drawable/bg_green_round.xml" value="0.255" />
+        <entry key="app/src/main/res/drawable/bg_warn_round.xml" value="0.2325" />
         <entry key="app/src/main/res/drawable/bg_yellow_round.xml" value="0.255" />
         <entry key="app/src/main/res/drawable/permotion_round.xml" value="0.256" />
         <entry key="app/src/main/res/drawable/white_round.xml" value="0.256" />
@@ -15,10 +16,11 @@
         <entry key="app/src/main/res/layout-w936dp/dia_status_icon_cout.xml" value="0.935546875" />
         <entry key="app/src/main/res/layout/activity_config.xml" value="0.42168674698795183" />
         <entry key="app/src/main/res/layout/activity_login.xml" value="0.4375" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.343980343980344" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.3448275862068966" />
         <entry key="app/src/main/res/layout/adapter_config.xml" value="0.375" />
         <entry key="app/src/main/res/layout/dia_icon_filter.xml" value="0.4307692307692308" />
         <entry key="app/src/main/res/layout/dia_icon_search.xml" value="0.4307692307692308" />
+        <entry key="app/src/main/res/layout/dia_source_from.xml" value="0.3591278324070115" />
         <entry key="app/src/main/res/layout/dia_source_from_string.xml" value="0.4307692307692308" />
         <entry key="app/src/main/res/layout/dia_status_icon_count.xml" value="0.45" />
         <entry key="app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.44871794871794873" />

README.md

@@ -2,7 +2,7 @@
 
 ![Eclipse Marketplace](https://img.shields.io/badge/build-passing-brightgreen)
 ![Eclipse Marketplace](https://img.shields.io/badge/license-AGPL3.0-blue)
-![Eclipse Marketplace](https://img.shields.io/badge/version-v2.0-green)
+![Eclipse Marketplace](https://img.shields.io/badge/version-v2.1-green)
 <br/><br/>
 <img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/app/src/main/ic_launcher-playstore.png" width = "100" height = "100"/>
 <br/>
@@ -12,7 +12,7 @@ Fix the native notification bar icon function abandoned by the MIUI development
 # 开始使用
 
 点击下载最新版本
-<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v2.0-green)</a>
+<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'>![Eclipse Marketplace](https://img.shields.io/badge/download-v2.1-green)</a>
 <br/><br/>
 ⚠️ 适配说明<br/>
 

app/src/main/java/com/fankes/miui/notify/hook/HookEntry.kt

@@ -119,6 +119,9 @@ class HookEntry : YukiHookXposedInitProxy {
     /** 缓存的通知优化图标数组 */
     private var iconDatas = ArrayList<IconDataBean>()
 
+    /** 是否显示通知图标 - 跟随 Hook 保存 */
+    private var isShowNotificationIcons = true
+
     /**
      * - 这个是修复彩色图标的关键核心代码判断
      *
@@ -558,12 +561,19 @@ class HookEntry : YukiHookXposedInitProxy {
                             method { name = "updateState" }
                             beforeHook {
                                 /** 解除状态栏通知图标个数限制 */
-                                if (prefs.getBoolean(ENABLE_HOOK_STATUS_ICON_COUNT, default = true))
+                                if (isShowNotificationIcons && prefs.getBoolean(ENABLE_HOOK_STATUS_ICON_COUNT, default = true))
                                     field { name = "MAX_STATIC_ICONS" }
                                         .get(instance).set(prefs.getInt(HOOK_STATUS_ICON_COUNT, default = 5)
                                             .let { if (it in 0..100) it else 5 })
                             }
                         }
+                        injectMember {
+                            method {
+                                name = "miuiShowNotificationIcons"
+                                param(BooleanType)
+                            }
+                            beforeHook { isShowNotificationIcons = firstArgs as Boolean }
+                        }
                     }
                     NotificationHeaderViewWrapperClass.hook {
                         /** 修复下拉通知图标自动设置回 APP 图标的方法 */

app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt

@@ -211,18 +211,12 @@ val Context.versionName get() = packageInfo.versionName ?: ""
  */
 val Context.versionCode get() = packageInfo.versionCode
 
-/**
- * dp 转换为 px
- * @return [Int]
- */
-val Number.dp get() = (toFloat() * appContext.resources.displayMetrics.density).toInt()
-
 /**
  * dp 转换为 px
  * @param context 使用的实例
  * @return [Float]
  */
-fun Number.dp(context: Context) = toFloat() * context.resources.displayMetrics.density
+fun Number.dp(context: Context) = (toFloat() * context.resources.displayMetrics.density)
 
 /**
  * Base64 加密

app/src/main/java/com/fankes/miui/notify/view/MaterialSwitch.kt

@@ -48,16 +48,16 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont
             .rectangle()
             .rounded()
             .solidColor(0xFF656565.toInt())
-            .height(20.dp)
+            .height(20.dp(context).toInt())
-            .cornerRadius(15.dp)
+            .cornerRadius(15.dp(context).toInt())
             .build()
         thumbDrawable = DrawableBuilder()
             .rectangle()
             .rounded()
             .solidColor(Color.WHITE)
-            .size(20.dp, 20.dp)
+            .size(20.dp(context).toInt(), 20.dp(context).toInt())
-            .cornerRadius(20.dp)
+            .cornerRadius(20.dp(context).toInt())
-            .strokeWidth(8.dp)
+            .strokeWidth(8.dp(context).toInt())
             .strokeColor(Color.TRANSPARENT)
             .build()
         trackTintList = toColors(

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "2.0"
+    appVersionName = "2.1"
-    appVersionCode = 23
+    appVersionCode = 24
 }
 
 task clean(type: Delete) {