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

6.3.0 - 新增 ocr / notice / s13n / Color 模块; 新增前台时保持屏幕常亮; 修复构建脚本依赖; 修复并优化控制台浮动窗口

Browse Source
This commit is contained in:
SuperMonster003
2023-04-29 20:07:53 +08:00
parent e2922cf8f5
commit 6ff598d587
511 changed files with 55015 additions and 11139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/res/layout/activity_documentation.xml
View File

@@ -1,29 +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">
<com.google.android.material.appbar.AppBarLayout
<androidx.coordinatorlayout.widget.CoordinatorLayout 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="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:orientation="vertical">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:theme="@style/ToolBarStyle"
android:background="?attr/colorPrimary"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
<!--<com.google.android.material.appbar.AppBarLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:theme="@style/AppTheme.AppBarOverlay">-->
</com.google.android.material.appbar.AppBarLayout>
<!-- <org.autojs.autojs.theme.widget.ThemeColorToolbar-->
<!-- android:id="@+id/toolbar"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="?attr/actionBarSize"-->
<!-- android:theme="@style/ToolBarStyle"-->
<!-- android:background="?attr/colorPrimary"-->
<!-- app:popupTheme="@style/AppTheme.PopupOverlay" />-->
<!--</com.google.android.material.appbar.AppBarLayout>-->
<org.autojs.autojs.ui.widget.EWebView
android:id="@+id/eweb_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:id="@+id/eweb_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@@ -79,7 +79,7 @@
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragment_drawer"
android:name="org.autojs.autojs.ui.main.drawer.DrawerFragment_"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
android:fitsSystemWindows="false"

93
app/src/main/res/layout/activity_view_sample.xml
View File

@@ -1,93 +0,0 @@
<?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"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="org.autojs.autojs.ui.edit.EditActivity">
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
<org.autojs.autojs.theme.widget.ThemeColorToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:theme="@style/ToolBarStyle"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:title="@string/app_name"
app:popupTheme="@style/AppTheme.PopupOverlay">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end"
android:orientation="horizontal">
<org.autojs.autojs.ui.widget.ToolbarMenuItem
android:id="@+id/edit"
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_edit_white_24dp"
app:icon_color="@android:color/white"
app:text="@string/text_edit"/>
<org.autojs.autojs.ui.widget.ToolbarMenuItem
android:id="@+id/run"
android:layout_width="40dp"
android:layout_height="match_parent"
app:icon="@drawable/ic_play_arrow_white_48dp"
app:icon_color="@android:color/white"
app:text="@string/text_run"/>
</LinearLayout>
</org.autojs.autojs.theme.widget.ThemeColorToolbar>
</com.google.android.material.appbar.AppBarLayout>
<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:background="#ffffffff"
android:orientation="vertical"
tools:showIn="@layout/activity_edit">
<com.jecelyin.editor.v2.view.EditorView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/editor"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
<com.jecelyin.editor.v2.core.widget.JecEditText
android:id="@+id/edit_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffffff"
android:enabled="true"
android:gravity="start|top"
android:inputType="textMultiLine"
android:padding="5dp"
android:scrollbarThumbVertical="@android:color/transparent"
android:scrollbarTrackVertical="@null"
android:scrollbars="vertical"/>
<me.zhanghai.android.materialprogressbar.MaterialProgressBar
android:id="@+id/progress_view"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="90dp"
android:indeterminate="true"
android:visibility="gone"/>
</com.jecelyin.editor.v2.view.EditorView>
</LinearLayout>
</LinearLayout>

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

@@ -7,6 +7,8 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/log_list"
android:clickable="false"
android:longClickable="false"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />

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

@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:text="@string/text_size_min_value"
android:text="@string/text_text_size_min_value"
android:textSize="16sp" />
<TextView
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:gravity="end"
android:text="@string/text_size_max_value"
android:text="@string/text_text_size_max_value"
android:textSize="16sp" />
</LinearLayout>

5
app/src/main/res/layout/ef_expandable_floaty_container.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<org.autojs.autojs.ui.widget.ViewSwitcher xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />

6
app/src/main/res/layout/ef_floaty_container.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/container"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</RelativeLayout>

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

@@ -52,7 +52,7 @@
tools:text="@string/text_sample_name" />
<TextView
android:id="@+id/desc"
android:id="@+id/script_file_size"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
@@ -62,7 +62,7 @@
android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="11sp"
tools:text="@string/text_sample_desc" />
tools:text="@string/text_sample_file_size" />
</LinearLayout>

20
app/src/main/res/layout/floating_console_expand.xml
View File

@@ -2,8 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tool="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
@@ -14,6 +14,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:id="@+id/title_bar"
android:background="@drawable/floating_console_bg_top"
android:orientation="horizontal">
@@ -75,17 +76,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/floating_console_bg_bottom"
android:minHeight="240dp" />
android:padding="8dp" />
</LinearLayout>
<ImageView
android:id="@+id/move_cursor"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@drawable/circle_cool_black"
android:padding="5dp"
android:padding="4dp"
android:scaleType="fitXY"
android:src="@drawable/ic_move_cursor"
android:visibility="gone"
@@ -95,12 +97,12 @@
<ImageView
android:id="@+id/resizer"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:background="@drawable/circle_cool_black"
android:padding="6dp"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_resizer"
android:tint="@android:color/white"

18
app/src/main/res/layout/floaty_window.xml
View File

@@ -12,11 +12,11 @@
<ImageView
android:id="@+id/resizer"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="bottom|end"
android:background="@drawable/circle_cool_black"
android:padding="6dp"
android:padding="5dp"
android:scaleType="fitXY"
android:src="@drawable/ic_resizer"
android:visibility="gone"
@@ -26,11 +26,11 @@
<ImageView
android:id="@+id/close"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="top|end"
android:background="@drawable/circle_cool_black"
android:padding="5dp"
android:padding="4dp"
android:scaleType="fitXY"
android:src="@drawable/ic_close_white_24dp"
android:visibility="gone"
@@ -40,11 +40,11 @@
<ImageView
android:id="@+id/move_cursor"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_gravity="center"
android:background="@drawable/circle_cool_black"
android:padding="5dp"
android:padding="4dp"
android:scaleType="fitXY"
android:src="@drawable/ic_move_cursor"
android:visibility="gone"

200
app/src/main/res/layout/fragment_drawer.xml
View File

@@ -11,118 +11,110 @@
android:orientation="vertical"
android:focusable="true">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/drawer_menu"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/drawer_menu"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="?android:divider" />
android:layout_height="41dp"
android:layout_gravity="center_horizontal"
android:baselineAligned="false">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="41dp"
android:layout_gravity="center_horizontal"
android:baselineAligned="false">
android:id="@+id/settings"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/settings"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_ali_settings"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_ali_settings"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:gravity="center"
android:text="@string/text_settings"
android:textColor="?android:textColorPrimary"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/restart"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_refresh_white_24dp"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:gravity="center"
android:text="@string/text_restart_app"
android:textColor="?android:textColorPrimary"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/exit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_ali_exit"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:textColor="?android:textColorPrimary"
android:gravity="center"
android:text="@string/text_exit"
android:textSize="15sp" />
</LinearLayout>
android:text="@string/text_settings"
android:textColor="?android:textColorPrimary"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/restart"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_refresh_white_24dp"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:gravity="center"
android:text="@string/text_restart_app"
android:textColor="?android:textColorPrimary"
android:textSize="15sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/exit"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?selectableItemBackground"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/ic_ali_exit"
app:tint="?android:textColorPrimary"
tools:ignore="ContentDescription" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="4dp"
android:textColor="?android:textColorPrimary"
android:gravity="center"
android:text="@string/text_exit"
android:textSize="15sp" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

31
app/src/main/res/layout/script_file_list_category.xml
View File

@@ -12,6 +12,7 @@
android:layout_weight="1"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:paddingVertical="8dp">
@@ -26,8 +27,7 @@
<TextView
android:id="@+id/title"
android:layout_weight="1"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/text_directory"
@@ -45,18 +45,7 @@
android:padding="8dp"
android:layout_marginHorizontal="3dp"
android:src="@drawable/ic_dir_up"
app:tint="#828384" />
<ImageView
android:id="@+id/order"
android:layout_width="32dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:padding="8dp"
android:layout_marginHorizontal="3dp"
android:src="@drawable/ic_descending_order"
android:focusable="true"
app:tint="#828384" />
<ImageView
@@ -68,6 +57,20 @@
android:clickable="true"
android:padding="8dp"
android:layout_marginHorizontal="3dp"
android:src="@drawable/ic_ascending_order"
android:focusable="true"
app:tint="#828384" />
<ImageView
android:id="@+id/sort_type"
android:layout_width="32dp"
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:background="?selectableItemBackgroundBorderless"
android:clickable="true"
android:padding="8dp"
android:layout_marginHorizontal="3dp"
android:src="@drawable/ic_sort"
android:focusable="true"
app:tint="#828384" />
</LinearLayout>

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

@@ -17,8 +17,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingTop="16dp"
android:paddingBottom="16dp">
android:paddingTop="9dp"
android:paddingBottom="9dp">
<ImageView
android:id="@+id/icon"
@@ -27,19 +27,35 @@
android:layout_gravity="center_vertical"
android:layout_marginHorizontal="16dp" />
<TextView
android:id="@+id/name"
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:paddingEnd="16dp"
android:textColor="?android:textColorPrimary"
android:textSize="14sp"
tools:text="@string/text_sample_name" />
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/name"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="14sp"
tools:text="@string/text_sample_name"/>
<TextView
android:id="@+id/script_dir_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="11sp"
tools:text="@string/text_sample_file_date" />
</LinearLayout>
<ImageView
android:id="@+id/more"

51
app/src/main/res/layout/script_file_list_file.xml
View File

@@ -26,7 +26,7 @@
layout="@layout/first_char_icon"
android:layout_gravity="center_vertical"
android:layout_height="wrap_content"
android:layout_width="wrap_content"/>
android:layout_width="wrap_content" />
<LinearLayout
android:layout_width="0dp"
@@ -47,18 +47,47 @@
android:textSize="14sp"
tools:text="@string/text_sample_name" />
<TextView
android:id="@+id/desc"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="4dp"
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="11sp"
tools:text="@string/text_sample_desc" />
android:layout_marginTop="4dp">
<TextView
android:id="@+id/script_file_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="11sp"
tools:text="@string/text_sample_file_date" />
<TextView
android:paddingHorizontal="3sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="11sp" />
<TextView
android:id="@+id/script_file_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="11sp"
tools:text="@string/text_sample_file_size" />
</LinearLayout>
</LinearLayout>

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

@@ -39,7 +39,7 @@
tools:text="@string/text_sample_name" />
<TextView
android:id="@+id/desc"
android:id="@+id/task_list_file_path"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
@@ -50,7 +50,7 @@
android:maxLines="1"
android:textColor="?android:textColorPrimary"
android:textSize="11sp"
tools:text="@string/text_sample_desc" />
tools:text="@string/text_sample_file_path" />
</LinearLayout>