mirror of
https://github.com/fankes/MIUINativeNotifyIcon.git
synced 2025-09-07 03:05:51 +08:00
Compare commits
23 Commits
Author | SHA1 | Date | |
---|---|---|---|
b0f9e44f8a | |||
1e749d2f64 | |||
c886bbd6cf | |||
ec45839029 | |||
6fd2294529 | |||
|
5913da8183 | ||
|
fcf2889668 | ||
|
6d784f1283 | ||
cd8ceec765 | |||
5325ac37d6 | |||
07fa6965ad | |||
4c88a5fbc6 | |||
da61a52c13 | |||
3314f9fb57 | |||
ebb1bec36f | |||
|
d5d2e2107c | ||
|
c39d03f8c9 | ||
|
e20dfab5b1 | ||
|
ffc9be3721 | ||
|
126aedabfd | ||
56661b03e6 | |||
|
c45658be68 | ||
e0443ff97c |
4
.github/ISSUE_TEMPLATE/----bug---.md
vendored
4
.github/ISSUE_TEMPLATE/----bug---.md
vendored
@@ -25,7 +25,7 @@ assignees: fankes
|
|||||||
|
|
||||||
**使用的 Xposed 框架名称与框架版本(必填)**
|
**使用的 Xposed 框架名称与框架版本(必填)**
|
||||||
|
|
||||||
*
|
* (例如:LSPosed Zygisk/Riru 版本号)
|
||||||
|
|
||||||
**同时使用的带有系统界面作用域的 Xposed 模块(选填)**
|
**同时使用的带有系统界面作用域的 Xposed 模块(选填)**
|
||||||
|
|
||||||
@@ -46,6 +46,8 @@ assignees: fankes
|
|||||||
|
|
||||||
</code></pre></details>
|
</code></pre></details>
|
||||||
|
|
||||||
|
<!--- 注意:只接受 MIUI 正规官方版本系统,如果你正在使用 MIUI 官改(第三方改版)请不要提交任何 BUG 与问题,开发者无义务解决 --->
|
||||||
|
|
||||||
<!--- 提交时请将括号内容包括括号全部删除,填入你自己的内容 --->
|
<!--- 提交时请将括号内容包括括号全部删除,填入你自己的内容 --->
|
||||||
<!--- 请保留模板原始标题 --->
|
<!--- 请保留模板原始标题 --->
|
||||||
<!--- 不按规定提交的 issues 将直接被关闭 --->
|
<!--- 不按规定提交的 issues 将直接被关闭 --->
|
||||||
|
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -6,6 +6,8 @@
|
|||||||
<entry key="app/src/main/res/drawable-night/dark_round.xml" value="0.256" />
|
<entry key="app/src/main/res/drawable-night/dark_round.xml" value="0.256" />
|
||||||
<entry key="app/src/main/res/drawable-night/permotion_round.xml" value="0.256" />
|
<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-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_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/permotion_round.xml" value="0.256" />
|
||||||
<entry key="app/src/main/res/drawable/white_round.xml" value="0.256" />
|
<entry key="app/src/main/res/drawable/white_round.xml" value="0.256" />
|
||||||
<entry key="app/src/main/res/layout/activity_config.xml" value="0.42168674698795183" />
|
<entry key="app/src/main/res/layout/activity_config.xml" value="0.42168674698795183" />
|
||||||
|
@@ -1,44 +0,0 @@
|
|||||||
# 开始贡献
|
|
||||||
|
|
||||||
欢迎为通知图标优化名单贡献宝贵资源!<br/>
|
|
||||||
|
|
||||||
## 分支规定
|
|
||||||
|
|
||||||
不管是直接 Push 代码还是提交 Pull Request,都必须使 commit 指向 master 分支。
|
|
||||||
|
|
||||||
## 代码格式规范
|
|
||||||
|
|
||||||
- 1.全部提交代码必须使用 IDE(Android Studio 或 IDEA) 进行格式化,未经格式化的代码将拒绝合并提交请求
|
|
||||||
- 2.代码必须使用 4 spaces 缩进格式化
|
|
||||||
|
|
||||||
## 贡献方法
|
|
||||||
|
|
||||||
- 在下方的类中添加新的 APP 通知图标适配条目
|
|
||||||
- [IconPackParams.kt](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/app/src/main/java/com/fankes/miui/notify/params/IconPackParams.kt)
|
|
||||||
- 使用灰度位图转 Base64 来得到 Base64 的位图数据字符串
|
|
||||||
- [BitmapToBase64](https://github.com/fankes/BitmapToBase64)
|
|
||||||
- 新增条目的模板如下所示
|
|
||||||
|
|
||||||
```kotlin
|
|
||||||
IconDataBean(
|
|
||||||
isEnabled = true, // 是否默认启用替换彩色图标 - 关闭后将全部停止替换
|
|
||||||
isEnabledAll = false, // 是否默认启用替换全部图标
|
|
||||||
appName = "", // APP 名称
|
|
||||||
packageName = "", // APP 包名
|
|
||||||
iconBitmap = ("").bitmap, // 位图数据 Base64
|
|
||||||
iconColor = 0, // 通知栏中显示的图标颜色 - 设置为 0 使用系统默认颜色 (不设置颜色可不写)
|
|
||||||
contributorName = "" // 贡献者昵称
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
- 图标大小建议保持在 50x50
|
|
||||||
- 提交时请将后方的注释删除,否则不予合并代码
|
|
||||||
|
|
||||||
## 其它要求
|
|
||||||
|
|
||||||
- 1.调试性质或大批量注释代码,禁止提交
|
|
||||||
- 2.类名和方法名仅能由开发者进行修改和提交,禁止随意修改项目名称、方法名称以及类名
|
|
||||||
- 3.禁止随意更新项目依赖以及增加新的依赖,有问题请提前提交到 issues 进行说明
|
|
||||||
- 4.禁止更新项目版本号,版本号交由开发者合并代码并发布 release 版本
|
|
||||||
- 5.代码语言要求,请统一使用 Kotlin,除特殊情况外,不接受其他语言的提交
|
|
||||||
- 6.以上
|
|
16
README.md
16
README.md
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||

|

|
||||||

|

|
||||||

|

|
||||||
<br/><br/>
|
<br/><br/>
|
||||||
<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/app/src/main/ic_launcher-playstore.png" width = "100" height = "100"/>
|
<img src="https://github.com/fankes/MIUINativeNotifyIcon/blob/master/app/src/main/ic_launcher-playstore.png" width = "100" height = "100"/>
|
||||||
<br/>
|
<br/>
|
||||||
@@ -12,11 +12,12 @@ Fix the native notification bar icon function abandoned by the MIUI development
|
|||||||
# 开始使用
|
# 开始使用
|
||||||
|
|
||||||
点击下载最新版本
|
点击下载最新版本
|
||||||
<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'></a>
|
<a href='https://github.com/fankes/MIUINativeNotifyIcon/releases'></a>
|
||||||
<br/><br/>
|
<br/><br/>
|
||||||
⚠️ 适配说明<br/>
|
⚠️ 适配说明<br/>
|
||||||
|
|
||||||
- 此模块仅支持 LSPosed(作用域“系统界面”)、~~EdXposed(随时停止支持)~~、不支持太极无极
|
- 此模块仅支持 LSPosed(作用域“系统界面”)、~~EdXposed(随时停止支持)~~、不支持太极无极
|
||||||
|
- 请确保你使用的是 MIUI 官方版本,任何第三方官改包发生的问题,开发者没有义务去解决和修复,请自求多福
|
||||||
- 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
|
- 目前最低支持基于 Android 9 版本的 MIUI 12 或 MIUI 12.5(最低建议)
|
||||||
- 建议最低从 MIUI 12.5 `2021-5-18` 开发版以后开始使用模块,之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块的问题
|
- 建议最低从 MIUI 12.5 `2021-5-18` 开发版以后开始使用模块,之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块的问题
|
||||||
- 请始终保持最新版本的 LSPosed,旧版本可能会出现 Hook 不生效的问题
|
- 请始终保持最新版本的 LSPosed,旧版本可能会出现 Hook 不生效的问题
|
||||||
@@ -28,16 +29,11 @@ Fix the native notification bar icon function abandoned by the MIUI development
|
|||||||
[Release](https://github.com/fankes/MIUINativeNotifyIcon/releases)
|
[Release](https://github.com/fankes/MIUINativeNotifyIcon/releases)
|
||||||
及[蓝奏云](https://fankes.lanzouy.com/b030o2e8h),从其他非正规渠道下载到的版本或对您造成任何影响均与我们无关。
|
及[蓝奏云](https://fankes.lanzouy.com/b030o2e8h),从其他非正规渠道下载到的版本或对您造成任何影响均与我们无关。
|
||||||
|
|
||||||
# 开始贡献
|
# 贡献通知图标优化名单
|
||||||
|
|
||||||
由于国内厂商 APP 的不规范彩色图标影响整体图标的美观,现在开放第三方 APP 的通知图标适配。<br/>
|
此项目是 `AndroidNotifyIconAdapt` 项目的一部分,详情请参考下方。<br/>
|
||||||
欢迎为通知图标优化名单贡献宝贵资源!<br/>
|
|
||||||
|
|
||||||
- [CONTRIBUTING](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/CONTRIBUTING.md)
|
- [Android 通知图标规范适配](https://github.com/fankes/AndroidNotifyIconAdapt)
|
||||||
|
|
||||||
# 通知测试
|
|
||||||
|
|
||||||
你可以 [点击这里下载](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/tool/NotifyTester.apk) 工具测试通知图标是否生效。
|
|
||||||
|
|
||||||
# 历史背景
|
# 历史背景
|
||||||
|
|
||||||
|
@@ -72,6 +72,7 @@ dependencies {
|
|||||||
ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.2'
|
ksp 'com.highcapable.yukihookapi:ksp-xposed:1.0.2'
|
||||||
implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
|
implementation 'com.geyifeng.immersionbar:immersionbar:3.2.0'
|
||||||
implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.0'
|
implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.0'
|
||||||
|
implementation 'com.squareup.okhttp3:okhttp:4.9.3'
|
||||||
implementation 'androidx.core:core-ktx:1.7.0'
|
implementation 'androidx.core:core-ktx:1.7.0'
|
||||||
implementation 'androidx.appcompat:appcompat:1.4.1'
|
implementation 'androidx.appcompat:appcompat:1.4.1'
|
||||||
implementation 'com.google.android.material:material:1.5.0'
|
implementation 'com.google.android.material:material:1.5.0'
|
||||||
|
@@ -3,6 +3,8 @@
|
|||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
package="com.fankes.miui.notify">
|
package="com.fankes.miui.notify">
|
||||||
|
|
||||||
|
<uses-permission android:name="android.permission.INTERNET" />
|
||||||
|
|
||||||
<application
|
<application
|
||||||
android:name=".application.MNNApplication"
|
android:name=".application.MNNApplication"
|
||||||
android:allowBackup="true"
|
android:allowBackup="true"
|
||||||
@@ -18,7 +20,7 @@
|
|||||||
android:value="true" />
|
android:value="true" />
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="xposeddescription"
|
android:name="xposeddescription"
|
||||||
android:value="MIUI 状态栏原生图标,修复 12.5、13 后期被破坏的彩色图标。\n开发者:酷安 @星夜不荟" />
|
android:value="MIUI 原生通知图标,修复 12.5、13 后期被破坏的彩色图标。\n开发者:酷安 @星夜不荟" />
|
||||||
<meta-data
|
<meta-data
|
||||||
android:name="xposedminversion"
|
android:name="xposedminversion"
|
||||||
android:value="93" />
|
android:value="93" />
|
||||||
|
@@ -28,7 +28,7 @@ import java.io.Serializable
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 通知栏小图标 bean
|
* 通知栏小图标 bean
|
||||||
* @param appName APP 名称 - 仅限默认语言区域
|
* @param appName APP 名称
|
||||||
* @param packageName 包名
|
* @param packageName 包名
|
||||||
* @param iconBitmap 图标位图
|
* @param iconBitmap 图标位图
|
||||||
* @param iconColor 通知栏中显示的图标颜色 - 设置为 0 使用系统默认颜色
|
* @param iconColor 通知栏中显示的图标颜色 - 设置为 0 使用系统默认颜色
|
||||||
|
@@ -32,6 +32,7 @@ object HookConst {
|
|||||||
const val ENABLE_COLOR_ICON_HOOK = "_color_icon_hook"
|
const val ENABLE_COLOR_ICON_HOOK = "_color_icon_hook"
|
||||||
const val ENABLE_COLOR_ICON_COMPAT = "_color_icon_compat"
|
const val ENABLE_COLOR_ICON_COMPAT = "_color_icon_compat"
|
||||||
const val ENABLE_NOTIFY_ICON_FIX = "_notify_icon_fix"
|
const val ENABLE_NOTIFY_ICON_FIX = "_notify_icon_fix"
|
||||||
|
const val NOTIFY_ICON_DATAS = "_notify_icon_datas"
|
||||||
|
|
||||||
const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui"
|
const val SYSTEMUI_PACKAGE_NAME = "com.android.systemui"
|
||||||
}
|
}
|
@@ -34,6 +34,7 @@ import android.view.View
|
|||||||
import android.view.ViewOutlineProvider
|
import android.view.ViewOutlineProvider
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import androidx.core.graphics.drawable.toBitmap
|
import androidx.core.graphics.drawable.toBitmap
|
||||||
|
import com.fankes.miui.notify.bean.IconDataBean
|
||||||
import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_COMPAT
|
import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_COMPAT
|
||||||
import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_HOOK
|
import com.fankes.miui.notify.hook.HookConst.ENABLE_COLOR_ICON_HOOK
|
||||||
import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
|
import com.fankes.miui.notify.hook.HookConst.ENABLE_MODULE
|
||||||
@@ -69,20 +70,27 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
private const val NotificationHeaderViewWrapperInjectorClass =
|
private const val NotificationHeaderViewWrapperInjectorClass =
|
||||||
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapperInjector"
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapperInjector"
|
||||||
|
|
||||||
/** MIUI 新版本存在的类 */
|
|
||||||
private const val NotificationHeaderViewWrapperClass =
|
|
||||||
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationHeaderViewWrapper"
|
|
||||||
|
|
||||||
/** MIUI 新版本存在的类 */
|
|
||||||
private const val NotificationViewWrapperClass =
|
|
||||||
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
|
|
||||||
|
|
||||||
/** 未确定是否只有旧版本存在的类 */
|
|
||||||
private const val ExpandableNotificationRowClass = "$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
|
|
||||||
|
|
||||||
/** 原生存在的类 */
|
/** 原生存在的类 */
|
||||||
private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
|
private const val ContrastColorUtilClass = "com.android.internal.util.ContrastColorUtil"
|
||||||
|
|
||||||
|
/** 根据多个版本存在不同的包名相同的类 */
|
||||||
|
private val ExpandableNotificationRowClass = VariousClass(
|
||||||
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.ExpandableNotificationRow",
|
||||||
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.ExpandableNotificationRow"
|
||||||
|
)
|
||||||
|
|
||||||
|
/** 根据多个版本存在不同的包名相同的类 */
|
||||||
|
private val NotificationViewWrapperClass = VariousClass(
|
||||||
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationViewWrapper",
|
||||||
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationViewWrapper"
|
||||||
|
)
|
||||||
|
|
||||||
|
/** 根据多个版本存在不同的包名相同的类 */
|
||||||
|
private val NotificationHeaderViewWrapperClass = VariousClass(
|
||||||
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.row.wrapper.NotificationHeaderViewWrapper",
|
||||||
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationHeaderViewWrapper"
|
||||||
|
)
|
||||||
|
|
||||||
/** 根据多个版本存在不同的包名相同的类 */
|
/** 根据多个版本存在不同的包名相同的类 */
|
||||||
private val NotificationUtilClass = VariousClass(
|
private val NotificationUtilClass = VariousClass(
|
||||||
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtil",
|
"$SYSTEMUI_PACKAGE_NAME.statusbar.notification.NotificationUtil",
|
||||||
@@ -96,6 +104,9 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 缓存的通知优化图标数组 */
|
||||||
|
private var iconDatas = ArrayList<IconDataBean>()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* - 这个是修复彩色图标的关键核心代码判断
|
* - 这个是修复彩色图标的关键核心代码判断
|
||||||
*
|
*
|
||||||
@@ -128,8 +139,21 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
|
NotificationUtilClass.clazz.hasMethod(name = "ignoreStatusBarIconColor", ExpandedNotificationClass.clazz)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 是否为旧版本 MIUI 方案
|
||||||
|
*
|
||||||
|
* 拥有 “handleHeaderViews” 方法
|
||||||
|
* @return [Boolean]
|
||||||
|
*/
|
||||||
|
private val PackageParam.hasHandleHeaderViews
|
||||||
|
get() = safeOfFalse {
|
||||||
|
NotificationHeaderViewWrapperClass.clazz.hasMethod(name = "handleHeaderViews")
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取当前通知栏的样式
|
* 获取当前通知栏的样式
|
||||||
|
*
|
||||||
|
* - ❗新版本可能不存在这个方法
|
||||||
* @return [Boolean]
|
* @return [Boolean]
|
||||||
*/
|
*/
|
||||||
private val PackageParam.isShowMiuiStyle
|
private val PackageParam.isShowMiuiStyle
|
||||||
@@ -137,15 +161,6 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
NotificationUtilClass.clazz.method { name = "showMiuiStyle" }.get().invoke() ?: false
|
NotificationUtilClass.clazz.method { name = "showMiuiStyle" }.get().invoke() ?: false
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取 [ExpandedNotificationClass] 的应用名称
|
|
||||||
* @param instance 通知实例
|
|
||||||
* @return [String]
|
|
||||||
*/
|
|
||||||
private fun PackageParam.findAppName(instance: Any?) = safeOf(default = "<unknown>") {
|
|
||||||
ExpandedNotificationClass.clazz.method { name = "getAppName" }.get(instance).invoke() ?: "<empty>"
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 适配通知栏、状态栏图标
|
* 适配通知栏、状态栏图标
|
||||||
*
|
*
|
||||||
@@ -159,10 +174,51 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
private fun StatusBarNotification.compatNotifyIcon(context: Context, iconDrawable: Drawable) = safeOf(iconDrawable) {
|
private fun StatusBarNotification.compatNotifyIcon(context: Context, iconDrawable: Drawable) = safeOf(iconDrawable) {
|
||||||
/** 给 MIPUSH 设置 APP 自己的图标 */
|
/** 给 MIPUSH 设置 APP 自己的图标 */
|
||||||
if (isXmsf && opPkgName.isNotBlank())
|
if (isXmsf && opPkgName.isNotBlank())
|
||||||
context.packageManager.getPackageInfo(opPkgName, 0).applicationInfo.loadIcon(context.packageManager)
|
findAppIcon(context)
|
||||||
else iconDrawable
|
else iconDrawable
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取推送通知的应用名称
|
||||||
|
* @param context 实例
|
||||||
|
* @return [String]
|
||||||
|
*/
|
||||||
|
private fun StatusBarNotification.findAppName(context: Context) = safeOf(default = "<unknown>") {
|
||||||
|
context.packageManager.getPackageInfo(opPkgName, 0).applicationInfo.loadLabel(context.packageManager)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取通知栏、状态栏 APP 图标
|
||||||
|
* @param context 实例
|
||||||
|
* @return [Drawable] 适配的图标
|
||||||
|
*/
|
||||||
|
private fun StatusBarNotification.findAppIcon(context: Context) = safeOf(notification.smallIcon.loadDrawable(context)) {
|
||||||
|
context.packageManager.getPackageInfo(opPkgName, 0).applicationInfo.loadIcon(context.packageManager)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 打印日志
|
||||||
|
* @param tag 标识
|
||||||
|
* @param context 实例
|
||||||
|
* @param expandedNf 通知实例
|
||||||
|
* @param isCustom 是否为通知优化生效图标
|
||||||
|
* @param isGrayscale 是否为灰度图标
|
||||||
|
*/
|
||||||
|
private fun PackageParam.printLogcat(
|
||||||
|
tag: String,
|
||||||
|
context: Context,
|
||||||
|
expandedNf: StatusBarNotification?,
|
||||||
|
isCustom: Boolean,
|
||||||
|
isGrayscale: Boolean
|
||||||
|
) {
|
||||||
|
if (prefs.getBoolean(ENABLE_MODULE_LOG)) loggerD(
|
||||||
|
msg = "$tag --> [${expandedNf?.findAppName(context)}][${expandedNf?.opPkgName}] " +
|
||||||
|
"custom [$isCustom] " +
|
||||||
|
"grayscale [$isGrayscale] " +
|
||||||
|
"xmsf [${expandedNf?.isXmsf}]"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取推送通知的包名
|
* 获取推送通知的包名
|
||||||
*
|
*
|
||||||
@@ -228,6 +284,11 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
|
if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
|
||||||
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
|
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
|
||||||
expandedNf?.also { notifyInstance ->
|
expandedNf?.also { notifyInstance ->
|
||||||
|
/** 判断是 MIUI 样式就停止 Hook */
|
||||||
|
if (context.isMiuiNotifyStyle) {
|
||||||
|
it(notifyInstance.findAppIcon(context).toBitmap())
|
||||||
|
return@safeRun
|
||||||
|
}
|
||||||
/** 判断是否不是灰度图标 */
|
/** 判断是否不是灰度图标 */
|
||||||
val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
|
val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
|
||||||
|
|
||||||
@@ -235,20 +296,17 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
var customIcon: Bitmap? = null
|
var customIcon: Bitmap? = null
|
||||||
if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
|
if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
|
||||||
run {
|
run {
|
||||||
IconPackParams.iconDatas.forEach {
|
if (iconDatas.isNotEmpty())
|
||||||
if ((notifyInstance.opPkgName == it.packageName ||
|
iconDatas.forEach {
|
||||||
findAppName(notifyInstance) == it.appName) &&
|
if (notifyInstance.opPkgName == it.packageName && isAppNotifyHookOf(it)) {
|
||||||
isAppNotifyHookOf(it)
|
if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it))
|
||||||
) {
|
customIcon = it.iconBitmap
|
||||||
if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it))
|
return@run
|
||||||
customIcon = it.iconBitmap
|
}
|
||||||
return@run
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
/** 打印日志 */
|
/** 打印日志 */
|
||||||
if (prefs.getBoolean(ENABLE_MODULE_LOG))
|
printLogcat(tag = "StatusIcon", context, notifyInstance, isCustom = customIcon != null, !isNotGrayscaleIcon)
|
||||||
loggerD(msg = "Icon --> [${findAppName(notifyInstance)}][${notifyInstance.opPkgName}] custom [${customIcon != null}] grayscale [${!isNotGrayscaleIcon}] xmsf [${notifyInstance.isXmsf}]")
|
|
||||||
when {
|
when {
|
||||||
/** 处理自定义通知图标优化 */
|
/** 处理自定义通知图标优化 */
|
||||||
customIcon != null -> it(customIcon!!)
|
customIcon != null -> it(customIcon!!)
|
||||||
@@ -268,6 +326,8 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
*/
|
*/
|
||||||
private fun PackageParam.hookNotifyIconOnSet(context: Context, expandedNf: StatusBarNotification?, iconImageView: ImageView) =
|
private fun PackageParam.hookNotifyIconOnSet(context: Context, expandedNf: StatusBarNotification?, iconImageView: ImageView) =
|
||||||
safeRun(msg = "AutoSetAppIconOnSet") {
|
safeRun(msg = "AutoSetAppIconOnSet") {
|
||||||
|
/** 判断是 MIUI 样式就停止 Hook */
|
||||||
|
if (context.isMiuiNotifyStyle) return@safeRun
|
||||||
/** 如果没开启修复 APP 的彩色图标 */
|
/** 如果没开启修复 APP 的彩色图标 */
|
||||||
if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
|
if (!prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) return@safeRun
|
||||||
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
|
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
|
||||||
@@ -309,19 +369,19 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
var customIconColor = 0
|
var customIconColor = 0
|
||||||
|
|
||||||
if (isNotifyIconFix) run {
|
if (isNotifyIconFix) run {
|
||||||
IconPackParams.iconDatas.forEach {
|
if (iconDatas.isNotEmpty())
|
||||||
if ((notifyInstance.opPkgName == it.packageName ||
|
iconDatas.forEach {
|
||||||
findAppName(notifyInstance) == it.appName) &&
|
if (notifyInstance.opPkgName == it.packageName && isAppNotifyHookOf(it)) {
|
||||||
isAppNotifyHookOf(it)
|
if (!isGrayscaleIcon || isAppNotifyHookAllOf(it)) {
|
||||||
) {
|
customIcon = it.iconBitmap
|
||||||
if (!isGrayscaleIcon || isAppNotifyHookAllOf(it)) {
|
customIconColor = it.iconColor
|
||||||
customIcon = it.iconBitmap
|
return@run
|
||||||
customIconColor = it.iconColor
|
}
|
||||||
return@run
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
/** 打印日志 */
|
||||||
|
printLogcat(tag = "NotifyIcon", context, notifyInstance, isCustom = customIcon != null, isGrayscaleIcon)
|
||||||
/** 处理自定义通知图标优化 */
|
/** 处理自定义通知图标优化 */
|
||||||
if (customIcon != null)
|
if (customIcon != null)
|
||||||
iconImageView.apply {
|
iconImageView.apply {
|
||||||
@@ -375,38 +435,37 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
* @return [Boolean] 是否忽略通知图标颜色
|
* @return [Boolean] 是否忽略通知图标颜色
|
||||||
*/
|
*/
|
||||||
private fun PackageParam.hookIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) =
|
private fun PackageParam.hookIgnoreStatusBarIconColor(context: Context, expandedNf: StatusBarNotification?) =
|
||||||
if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) safeOfFalse {
|
if (!context.isMiuiNotifyStyle)
|
||||||
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
|
if (prefs.getBoolean(ENABLE_COLOR_ICON_HOOK, default = true)) safeOfFalse {
|
||||||
expandedNf?.let { notifyInstance ->
|
/** 获取通知对象 - 由于 MIUI 的版本迭代不规范性可能是空的 */
|
||||||
/** 获取通知小图标 */
|
expandedNf?.let { notifyInstance ->
|
||||||
val iconDrawable =
|
/** 获取通知小图标 */
|
||||||
notifyInstance.notification.smallIcon.loadDrawable(context)
|
val iconDrawable = notifyInstance.notification.smallIcon.loadDrawable(context)
|
||||||
|
|
||||||
/** 判断是否不是灰度图标 */
|
/** 判断是否不是灰度图标 */
|
||||||
val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
|
val isNotGrayscaleIcon = notifyInstance.isXmsf || !isGrayscaleIcon(context, iconDrawable)
|
||||||
|
|
||||||
/** 获取目标修复彩色图标的 APP */
|
/** 获取目标修复彩色图标的 APP */
|
||||||
var isTargetFixApp = false
|
var isTargetFixApp = false
|
||||||
/** 如果开启了自定义通知图标优化 */
|
/** 如果开启了自定义通知图标优化 */
|
||||||
if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
|
if (prefs.getBoolean(ENABLE_NOTIFY_ICON_FIX, default = true))
|
||||||
run {
|
run {
|
||||||
IconPackParams.iconDatas.forEach {
|
if (iconDatas.isNotEmpty())
|
||||||
if ((notifyInstance.opPkgName == it.packageName ||
|
iconDatas.forEach {
|
||||||
findAppName(notifyInstance) == it.appName) &&
|
if (notifyInstance.opPkgName == it.packageName && isAppNotifyHookOf(it)) {
|
||||||
isAppNotifyHookOf(it)
|
if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it)) isTargetFixApp = true
|
||||||
) {
|
return@run
|
||||||
if (isNotGrayscaleIcon || isAppNotifyHookAllOf(it)) isTargetFixApp = true
|
}
|
||||||
return@run
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
/**
|
||||||
/**
|
* 只要不是灰度就返回彩色图标
|
||||||
* 只要不是灰度就返回彩色图标
|
* 否则不对颜色进行反色处理防止一些系统图标出现异常
|
||||||
* 否则不对颜色进行反色处理防止一些系统图标出现异常
|
*/
|
||||||
*/
|
if (isTargetFixApp) false else isNotGrayscaleIcon
|
||||||
if (isTargetFixApp) false else isNotGrayscaleIcon
|
} ?: true
|
||||||
} ?: true
|
} else false
|
||||||
} else false
|
else true
|
||||||
|
|
||||||
override fun onHook() = encase {
|
override fun onHook() = encase {
|
||||||
configs {
|
configs {
|
||||||
@@ -425,6 +484,9 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
!prefs.getBoolean(ENABLE_MODULE, default = true) -> loggerW(msg = "Aborted Hook -> Hook Closed")
|
!prefs.getBoolean(ENABLE_MODULE, default = true) -> loggerW(msg = "Aborted Hook -> Hook Closed")
|
||||||
/** 开始 Hook */
|
/** 开始 Hook */
|
||||||
else -> {
|
else -> {
|
||||||
|
/** 缓存图标数据 */
|
||||||
|
iconDatas = IconPackParams(param = this).iconDatas
|
||||||
|
/** 执行 Hook */
|
||||||
NotificationUtilClass.hook {
|
NotificationUtilClass.hook {
|
||||||
/** 强制回写系统的状态栏图标样式为原生 */
|
/** 强制回写系统的状态栏图标样式为原生 */
|
||||||
injectMember {
|
injectMember {
|
||||||
@@ -433,10 +495,10 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
param(ExpandedNotificationClass.clazz)
|
param(ExpandedNotificationClass.clazz)
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* 因为之前的 MIUI 版本的状态栏图标颜色会全部设置为白色的 - 找不到修复的地方就直接判断版本了
|
* 为了防止 MIUI 自身的版本不同造成的各种 BUG
|
||||||
* 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook
|
* 判断是 MIUI 样式就停止 Hook
|
||||||
*/
|
*/
|
||||||
replaceAny { if (hasIgnoreStatusBarIconColor) false else isShowMiuiStyle }
|
replaceAny { globalContext?.isMiuiNotifyStyle ?: isShowMiuiStyle }
|
||||||
}
|
}
|
||||||
if (hasIgnoreStatusBarIconColor)
|
if (hasIgnoreStatusBarIconColor)
|
||||||
injectMember {
|
injectMember {
|
||||||
@@ -468,86 +530,71 @@ class HookEntry : YukiHookXposedInitProxy {
|
|||||||
}.onFind { isUseLegacy = true }
|
}.onFind { isUseLegacy = true }
|
||||||
}
|
}
|
||||||
afterHook {
|
afterHook {
|
||||||
/** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
|
(globalContext ?: args[0] as Context).also { context ->
|
||||||
if (hasIgnoreStatusBarIconColor || !isShowMiuiStyle)
|
hookSmallIconOnSet(
|
||||||
(globalContext ?: args[0] as Context).also { context ->
|
context = context,
|
||||||
hookSmallIconOnSet(
|
args[if (isUseLegacy) 1 else 0] as? StatusBarNotification?,
|
||||||
context = context,
|
(result as Icon).loadDrawable(context)
|
||||||
args[if (isUseLegacy) 1 else 0] as? StatusBarNotification?,
|
) { icon -> result = Icon.createWithBitmap(icon) }
|
||||||
(result as Icon).loadDrawable(context)
|
}
|
||||||
) { icon -> result = Icon.createWithBitmap(icon) }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (NotificationHeaderViewWrapperInjectorClass.hasClass)
|
NotificationHeaderViewWrapperClass.hook {
|
||||||
NotificationHeaderViewWrapperInjectorClass.hook {
|
/** 修复下拉通知图标自动设置回 APP 图标的方法 */
|
||||||
/** 修复下拉通知图标自动设置回 APP 图标的方法 */
|
injectMember {
|
||||||
injectMember {
|
if (hasHandleHeaderViews)
|
||||||
var isUseLegacy = false
|
method { name = "handleHeaderViews" }
|
||||||
|
else method { name = "resolveHeaderViews" }
|
||||||
|
afterHook {
|
||||||
|
/** 获取小图标 */
|
||||||
|
val iconImageView =
|
||||||
|
NotificationHeaderViewWrapperClass.clazz
|
||||||
|
.field { name = "mIcon" }.of<ImageView>(instance) ?: return@afterHook
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass]
|
||||||
|
* 获取其中的得到通知方法
|
||||||
|
*/
|
||||||
|
val expandedNf = ExpandableNotificationRowClass.clazz
|
||||||
|
.method { name = "getEntry" }
|
||||||
|
.get(NotificationViewWrapperClass.clazz.field {
|
||||||
|
name = "mRow"
|
||||||
|
}.get(instance).self).call()?.let {
|
||||||
|
it.javaClass.method {
|
||||||
|
name = "getSbn"
|
||||||
|
}.get(it).invoke<StatusBarNotification>()
|
||||||
|
} ?: ExpandableNotificationRowClass.clazz
|
||||||
|
.method { name = "getStatusBarNotification" }
|
||||||
|
.get(NotificationViewWrapperClass.clazz.field { name = "mRow" }.get(instance).self)
|
||||||
|
.invoke<StatusBarNotification>()
|
||||||
|
/** 执行 Hook */
|
||||||
|
hookNotifyIconOnSet(iconImageView.context, expandedNf, iconImageView)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/** 干掉下拉通知图标自动设置回 APP 图标的方法 */
|
||||||
|
NotificationHeaderViewWrapperInjectorClass.hook {
|
||||||
|
injectMember {
|
||||||
|
method {
|
||||||
|
name = "setAppIcon"
|
||||||
|
param(ContextClass, ImageViewClass, ExpandedNotificationClass.clazz)
|
||||||
|
}.remedys {
|
||||||
method {
|
method {
|
||||||
name = "setAppIcon"
|
name = "setAppIcon"
|
||||||
param(ContextClass, ImageViewClass, ExpandedNotificationClass.clazz)
|
param(ImageViewClass, ExpandedNotificationClass.clazz)
|
||||||
}.remedys {
|
|
||||||
method {
|
|
||||||
name = "setAppIcon"
|
|
||||||
param(ImageViewClass, ExpandedNotificationClass.clazz)
|
|
||||||
}.onFind { isUseLegacy = true }
|
|
||||||
}
|
|
||||||
replaceUnit {
|
|
||||||
if (isUseLegacy)
|
|
||||||
hookNotifyIconOnSet(
|
|
||||||
context = globalContext ?: error("GlobalContext got null"),
|
|
||||||
args[1] as? StatusBarNotification?,
|
|
||||||
args[0] as ImageView
|
|
||||||
)
|
|
||||||
else
|
|
||||||
hookNotifyIconOnSet(
|
|
||||||
context = args[0] as? Context ?: globalContext ?: error("GlobalContext got null"),
|
|
||||||
args[2] as? StatusBarNotification?,
|
|
||||||
args[1] as ImageView
|
|
||||||
)
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/** 干掉下拉通知图标自动设置回 APP 图标的方法 - Android 12 */
|
intercept()
|
||||||
if (isUpperOfAndroidS)
|
}.ignoredAllFailure()
|
||||||
injectMember {
|
injectMember {
|
||||||
method {
|
method {
|
||||||
name = "resetIconBgAndPaddings"
|
name = "resetIconBgAndPaddings"
|
||||||
param(ImageViewClass, ExpandedNotificationClass.clazz)
|
param(ImageViewClass, ExpandedNotificationClass.clazz)
|
||||||
}
|
|
||||||
intercept()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
NotificationHeaderViewWrapperClass.hook {
|
|
||||||
/** 之前的版本解决方案 */
|
|
||||||
injectMember {
|
|
||||||
method { name = "handleHeaderViews" }
|
|
||||||
afterHook {
|
|
||||||
/** 对于之前没有通知图标色彩判断功能的版本判断是 MIUI 样式就停止 Hook */
|
|
||||||
if (!hasIgnoreStatusBarIconColor && isShowMiuiStyle) return@afterHook
|
|
||||||
|
|
||||||
/** 获取小图标 */
|
|
||||||
val iconImageView =
|
|
||||||
NotificationHeaderViewWrapperClass.clazz
|
|
||||||
.field { name = "mIcon" }.of<ImageView>(instance) ?: return@afterHook
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 从父类中得到 mRow 变量 - [ExpandableNotificationRowClass]
|
|
||||||
* 获取其中的得到通知方法
|
|
||||||
*/
|
|
||||||
val expandedNf =
|
|
||||||
ExpandableNotificationRowClass.clazz
|
|
||||||
.method { name = "getStatusBarNotification" }
|
|
||||||
.get(NotificationViewWrapperClass.clazz.field { name = "mRow" }.get(instance).self)
|
|
||||||
.invoke<StatusBarNotification>()
|
|
||||||
/** 执行 Hook */
|
|
||||||
hookNotifyIconOnSet(iconImageView.context, expandedNf, iconImageView)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
intercept()
|
||||||
|
}.ignoredAllFailure()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
File diff suppressed because it is too large
Load Diff
@@ -24,6 +24,7 @@
|
|||||||
|
|
||||||
package com.fankes.miui.notify.ui
|
package com.fankes.miui.notify.ui
|
||||||
|
|
||||||
|
import android.app.ProgressDialog
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
@@ -36,18 +37,17 @@ import android.widget.TextView
|
|||||||
import androidx.constraintlayout.utils.widget.ImageFilterView
|
import androidx.constraintlayout.utils.widget.ImageFilterView
|
||||||
import androidx.core.view.isVisible
|
import androidx.core.view.isVisible
|
||||||
import com.fankes.miui.notify.R
|
import com.fankes.miui.notify.R
|
||||||
|
import com.fankes.miui.notify.bean.IconDataBean
|
||||||
import com.fankes.miui.notify.hook.factory.isAppNotifyHookAllOf
|
import com.fankes.miui.notify.hook.factory.isAppNotifyHookAllOf
|
||||||
import com.fankes.miui.notify.hook.factory.isAppNotifyHookOf
|
import com.fankes.miui.notify.hook.factory.isAppNotifyHookOf
|
||||||
import com.fankes.miui.notify.hook.factory.putAppNotifyHookAllOf
|
import com.fankes.miui.notify.hook.factory.putAppNotifyHookAllOf
|
||||||
import com.fankes.miui.notify.hook.factory.putAppNotifyHookOf
|
import com.fankes.miui.notify.hook.factory.putAppNotifyHookOf
|
||||||
import com.fankes.miui.notify.params.IconPackParams
|
import com.fankes.miui.notify.params.IconPackParams
|
||||||
import com.fankes.miui.notify.ui.base.BaseActivity
|
import com.fankes.miui.notify.ui.base.BaseActivity
|
||||||
import com.fankes.miui.notify.utils.SystemUITool
|
import com.fankes.miui.notify.utils.*
|
||||||
import com.fankes.miui.notify.utils.showDialog
|
|
||||||
import com.fankes.miui.notify.utils.snake
|
|
||||||
import com.fankes.miui.notify.utils.toast
|
|
||||||
import com.fankes.miui.notify.view.MaterialSwitch
|
import com.fankes.miui.notify.view.MaterialSwitch
|
||||||
import com.google.android.material.textfield.TextInputEditText
|
import com.google.android.material.textfield.TextInputEditText
|
||||||
|
import com.highcapable.yukihookapi.hook.xposed.YukiHookModuleStatus
|
||||||
|
|
||||||
class ConfigureActivity : BaseActivity() {
|
class ConfigureActivity : BaseActivity() {
|
||||||
|
|
||||||
@@ -60,9 +60,22 @@ class ConfigureActivity : BaseActivity() {
|
|||||||
/** 回调滚动事件改变 */
|
/** 回调滚动事件改变 */
|
||||||
private var onScrollEvent: ((Boolean) -> Unit)? = null
|
private var onScrollEvent: ((Boolean) -> Unit)? = null
|
||||||
|
|
||||||
|
/** 全部的通知优化图标数据 */
|
||||||
|
private var iconAllDatas = ArrayList<IconDataBean>()
|
||||||
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
setContentView(R.layout.activity_config)
|
setContentView(R.layout.activity_config)
|
||||||
|
/** 检查激活状态 */
|
||||||
|
if (!YukiHookModuleStatus.isActive()) {
|
||||||
|
showDialog {
|
||||||
|
title = "模块没有激活"
|
||||||
|
msg = "模块没有激活,你无法使用这里的功能,请先激活模块。"
|
||||||
|
confirmButton(text = "我知道了") { finish() }
|
||||||
|
noCancelable()
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
/** 返回按钮点击事件 */
|
/** 返回按钮点击事件 */
|
||||||
findViewById<View>(R.id.title_back_icon).setOnClickListener { onBackPressed() }
|
findViewById<View>(R.id.title_back_icon).setOnClickListener { onBackPressed() }
|
||||||
/** 刷新适配器结果相关 */
|
/** 刷新适配器结果相关 */
|
||||||
@@ -94,7 +107,6 @@ class ConfigureActivity : BaseActivity() {
|
|||||||
confirmButton {
|
confirmButton {
|
||||||
if (editText.text.toString().isNotBlank()) {
|
if (editText.text.toString().isNotBlank()) {
|
||||||
filterText = editText.text.toString().trim()
|
filterText = editText.text.toString().trim()
|
||||||
onChanged?.invoke()
|
|
||||||
refreshAdapterResult()
|
refreshAdapterResult()
|
||||||
} else {
|
} else {
|
||||||
toast(msg = "条件不能为空")
|
toast(msg = "条件不能为空")
|
||||||
@@ -105,11 +117,12 @@ class ConfigureActivity : BaseActivity() {
|
|||||||
if (filterText.isNotBlank())
|
if (filterText.isNotBlank())
|
||||||
neutralButton(text = "清除条件") {
|
neutralButton(text = "清除条件") {
|
||||||
filterText = ""
|
filterText = ""
|
||||||
onChanged?.invoke()
|
|
||||||
refreshAdapterResult()
|
refreshAdapterResult()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/** 设置同步列表按钮点击事件 */
|
||||||
|
findViewById<View>(R.id.config_title_sync).setOnClickListener { onStartRefresh() }
|
||||||
/** 设置列表元素和 Adapter */
|
/** 设置列表元素和 Adapter */
|
||||||
findViewById<ListView>(R.id.config_list_view).apply {
|
findViewById<ListView>(R.id.config_list_view).apply {
|
||||||
adapter = object : BaseAdapter() {
|
adapter = object : BaseAdapter() {
|
||||||
@@ -182,7 +195,7 @@ class ConfigureActivity : BaseActivity() {
|
|||||||
runCatching {
|
runCatching {
|
||||||
startActivity(Intent().apply {
|
startActivity(Intent().apply {
|
||||||
action = "android.intent.action.VIEW"
|
action = "android.intent.action.VIEW"
|
||||||
data = Uri.parse("https://github.com/fankes/MIUINativeNotifyIcon")
|
data = Uri.parse("https://github.com/fankes/AndroidNotifyIconAdapt/blob/main/CONTRIBUTING.md")
|
||||||
/** 防止顶栈一样重叠在自己的 APP 中 */
|
/** 防止顶栈一样重叠在自己的 APP 中 */
|
||||||
flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
||||||
})
|
})
|
||||||
@@ -190,14 +203,78 @@ class ConfigureActivity : BaseActivity() {
|
|||||||
toast(msg = "无法启动系统默认浏览器")
|
toast(msg = "无法启动系统默认浏览器")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/** 装载数据 */
|
||||||
|
mockLocalData()
|
||||||
|
/** 更新数据 */
|
||||||
|
onStartRefresh()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 装载或刷新本地数据 */
|
||||||
|
private fun mockLocalData() {
|
||||||
|
iconAllDatas = IconPackParams(context = this).iconDatas
|
||||||
|
refreshAdapterResult()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 首次进入或更新数据 */
|
||||||
|
private fun onStartRefresh() =
|
||||||
|
showDialog {
|
||||||
|
title = if (iconAllDatas.isNotEmpty()) "同步列表" else "初始化"
|
||||||
|
msg = (if (iconAllDatas.isNotEmpty()) "建议定期从云端拉取数据以获得最新的通知图标优化名单适配数据。\n\n"
|
||||||
|
else "首次装载需要从云端下载最新适配数据,后续可继续前往这里检查更新。\n\n") +
|
||||||
|
"通过从 Github 同步最新数据,无法连接可能需要魔法上网。"
|
||||||
|
confirmButton(text = "开始同步") { onRefreshing() }
|
||||||
|
cancelButton()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 开始更新数据 */
|
||||||
|
private fun onRefreshing() {
|
||||||
|
ProgressDialog(this).apply {
|
||||||
|
setDefaultStyle(context = this@ConfigureActivity)
|
||||||
|
setCancelable(false)
|
||||||
|
setTitle("同步中")
|
||||||
|
setMessage("正在同步 OS 数据")
|
||||||
|
show()
|
||||||
|
}.also {
|
||||||
|
ClientRequestTool.wait(
|
||||||
|
context = this,
|
||||||
|
url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main/OS/MIUI/NotifyIconsSupportConfig.json"
|
||||||
|
) { isDone1, ctOS ->
|
||||||
|
it.setMessage("正在同步 APP 数据")
|
||||||
|
ClientRequestTool.wait(
|
||||||
|
context = this,
|
||||||
|
url = "https://raw.githubusercontent.com/fankes/AndroidNotifyIconAdapt/main/APP/NotifyIconsSupportConfig.json"
|
||||||
|
) { isDone2, ctAPP ->
|
||||||
|
it.cancel()
|
||||||
|
IconPackParams(context = this).also { params ->
|
||||||
|
if (isDone1 && isDone2) params.splicingJsonArray(ctOS, ctAPP).also {
|
||||||
|
if (params.isCompareDifferent(it)) {
|
||||||
|
params.save(it)
|
||||||
|
filterText = ""
|
||||||
|
mockLocalData()
|
||||||
|
SystemUITool.showNeedUpdateApplySnake(context = this)
|
||||||
|
} else snake(msg = "列表数据已是最新")
|
||||||
|
} else
|
||||||
|
showDialog {
|
||||||
|
title = "连接失败"
|
||||||
|
msg = "连接失败,错误如下:\n${if (!isDone1) ctOS else ctAPP}"
|
||||||
|
confirmButton(text = "我知道了")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 刷新适配器结果相关 */
|
/** 刷新适配器结果相关 */
|
||||||
private fun refreshAdapterResult() {
|
private fun refreshAdapterResult() {
|
||||||
|
onChanged?.invoke()
|
||||||
findViewById<TextView>(R.id.config_title_count_text).text =
|
findViewById<TextView>(R.id.config_title_count_text).text =
|
||||||
if (filterText.isBlank()) "已适配 ${iconDatas.size} 个 APP 的通知图标"
|
if (filterText.isBlank()) "已适配 ${iconDatas.size} 个 APP 的通知图标"
|
||||||
else "“${filterText}” 匹配到 ${iconDatas.size} 个结果"
|
else "“${filterText}” 匹配到 ${iconDatas.size} 个结果"
|
||||||
findViewById<View>(R.id.config_list_no_data_view).isVisible = iconDatas.isEmpty()
|
findViewById<TextView>(R.id.config_list_no_data_view).apply {
|
||||||
|
text = if (iconAllDatas.isEmpty()) "噫,竟然什么都没有~\n请点击右上角同步按钮获取云端数据" else "噫,竟然什么都没找到~"
|
||||||
|
isVisible = iconDatas.isEmpty()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -205,8 +282,8 @@ class ConfigureActivity : BaseActivity() {
|
|||||||
* @return [Array]
|
* @return [Array]
|
||||||
*/
|
*/
|
||||||
private val iconDatas
|
private val iconDatas
|
||||||
get() = if (filterText.isBlank()) IconPackParams.iconDatas
|
get() = if (filterText.isBlank()) iconAllDatas
|
||||||
else IconPackParams.iconDatas.filter {
|
else iconAllDatas.filter {
|
||||||
it.appName.lowercase().contains(filterText.lowercase()) || it.packageName.lowercase().contains(filterText.lowercase())
|
it.appName.lowercase().contains(filterText.lowercase()) || it.packageName.lowercase().contains(filterText.lowercase())
|
||||||
}.toTypedArray()
|
}
|
||||||
}
|
}
|
@@ -93,11 +93,7 @@ class MainActivity : BaseActivity() {
|
|||||||
noCancelable()
|
noCancelable()
|
||||||
}
|
}
|
||||||
/** 判断是否 Hook */
|
/** 判断是否 Hook */
|
||||||
YukiHookModuleStatus.isActive() -> {
|
YukiHookModuleStatus.isActive() -> {}
|
||||||
findViewById<LinearLayout>(R.id.main_lin_status).setBackgroundResource(R.drawable.bg_green_round)
|
|
||||||
findViewById<ImageFilterView>(R.id.main_img_status).setImageResource(R.mipmap.ic_success)
|
|
||||||
findViewById<TextView>(R.id.main_text_status).text = "模块已激活"
|
|
||||||
}
|
|
||||||
else ->
|
else ->
|
||||||
showDialog {
|
showDialog {
|
||||||
title = "模块没有激活"
|
title = "模块没有激活"
|
||||||
@@ -208,16 +204,56 @@ class MainActivity : BaseActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** 刷新模块状态 */
|
||||||
|
private fun refreshModuleStatus() {
|
||||||
|
findViewById<LinearLayout>(R.id.main_lin_status).setBackgroundResource(
|
||||||
|
when {
|
||||||
|
YukiHookModuleStatus.isActive() && isMiuiNotifyStyle -> R.drawable.bg_yellow_round
|
||||||
|
YukiHookModuleStatus.isActive() -> R.drawable.bg_green_round
|
||||||
|
else -> R.drawable.bg_dark_round
|
||||||
|
}
|
||||||
|
)
|
||||||
|
findViewById<ImageFilterView>(R.id.main_img_status).setImageResource(
|
||||||
|
when {
|
||||||
|
YukiHookModuleStatus.isActive() && !isMiuiNotifyStyle -> R.mipmap.ic_success
|
||||||
|
else -> R.mipmap.ic_warn
|
||||||
|
}
|
||||||
|
)
|
||||||
|
findViewById<TextView>(R.id.main_text_status).text =
|
||||||
|
when {
|
||||||
|
YukiHookModuleStatus.isActive() && isMiuiNotifyStyle -> "模块已激活,但未在工作"
|
||||||
|
YukiHookModuleStatus.isActive() -> "模块已激活"
|
||||||
|
else -> "模块未激活"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
/** MIUI 12 的版本特殊 - 所以给出提示 */
|
/** 刷新模块状态 */
|
||||||
if (!isWarnDialogShowing && YukiHookModuleStatus.isActive() && miuiVersion == "12" && isMiuiNotifyStyle)
|
refreshModuleStatus()
|
||||||
|
/** 经典样式启用后给出警告 */
|
||||||
|
if (!isWarnDialogShowing && YukiHookModuleStatus.isActive() && isMiuiNotifyStyle)
|
||||||
showDialog {
|
showDialog {
|
||||||
isWarnDialogShowing = true
|
isWarnDialogShowing = true
|
||||||
title = "经典通知栏样式已启用"
|
title = "经典通知栏样式已启用"
|
||||||
msg = "在 MIUI 12 中启用了经典通知栏样式后状态栏图标将不再做原生处理,模块停止工作," +
|
msg = "当你启用了经典通知栏样式后,为防止 MIUI 自身不规范 APP 图标被破坏,状态栏图标将不再做原生处理。\n\n" +
|
||||||
"这取决于系统设置,你应当在 设置>通知管理>通知显示设置 中将样式设置为“原生样式”。"
|
"若要使用原生样式,请前往 设置>通知管理>通知显示设置 中将样式设置为“原生样式”,新版本为 设置>通知与控制中心>通知显示设置。"
|
||||||
confirmButton(text = "我知道了") { isWarnDialogShowing = false }
|
confirmButton(text = "去设置") {
|
||||||
|
runCatching {
|
||||||
|
startActivity(Intent().apply {
|
||||||
|
component = ComponentName(
|
||||||
|
"com.miui.notification",
|
||||||
|
"miui.notification.management.activity.NotificationDisplaySettingsActivity"
|
||||||
|
)
|
||||||
|
/** 防止顶栈一样重叠在自己的 APP 中 */
|
||||||
|
flags = Intent.FLAG_ACTIVITY_NEW_TASK
|
||||||
|
})
|
||||||
|
}.onFailure {
|
||||||
|
toast(msg = "启动失败,请手动调整设置")
|
||||||
|
}
|
||||||
|
isWarnDialogShowing = false
|
||||||
|
}
|
||||||
|
cancelButton { isWarnDialogShowing = false }
|
||||||
noCancelable()
|
noCancelable()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,110 @@
|
|||||||
|
/*
|
||||||
|
* MIUINativeNotifyIcon - Fix the native notification bar icon function abandoned by the MIUI development team.
|
||||||
|
* Copyright (C) 2019-2022 Fankes Studio(qzmmcn@163.com)
|
||||||
|
* https://github.com/fankes/MIUINativeNotifyIcon
|
||||||
|
*
|
||||||
|
* This software is non-free but opensource software: you can redistribute it
|
||||||
|
* and/or modify it under the terms of the GNU Affero General Public License
|
||||||
|
* as published by the Free Software Foundation; either
|
||||||
|
* version 3 of the License, or any later version.
|
||||||
|
* <p>
|
||||||
|
*
|
||||||
|
* This software is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Affero General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
|
* and eula along with this software. If not, see
|
||||||
|
* <https://www.gnu.org/licenses/>
|
||||||
|
*
|
||||||
|
* This file is Created by fankes on 2022/2/25.
|
||||||
|
*/
|
||||||
|
@file:Suppress("TrustAllX509TrustManager", "CustomX509TrustManager")
|
||||||
|
|
||||||
|
package com.fankes.miui.notify.utils
|
||||||
|
|
||||||
|
import android.app.Activity
|
||||||
|
import com.highcapable.yukihookapi.hook.log.loggerD
|
||||||
|
import okhttp3.*
|
||||||
|
import java.io.IOException
|
||||||
|
import java.security.SecureRandom
|
||||||
|
import java.security.cert.X509Certificate
|
||||||
|
import javax.net.ssl.*
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 网络请求管理类
|
||||||
|
*/
|
||||||
|
object ClientRequestTool {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 发送 GET 请求内容并等待
|
||||||
|
* @param context 实例
|
||||||
|
* @param url 请求地址
|
||||||
|
* @param it 回调 - ([Boolean] 是否成功,[String] 成功的内容或失败消息)
|
||||||
|
*/
|
||||||
|
fun wait(context: Activity, url: String, it: (Boolean, String) -> Unit) {
|
||||||
|
OkHttpClient().newBuilder().apply {
|
||||||
|
SSLSocketClient.sSLSocketFactory?.let { sslSocketFactory(it, SSLSocketClient.trustManager) }
|
||||||
|
hostnameVerifier(SSLSocketClient.hostnameVerifier)
|
||||||
|
}.build().newCall(
|
||||||
|
Request.Builder()
|
||||||
|
.url(url)
|
||||||
|
.get()
|
||||||
|
.build()
|
||||||
|
).enqueue(object : Callback {
|
||||||
|
override fun onFailure(call: Call, e: IOException) {
|
||||||
|
context.runOnUiThread { it(false, e.toString()) }
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onResponse(call: Call, response: Response) {
|
||||||
|
val bodyString = response.body?.string() ?: ""
|
||||||
|
context.runOnUiThread { it(true, bodyString) }
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 自动信任 SSL 证书
|
||||||
|
*
|
||||||
|
* 放行全部加密 SSL 请求
|
||||||
|
*/
|
||||||
|
object SSLSocketClient {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 格式化实例
|
||||||
|
* @return [SSLSocketFactory] or null
|
||||||
|
*/
|
||||||
|
val sSLSocketFactory
|
||||||
|
get() = safeOfNull {
|
||||||
|
SSLContext.getInstance("TLS").let {
|
||||||
|
it.init(null, arrayOf<TrustManager>(trustManager), SecureRandom())
|
||||||
|
it.socketFactory
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 使用的实例
|
||||||
|
* @return [HostnameVerifier]
|
||||||
|
*/
|
||||||
|
val hostnameVerifier get() = HostnameVerifier { _, _ -> true }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 信任管理者
|
||||||
|
* @return [X509TrustManager]
|
||||||
|
*/
|
||||||
|
val trustManager
|
||||||
|
get() = object : X509TrustManager {
|
||||||
|
|
||||||
|
override fun checkClientTrusted(chain: Array<X509Certificate?>?, authType: String?) {
|
||||||
|
loggerD(msg = "TrustX509 --> $authType")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun checkServerTrusted(chain: Array<X509Certificate?>?, authType: String?) {
|
||||||
|
loggerD(msg = "TrustX509 --> $authType")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getAcceptedIssuers() = arrayOf<X509Certificate>()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -26,8 +26,6 @@ package com.fankes.miui.notify.utils
|
|||||||
|
|
||||||
import android.app.AlertDialog
|
import android.app.AlertDialog
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.Color
|
|
||||||
import android.graphics.drawable.GradientDrawable
|
|
||||||
import android.util.DisplayMetrics
|
import android.util.DisplayMetrics
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
import android.view.View
|
import android.view.View
|
||||||
@@ -109,14 +107,7 @@ class DialogBuilder(private val context: Context) {
|
|||||||
internal fun show() = instance?.create()?.apply {
|
internal fun show() = instance?.create()?.apply {
|
||||||
val dm = DisplayMetrics()
|
val dm = DisplayMetrics()
|
||||||
(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.getMetrics(dm)
|
(context.getSystemService(Context.WINDOW_SERVICE) as WindowManager).defaultDisplay.getMetrics(dm)
|
||||||
customLayoutView?.let { setView(it.apply { minimumWidth = round(dm.widthPixels / 1.3).toInt() }) }
|
customLayoutView?.let { setView(it.apply { minimumWidth = round(x = dm.widthPixels / 1.3).toInt() }) }
|
||||||
window?.setBackgroundDrawable(GradientDrawable(
|
setDefaultStyle(context = this@DialogBuilder.context)
|
||||||
GradientDrawable.Orientation.TOP_BOTTOM,
|
|
||||||
intArrayOf(Color.WHITE, Color.WHITE)
|
|
||||||
).apply {
|
|
||||||
shape = GradientDrawable.RECTANGLE
|
|
||||||
gradientType = GradientDrawable.LINEAR_GRADIENT
|
|
||||||
cornerRadius = 15.dp(this@DialogBuilder.context)
|
|
||||||
})
|
|
||||||
}?.show()
|
}?.show()
|
||||||
}
|
}
|
@@ -58,4 +58,13 @@ object SystemUITool {
|
|||||||
if (YukiHookModuleStatus.isActive())
|
if (YukiHookModuleStatus.isActive())
|
||||||
context.snake(msg = "设置需要重启系统界面才能生效", actionText = "立即重启") { restartSystemUI(context) }
|
context.snake(msg = "设置需要重启系统界面才能生效", actionText = "立即重启") { restartSystemUI(context) }
|
||||||
else context.snake(msg = "模块没有激活,更改不会生效")
|
else context.snake(msg = "模块没有激活,更改不会生效")
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 显示更新数据后需要重启系统界面的 [Snackbar]
|
||||||
|
* @param context 实例
|
||||||
|
*/
|
||||||
|
fun showNeedUpdateApplySnake(context: Context) =
|
||||||
|
if (YukiHookModuleStatus.isActive())
|
||||||
|
context.snake(msg = "数据已更新,请重启系统界面使更改生效", actionText = "立即重启") { restartSystemUI(context) }
|
||||||
|
else context.snake(msg = "模块没有激活,更改不会生效")
|
||||||
}
|
}
|
@@ -25,6 +25,7 @@
|
|||||||
package com.fankes.miui.notify.utils
|
package com.fankes.miui.notify.utils
|
||||||
|
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
|
import android.app.AlertDialog
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.pm.PackageInfo
|
import android.content.pm.PackageInfo
|
||||||
import android.content.pm.PackageManager
|
import android.content.pm.PackageManager
|
||||||
@@ -32,6 +33,7 @@ import android.content.res.Configuration
|
|||||||
import android.graphics.Bitmap
|
import android.graphics.Bitmap
|
||||||
import android.graphics.BitmapFactory
|
import android.graphics.BitmapFactory
|
||||||
import android.graphics.Color
|
import android.graphics.Color
|
||||||
|
import android.graphics.drawable.GradientDrawable
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.provider.Settings
|
import android.provider.Settings
|
||||||
import android.util.Base64
|
import android.util.Base64
|
||||||
@@ -215,6 +217,21 @@ val ByteArray.bitmap: Bitmap get() = BitmapFactory.decodeByteArray(this, 0, size
|
|||||||
*/
|
*/
|
||||||
val String.bitmap: Bitmap get() = unbase64.bitmap
|
val String.bitmap: Bitmap get() = unbase64.bitmap
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 设置对话框默认风格
|
||||||
|
* @param context 使用的实例
|
||||||
|
*/
|
||||||
|
fun AlertDialog.setDefaultStyle(context: Context) =
|
||||||
|
window?.setBackgroundDrawable(
|
||||||
|
GradientDrawable(
|
||||||
|
GradientDrawable.Orientation.TOP_BOTTOM,
|
||||||
|
intArrayOf(Color.WHITE, Color.WHITE)
|
||||||
|
).apply {
|
||||||
|
shape = GradientDrawable.RECTANGLE
|
||||||
|
gradientType = GradientDrawable.LINEAR_GRADIENT
|
||||||
|
cornerRadius = 15.dp(context)
|
||||||
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取系统 Prop 值
|
* 获取系统 Prop 值
|
||||||
* @param key Key
|
* @param key Key
|
||||||
|
6
app/src/main/res/drawable/bg_yellow_round.xml
Executable file
6
app/src/main/res/drawable/bg_yellow_round.xml
Executable file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:shape="rectangle">
|
||||||
|
<solid android:color="#FF9800" />
|
||||||
|
<corners android:radius="15dp" />
|
||||||
|
</shape>
|
@@ -52,7 +52,7 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:text="..."
|
android:text="适配列表正在等待装载"
|
||||||
android:textColor="@color/colorTextDark"
|
android:textColor="@color/colorTextDark"
|
||||||
android:textSize="12sp" />
|
android:textSize="12sp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
@@ -61,7 +61,7 @@
|
|||||||
android:id="@+id/config_title_up"
|
android:id="@+id/config_title_up"
|
||||||
android:layout_width="22dp"
|
android:layout_width="22dp"
|
||||||
android:layout_height="22dp"
|
android:layout_height="22dp"
|
||||||
android:layout_marginEnd="10dp"
|
android:layout_marginEnd="5dp"
|
||||||
android:src="@mipmap/ic_page_top"
|
android:src="@mipmap/ic_page_top"
|
||||||
android:tint="@color/colorTextGray"
|
android:tint="@color/colorTextGray"
|
||||||
android:tooltipText="滚动到顶部" />
|
android:tooltipText="滚动到顶部" />
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
android:id="@+id/config_title_down"
|
android:id="@+id/config_title_down"
|
||||||
android:layout_width="22dp"
|
android:layout_width="22dp"
|
||||||
android:layout_height="22dp"
|
android:layout_height="22dp"
|
||||||
android:layout_marginEnd="17dp"
|
android:layout_marginEnd="15dp"
|
||||||
android:src="@mipmap/ic_page_bottom"
|
android:src="@mipmap/ic_page_bottom"
|
||||||
android:tint="@color/colorTextGray"
|
android:tint="@color/colorTextGray"
|
||||||
android:tooltipText="滚动到底部" />
|
android:tooltipText="滚动到底部" />
|
||||||
@@ -83,6 +83,15 @@
|
|||||||
android:src="@mipmap/ic_filter"
|
android:src="@mipmap/ic_filter"
|
||||||
android:tint="@color/colorTextGray"
|
android:tint="@color/colorTextGray"
|
||||||
android:tooltipText="按条件过滤" />
|
android:tooltipText="按条件过滤" />
|
||||||
|
|
||||||
|
<androidx.constraintlayout.utils.widget.ImageFilterView
|
||||||
|
android:id="@+id/config_title_sync"
|
||||||
|
android:layout_width="23dp"
|
||||||
|
android:layout_height="23dp"
|
||||||
|
android:layout_marginEnd="10dp"
|
||||||
|
android:src="@mipmap/ic_sync"
|
||||||
|
android:tint="@color/colorTextGray"
|
||||||
|
android:tooltipText="同步列表" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
@@ -126,7 +135,9 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:text="噫,竟然什么都没找到~"
|
android:gravity="center"
|
||||||
|
android:lineSpacingExtra="6dp"
|
||||||
|
android:text="没有数据"
|
||||||
android:textColor="@color/colorTextDark"
|
android:textColor="@color/colorTextDark"
|
||||||
android:textSize="17sp"
|
android:textSize="17sp"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
@@ -76,7 +76,7 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="5dp"
|
android:layout_marginBottom="5dp"
|
||||||
android:text="模块未激活"
|
android:text="模块状态未知"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="18sp" />
|
android:textSize="18sp" />
|
||||||
|
|
||||||
@@ -280,6 +280,18 @@
|
|||||||
android:textColor="@color/colorTextGray"
|
android:textColor="@color/colorTextGray"
|
||||||
android:textSize="15sp" />
|
android:textSize="15sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="5dp"
|
||||||
|
android:layout_marginRight="5dp"
|
||||||
|
android:layout_marginBottom="10dp"
|
||||||
|
android:alpha="0.6"
|
||||||
|
android:lineSpacingExtra="6dp"
|
||||||
|
android:text="首次安装请打开名单列表从云端更新数据,后期适配的内容也请手动打开名单列表重新拉取数据以检查更新,数据更新后重启系统界面即可生效。"
|
||||||
|
android:textColor="@color/colorTextDark"
|
||||||
|
android:textSize="12sp" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
BIN
app/src/main/res/mipmap-xxhdpi/ic_sync.png
Normal file
BIN
app/src/main/res/mipmap-xxhdpi/ic_sync.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.0 KiB |
@@ -2,16 +2,13 @@ package com.fankes.miui.notify
|
|||||||
|
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
|
|
||||||
import org.junit.Assert.*
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Example local unit test, which will execute on the development machine (host).
|
* Example local unit test, which will execute on the development machine (host).
|
||||||
*
|
*
|
||||||
* See [testing documentation](http://d.android.com/tools/testing).
|
* See [testing documentation](http://d.android.com/tools/testing).
|
||||||
*/
|
*/
|
||||||
class ExampleUnitTest {
|
class ExampleUnitTest {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun addition_isCorrect() {
|
fun main() = println("Hello world")
|
||||||
assertEquals(4, 2 + 2)
|
|
||||||
}
|
|
||||||
}
|
}
|
@@ -5,8 +5,8 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ext {
|
ext {
|
||||||
appVersionName = "1.71"
|
appVersionName = "1.85"
|
||||||
appVersionCode = 16
|
appVersionCode = 18
|
||||||
}
|
}
|
||||||
|
|
||||||
task clean(type: Delete) {
|
task clean(type: Delete) {
|
||||||
|
Binary file not shown.
Reference in New Issue
Block a user