From fb6c9645b3db694093e9f01ca6798fc29fbf9baa Mon Sep 17 00:00:00 2001 From: SuperMonster003 Date: Sat, 18 Jan 2025 23:47:59 +0800 Subject: [PATCH] =?UTF-8?q?6.6.2=20-=20Alpha2=20-=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=BA=94=E7=94=A8=E4=B8=BB=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=8A=B6=E6=80=81=E6=A0=8F=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E5=8F=8A=E6=96=87=E5=AD=97=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changelog/lang_zh-Hans.json | 4 +- app/src/main/AndroidManifest.xml | 2 +- .../java/org/autojs/autojs/ui/BaseActivity.kt | 11 +++- .../main/res/layout/activity_main_inrt.xml | 63 +++++++++---------- .../main/res/layout/activity_preferences.xml | 36 +++++------ app/src/main/res/values-en/strings_legacy.xml | 2 +- app/src/main/res/values/styles.xml | 29 ++++++++- version.properties | 6 +- 8 files changed, 89 insertions(+), 64 deletions(-) diff --git a/.changelog/lang_zh-Hans.json b/.changelog/lang_zh-Hans.json index fb20a9ac..597a36ac 100644 --- a/.changelog/lang_zh-Hans.json +++ b/.changelog/lang_zh-Hans.json @@ -7,11 +7,13 @@ "dx 库在 Android 7.x 无法正常使用的问题 _[`issue #293`](http://issues.autojs6.com/293)_", "ScriptRuntime 使用 require 引用内置模块时可能出现的同步状态异常 (试修) _[`issue #298`](http://issues.autojs6.com/298)_", "notice 模块缺失 getBuilder 等扩展方法的问题 _[`issue #301`](http://issues.autojs6.com/301)_", - "floaty.window/floaty.rawWindow 无法在子线程执行的问题" + "floaty.window/floaty.rawWindow 无法在子线程执行的问题", + "代码编辑器跳转到行尾时可能跳转到下一行起始位置的问题" ], "improvement": [ "精简打包应用模板 APK 文件大小", "打包页面支持 Pinyin 库选项", + "打包应用主活动页面优化状态栏背景及文字颜色", "APK 文件类型信息对话框增加文件大小与签名方案信息", "APK 文件类型信息对话框增加点击监听器支持文本复制与应用详情跳转", "尝试恢复 com.stardust 前缀包以便提升代码兼容性 _[`issue #290`](http://issues.autojs6.com/290)_", diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c4d8fd71..11803ecf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -638,7 +638,7 @@ + android:theme="@style/AppTheme.LogActivityInrt" /> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay" + android:fitsSystemWindows="true"> + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:theme="@style/ToolBarStyleInrt" + app:contentInsetStartWithNavigation="0dp" + app:contentInsetEndWithActions="2dp" + app:popupTheme="@style/OverflowMenuInrt" /> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingStart="4dp" + android:paddingEnd="2dp"> + android:id="@+id/console" + android:layout_width="match_parent" + android:layout_height="match_parent" + app:color_verbose="#DFC0C0C0" + app:color_debug="#CC000000" + app:color_info="#FF43A047" + app:color_warn="#FF1976D2" + app:color_error="#FFC62828" + app:color_assert="#FFE254FF" /> diff --git a/app/src/main/res/layout/activity_preferences.xml b/app/src/main/res/layout/activity_preferences.xml index 78b1e767..0f8fba95 100644 --- a/app/src/main/res/layout/activity_preferences.xml +++ b/app/src/main/res/layout/activity_preferences.xml @@ -1,30 +1,30 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:theme="@style/AppTheme.AppBarOverlay" + android:fitsSystemWindows="true"> + android:id="@+id/toolbar" + android:theme="@style/ToolBarStyle" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + android:id="@+id/fragment_preferences" + android:layout_width="match_parent" + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/values-en/strings_legacy.xml b/app/src/main/res/values-en/strings_legacy.xml index f00367ea..6f13458d 100644 --- a/app/src/main/res/values-en/strings_legacy.xml +++ b/app/src/main/res/values-en/strings_legacy.xml @@ -78,7 +78,7 @@ Start the accessibility service timeout Error Bug Report - \\n------------\\n[%s]Finished，spent %f seconds. + \\n------------\\n[%s]Finished，spent %f seconds. Exit Exit The file exists diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2b4a5669..f5e98c36 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -28,10 +28,18 @@ @style/PopupMenuTheme - + + + + diff --git a/version.properties b/version.properties index 9a8b2a3c..323459ed 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Sat Jan 18 23:40:06 CST 2025 -BUILD_TIME=1737214806122 +#Sat Jan 18 23:47:18 CST 2025 +BUILD_TIME=1737215238545 COMPILE_SDK_VERSION=34 JAVA_VERSION=23 JAVA_VERSION_MIN_RADICAL=0 @@ -17,6 +17,6 @@ RAPID_OCR_OPENCV_MOBILE_LABEL_VERSION=13 RAPID_OCR_OPENCV_MOBILE_VERSION=4.5.3 TARGET_SDK_VERSION=34 TARGET_SDK_VERSION_INRT=29 -VERSION_BUILD=2976 +VERSION_BUILD=2977 VERSION_NAME=6.6.2 Alpha2 VSCODE_EXT_REQUIRED_VERSION=1.0.8