6.6.2 - Alpha2 - 优化打包应用主活动页面状态栏背景及文字颜色

.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)_",

app/src/main/AndroidManifest.xml

@@ -638,7 +638,7 @@
 
         <activity
             android:name="org.autojs.autojs.inrt.LogActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/AppTheme.LogActivityInrt" />
 
         <activity
             android:name="org.autojs.autojs.inrt.SettingsActivity"

app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt

@@ -13,6 +13,7 @@ import org.autojs.autojs.core.pref.Language
 import org.autojs.autojs.theme.ThemeColorManager
 import org.autojs.autojs.util.LocaleUtils
 import org.autojs.autojs.util.ViewUtils
+import org.autojs.autojs6.BuildConfig
 
 /**
  * Created by Stardust on Jan 23, 2017.
@@ -35,7 +36,9 @@ abstract class BaseActivity : AppCompatActivity() {
             }
         }
 
+        if (!BuildConfig.isInrt) {
             ViewUtils.makeBarsAdaptToNightMode(this)
+        }
 
         setApplicationLocale(this)
 
@@ -59,10 +62,12 @@ abstract class BaseActivity : AppCompatActivity() {
 
     override fun onStart() {
         super.onStart()
+        if (!BuildConfig.isInrt) {
             if (window.decorView.systemUiVisibility and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN == 0) {
                 ThemeColorManager.addActivityStatusBar(this)
             }
         }
+    }
 
     override fun onResume() {
         super.onResume()

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

@@ -4,26 +4,21 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="true"
-        android:theme="@style/Theme.AppCompat.Light.NoActionBar"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-            android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        android:theme="@style/AppTheme.AppBarOverlay"
         android:fitsSystemWindows="true">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-                app:titleTextColor="@color/md_black_1000"
-                app:subtitleTextColor="@color/md_black_1000"
             android:theme="@style/ToolBarStyleInrt"
-                android:background="@color/md_blue_grey_50"
             app:contentInsetStartWithNavigation="0dp"
             app:contentInsetEndWithActions="2dp"
-                app:titleTextAppearance="@style/TextAppearanceEditorTitle"
             app:popupTheme="@style/OverflowMenuInrt" />
 
     </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/values-en/strings_legacy.xml

@@ -78,7 +78,7 @@
     <string name="legacy_text_enable_accessibility_service_by_root_timeout">Start the accessibility service timeout</string>
     <string name="legacy_text_error">Error</string>
     <string name="legacy_text_error_report">Bug Report</string>
-    <string name="legacy_text_execution_finished">\\n------------\\n[%s]Finished，spent %f seconds.</string>
+    <string name="legacy_text_execution_finished" formatted="false">\\n------------\\n[%s]Finished，spent %f seconds.</string>
     <string name="legacy_text_exit">Exit</string>
     <string name="legacy_text_exit_directly">Exit</string>
     <string name="legacy_text_file_exists">The file exists</string>

app/src/main/res/values/styles.xml

@@ -28,10 +28,18 @@
         <item name="popupTheme">@style/PopupMenuTheme</item>
     </style>
 
-    <style name="ToolBarStyleInrt" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
+    <style name="ToolBarStyleInrt" parent="ToolBarStyle">
         <item name="colorControlNormal">@color/md_black_1000</item>
     </style>
 
+    <style name="AppTheme.LogActivityInrt" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@color/md_blue_grey_600</item>
+        <item name="android:windowLightStatusBar">false</item>
+        <item name="colorPrimary">@color/md_blue_grey_50</item>
+        <item name="colorPrimaryDark">@color/md_blue_grey_50</item>
+        <item name="colorAccent">@color/md_black_1000</item>
+    </style>
+
     <style name="EditorTheme" parent="AppTheme">
         <item name="android:windowActionModeOverlay">true</item>
         <item name="android:actionModeBackground">@color/colorAccent</item>
@@ -65,6 +73,21 @@
         <item name="android:backgroundDimEnabled">false</item>
     </style>
 
+    <style name="AppTheme.SevereTransparent" parent="AppTheme">
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowDisablePreview">true</item>
+        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:windowTranslucentNavigation">false</item>
+        <item name="android:windowAnimationStyle">@null</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar">
@@ -143,8 +166,8 @@
 
     <style name="OverflowMenuInrt" parent="OverflowMenu">
         <item name="android:textColor">@color/md_black_1000</item>
-        <item name="android:popupBackground">@color/md_blue_grey_100</item>
+        <item name="android:popupBackground">@color/md_blue_grey_50</item>
-        <item name="android:itemBackground">@color/md_blue_grey_100</item>
+        <item name="android:itemBackground">@color/md_blue_grey_50</item>
     </style>
 
 </resources>

version.properties

@@ -1,5 +1,5 @@
-#Sat Jan 18 23:40:06 CST 2025
+#Sat Jan 18 23:47:18 CST 2025
-BUILD_TIME=1737214806122
+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