fankes/ColorOSNotifyIcon
2
0
Fork 0
mirror of https://github.com/fankes/ColorOSNotifyIcon.git synced 2025-09-06 18:55:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge code

Browse Source
This commit is contained in:
Fankesyooni
2022-03-25 14:37:41 +08:00
parent 618fd8af0e
commit 05e083f8e6
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/fankes/coloros/notify/hook/HookConst.kt
View File

@@ -42,5 +42,6 @@ object HookConst {
const val TYPE_SOURCE_SYNC_WAY_2 = 2000 const val TYPE_SOURCE_SYNC_WAY_2 = 2000
const val TYPE_SOURCE_SYNC_WAY_3 = 3000 const val TYPE_SOURCE_SYNC_WAY_3 = 3000
const val ANDROID_PACKAGE_NAME = "android"
const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui" const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui"
} }

3
app/src/main/java/com/fankes/coloros/notify/hook/entity/SystemUIHooker.kt
View File

@@ -42,6 +42,7 @@ import android.widget.ImageView
import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toBitmap
import com.fankes.coloros.notify.bean.IconDataBean import com.fankes.coloros.notify.bean.IconDataBean
import com.fankes.coloros.notify.const.Const import com.fankes.coloros.notify.const.Const
import com.fankes.coloros.notify.hook.HookConst.ANDROID_PACKAGE_NAME
import com.fankes.coloros.notify.hook.HookConst.ENABLE_ANDROID12_STYLE import com.fankes.coloros.notify.hook.HookConst.ENABLE_ANDROID12_STYLE
import com.fankes.coloros.notify.hook.HookConst.ENABLE_MODULE_LOG import com.fankes.coloros.notify.hook.HookConst.ENABLE_MODULE_LOG
import com.fankes.coloros.notify.hook.HookConst.ENABLE_NOTIFY_ICON_FIX import com.fankes.coloros.notify.hook.HookConst.ENABLE_NOTIFY_ICON_FIX
@@ -330,7 +331,7 @@ class SystemUIHooker : YukiBaseHooker() {
var customPair: Pair<Bitmap?, Int>? = null var customPair: Pair<Bitmap?, Int>? = null
when { when {
/** 替换系统图标为 Android 默认 */ /** 替换系统图标为 Android 默认 */
(packageName == "android" || packageName == SYSTEMUI_PACKAGE_NAME) && !isGrayscaleIcon -> (packageName == ANDROID_PACKAGE_NAME || packageName == SYSTEMUI_PACKAGE_NAME) && !isGrayscaleIcon ->
customPair = Pair(if (isUpperOfAndroidS) IconPackParams.android12IconBitmap else IconPackParams.android11IconBitmap, 0) customPair = Pair(if (isUpperOfAndroidS) IconPackParams.android12IconBitmap else IconPackParams.android11IconBitmap, 0)
/** 替换自定义通知图标 */ /** 替换自定义通知图标 */
prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true) -> run { prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true) -> run {