Update version to 1.85

Added notify icon custom corner function
Update misc
2025-09-08 03:24:11 +08:00 · 2022-05-31 04:06:23 +08:00 · 2022-05-31 03:43:46 +08:00 · 2022-05-31 03:43:42 +08:00 · 2022-05-31 02:13:53 +08:00
9 changed files with 130 additions and 27 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -11,7 +11,7 @@
        <entry key="app/src/main/res/drawable/ic_notify_icon.xml" value="0.232" />
        <entry key="app/src/main/res/drawable/ic_system_clock.xml" value="0.232" />
        <entry key="app/src/main/res/layout/activity_config.xml" value="0.4375" />
-        <entry key="app/src/main/res/layout/activity_main.xml" value="0.3060926669098869" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.29182608695652174" />
        <entry key="app/src/main/res/layout/adapter_config.xml" value="0.4375" />
        <entry key="app/src/main/res/layout/dia_icon_filter.xml" value="0.4375" />
        <entry key="app/src/main/res/layout/dia_source_from.xml" value="0.4375" />
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![Blank](https://img.shields.io/badge/build-passing-brightgreen)](https://github.com/fankes/ColorOSNotifyIcon)
 [![Blank](https://img.shields.io/badge/license-AGPL3.0-blue)](https://github.com/fankes/ColorOSNotifyIcon/blob/master/LICENSE)
-[![Blank](https://img.shields.io/badge/version-v1.8-green)](https://github.com/fankes/ColorOSNotifyIcon/releases)
+[![Blank](https://img.shields.io/badge/version-v1.85-green)](https://github.com/fankes/ColorOSNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/fankes/ColorOSNotifyIcon/total?label=Release)](https://github.com/fankes/ColorOSNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/Xposed-Modules-Repo/com.fankes.coloros.notify/total?label=LSPosed%20Repo&logo=Android&style=flat&labelColor=F48FB1&logoColor=ffffff)](https://github.com/Xposed-Modules-Repo/com.fankes.coloros.notify/releases)
 [![Telegram](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/XiaofangInternet)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,6 +31,8 @@ android {
    buildTypes {
        release {
            minifyEnabled rootProject.ext.enableR8
+            shrinkResources rootProject.ext.enableR8
+            zipAlignEnabled rootProject.ext.enableR8
            signingConfig signingConfigs.debug
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
        }
@@ -57,8 +59,8 @@ android {

 dependencies {
    compileOnly 'de.robv.android.xposed:api:82'
-    implementation 'com.highcapable.yukihookapi:api:1.0.91'
-    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.91'
+    implementation 'com.highcapable.yukihookapi:api:1.0.92'
+    ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.92'
    implementation "com.github.topjohnwu.libsu:core:3.1.2"
    implementation 'androidx.annotation:annotation:1.3.0'
    implementation 'com.squareup.okhttp3:okhttp:4.9.3'
--- a/app/src/main/java/com/fankes/coloros/notify/data/DataConst.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/data/DataConst.kt
@@ -41,6 +41,7 @@ object DataConst {
    val ENABLE_NOTIFY_ICON_FIX_AUTO = PrefsData("_enable_notify_icon_fix_auto", true)
    val ENABLE_NOTIFY_PANEL_ALPHA = PrefsData("_enable_notify_panel_alpha", false)
    val ENABLE_NOTIFY_MEDIA_PANEL_AUTO_EXP = PrefsData("_enable_notify_media_panel_auto_exp", false)
+    val NOTIFY_ICON_CORNER = PrefsData("_notify_icon_corner", 10)
    val NOTIFY_PANEL_ALPHA = PrefsData("_notify_panel_alpha_pst", 75)
    val NOTIFY_ICON_DATAS = PrefsData("_notify_icon_datas", "")
    val NOTIFY_ICON_FIX_AUTO_TIME = PrefsData("_notify_icon_fix_auto_time", "07:00")
--- a/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/HookEntry.kt
@@ -32,7 +32,7 @@ import com.highcapable.yukihookapi.hook.factory.encase
 import com.highcapable.yukihookapi.hook.log.loggerW
 import com.highcapable.yukihookapi.hook.xposed.proxy.IYukiHookXposedInit

-@InjectYukiHookWithXposed
+@InjectYukiHookWithXposed(isUsingResourcesHook = false)
 class HookEntry : IYukiHookXposedInit {

    override fun onInit() = configs {
--- a/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
@@ -462,7 +462,12 @@ object SystemUIHooker : YukiBaseHooker() {

                    /** 判断风格并开始 Hook */
                    if (isA12Style) {
-                        background = DrawableBuilder().rounded().solidColor(newApplyColor).build()
+                        /** 通知图标边框圆角大小 */
+                        background = DrawableBuilder()
+                            .rectangle()
+                            .cornerRadius(prefs.get(DataConst.NOTIFY_ICON_CORNER).dp(context))
+                            .solidColor(newApplyColor)
+                            .build()
                        setColorFilter(newStyle)
                        setPadding(2.dp(context), 2.dp(context), 2.dp(context), 2.dp(context))
                    } else {
--- a/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt
+++ b/app/src/main/java/com/fankes/coloros/notify/ui/activity/MainActivity.kt
@@ -124,6 +124,8 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
        binding.a12StyleConfigItem.isVisible = modulePrefs.get(DataConst.ENABLE_MODULE)
        binding.notifyIconConfigItem.isVisible = modulePrefs.get(DataConst.ENABLE_MODULE)
        binding.notifyIconFixButton.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
+        binding.notifyIconCustomCornerItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX) &&
+                modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FORCE_APP_ICON).not()
        binding.notifyIconForceAppIconItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
        binding.notifyIconFixNotifyItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
        binding.notifyIconAutoSyncItem.isVisible = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX)
@@ -145,7 +147,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
        binding.notifyIconAutoSyncSwitch.isChecked = modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FIX_AUTO)
        binding.notifyPanelConfigSwitch.isChecked = modulePrefs.get(DataConst.ENABLE_NOTIFY_PANEL_ALPHA)
        binding.notifyPanelConfigSeekbar.progress = modulePrefs.get(DataConst.NOTIFY_PANEL_ALPHA)
+        binding.notifyIconCustomCornerSeekbar.progress = modulePrefs.get(DataConst.NOTIFY_ICON_CORNER)
        binding.notifyPanelConfigText.text = "${modulePrefs.get(DataConst.NOTIFY_PANEL_ALPHA)}%"
+        binding.notifyIconCustomCornerText.text = "${modulePrefs.get(DataConst.NOTIFY_ICON_CORNER)} dp"
        binding.notifyIconAutoSyncText.text = notifyIconAutoSyncTime
        /** 媒体通知自动展开仅支持 12.1 - 旧版本适配过于复杂已放弃 */
        if (colorOSNumberVersion != "V12.1") {
@@ -179,6 +183,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
            if (btn.isPressed.not()) return@setOnCheckedChangeListener
            modulePrefs.put(DataConst.ENABLE_NOTIFY_ICON_FIX, b)
            binding.notifyIconFixButton.isVisible = b
+            binding.notifyIconCustomCornerItem.isVisible = b && modulePrefs.get(DataConst.ENABLE_NOTIFY_ICON_FORCE_APP_ICON).not()
            binding.notifyIconForceAppIconItem.isVisible = b
            binding.notifyIconFixNotifyItem.isVisible = b
            binding.notifyIconAutoSyncItem.isVisible = b
@@ -187,6 +192,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
        binding.notifyIconForceAppIconSwitch.setOnCheckedChangeListener { btn, b ->
            if (btn.isPressed.not()) return@setOnCheckedChangeListener
            fun saveState() {
+                binding.notifyIconCustomCornerItem.isVisible = b.not()
                modulePrefs.put(DataConst.ENABLE_NOTIFY_ICON_FORCE_APP_ICON, b)
                SystemUITool.refreshSystemUI(context = this)
            }
@@ -256,6 +262,18 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {

            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
        })
+        binding.notifyIconCustomCornerSeekbar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                binding.notifyIconCustomCornerText.text = "$progress dp"
+            }
+
+            override fun onStopTrackingTouch(seekBar: SeekBar) {
+                modulePrefs.put(DataConst.NOTIFY_ICON_CORNER, seekBar.progress)
+                SystemUITool.refreshSystemUI(context = this@MainActivity)
+            }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) {}
+        })
        /** 通知图标优化名单按钮点击事件 */
        binding.notifyIconFixButton.setOnClickListener { navigate<ConfigureActivity>() }
        /** 自动更新在线规则修改时间按钮点击事件 */
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -563,15 +563,13 @@
                android:elevation="0dp"
                android:gravity="center"
                android:orientation="vertical"
-                android:paddingLeft="10dp"
-                android:paddingTop="15dp"
-                android:paddingRight="10dp">
+                android:paddingTop="15dp">

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                    android:gravity="center|start">

                    <ImageView
@@ -594,8 +592,8 @@
                    android:id="@+id/notify_icon_fix_switch"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                    android:text="启用通知图标优化"
                    android:textColor="@color/colorTextGray"
                    android:textSize="15sp" />
@@ -604,8 +602,8 @@
                    android:id="@+id/notify_icon_fix_button"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="3dp"
-                    android:layout_marginRight="3dp"
+                    android:layout_marginLeft="13dp"
+                    android:layout_marginRight="13dp"
                    android:layout_marginBottom="10dp"
                    android:background="@drawable/bg_button_round"
                    android:gravity="center"
@@ -618,8 +616,8 @@
                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                    android:layout_marginBottom="10dp"
                    android:alpha="0.6"
                    android:lineSpacingExtra="6dp"
@@ -630,8 +628,8 @@
                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                    android:layout_marginBottom="10dp"
                    android:alpha="0.6"
                    android:lineSpacingExtra="6dp"
@@ -639,12 +637,91 @@
                    android:textColor="@color/colorTextDark"
                    android:textSize="12sp" />

+                <LinearLayout
+                    android:id="@+id/notify_icon_custom_corner_item"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="10dp"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="30dp"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:layout_marginBottom="5dp"
+                        android:gravity="center|start"
+                        android:text="调整通知栏中的图标边框圆角大小"
+                        android:textAllCaps="false"
+                        android:textColor="@color/colorTextGray"
+                        android:textSize="15sp" />
+
+                    <androidx.appcompat.widget.AppCompatSeekBar
+                        android:id="@+id/notify_icon_custom_corner_seekbar"
+                        android:layout_width="match_parent"
+                        android:layout_height="40dp"
+                        android:layout_marginTop="5dp"
+                        android:max="10"
+                        android:min="0"
+                        android:paddingLeft="5dp"
+                        android:paddingRight="5dp"
+                        android:progress="10" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:gravity="center"
+                        android:orientation="horizontal"
+                        android:paddingTop="5dp"
+                        android:paddingBottom="15dp">
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="5dp"
+                            android:alpha="0.75"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxWidth="100dp"
+                            android:singleLine="true"
+                            android:text="当前"
+                            android:textColor="@color/colorTextGray"
+                            android:textSize="13.5sp" />
+
+                        <TextView
+                            android:id="@+id/notify_icon_custom_corner_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:ellipsize="end"
+                            android:gravity="center"
+                            android:maxWidth="100dp"
+                            android:singleLine="true"
+                            android:text="10 dp"
+                            android:textColor="@color/colorTextGray"
+                            android:textSize="15sp"
+                            android:textStyle="bold" />
+                    </LinearLayout>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="15dp"
+                        android:layout_marginRight="15dp"
+                        android:alpha="0.6"
+                        android:lineSpacingExtra="6dp"
+                        android:text="你可以拖拽滑动条来调整通知栏中图标的边框圆角大小，仅支持启用了 Android 12 通知栏风格的通知图标。"
+                        android:textColor="@color/colorTextDark"
+                        android:textSize="12sp" />
+                </LinearLayout>
+
                <LinearLayout
                    android:id="@+id/notify_icon_force_app_icon_item"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                    android:orientation="vertical">

                    <com.fankes.coloros.notify.ui.view.MaterialSwitch
@@ -671,8 +748,8 @@
                    android:id="@+id/notify_icon_fix_notify_item"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                    android:orientation="vertical">

                    <com.fankes.coloros.notify.ui.view.MaterialSwitch
@@ -699,8 +776,8 @@
                    android:id="@+id/notify_icon_auto_sync_item"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
                    android:animateLayoutChanges="true"
                    android:orientation="vertical">

--- a/build.gradle
+++ b/build.gradle
@@ -5,8 +5,8 @@ plugins {
 }

 ext {
-    appVersionName = "1.8"
-    appVersionCode = 16
+    appVersionName = "1.85"
+    appVersionCode = 17
    enableR8 = true
 }
Author	SHA1	Message	Date
fankesyooni	c02bc2314a	Update version to 1.85	2022-05-31 04:06:23 +08:00
fankesyooni	d177620784	Added notify icon custom corner function	2022-05-31 03:43:46 +08:00
fankesyooni	354d0e1961	Update misc	2022-05-31 03:43:42 +08:00
fankesyooni	bc1f379650	Update YukiHookAPI	2022-05-31 02:13:53 +08:00