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

6.6.4 - Alpha2 - 修复屏幕旋转至横向时部分页面内容被侧边导航栏遮挡的问题

Browse Source
This commit is contained in:
SuperMonster003
2025-05-30 21:19:16 +08:00
parent 2dddebdc11
commit 49869b7188
54 changed files with 485 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

534
app/src/main/res/layout-land/activity_about.xml
View File

@@ -1,322 +1,314 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:fitsSystemWindows="true"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
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"
app:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="15"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="15"
android:id="@+id/icon_1st_developer_container"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_1st_developer_container"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_1st_developer_identifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="end"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_1_black_48dp"
app:tint="@color/tint_1st_developer_identifier"
android:contentDescription="icon_1st_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_original_developer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_original_developer"
android:contentDescription="avatar_original_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_original_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/original_developer_full_name"
android:textColor="@color/github_color_fg_default"
android:textSize="@dimen/github_font_size_full_name_compat"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/original_developer_nickname"
android:textColor="@color/github_color_fg_muted"
android:textSize="@dimen/github_font_size_nickname_compat" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/icon_container"
android:id="@+id/icon_1st_developer_identifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
android:background="@android:color/transparent"
android:foreground="?selectableItemBackgroundBorderless">
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="end"
android:orientation="horizontal">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.jaredrummler.android.widget.AnimatedSvgView
android:id="@+id/icon_about_app_svg_view"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_gravity="center"
android:layout_margin="8dp"
app:animatedSvgFillColors="@array/icon_about_app_svg_view_fill_colors"
app:animatedSvgGlyphStrings="@array/icon_about_app_svg_view_paths"
app:animatedSvgTraceColors="@array/icon_about_app_svg_view_trace_colors"
app:animatedSvgTraceResidueColors="@array/icon_about_app_svg_view_trace_residue_colors"
app:animatedSvgImageSizeX="576"
app:animatedSvgImageSizeY="576"
app:animatedSvgFillStart="200"
app:animatedSvgFillTime="200"
app:animatedSvgTraceTime="500"
app:animatedSvgTraceTimePerGlyph="500" />
<ImageView
android:id="@+id/icon_about_app"
android:visibility="invisible"
tools:visibility="visible"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_margin="8dp"
android:src="@drawable/autojs6_material"
tools:ignore="ContentDescription,ImageContrastCheck" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="40dp"
android:orientation="vertical"
android:gravity="center">
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="14sp"
android:text="@string/text_sample_string" />
<TextView
android:id="@+id/since"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="11sp"
android:text="@string/text_sample_string" />
</LinearLayout>
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_1_black_48dp"
app:tint="@color/tint_1st_developer_identifier"
android:contentDescription="icon_1st_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/icon_2nd_developer_container"
android:layout_width="180dp"
android:id="@+id/avatar_original_developer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_original_developer"
android:contentDescription="avatar_original_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_original_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_2nd_developer_identifier"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="end"
android:orientation="horizontal">
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/original_developer_full_name"
android:textColor="@color/github_color_fg_default"
android:textSize="@dimen/github_font_size_full_name_compat"
android:textStyle="bold" />
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_2_black_48dp"
app:tint="@color/tint_2nd_developer_identifier"
android:contentDescription="icon_2nd_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_developer"
android:contentDescription="avatar_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_full_name"
android:textColor="@color/github_color_fg_default"
android:textSize="@dimen/github_font_size_full_name_compat"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_nickname"
android:textColor="@color/github_color_fg_muted"
android:textSize="@dimen/github_font_size_nickname_compat" />
</LinearLayout>
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/original_developer_nickname"
android:textColor="@color/github_color_fg_muted"
android:textSize="@dimen/github_font_size_nickname_compat" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_weight="4.5"
android:id="@+id/icon_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical"
android:gravity="center">
android:background="@android:color/transparent"
android:foreground="?selectableItemBackgroundBorderless">
<include
android:id="@+id/activity_about_function_buttons"
layout="@layout/activity_about_function_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center" />
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.jaredrummler.android.widget.AnimatedSvgView
android:id="@+id/icon_about_app_svg_view"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_gravity="center"
android:layout_margin="8dp"
app:animatedSvgFillColors="@array/icon_about_app_svg_view_fill_colors"
app:animatedSvgGlyphStrings="@array/icon_about_app_svg_view_paths"
app:animatedSvgTraceColors="@array/icon_about_app_svg_view_trace_colors"
app:animatedSvgTraceResidueColors="@array/icon_about_app_svg_view_trace_residue_colors"
app:animatedSvgImageSizeX="576"
app:animatedSvgImageSizeY="576"
app:animatedSvgFillStart="200"
app:animatedSvgFillTime="200"
app:animatedSvgTraceTime="500"
app:animatedSvgTraceTimePerGlyph="500" />
<ImageView
android:id="@+id/icon_about_app"
android:visibility="invisible"
tools:visibility="visible"
android:layout_width="82dp"
android:layout_height="82dp"
android:layout_margin="8dp"
android:src="@drawable/autojs6_material"
tools:ignore="ContentDescription,ImageContrastCheck" />
</FrameLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="40dp"
android:orientation="vertical"
android:gravity="center">
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="14sp"
android:text="@string/text_sample_string" />
<TextView
android:id="@+id/since"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/about_app_version_info"
android:textSize="11sp"
android:text="@string/text_sample_string" />
</LinearLayout>
</LinearLayout>
<org.autojs.autojs.ui.widget.CopyrightTextView
android:layout_width="match_parent"
<LinearLayout
android:id="@+id/icon_2nd_developer_container"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:layout_gravity="center"
android:layout_marginStart="32dp"
android:background="?selectableItemBackground"
android:baselineAligned="false"
android:gravity="center"
android:textColor="@color/prefTextColorPrimary"
android:textSize="13sp"
tools:text="@string/text_copyright_sample" />
android:orientation="vertical">
<LinearLayout
android:id="@+id/icon_2nd_developer_identifier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="end"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/icon_developer_identifier_image_side_length_compact"
android:layout_height="@dimen/icon_developer_identifier_image_side_length_compact"
android:padding="@dimen/icon_developer_identifier_image_padding"
android:layout_gravity="center"
android:src="@drawable/ic_looks_2_black_48dp"
app:tint="@color/tint_2nd_developer_identifier"
android:contentDescription="icon_2nd_developer_identifier" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:gravity="center"
android:orientation="horizontal">
<de.hdodenhof.circleimageview.CircleImageView
android:layout_width="@dimen/about_item_avatar_side_length_land"
android:layout_height="@dimen/about_item_avatar_side_length_land"
android:src="@drawable/avatar_developer"
android:contentDescription="avatar_developer"
app:civ_border_width="@dimen/github_avatar_border_width"
app:civ_border_color="@color/github_avatar_border" />
</LinearLayout>
<LinearLayout
android:id="@+id/avatar_developer_user_contents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="1dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_full_name"
android:textColor="@color/github_color_fg_default"
android:textSize="@dimen/github_font_size_full_name_compat"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:ellipsize="middle"
android:maxLines="1"
android:text="@string/developer_nickname"
android:textColor="@color/github_color_fg_muted"
android:textSize="@dimen/github_font_size_nickname_compat" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="32dp"
android:layout_weight="4.5"
android:orientation="vertical"
android:gravity="center">
<include
android:id="@+id/activity_about_function_buttons"
layout="@layout/activity_about_function_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</LinearLayout>
<org.autojs.autojs.ui.widget.CopyrightTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:gravity="center"
android:textColor="@color/prefTextColorPrimary"
android:textSize="13sp"
tools:text="@string/text_copyright_sample" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

8
app/src/main/res/layout-sw400dp-land/activity_about.xml
View File

@@ -2,27 +2,25 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:fitsSystemWindows="true">
<LinearLayout
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"
app:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />

8
app/src/main/res/layout/activity_about.xml
View File

@@ -2,27 +2,25 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools">
android:fitsSystemWindows="true">
<LinearLayout
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"
app:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/text_about" />

4
app/src/main/res/layout/activity_apps_icon_select.xml
View File

@@ -10,8 +10,8 @@
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"

5
app/src/main/res/layout/activity_build.xml
View File

@@ -10,8 +10,8 @@
<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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -450,7 +450,6 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_packaging"
app:backgroundTint="?attr/colorPrimary"
android:tint="@color/toolbar_text" />
</FrameLayout>

37
app/src/main/res/layout/activity_developer_options.xml
View File

@@ -1,30 +1,29 @@
<?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">
<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: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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<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"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragment_developer_options"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:id="@+id/fragment_developer_options"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

4
app/src/main/res/layout/activity_display_scrollable_content.xml
View File

@@ -3,14 +3,14 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
android:layout_height="match_parent">
<org.autojs.autojs.ui.common.NestedOuterScrollView
android:id="@+id/outerScrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:fitsSystemWindows="true"
android:paddingVertical="2sp"
android:scrollbars="vertical">

40
app/src/main/res/layout/activity_display_version_histories.xml
View File

@@ -1,37 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/loading_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">
android:orientation="vertical"
tools:visibility="gone">
<TextView
android:id="@+id/loading_text"
@@ -53,4 +55,4 @@
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</LinearLayout>

9
app/src/main/res/layout/activity_edit.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<org.autojs.autojs.ui.edit.EditorView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/editor_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<org.autojs.autojs.ui.edit.EditorView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/editor_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />

5
app/src/main/res/layout/activity_error_report.xml
View File

@@ -9,15 +9,14 @@
<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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<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" />
</com.google.android.material.appbar.AppBarLayout>

6
app/src/main/res/layout/activity_log.xml
View File

@@ -8,14 +8,13 @@
<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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />
@@ -37,7 +36,6 @@
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
android:tint="@color/toolbar_text"
app:backgroundTint="?attr/colorPrimary"
app:layout_behavior="org.autojs.autojs.ui.widget.ScrollAwareFABBehavior"
app:srcCompat="@drawable/ic_clear_white_48dp" />

5
app/src/main/res/layout/activity_main.xml
View File

@@ -18,9 +18,9 @@
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay"
android:clipToPadding="true"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -54,7 +54,6 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_add_white_48dp"
app:backgroundTint="?attr/colorPrimary"
app:layout_anchor="@id/viewpager"
app:layout_anchorGravity="bottom|end"
app:layout_behavior="org.autojs.autojs.ui.widget.ScrollAwareFABBehavior"

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

@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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">
<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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextColor="@color/day_full"
app:subtitleTextColor="@color/day_full"
android:theme="@style/ToolBarStyleInrt"
app:contentInsetStartWithNavigation="0dp"
app:contentInsetEndWithActions="2dp"
app:popupTheme="@style/OverflowMenuInrt" />
app:contentInsetStartWithNavigation="0dp"
app:popupTheme="@style/OverflowMenuInrt"
app:subtitleTextColor="@color/day_full"
app:titleTextColor="@color/day_full" />
</com.google.android.material.appbar.AppBarLayout>

3
app/src/main/res/layout/activity_manage_key_store.xml
View File

@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -45,7 +45,6 @@
android:alpha="0.9"
android:src="@drawable/ic_add_white_48dp"
android:tint="@color/toolbar_text"
app:backgroundTint="?attr/colorPrimary"
app:layout_behavior="org.autojs.autojs.ui.widget.ScrollAwareFABBehavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -8,15 +8,14 @@
<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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<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" />
</com.google.android.material.appbar.AppBarLayout>

5
app/src/main/res/layout/activity_project_config.xml
View File

@@ -9,8 +9,8 @@
<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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
@@ -228,7 +228,6 @@
android:layout_gravity="end|bottom"
android:layout_margin="16dp"
android:src="@drawable/ic_done_white_48dp"
app:backgroundTint="?attr/colorPrimary"
android:tint="@color/toolbar_text" />
</FrameLayout>

4
app/src/main/res/layout/activity_script_widget_settings.xml
View File

@@ -9,9 +9,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:fitsSystemWindows="true"
android:clipToPadding="false"
android:theme="@style/AppTheme.AppBarOverlay">
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"

50
app/src/main/res/layout/activity_settings_inrt.xml
View File

@@ -1,35 +1,35 @@
<?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">
<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:orientation="vertical"
android:theme="@style/Theme.AppCompat.Light.NoActionBar">
<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:fitsSystemWindows="true"
app:theme="@style/ThemeOverlay.AppCompat.ActionBar">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:titleTextColor="@color/day_full"
app:subtitleTextColor="@color/day_full"
android:theme="@style/ToolBarStyleInrt"
android:background="@color/md_blue_gray_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"
app:titleTextColor="@color/day_full"
app:subtitleTextColor="@color/day_full"
android:theme="@style/ToolBarStyleInrt"
android:background="@color/md_blue_gray_50"
app:contentInsetStartWithNavigation="0dp"
app:contentInsetEndWithActions="2dp"
app:titleTextAppearance="@style/TextAppearanceEditorTitle"
app:popupTheme="@style/OverflowMenuInrt" />
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/fragment_setting"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:id="@+id/fragment_setting"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

4
app/src/main/res/layout/activity_splash.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center|bottom">
<LinearLayout

4
app/src/main/res/layout/activity_splash_inrt.xml
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center|bottom">
<LinearLayout

79
app/src/main/res/layout/activity_tasker_edit.xml
View File

@@ -1,57 +1,58 @@
<?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:orientation="vertical">
<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:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:clipToPadding="false"
android:theme="@style/AppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:clipToPadding="false"
android:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:theme="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/app_name" />
android:id="@+id/toolbar"
android:theme="@style/ToolBarStyle"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:popupTheme="@style/AppTheme.PopupOverlay"
app:title="@string/app_name" />
</com.google.android.material.appbar.AppBarLayout>
<LinearLayout
android:id="@+id/edit_script"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#e4e4e4"
android:foreground="?selectableItemBackground">
android:id="@+id/edit_script"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#e4e4e4"
android:foreground="?selectableItemBackground">
<ImageView
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:layout_marginTop="12dp"
android:src="@drawable/ic_edit_gray_48dp" />
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_marginBottom="12dp"
android:layout_marginStart="17dp"
android:layout_marginEnd="17dp"
android:layout_marginTop="12dp"
android:src="@drawable/ic_edit_gray_48dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/text_edit_prepare_script"
android:textColor="@android:color/primary_text_light"
android:textSize="16sp" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/text_edit_prepare_script"
android:textColor="@android:color/primary_text_light"
android:textSize="16sp" />
</LinearLayout>
<org.autojs.autojs.ui.explorer.ExplorerView
android:id="@+id/script_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/window_background" />
android:id="@+id/script_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/window_background" />
</LinearLayout>

2
app/src/main/res/layout/activity_tasker_script_edit.xml
View File

@@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/editor_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent" />

5
app/src/main/res/layout/activity_timed_task_setting.xml
View File

@@ -10,14 +10,13 @@
<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:fitsSystemWindows="true"
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:popupTheme="@style/AppTheme.PopupOverlay" />

7
app/src/main/res/layout/editor_view.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -10,14 +11,12 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:theme="@style/AppTheme.AppBarOverlay">
app:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbarEditor
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ToolBarStyle"
app:contentInsetEndWithActions="2dp"
app:contentInsetStartWithNavigation="0dp"

6
app/src/main/res/layout/mt_activity_color_items.xml
View File

@@ -13,11 +13,11 @@
android:layout_height="wrap_content">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/MtAppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/MtAppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"

6
app/src/main/res/layout/mt_activity_color_libraries.xml
View File

@@ -13,11 +13,11 @@
android:layout_height="wrap_content">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/MtAppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/MtAppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"

6
app/src/main/res/layout/mt_activity_color_select.xml
View File

@@ -13,11 +13,11 @@
android:layout_height="wrap_content">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBar"
android:id="@+id/app_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/MtAppTheme.AppBarOverlay"
android:fitsSystemWindows="true">
android:fitsSystemWindows="true"
app:theme="@style/MtAppTheme.AppBarOverlay">
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"

1
app/src/main/res/layout/preference_category_custom.xml
View File

@@ -15,7 +15,6 @@
android:paddingEnd="0dp"
android:paddingStart="16dp"
android:gravity="center_vertical"
android:textColor="?attr/colorPrimary"
android:textSize="13sp"
tools:text="@string/text_sample_string" />
</LinearLayout>