From 226d9395b6a2378df3a55b27c15b9b4212ef2ff0 Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Mon, 28 Mar 2022 14:01:45 +0800 Subject: [PATCH] Update version to 2.2 --- README.md | 4 ++-- app/build.gradle | 2 +- .../com/fankes/miui/notify/ui/activity/MainActivity.kt | 2 +- .../java/com/fankes/miui/notify/ui/view/MaterialSwitch.kt | 7 +++++-- .../fankes/miui/notify/utils/factory/FunctionFactory.kt | 2 +- app/src/main/res/drawable/ic_notify_icon.xml | 1 + build.gradle | 4 ++-- 7 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 007fd48..6361c15 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # MIUI 原生通知图标 -[![Blank](https://img.shields.io/badge/build-pending-dbab09)](https://github.com/fankes/MIUINativeNotifyIcon) +[![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.16-green)](https://github.com/fankes/MIUINativeNotifyIcon/releases) +[![Blank](https://img.shields.io/badge/version-v2.2-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/static/v1?label=Telegram&message=交流讨论&color=0088cc)](https://t.me/XiaofangInternet) diff --git a/app/build.gradle b/app/build.gradle index 0393c60..cb1d0ec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,7 +38,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true signingConfig signingConfigs.debug proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } diff --git a/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt b/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt index 03f354b..ca13d56 100644 --- a/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/fankes/miui/notify/ui/activity/MainActivity.kt @@ -53,7 +53,7 @@ class MainActivity : BaseActivity() { private const val moduleVersion = Const.MODULE_VERSION_NAME /** 预发布的版本标识 */ - private const val pendingFlag = "[pending]" + private const val pendingFlag = "" } /** 模块是否可用 */ diff --git a/app/src/main/java/com/fankes/miui/notify/ui/view/MaterialSwitch.kt b/app/src/main/java/com/fankes/miui/notify/ui/view/MaterialSwitch.kt index ae144c5..e27a6a4 100644 --- a/app/src/main/java/com/fankes/miui/notify/ui/view/MaterialSwitch.kt +++ b/app/src/main/java/com/fankes/miui/notify/ui/view/MaterialSwitch.kt @@ -32,6 +32,7 @@ import android.util.AttributeSet import androidx.appcompat.widget.SwitchCompat import com.fankes.miui.notify.utils.drawable.drawabletoolbox.DrawableBuilder import com.fankes.miui.notify.utils.factory.dp +import com.fankes.miui.notify.utils.factory.isSystemInDarkMode class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(context, attrs) { @@ -44,6 +45,8 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont return ColorStateList(states, colors) } + private val thumbColor get() = if (isSystemInDarkMode) 0xFF7C7C7C else 0xFFCCCCCC + init { trackDrawable = DrawableBuilder() .rectangle() @@ -63,8 +66,8 @@ class MaterialSwitch(context: Context, attrs: AttributeSet?) : SwitchCompat(cont .build() trackTintList = toColors( 0xFF656565.toInt(), - 0xFFCCCCCC.toInt(), - 0xFFCCCCCC.toInt() + thumbColor.toInt(), + thumbColor.toInt() ) isSingleLine = true ellipsize = TextUtils.TruncateAt.END diff --git a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt index 9440a03..065c492 100644 --- a/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt +++ b/app/src/main/java/com/fankes/miui/notify/utils/factory/FunctionFactory.kt @@ -430,7 +430,7 @@ fun Context.snake(msg: String, actionText: String = "", it: () -> Unit = {}) = Snackbar.make((this as Activity).findViewById(android.R.id.content), msg, Snackbar.LENGTH_LONG) .apply { if (actionText.isBlank()) return@apply - setActionTextColor(Color.WHITE) + setActionTextColor(if (isSystemInDarkMode) Color.BLACK else Color.WHITE) setAction(actionText) { it() } }.show() diff --git a/app/src/main/res/drawable/ic_notify_icon.xml b/app/src/main/res/drawable/ic_notify_icon.xml index 28818a5..3aa6b3c 100644 --- a/app/src/main/res/drawable/ic_notify_icon.xml +++ b/app/src/main/res/drawable/ic_notify_icon.xml @@ -3,6 +3,7 @@ android:height="150dp" android:viewportWidth="1024" android:viewportHeight="1024"> + diff --git a/build.gradle b/build.gradle index ec774fd..9636736 100644 --- a/build.gradle +++ b/build.gradle @@ -5,8 +5,8 @@ plugins { } ext { - appVersionName = "2.16" - appVersionCode = 26 + appVersionName = "2.2" + appVersionCode = 27 } task clean(type: Delete) {