From e30afc4011fda64bbe2be25ecb397e465efc5f1e Mon Sep 17 00:00:00 2001 From: Fankesyooni Date: Sun, 30 Jan 2022 19:21:21 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=A4=9C=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BB=A5=E5=8F=8A=20Material3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 1 + .../tsbattery/application/TSApplication.kt | 4 +- .../com/fankes/tsbattery/ui/MainActivity.kt | 23 +++--- .../java/com/fankes/tsbattery/utils/Utils.kt | 14 ++++ .../main/res/drawable-night/dark_round.xml | 6 ++ .../res/drawable-night/permotion_round.xml | 6 ++ app/src/main/res/layout/activity_main.xml | 76 +++++++++---------- app/src/main/res/values-night/color.xml | 6 ++ app/src/main/res/values-night/themes.xml | 2 +- app/src/main/res/values/color.xml | 6 ++ app/src/main/res/values/themes.xml | 2 +- 11 files changed, 91 insertions(+), 55 deletions(-) create mode 100755 app/src/main/res/drawable-night/dark_round.xml create mode 100644 app/src/main/res/drawable-night/permotion_round.xml create mode 100644 app/src/main/res/values-night/color.xml create mode 100644 app/src/main/res/values/color.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index f5b271c..3ea528d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,6 +9,7 @@ + diff --git a/app/src/main/java/com/fankes/tsbattery/application/TSApplication.kt b/app/src/main/java/com/fankes/tsbattery/application/TSApplication.kt index 61c6d1c..8a73904 100644 --- a/app/src/main/java/com/fankes/tsbattery/application/TSApplication.kt +++ b/app/src/main/java/com/fankes/tsbattery/application/TSApplication.kt @@ -43,7 +43,7 @@ class TSApplication : Application() { super.onCreate() /** 设置静态实例 */ context = this - /** 禁止系统夜间模式对自己造成干扰 - 模块要什么夜间模式？😅 (其实是我懒) */ - AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO) + /** 跟随系统夜间模式 */ + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) } } \ No newline at end of file diff --git a/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt b/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt index e30f47d..e275dd3 100644 --- a/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt +++ b/app/src/main/java/com/fankes/tsbattery/ui/MainActivity.kt @@ -46,11 +46,8 @@ import com.fankes.tsbattery.hook.HookMedium import com.fankes.tsbattery.hook.HookMedium.QQ_PACKAGE_NAME import com.fankes.tsbattery.hook.HookMedium.TIM_PACKAGE_NAME import com.fankes.tsbattery.hook.HookMedium.WECHAT_PACKAGE_NAME -import com.fankes.tsbattery.utils.FileUtils -import com.fankes.tsbattery.utils.isInstall -import com.fankes.tsbattery.utils.openSelfSetting -import com.fankes.tsbattery.utils.showDialog -import com.gyf.immersionbar.ImmersionBar +import com.fankes.tsbattery.utils.* +import com.gyf.immersionbar.ktx.immersionBar import java.io.File class MainActivity : AppCompatActivity() { @@ -75,14 +72,14 @@ class MainActivity : AppCompatActivity() { /** 隐藏系统的标题栏 */ supportActionBar?.hide() /** 初始化沉浸状态栏 */ - ImmersionBar.with(this) - .statusBarColor(R.color.white) - .autoDarkModeEnable(false) - .statusBarDarkFont(true) - .navigationBarColor(R.color.white) - .navigationBarDarkIcon(true) - .fitsSystemWindows(true) - .init() + immersionBar { + statusBarColor(R.color.colorThemeBackground) + autoDarkModeEnable(true) + statusBarDarkFont(isNotSystemInDarkMode) + navigationBarColor(R.color.colorThemeBackground) + navigationBarDarkIcon(isNotSystemInDarkMode) + fitsSystemWindows(true) + } /** 判断 Hook 状态 */ if (isHooked()) { findViewById(R.id.main_lin_status).setBackgroundResource(R.drawable.green_round) diff --git a/app/src/main/java/com/fankes/tsbattery/utils/Utils.kt b/app/src/main/java/com/fankes/tsbattery/utils/Utils.kt index 3e47ec8..d6699ca 100644 --- a/app/src/main/java/com/fankes/tsbattery/utils/Utils.kt +++ b/app/src/main/java/com/fankes/tsbattery/utils/Utils.kt @@ -26,11 +26,25 @@ import android.content.Context import android.content.Intent import android.content.pm.PackageInfo import android.content.pm.PackageManager +import android.content.res.Configuration import android.net.Uri import android.provider.Settings import android.widget.Toast import com.fankes.tsbattery.application.TSApplication.Companion.appContext +/** + * 系统深色模式是否开启 + * @return [Boolean] 是否开启 + */ +val isSystemInDarkMode + get() = (appContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES + +/** + * 系统深色模式是否没开启 + * @return [Boolean] 是否开启 + */ +inline val isNotSystemInDarkMode get() = !isSystemInDarkMode + /** * 得到安装包信息 * @return [PackageInfo] diff --git a/app/src/main/res/drawable-night/dark_round.xml b/app/src/main/res/drawable-night/dark_round.xml new file mode 100755 index 0000000..71baadb --- /dev/null +++ b/app/src/main/res/drawable-night/dark_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-night/permotion_round.xml b/app/src/main/res/drawable-night/permotion_round.xml new file mode 100644 index 0000000..09cbc15 --- /dev/null +++ b/app/src/main/res/drawable-night/permotion_round.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index c14103a..ed7587c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/colorThemeBackground" android:orientation="vertical" tools:context=".ui.MainActivity" tools:ignore="HardcodedText,UseCompoundDrawables,ContentDescription,TooManyViews"> @@ -11,7 +12,6 @@ @@ -259,7 +259,7 @@ android:layout_marginEnd="15dp" android:alpha="0.85" android:src="@mipmap/about" - android:tint="#FF777777" /> + android:tint="@color/colorTextDark" /> @@ -308,7 +308,7 @@ android:alpha="0.85" android:singleLine="true" android:text="QQ、TIM" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="12sp" /> @@ -317,7 +317,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="启用保守模式 [QQ]" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="15sp" /> @@ -396,7 +396,7 @@ android:alpha="0.85" android:singleLine="true" android:text="微信" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="12sp" /> @@ -405,7 +405,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="停用省电策略" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="15sp" /> @@ -448,7 +448,7 @@ android:alpha="0.85" android:singleLine="true" android:text="快捷操作" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="12sp" /> @@ -467,7 +467,7 @@ android:padding="10dp" android:singleLine="true" android:text="QQ" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="15sp" /> @@ -517,7 +517,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="提示模块运行信息" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="15sp" /> @@ -549,7 +549,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="在桌面隐藏模块图标" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="15sp" /> @@ -587,7 +587,7 @@ android:layout_marginEnd="5dp" android:alpha="0.85" android:src="@mipmap/about" - android:tint="#FF323B42" /> + android:tint="@color/colorTextGray" /> @@ -606,7 +606,7 @@ android:alpha="0.8" android:lineSpacingExtra="6dp" android:text="Q.这个模块是做什么的？\nA.此模块的诞生来源于国内厂商毒瘤 APP 强行霸占后台耗电，QQ 在 8.6.0 版本以后也只是接入了 HMS 推送，但是可笑的是开发组却并没有删除之前疯狂耗电的接收消息方法，于是这个模块就诞生了。" - android:textColor="#777777" + android:textColor="@color/colorTextDark" android:textSize="12sp" /> @@ -704,7 +704,7 @@ android:layout_marginEnd="5dp" android:alpha="0.85" android:src="@mipmap/about" - android:tint="#FF323B42" /> + android:tint="@color/colorTextGray" /> @@ -722,7 +722,7 @@ android:alpha="0.8" android:lineSpacingExtra="6dp" android:text="本软件是免费开源项目，遵循 GPL 协议，你可以点击这里前往 Github 查看源码以及获取模块更新。\n严禁以任何形式贩卖、商用本软件，否则开发者有权追究其法律责任。" - android:textColor="#777777" + android:textColor="@color/colorTextDark" android:textSize="12sp" /> @@ -749,7 +749,7 @@ android:gravity="center" android:lineSpacingExtra="6dp" android:text="恰饭时间\n点击前往酷安关注我，获取我的更多应用" - android:textColor="#FF323B42" + android:textColor="@color/colorTextGray" android:textSize="16sp" /> diff --git a/app/src/main/res/values-night/color.xml b/app/src/main/res/values-night/color.xml new file mode 100644 index 0000000..809ab40 --- /dev/null +++ b/app/src/main/res/values-night/color.xml @@ -0,0 +1,6 @@ + + + #FF2D2D2D + #FFCFCFCF + #FFD3D3D3 + \ No newline at end of file diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index 7e22751..7e17859 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -1,6 +1,6 @@ -