tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
SuperMonster003
2025-01-18 23:47:59 +08:00
parent 0c2c686022
commit fb6c9645b3
8 changed files with 89 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@@ -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"

11
app/src/main/java/org/autojs/autojs/ui/BaseActivity.kt
View File

@@ -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() {
}
}
ViewUtils.makeBarsAdaptToNightMode(this)
if (!BuildConfig.isInrt) {
ViewUtils.makeBarsAdaptToNightMode(this)
}
setApplicationLocale(this)
@@ -59,8 +62,10 @@ abstract class BaseActivity : AppCompatActivity() {
override fun onStart() {
super.onStart()
if (window.decorView.systemUiVisibility and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN == 0) {
ThemeColorManager.addActivityStatusBar(this)
if (!BuildConfig.isInrt) {
if (window.decorView.systemUiVisibility and SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN == 0) {
ThemeColorManager.addActivityStatusBar(this)
}
}
}

63
app/src/main/res/layout/activity_main_inrt.xml
View File

@@ -1,49 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:theme="@style/Theme.AppCompat.Light.NoActionBar"
android:orientation="vertical">
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">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
android:fitsSystemWindows="true">
android:layout_width="match_parent"
android:layout_height="wrap_content"
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" />
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" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="4dp"
android:paddingEnd="2dp">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingStart="4dp"
android:paddingEnd="2dp">
<org.autojs.autojs.core.console.ConsoleView
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" />
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" />
</FrameLayout>

36
app/src/main/res/layout/activity_preferences.xml
View File

@@ -1,30 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
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">
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">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
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/toolbar"
android:theme="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragment_preferences"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:id="@+id/fragment_preferences"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

2
app/src/main/res/values-en/strings_legacy.xml
View File

@@ -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>

29
app/src/main/res/values/styles.xml
View File

@@ -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:itemBackground">@color/md_blue_grey_100</item>
<item name="android:popupBackground">@color/md_blue_grey_50</item>
<item name="android:itemBackground">@color/md_blue_grey_50</item>
</style>
</resources>