diff --git a/app/build.gradle b/app/build.gradle index 170c2439..bc4cba8f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,10 +9,13 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 19 targetSdkVersion 23 - versionCode 120 - versionName "2.0.9 Beta" + versionCode 121 + versionName "2.0.9b Beta" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true + ndk { + abiFilters 'armeabi-v7a' + } } buildTypes { release { @@ -62,7 +65,7 @@ android { enableForInstantRun = false teamCitySlug = null runOnEachAssemble = true - maxMethodCount = 64000 + maxMethodCount = 128000 } configurations.all { resolutionStrategy.force 'com.google.code.findbugs:jsr305:3.0.1' diff --git a/app/src/main/java/com/stardust/scriptdroid/tool/AccessibilityServiceTool.java b/app/src/main/java/com/stardust/scriptdroid/tool/AccessibilityServiceTool.java index 2961f548..4c22bd14 100644 --- a/app/src/main/java/com/stardust/scriptdroid/tool/AccessibilityServiceTool.java +++ b/app/src/main/java/com/stardust/scriptdroid/tool/AccessibilityServiceTool.java @@ -55,7 +55,7 @@ public class AccessibilityServiceTool { public static boolean enableAccessibilityServiceByRoot(Class accessibilityService) { String serviceName = App.getApp().getPackageName() + "/" + accessibilityService.getName(); - return TextUtils.isEmpty(ProcessShell.exec(String.format(Locale.getDefault(), cmd, serviceName), true).error); + return TextUtils.isEmpty(ProcessShell.execCommand(String.format(Locale.getDefault(), cmd, serviceName), true).error); } public static boolean enableAccessibilityServiceByRootAndWaitFor(long timeOut) { diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListWithProgressBarView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListWithProgressBarView.java index 804c823c..7279b27d 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListWithProgressBarView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/script_list/ScriptListWithProgressBarView.java @@ -2,6 +2,7 @@ package com.stardust.scriptdroid.ui.main.script_list; import android.content.Context; import android.os.Build; +import android.os.Parcelable; import android.support.annotation.AttrRes; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -104,4 +105,16 @@ public class ScriptListWithProgressBarView extends FrameLayout { public void setCurrentDirectory(ScriptFile directory) { mScriptAndFolderListRecyclerView.setCurrentDirectory(directory); } + + @Override + protected void onRestoreInstanceState(Parcelable state) { + super.onRestoreInstanceState(state); + //in some phones, SwipeRefreshLayout will keep refreshing after screen orientation change + mSwipeRefreshLayout.post(new Runnable() { + @Override + public void run() { + mSwipeRefreshLayout.setRefreshing(false); + } + }); + } } diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskListRecyclerView.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskListRecyclerView.java index f0c2df22..4a6e0049 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskListRecyclerView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskListRecyclerView.java @@ -43,7 +43,11 @@ public class TaskListRecyclerView extends ThemeColorRecyclerView implements Java @Override public void onClick(View v) { int position = getChildViewHolder((View) v.getParent()).getAdapterPosition(); - mScriptEngines.get(position).forceStop(); + if(position >= 0){ + mScriptEngines.get(position).forceStop(); + }else { + updateEngineList(); + } } }; diff --git a/app/src/main/res/drawable-hdpi/ic_debug_console.png b/app/src/main/res/drawable-hdpi/ic_debug_console.png new file mode 100644 index 00000000..75757e30 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_debug_console.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_exit.png b/app/src/main/res/drawable-hdpi/ic_exit.png new file mode 100644 index 00000000..79904a43 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_exit.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_folder_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_folder_black_24dp.png deleted file mode 100644 index 1d25a2d1..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_folder_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-hdpi/ic_play_arrow_black_24dp.png deleted file mode 100644 index e9c288c9..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_play_arrow_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png new file mode 100644 index 00000000..644b9884 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_settings.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_debug_console.png b/app/src/main/res/drawable-mdpi/ic_debug_console.png new file mode 100644 index 00000000..f5f62a08 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_debug_console.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_exit.png b/app/src/main/res/drawable-mdpi/ic_exit.png new file mode 100644 index 00000000..aa4ade93 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_exit.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_folder_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_folder_black_24dp.png deleted file mode 100644 index 6e6b8705..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_folder_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-mdpi/ic_play_arrow_black_24dp.png deleted file mode 100644 index d78c57ba..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_play_arrow_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png new file mode 100644 index 00000000..61dab039 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_settings.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_debug_console.png b/app/src/main/res/drawable-xhdpi/ic_debug_console.png new file mode 100644 index 00000000..7487205b Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_debug_console.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_exit.png b/app/src/main/res/drawable-xhdpi/ic_exit.png new file mode 100644 index 00000000..cda15079 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_exit.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png deleted file mode 100644 index 49272b0f..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_24dp.png deleted file mode 100644 index f208795f..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_play_arrow_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png new file mode 100644 index 00000000..f96e0c73 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_settings.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_debug_console.png b/app/src/main/res/drawable-xxhdpi/ic_debug_console.png new file mode 100644 index 00000000..5bac0986 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_debug_console.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit.png b/app/src/main/res/drawable-xxhdpi/ic_exit.png new file mode 100644 index 00000000..24e0bcd9 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_exit.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png deleted file mode 100644 index 5c4360af..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_24dp.png deleted file mode 100644 index 5345ee3c..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_play_arrow_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png new file mode 100644 index 00000000..ef4ae1c4 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_settings.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_debug_console.png b/app/src/main/res/drawable-xxxhdpi/ic_debug_console.png new file mode 100644 index 00000000..5699ce3a Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_debug_console.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit.png b/app/src/main/res/drawable-xxxhdpi/ic_exit.png new file mode 100644 index 00000000..04dfb5ce Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_exit.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_black_24dp.png deleted file mode 100644 index 073d8533..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_folder_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_24dp.png deleted file mode 100644 index d12d4956..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_play_arrow_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/app/src/main/res/drawable-xxxhdpi/ic_settings.png new file mode 100644 index 00000000..1c69e5c4 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_settings.png differ diff --git a/app/src/main/res/drawable/circle.xml b/app/src/main/res/drawable/circle.xml deleted file mode 100644 index 1a1a6bc2..00000000 --- a/app/src/main/res/drawable/circle.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_color_primary.xml b/app/src/main/res/drawable/circle_color_primary.xml deleted file mode 100644 index 50194cc2..00000000 --- a/app/src/main/res/drawable/circle_color_primary.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/circle_with_border.xml b/app/src/main/res/drawable/circle_with_border.xml deleted file mode 100644 index 74698bae..00000000 --- a/app/src/main/res/drawable/circle_with_border.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/debug_console_icon_128.png b/app/src/main/res/drawable/debug_console_icon_128.png deleted file mode 100644 index 90dfbe3b..00000000 Binary files a/app/src/main/res/drawable/debug_console_icon_128.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_about_us_green_100px.png b/app/src/main/res/drawable/ic_about_us_green_100px.png deleted file mode 100644 index 592af49e..00000000 Binary files a/app/src/main/res/drawable/ic_about_us_green_100px.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_ali_edit.png b/app/src/main/res/drawable/ic_ali_edit.png deleted file mode 100644 index 13c4a9bd..00000000 Binary files a/app/src/main/res/drawable/ic_ali_edit.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_ali_run.png b/app/src/main/res/drawable/ic_ali_run.png deleted file mode 100644 index 600819cd..00000000 Binary files a/app/src/main/res/drawable/ic_ali_run.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_delete_black_48dp.png b/app/src/main/res/drawable/ic_delete_black_48dp.png deleted file mode 100644 index 796ccd22..00000000 Binary files a/app/src/main/res/drawable/ic_delete_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_delete_forever_black_48dp.png b/app/src/main/res/drawable/ic_delete_forever_black_48dp.png deleted file mode 100644 index a7468f27..00000000 Binary files a/app/src/main/res/drawable/ic_delete_forever_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_delete_forever_green_48dp.png b/app/src/main/res/drawable/ic_delete_forever_green_48dp.png deleted file mode 100644 index 710737e2..00000000 Binary files a/app/src/main/res/drawable/ic_delete_forever_green_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_delete_green_48dp.png b/app/src/main/res/drawable/ic_delete_green_48dp.png deleted file mode 100644 index bdb1d46c..00000000 Binary files a/app/src/main/res/drawable/ic_delete_green_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_exit_to_app_green_48dp.png b/app/src/main/res/drawable/ic_exit_to_app_green_48dp.png deleted file mode 100644 index 61d601e5..00000000 Binary files a/app/src/main/res/drawable/ic_exit_to_app_green_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_folder_outline_white.png b/app/src/main/res/drawable/ic_folder_outline_white.png deleted file mode 100644 index 9b892cce..00000000 Binary files a/app/src/main/res/drawable/ic_folder_outline_white.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_license_green.png b/app/src/main/res/drawable/ic_license_green.png deleted file mode 100644 index 7322b97b..00000000 Binary files a/app/src/main/res/drawable/ic_license_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_navigation_show_more_vertical_512.png b/app/src/main/res/drawable/ic_navigation_show_more_vertical_512.png deleted file mode 100644 index ad25063f..00000000 Binary files a/app/src/main/res/drawable/ic_navigation_show_more_vertical_512.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_notifications_green_48dp.png b/app/src/main/res/drawable/ic_notifications_green_48dp.png deleted file mode 100644 index d8d530df..00000000 Binary files a/app/src/main/res/drawable/ic_notifications_green_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_open_in_new_green_48dp.png b/app/src/main/res/drawable/ic_open_in_new_green_48dp.png deleted file mode 100644 index e006ffe3..00000000 Binary files a/app/src/main/res/drawable/ic_open_in_new_green_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_orange_circle.png b/app/src/main/res/drawable/ic_orange_circle.png deleted file mode 100644 index addea5e1..00000000 Binary files a/app/src/main/res/drawable/ic_orange_circle.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_paintbrush.png b/app/src/main/res/drawable/ic_paintbrush.png deleted file mode 100644 index 45246d34..00000000 Binary files a/app/src/main/res/drawable/ic_paintbrush.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_pause_gray_48dp.png b/app/src/main/res/drawable/ic_pause_gray_48dp.png deleted file mode 100644 index f4511e63..00000000 Binary files a/app/src/main/res/drawable/ic_pause_gray_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_pause_grey600_48dp.png b/app/src/main/res/drawable/ic_pause_grey600_48dp.png deleted file mode 100644 index dc9d1740..00000000 Binary files a/app/src/main/res/drawable/ic_pause_grey600_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_pen.png b/app/src/main/res/drawable/ic_pen.png deleted file mode 100644 index 2db9b834..00000000 Binary files a/app/src/main/res/drawable/ic_pen.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_play_arrow_black_48dp.png b/app/src/main/res/drawable/ic_play_arrow_black_48dp.png deleted file mode 100644 index f208795f..00000000 Binary files a/app/src/main/res/drawable/ic_play_arrow_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_play_arrow_gray_48dp.png b/app/src/main/res/drawable/ic_play_arrow_gray_48dp.png deleted file mode 100644 index 308ef810..00000000 Binary files a/app/src/main/res/drawable/ic_play_arrow_gray_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_play_arrow_grey600_48dp.png b/app/src/main/res/drawable/ic_play_arrow_grey600_48dp.png deleted file mode 100644 index bcffe663..00000000 Binary files a/app/src/main/res/drawable/ic_play_arrow_grey600_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_play_with_circle.png b/app/src/main/res/drawable/ic_play_with_circle.png deleted file mode 100644 index 7872c680..00000000 Binary files a/app/src/main/res/drawable/ic_play_with_circle.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_redo_gray600.png b/app/src/main/res/drawable/ic_redo_gray600.png deleted file mode 100644 index 69891702..00000000 Binary files a/app/src/main/res/drawable/ic_redo_gray600.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_rename_green.png b/app/src/main/res/drawable/ic_rename_green.png deleted file mode 100644 index 64f9824b..00000000 Binary files a/app/src/main/res/drawable/ic_rename_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_robot_green.png b/app/src/main/res/drawable/ic_robot_green.png deleted file mode 100644 index 9ee76742..00000000 Binary files a/app/src/main/res/drawable/ic_robot_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_robot_head.png b/app/src/main/res/drawable/ic_robot_head.png deleted file mode 100644 index e5905271..00000000 Binary files a/app/src/main/res/drawable/ic_robot_head.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_shortcut_green.png b/app/src/main/res/drawable/ic_shortcut_green.png deleted file mode 100644 index 9ac3d47c..00000000 Binary files a/app/src/main/res/drawable/ic_shortcut_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_stack.png b/app/src/main/res/drawable/ic_stack.png deleted file mode 100644 index a1251e53..00000000 Binary files a/app/src/main/res/drawable/ic_stack.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_stop_black_36dp.png b/app/src/main/res/drawable/ic_stop_black_36dp.png deleted file mode 100644 index 75f47c1b..00000000 Binary files a/app/src/main/res/drawable/ic_stop_black_36dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_stop_grey600_48dp.png b/app/src/main/res/drawable/ic_stop_grey600_48dp.png deleted file mode 100644 index e65afc8b..00000000 Binary files a/app/src/main/res/drawable/ic_stop_grey600_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/more_three_dots_gray.png b/app/src/main/res/drawable/more_three_dots_gray.png deleted file mode 100644 index 6a6346c0..00000000 Binary files a/app/src/main/res/drawable/more_three_dots_gray.png and /dev/null differ diff --git a/app/src/main/res/drawable/more_three_dots_ios_7_white.png b/app/src/main/res/drawable/more_three_dots_ios_7_white.png deleted file mode 100644 index 6b0d03f7..00000000 Binary files a/app/src/main/res/drawable/more_three_dots_ios_7_white.png and /dev/null differ diff --git a/app/src/main/res/drawable/popup_menu_background.xml b/app/src/main/res/drawable/popup_menu_background.xml deleted file mode 100644 index 97499ebe..00000000 --- a/app/src/main/res/drawable/popup_menu_background.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/toolbar_bg_top_clip.xml b/app/src/main/res/drawable/toolbar_bg_top_clip.xml deleted file mode 100644 index 9ef38de1..00000000 --- a/app/src/main/res/drawable/toolbar_bg_top_clip.xml +++ /dev/null @@ -1,5 +0,0 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/assist_clip_list_recycler_view_item.xml b/app/src/main/res/layout/assist_clip_list_recycler_view_item.xml deleted file mode 100644 index 2454e2ce..00000000 --- a/app/src/main/res/layout/assist_clip_list_recycler_view_item.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/drawer.xml b/app/src/main/res/layout/drawer.xml index b95decb4..957b62c5 100644 --- a/app/src/main/res/layout/drawer.xml +++ b/app/src/main/res/layout/drawer.xml @@ -79,7 +79,7 @@ android:layout_width="40dp" android:layout_height="40dp" android:padding="6dp" - android:src="@drawable/ic_settings_applications_green_48dp"/> + android:src="@drawable/ic_settings"/> + android:src="@drawable/ic_exit"/> + android:src="@drawable/ic_debug_console"/> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_scripts.xml b/app/src/main/res/layout/fragment_scripts.xml deleted file mode 100644 index 20c00d1c..00000000 --- a/app/src/main/res/layout/fragment_scripts.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/node_info_view_item.xml b/app/src/main/res/layout/node_info_view_item.xml deleted file mode 100644 index 7a83f5d7..00000000 --- a/app/src/main/res/layout/node_info_view_item.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/remote_views_record_switch.xml b/app/src/main/res/layout/remote_views_record_switch.xml deleted file mode 100644 index f44359af..00000000 --- a/app/src/main/res/layout/remote_views_record_switch.xml +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/script_list_recycler_view_item.xml b/app/src/main/res/layout/script_list_recycler_view_item.xml deleted file mode 100644 index fa97fb2b..00000000 --- a/app/src/main/res/layout/script_list_recycler_view_item.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/sliding_up_panel.xml b/app/src/main/res/layout/sliding_up_panel.xml index efc63fb9..80f964ca 100644 --- a/app/src/main/res/layout/sliding_up_panel.xml +++ b/app/src/main/res/layout/sliding_up_panel.xml @@ -9,16 +9,10 @@ android:layout_height="match_parent" android:background="@color/sliding_up_panel_shadow_color"/> - + android:layout_height="wrap_content" + android:layout_gravity="bottom"/> - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml deleted file mode 100644 index 1175d159..00000000 --- a/app/src/main/res/menu/menu_main.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml index 566a771b..f4b7e1fc 100644 --- a/app/src/main/res/values-en/strings.xml +++ b/app/src/main/res/values-en/strings.xml @@ -1,13 +1,9 @@ AutoJs Settings - Disable Service Required by the script automatic operation (click, long press, slide, etc.). New File Import File - Exit - Service disabled. - No file explorer T.T Creation failed Input name Name @@ -41,11 +37,9 @@ Source Code Copied Donate - Email https://github.com/hyb1996/NoRootScriptDroid [UiAutomator]Download：http://www.coolapk.com/apk/com.stardust.scriptdroid Floating Window - Others Bug Report Press again to exit Common using functions @@ -54,49 +48,36 @@ Running Open by other apps Rename - Rename file - Input new name Create shortcut Created Delete - Delete file Deleted - File deletion failed - Choose a file /Scripts/ Error There is no documentation yet/(ㄒoㄒ)/~~ Copy debugging log This is a software developer(。・・)ノ lol - Choose a email application - Script stopped Please choose Crash~ o(≧口≦)o (ಥ _ ಥ)Exit or submit a bug report or copy debugging log to the developer(≧∇≦)ﾉ - Failed Clear Console Submit Bug report - Bug Report Submission Failed Submitted successfully Cannot process file - Crash Feedback Record touches Start Stop - Recording is not started Pause Resume Recording stopped Copy File writing failed - Need to enable the Accessibility Service Join in QQ Group Copied - Close Use the volume keys to control Stop or start recording when volume changes key_use_volume_control_record @@ -116,7 +97,6 @@ Choose a picture Help No floating window permission - Node info View layout hierarchy View layout bounds Accessibility service is not activated @@ -124,7 +104,6 @@ My Scripts Click ADD to create your first script~(。・・)ノ Reset background settings - Restart to apply Recording with Rooting Recording Prompt Text Changed @@ -148,9 +127,6 @@ key_use_volume_control_running Stop all scripts when volume changes Need to enable Accessibility Service - Advanced - Auto operation function running mode - If the app responses slowly when running script, choose Thread Pool or Create Thread. But it may causes rebooting of the device ON OFF Select script file to import @@ -169,17 +145,10 @@ Camera - - Single Thread - Create New Thread Every Time - Thread Pool - Update Tasks - Script Processing - Pre-execute script Check for updates New Directory diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 297bbbd1..0764b0da 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,6 @@ #009688 - #8ea22a #00796B #536DFE #99444444 diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index a33277ab..bc3563c0 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -2,7 +2,6 @@ 16dp 16dp - 16dp 3dp 6dp 2dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 931e9e6c..f347c9f2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,13 +1,9 @@ AutoJs 设置 - 关闭服务 使脚本自动操作(点击、长按、滑动等)所需，若关闭则只能执行不涉及自动操作的脚本。 新建文件 从文件导入 - 退出 - 服务已关闭 - 找不到文件管理器T.T 创建失败 请输入名称 名称 @@ -17,7 +13,6 @@ 路径为空 文件不存在 无文件读写权限 - 内嵌920测试 无障碍服务未启动，脚本已停止运行 关闭侧拉菜单 打开侧拉菜单 @@ -37,9 +32,6 @@ 关于 开放源代码许可 不再提示 - 支付宝扫一扫 - 示例：打开正在运行的服务(安卓6.0+) - 示例：简单计算器 Copyright©2016 All right reserves. 星尘幻影 2732014414 @@ -47,16 +39,10 @@ 软件源代码 已复制到剪贴板 打赏作者 - 邮箱 https://github.com/hyb1996/NoRootScriptDroid [AutoJs]下载地址：http://www.coolapk.com/apk/com.stardust.scriptdroid 悬浮窗 - 通知栏点击区域辅助开关 - 其他 - 点击区域辅助服务已开启(点击关闭) - 点击区域辅助服务已关闭(点击开启) 错误报告 - 示例：QQ自动抢红包 再按一次退出程序 常用函数 很抱歉(ಥ _ ಥ)程序遇到未知错误，即将停止运行\n错误代码： @@ -65,59 +51,37 @@ 开始运行 用其他应用打开 重命名 - 同时重命名原文件 - 请输入新名称 创建桌面快捷方式 已创建 删除 - 彻底删除 已删除 - 文件删除失败 - 选择一个文件 /脚本/ 错误 还没有文档/(ㄒoㄒ)/~~ 复制调试信息 这是软件开发者(。・・)ノ 略略略 - 请选择邮件应用 - 点击定位剪贴板 - 脚本已停止 - \"点击区域辅助服务\"是在要点击的区域不是文本时使用的，参见\"帮助\"。\"点击区域辅助服务\"只有在\"无障碍服务\"开启时才有效。 请选择 崩溃了o(≧口≦)o 点击\"退出\"退出程序(ಥ _ ಥ)或者提交错误报告或者复制调试信息反馈给开发者(≧∇≦)ﾉ - 无法在后台显示弹框，脚本已停止运行 - 示例：QQ强制聊天 - 重新导入示例脚本文件 - 导入成功 - 失败 清空 控制台 日志 - 微信扫一扫 提交错误报告 - Bug Report 提交失败 提交成功 无法处理文件 - Crash 问题反馈 录制脚本 - 在通知栏中开始录制 开始录制 停止录制 - 录制未开始 暂停录制 继续录制 录制结束 复制到剪贴板 文件写入失败 - 需要打开\"无障碍服务“才能录制脚本 加入QQ交流群 已复制到剪贴板 - 关闭 - 重新录制 使用音量键控制 开启后每次音量变化会开始或停止脚本录制 key_use_volume_control_record @@ -137,9 +101,7 @@ 选择图片 帮助 录制脚本(root) - 使用音量上键，音量下键结束录制 没有悬浮窗权限 - 节点信息 布局层次分析 布局范围查看 无障碍服务未启动 @@ -147,7 +109,6 @@ 我的脚本 点击右上角新建第一个脚本吧~(。・・)ノ 重置背景图片设置 - 重启软件生效 使用root权限录制 录制提示 文字改变 @@ -171,15 +132,9 @@ key_use_volume_control_running 每次音量键变化停止所有脚本 需要启用无障碍服务 - 高级 运行方式 - 自动操作函数执行方式 - 如果运行脚本后界面卡顿请尝试多线程或线程池，但这可能导致设备重启 - KEY_SINGLE_THREAD 已开启 已关闭 - 脚本 - 管理 任务管理 名称不能为空 新文件夹 @@ -215,7 +170,6 @@ 保护模式 在本软件界面无法运行自动操作命令以免误触 key_guard_mode - 控制台悬浮窗 布局分析中，请稍后点击 强制停止 \n------------\n[%s]运行结束，用时%f秒 @@ -235,15 +189,4 @@ KEY_CAMERA - - 单线程 - 每次都创建新线程 - 线程池 - - - - KEY_SINGLE_THREAD - KEY_NEW_THREAD_EVERY_TIME - KEY_THREAD_POOL - diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java index a1fa16d9..2b253cc7 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/ScriptRuntime.java @@ -69,7 +69,7 @@ public class ScriptRuntime extends AbstractScriptRuntime { } public AbstractShell.Result shell(String cmd, int root) { - return ProcessShell.exec(cmd, root != 0); + return ProcessShell.execCommand(cmd, root != 0); } public UiSelector selector(JavaScriptEngine engine) { diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractShell.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractShell.java index 459f4e15..5a67207d 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractShell.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/AbstractShell.java @@ -28,8 +28,8 @@ public abstract class AbstractShell { } } - private static final String COMMAND_SU = "su"; - private static final String COMMAND_SH = "sh"; + static final String COMMAND_SU = "su"; + static final String COMMAND_SH = "sh"; static final String COMMAND_EXIT = "exit\n"; static final String COMMAND_LINE_END = "\n"; diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java index 1d32338b..7de91c3f 100644 --- a/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java +++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/ProcessShell.java @@ -1,12 +1,15 @@ package com.stardust.autojs.runtime.api; +import android.util.Log; + import com.stardust.pio.UncheckedIOException; import java.io.BufferedReader; import java.io.DataOutputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.io.Reader; /** * Created by Stardust on 2017/1/20. @@ -109,26 +112,23 @@ public class ProcessShell extends AbstractShell implements AutoCloseable { } public ProcessShell readSucceedOutput() { - try { - while (mSucceedReader.ready()) { - String line = mSucceedReader.readLine(); - mSucceedOutput.append(line).append("\n"); - } - } catch (IOException e) { - throw new UncheckedIOException(e); - } + read(mSucceedReader, mSucceedOutput); return this; } - public ProcessShell readErrorOutput() { - String line; + private void read(BufferedReader reader, StringBuilder sb) { try { - while ((line = mErrorReader.readLine()) != null) { - mErrorOutput.append(line).append("\n"); + String line; + while ((line = reader.readLine()) != null) { + sb.append(line).append("\n"); } } catch (IOException e) { throw new UncheckedIOException(e); } + } + + public ProcessShell readErrorOutput() { + read(mErrorReader, mErrorOutput); return this; } @@ -173,5 +173,68 @@ public class ProcessShell extends AbstractShell implements AutoCloseable { } } + public static Result execCommand(String[] commands, boolean isRoot) { + Result commandResult = new Result(); + if (commands == null || commands.length == 0) return commandResult; + Process process = null; + DataOutputStream os = null; + BufferedReader successResult = null; + BufferedReader errorResult = null; + StringBuilder successMsg = null; + StringBuilder errorMsg = null; + try { + process = Runtime.getRuntime().exec(isRoot ? COMMAND_SU : COMMAND_SH); + os = new DataOutputStream(process.getOutputStream()); + for (String command : commands) { + if (command != null) { + os.write(command.getBytes()); + os.writeBytes(COMMAND_LINE_END); + os.flush(); + } + } + os.writeBytes(COMMAND_EXIT); + os.flush(); + commandResult.code = process.waitFor(); + //获取错误信息 + successMsg = new StringBuilder(); + errorMsg = new StringBuilder(); + successResult = new BufferedReader(new InputStreamReader(process.getInputStream())); + errorResult = new BufferedReader(new InputStreamReader(process.getErrorStream())); + String s; + while ((s = successResult.readLine()) != null) successMsg.append(s); + while ((s = errorResult.readLine()) != null) errorMsg.append(s); + commandResult.result = successMsg.toString(); + commandResult.error = errorMsg.toString(); + Log.i(TAG, commandResult.toString()); + } catch (Exception e) { + String errmsg = e.getMessage(); + if (errmsg != null) { + Log.e(TAG, errmsg); + } else { + e.printStackTrace(); + } + } finally { + try { + if (os != null) os.close(); + if (successResult != null) successResult.close(); + if (errorResult != null) errorResult.close(); + } catch (IOException e) { + String errmsg = e.getMessage(); + if (errmsg != null) { + Log.e(TAG, errmsg); + } else { + e.printStackTrace(); + } + } + if (process != null) process.destroy(); + } + return commandResult; + } + + public static Result execCommand(String command, boolean isRoot) { + String[] commands = command.split("\n"); + return execCommand(commands, isRoot); + } + } \ No newline at end of file