From 8814ecc4116c5317206bd838ac6e34c6cec14dad Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Tue, 30 Dec 2025 16:18:21 +0800 Subject: [PATCH] =?UTF-8?q?6.7.0=20-=20Alpha13=20-=20=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?"=E4=B8=89=E6=8C=89=E9=92=AE"=20=E6=89=8B=E5=8A=BF=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=97=B6=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=89=8D=E6=99=AF?= =?UTF-8?q?=E8=89=B2=E4=B8=8E=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F=E5=85=B3?= =?UTF-8?q?=E8=81=94=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changelog/lang_zh-Hans.json | 1 + app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt | 10 ++++++++++ app/src/main/java/org/autojs/autojs/util/ViewUtils.kt | 2 +- version.properties | 6 +++--- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index d8891414..444cbc03 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -71,6 +71,7 @@ "ErrorDialogActivity 可能无法正常启动或短时间自动消失的问题 _[`issue #471`](http://issues.autojs6.com/471)_ _[`issue #414`](http://issues.autojs6.com/414)_ _[`issue #340`](http://issues.autojs6.com/340#issuecomment-2973485826)_", "崩溃报告页面复制详细信息功能失效的问题", "文件管理器删除项目文件夹后 UI 未能自动刷新的问题", + "使用 \"三按钮\" 手势导航时导航栏前景色可能与夜间模式关联异常的问题", "APK 文件类型信息对话框可能无法获取应用名称及 SDK 信息的问题", "构建工具启用 isCleanup[Paddle/Rapid]Ocr 配置选项时无法正常完成 Rebuild Project 任务的问题" ], diff --git a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt index e5c99f13..75077298 100644 --- a/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt +++ b/app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt @@ -56,6 +56,9 @@ abstract class BaseActivity : AppCompatActivity() { ThemeColorManager.setStatusBarBackgroundColor(this) setUpStatusBarIconLightByThemeColor() } + if (handleNavigationBarContrastEnforcedAutomatically) { + setUpNavigationBarIconLightByNightMode() + } } // @Dubious by SuperMonster003 on Oct 28, 2024. @@ -83,6 +86,9 @@ abstract class BaseActivity : AppCompatActivity() { ThemeColorManager.addActivityStatusBar(this) setUpStatusBarIconLightByThemeColor() } + if (handleNavigationBarContrastEnforcedAutomatically) { + setUpNavigationBarIconLightByNightMode() + } } override fun onResume() { @@ -102,6 +108,10 @@ abstract class BaseActivity : AppCompatActivity() { ViewUtils.setStatusBarIconLight(this, ViewUtils.isNightModeEnabled) } + protected fun setUpNavigationBarIconLightByNightMode() { + ViewUtils.setNavigationBarIconLight(this, ViewUtils.isNightModeEnabled) + } + protected fun setUpStatusBarIconLightByThemeColor() { ThemeColorManager.setStatusBarIconLight(this) } diff --git a/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt b/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt index 4e859d7a..93bdba8e 100644 --- a/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt +++ b/app/src/main/java/org/autojs/autojs/util/ViewUtils.kt @@ -349,7 +349,7 @@ object ViewUtils { } fun setNavigationBarIconLight(activity: Activity, isLight: Boolean) { - WindowInsetsControllerCompat(activity.window, activity.window.decorView).isAppearanceLightNavigationBars = isLight + WindowInsetsControllerCompat(activity.window, activity.window.decorView).isAppearanceLightNavigationBars = !isLight } fun setNavigationBarIconLightByColorLuminance(activity: Activity, @ColorInt referenceBackgroundColor: Int) { diff --git a/version.properties b/version.properties index 16b6feca..205bda9a 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Tue Dec 30 00:06:17 CST 2025 -BUILD_TIME=1767024377057 +#Tue Dec 30 16:16:09 CST 2025 +BUILD_TIME=1767082569045 COMPILE_SDK_VERSION=36 IMAGE_QUANT_CMAKE_VERSION=3.22.1 IMAGE_QUANT_NDK_VERSION=26.1.10909125 @@ -27,6 +27,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 TARGET_SDK_VERSION=36 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=3563 +VERSION_BUILD=3565 VERSION_NAME=6.7.0 Alpha13 VSCODE_EXT_REQUIRED_VERSION=1.0.8