Update version to 2.75

README.md

@@ -2,7 +2,7 @@
 
 [![Blank](https://img.shields.io/badge/build-passing-brightgreen)](https://github.com/fankes/MIUINativeNotifyIcon)
 [![Blank](https://img.shields.io/badge/license-AGPL3.0-blue)](https://github.com/fankes/MIUINativeNotifyIcon/blob/master/LICENSE)
-[![Blank](https://img.shields.io/badge/version-v2.7-green)](https://github.com/fankes/MIUINativeNotifyIcon/releases)
+[![Blank](https://img.shields.io/badge/version-v2.75-green)](https://github.com/fankes/MIUINativeNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/fankes/MIUINativeNotifyIcon/total?label=Release)](https://github.com/fankes/MIUINativeNotifyIcon/releases)
 [![Blank](https://img.shields.io/github/downloads/Xposed-Modules-Repo/com.fankes.miui.notify/total?label=LSPosed%20Repo&logo=Android&style=flat&labelColor=F48FB1&logoColor=ffffff)](https://github.com/Xposed-Modules-Repo/com.fankes.miui.notify/releases)
 [![Telegram](https://img.shields.io/badge/Follow-Telegram-blue.svg?logo=telegram)](https://t.me/XiaofangInternet)

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

@@ -43,6 +43,7 @@ import android.view.ViewOutlineProvider
 import android.widget.ImageView
 import androidx.core.graphics.drawable.toBitmap
 import androidx.core.view.children
+import androidx.core.view.isVisible
 import com.fankes.miui.notify.bean.IconDataBean
 import com.fankes.miui.notify.data.DataConst
 import com.fankes.miui.notify.hook.HookConst.SYSTEMUI_PACKAGE_NAME
@@ -589,6 +590,30 @@ object SystemUIHooker : YukiBaseHooker() {
             .get(NotificationViewWrapperClass.clazz.field { name = "mRow" }.get(this).self)
             .invoke<StatusBarNotification>()
 
+    /**
+     * 根据当前 [ImageView] 的父布局克隆一个新的 [ImageView]
+     * @param initiate 新的 [ImageView] 方法体 - 失败会返回当前 [ImageView]
+     */
+    private fun ImageView.clone(initiate: ImageView.() -> Unit) {
+        (parent as? ViewGroup?)?.also { parent ->
+            /** 将之前的 [ImageView] 调为全透明且隐藏 */
+            alpha = 0f
+            isVisible = false
+            /** 将内容清空 */
+            setImageDrawable(null)
+            setBackgroundColor(Color.TRANSPARENT)
+            /** 创建一个傀儡 */
+            parent.findViewWithTag<ImageView?>("new_view").also { base ->
+                if (base == null) parent.addView(ImageView(context).also { new ->
+                    new.tag = "new_view"
+                    /** 克隆它的 [ViewGroup.LayoutParams] */
+                    new.layoutParams = layoutParams
+                    initiate(new)
+                }) else initiate(base)
+            }
+        } ?: initiate(this)
+    }
+
     /** 注册 */
     private fun register() {
         /** 解锁后重新刷新状态栏图标防止系统重新设置它 */
@@ -802,7 +827,7 @@ object SystemUIHooker : YukiBaseHooker() {
             injectMember {
                 method { name = "handleAppIcon" }
                 replaceUnit {
-                    field { name = "mAppIcon" }.get(instance).cast<ImageView>()?.apply {
+                    field { name = "mAppIcon" }.get(instance).cast<ImageView>()?.clone {
                         compatNotifyIcon(
                             context = context,
                             expandedNf = instance.getRowPair().second.getSbn(),

app/src/main/java/com/fankes/miui/notify/ui/activity/ConfigureActivity.kt

@@ -24,10 +24,6 @@
 
 package com.fankes.miui.notify.ui.activity
 
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.BaseAdapter
 import androidx.core.view.isVisible
 import com.fankes.miui.notify.R
 import com.fankes.miui.notify.bean.IconDataBean
@@ -116,46 +112,33 @@ class ConfigureActivity : BaseActivity<ActivityConfigBinding>() {
         binding.configTitleSync.setOnClickListener { onStartRefresh() }
         /** 设置列表元素和 Adapter */
         binding.configListView.apply {
-            adapter = object : BaseAdapter() {
-
-                override fun getCount() = iconDatas.size
-
-                override fun getItem(position: Int) = iconDatas[position]
-
-                override fun getItemId(position: Int) = position.toLong()
-
-                override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
-                    var cView = convertView
-                    val holder: AdapterConfigBinding
-                    if (convertView == null) {
-                        holder = AdapterConfigBinding.inflate(LayoutInflater.from(context))
-                        cView = holder.root
-                        cView.tag = holder
-                    } else holder = convertView.tag as AdapterConfigBinding
-                    getItem(position).also {
-                        holder.adpAppIcon.setImageBitmap(it.iconBitmap)
-                        (if (it.iconColor != 0) it.iconColor else resources.getColor(R.color.colorTextGray)).also { color ->
-                            holder.adpAppIcon.setColorFilter(color)
-                            holder.adpAppName.setTextColor(color)
+            bindAdapter {
+                onBindDatas { iconDatas }
+                onBindViews<AdapterConfigBinding> { binding, position ->
+                    iconDatas[position].also { bean ->
+                        binding.adpAppIcon.setImageBitmap(bean.iconBitmap)
+                        (if (bean.iconColor != 0) bean.iconColor else resources.getColor(R.color.colorTextGray)).also { color ->
+                            binding.adpAppIcon.setColorFilter(color)
+                            binding.adpAppName.setTextColor(color)
                         }
-                        holder.adpAppName.text = it.appName
-                        holder.adpAppPkgName.text = it.packageName
-                        holder.adpCbrName.text = "贡献者：" + it.contributorName
-                        isAppNotifyHookOf(it).also { e ->
-                            holder.adpAppOpenSwitch.isChecked = e
-                            holder.adpAppAllSwitch.isEnabled = e
+                        binding.adpAppName.text = bean.appName
+                        binding.adpAppPkgName.text = bean.packageName
+                        binding.adpCbrName.text = "贡献者：" + bean.contributorName
+                        isAppNotifyHookOf(bean).also { e ->
+                            binding.adpAppOpenSwitch.isChecked = e
+                            binding.adpAppAllSwitch.isEnabled = e
                         }
-                        holder.adpAppOpenSwitch.setOnCheckedChangeListener { btn, b ->
+                        binding.adpAppOpenSwitch.setOnCheckedChangeListener { btn, b ->
                             if (btn.isPressed.not()) return@setOnCheckedChangeListener
-                            putAppNotifyHookOf(it, b)
-                            holder.adpAppAllSwitch.isEnabled = b
+                            putAppNotifyHookOf(bean, b)
+                            binding.adpAppAllSwitch.isEnabled = b
                             SystemUITool.refreshSystemUI(context = this@ConfigureActivity)
                         }
-                        holder.adpAppAllSwitch.isChecked = isAppNotifyHookAllOf(it)
-                        holder.adpAppAllSwitch.setOnCheckedChangeListener { btn, b ->
+                        binding.adpAppAllSwitch.isChecked = isAppNotifyHookAllOf(bean)
+                        binding.adpAppAllSwitch.setOnCheckedChangeListener { btn, b ->
                             if (btn.isPressed.not()) return@setOnCheckedChangeListener
                             fun saveState() {
-                                putAppNotifyHookAllOf(it, b)
+                                putAppNotifyHookAllOf(bean, b)
                                 SystemUITool.refreshSystemUI(context = this@ConfigureActivity)
                             }
                             if (b) showDialog {
@@ -169,7 +152,6 @@ class ConfigureActivity : BaseActivity<ActivityConfigBinding>() {
                             } else saveState()
                         }
                     }
-                    return cView!!
                 }
             }.apply {
                 setOnItemLongClickListener { _, _, p, _ ->

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

@@ -0,0 +1,87 @@
+/*
+ * 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/6/3.
+ */
+package com.fankes.miui.notify.utils.factory
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.ListView
+import androidx.viewbinding.ViewBinding
+import com.highcapable.yukihookapi.hook.factory.method
+import com.highcapable.yukihookapi.hook.type.android.LayoutInflaterClass
+
+/**
+ * 绑定 [BaseAdapter] 到 [ListView]
+ * @param initiate 方法体
+ * @return [BaseAdapter]
+ */
+inline fun ListView.bindAdapter(initiate: BaseAdapterCreater.() -> Unit) =
+    BaseAdapterCreater(context).apply(initiate).baseAdapter?.apply { adapter = this } ?: error("BaseAdapter not binded")
+
+/**
+ * [BaseAdapter] 创建类
+ * @param context 实例
+ */
+class BaseAdapterCreater(val context: Context) {
+
+    /** 当前 [List] 回调 */
+    var listDataCallback: (() -> List<*>)? = null
+
+    /** 当前 [BaseAdapter] */
+    var baseAdapter: BaseAdapter? = null
+
+    /**
+     * 绑定 [List] 到 [ListView]
+     * @param result 回调数据
+     */
+    fun onBindDatas(result: (() -> List<*>)) {
+        listDataCallback = result
+    }
+
+    /**
+     * 绑定 [BaseAdapter] 到 [ListView]
+     * @param bindViews 回调 - ([VB] 每项,[Int] 下标)
+     */
+    inline fun <reified VB : ViewBinding> onBindViews(crossinline bindViews: (binding: VB, position: Int) -> Unit) {
+        baseAdapter = object : BaseAdapter() {
+            override fun getCount() = listDataCallback?.let { it() }?.size ?: 0
+            override fun getItem(position: Int) = listDataCallback?.let { it() }?.get(position)
+            override fun getItemId(position: Int) = position.toLong()
+            override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
+                var holderView = convertView
+                val holder: VB
+                if (convertView == null) {
+                    holder = VB::class.java.method {
+                        name = "inflate"
+                        param(LayoutInflaterClass)
+                    }.get().invoke<VB>(LayoutInflater.from(context)) ?: error("ViewHolder binding failed")
+                    holderView = holder.root.apply { tag = holder }
+                } else holder = convertView.tag as VB
+                bindViews(holder, position)
+                return holderView ?: error("ViewHolder binding failed")
+            }
+        }
+    }
+}

app/src/main/java/com/fankes/miui/notify/utils/tool/GithubReleaseTool.kt

@@ -24,11 +24,15 @@ package com.fankes.miui.notify.utils.tool
 
 import android.app.Activity
 import android.content.Context
+import android.icu.text.SimpleDateFormat
+import android.icu.util.Calendar
+import android.icu.util.TimeZone
 import com.fankes.miui.notify.utils.factory.*
 import okhttp3.*
 import org.json.JSONObject
 import java.io.IOException
 import java.io.Serializable
+import java.util.*
 
 /**
  * 获取 Github Release 最新版本工具类
@@ -62,7 +66,7 @@ object GithubReleaseTool {
                         name = getString("name"),
                         htmlUrl = getString("html_url"),
                         content = getString("body"),
-                        date = getString("published_at").replace(oldValue = "T", newValue = " ").replace(oldValue = "Z", newValue = "")
+                        date = getString("published_at").localTime()
                     ).apply {
                         fun showUpdate() = context.showDialog {
                             title = "最新版本 $name"
@@ -112,6 +116,18 @@ object GithubReleaseTool {
             })
     }
 
+    /**
+     * 格式化时间为本地时区
+     * @return [String] 本地时区时间
+     */
+    private fun String.localTime() = replace(oldValue = "T", newValue = " ").replace(oldValue = "Z", newValue = "").let {
+        runCatching {
+            val local = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT).apply { timeZone = Calendar.getInstance().timeZone }
+            val current = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.ROOT).apply { timeZone = TimeZone.getTimeZone("GMT") }
+            local.format(current.parse(it))
+        }.getOrNull() ?: it
+    }
+
     /**
      * Github Release bean
      * @param name 版本名称

app/src/main/java/com/fankes/miui/notify/utils/tool/YukiPromoteTool.kt

@@ -23,6 +23,7 @@
 package com.fankes.miui.notify.utils.tool
 
 import android.content.Context
+import com.fankes.miui.notify.BuildConfig
 import com.fankes.miui.notify.utils.factory.openBrowser
 import com.fankes.miui.notify.utils.factory.showDialog
 import com.highcapable.yukihookapi.YukiHookAPI
@@ -35,7 +36,7 @@ import com.highcapable.yukihookapi.hook.xposed.prefs.data.PrefsData
 object YukiPromoteTool {
 
     /** 推广已读存储键值 */
-    private val YUKI_PROMOTE_READED = PrefsData("yuki_promote_readed", false)
+    private val YUKI_PROMOTE_READED = PrefsData("yuki_promote_readed_${BuildConfig.VERSION_NAME}", false)
 
     /**
      * 显示推广对话框

app/src/main/res/layout/activity_main.xml

@@ -316,7 +316,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.6"
                     android:lineSpacingExtra="6dp"
-                    android:text="此选项默认开启，MIUI 默认最多只能显示 3 个图标，其余图标将变成省略号，你可以在下方自定义最多显示的图标个数，修改为 0 则只会显示省略号代表图标个数，为防止发生异常，最大限制 100 个，超出的图标可能会被信号或网速指示器遮挡。"
+                    android:text="此选项默认开启，MIUI 默认最多只能显示 3 个图标，其余图标将变成省略号，你可以在下方自定义最多显示的图标个数，修改为 0 则只会显示省略号代表图标个数，为防止发生异常，最大限制 100 个，超出的图标可能会被信号或网速指示器遮挡。\n请注意：可能无法兼容中置挖孔屏的设备。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 
@@ -885,7 +885,7 @@
                     android:layout_marginBottom="10dp"
                     android:alpha="0.8"
                     android:lineSpacingExtra="10dp"
-                    android:text="Q.哪些是已知问题？\nA.以下是问题描述列表：\n(1) 动态小图标可能会在高版本系统中闪烁，这是 MIUI 自身就存在的问题，后期只能等官方修复。\n(2) 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题，若最新版本依然不生效请在作用域中长按“系统界面”(“系统 UI”)选择重新优化。\n(3) 建议最低从 MIUI 12.5 “2021-5-18” 开发版以后开始使用，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块问题，将不再进行适配。"
+                    android:text="Q.哪些是已知问题？\nA.以下是问题描述列表：\n(1) 动态小图标可能会在高版本系统中闪烁，这是 MIUI 强行设置 APP 图标的问题，暂时没有找到解决方案，强行破坏修复方式会导致原生动画出现问题，后期有解决方案再研究。\n(2) 请始终保持最新版本的 LSPosed，旧版本可能会出现 Hook 不生效的问题，若最新版本依然不生效请在作用域中长按“系统界面”(“系统 UI”)选择重新优化。\n(3) 建议最低从 MIUI 12.5 “2021-5-18” 开发版以后开始使用，之前的版本可能或多或少存在 MIUI 自身 BUG 不生效、黑白块问题，将不再进行适配。"
                     android:textColor="@color/colorTextDark"
                     android:textSize="12sp" />
 

build.gradle

@@ -5,8 +5,8 @@ plugins {
 }
 
 ext {
-    appVersionName = "2.7"
-    appVersionCode = 32
+    appVersionName = "2.75"
+    appVersionCode = 33
     enableR8 = true
 }