diff --git a/app/build.gradle b/app/build.gradle
index b84b0168..7d4b2294 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
applicationId "com.stardust.scriptdroid"
minSdkVersion 17
targetSdkVersion 23
- versionCode 217
- versionName "3.0.0 Alpha17"
+ versionCode 218
+ versionName "3.0.0 Alpha18"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
multiDexEnabled true
ndk {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index db3e1dee..0379d4f7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
@@ -14,7 +15,6 @@
-
-
-
+
@@ -42,16 +41,14 @@
android:label="@string/_app_name"
android:launchMode="singleTask"
android:theme="@style/AppTheme.FullScreen">
-
-
-
+
@@ -69,7 +66,6 @@
-
+
-
-
-
+
-
@@ -135,12 +129,10 @@
-
-
@@ -153,9 +145,7 @@
-
-
-
-
-
-
@@ -191,7 +177,6 @@
-
@@ -200,18 +185,17 @@
+
-
-
+
@@ -234,10 +219,10 @@
+
-
\ No newline at end of file
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java
index 4013bef4..63fb4cd8 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java
@@ -11,6 +11,7 @@ import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.ui.build.BuildActivity;
import com.stardust.scriptdroid.ui.build.BuildActivity_;
+import com.stardust.scriptdroid.ui.log.LogActivity_;
import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder;
import com.stardust.util.ClipboardUtil;
@@ -258,7 +259,7 @@ public class EditorMenu {
private void showLog() {
- AutoJs.getInstance().getScriptEngineService().getGlobalConsole().show();
+ LogActivity_.intent(mContext).start();
}
private void showConsole() {
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java
new file mode 100644
index 00000000..105f9773
--- /dev/null
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java
@@ -0,0 +1,40 @@
+package com.stardust.scriptdroid.ui.log;
+
+import android.os.Bundle;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
+import android.view.View;
+
+import com.stardust.autojs.core.console.ConsoleView;
+import com.stardust.autojs.core.console.StardustConsole;
+import com.stardust.scriptdroid.R;
+import com.stardust.scriptdroid.autojs.AutoJs;
+import com.stardust.scriptdroid.ui.BaseActivity;
+
+import org.androidannotations.annotations.AfterViews;
+import org.androidannotations.annotations.Click;
+import org.androidannotations.annotations.EActivity;
+import org.androidannotations.annotations.ViewById;
+
+@EActivity(R.layout.activity_log)
+public class LogActivity extends BaseActivity {
+
+ @ViewById(R.id.console)
+ ConsoleView mConsoleView;
+
+ private StardustConsole mStardustConsole;
+
+ @AfterViews
+ void setupViews() {
+ setToolbarAsBack(getString(R.string.text_log));
+ mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole();
+ mConsoleView.setConsole(mStardustConsole);
+ }
+
+ @Click(R.id.fab)
+ void clearConsole() {
+ mStardustConsole.clear();
+ }
+}
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
index cece68e0..bc46a5d7 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java
@@ -32,6 +32,7 @@ import com.stardust.scriptdroid.ui.floating.FloatyWindowManger;
import com.stardust.scriptdroid.io.StorageFileProvider;
import com.stardust.scriptdroid.ui.main.community.CommunityFragment_;
import com.stardust.scriptdroid.ui.main.sample.SampleListFragment;
+import com.stardust.scriptdroid.ui.log.LogActivity_;
import com.stardust.scriptdroid.ui.main.sample.SampleListFragment_;
import com.stardust.scriptdroid.ui.main.scripts.MyScriptListFragment_;
import com.stardust.scriptdroid.ui.main.task.TaskManagerFragment_;
@@ -259,6 +260,15 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
return true;
}
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ if(item.getItemId() == R.id.action_log){
+ LogActivity_.intent(this).start();
+ return true;
+ }
+ return super.onOptionsItemSelected(item);
+ }
+
private void setUpSearchMenuItem(MenuItem searchMenuItem) {
mSearchViewItem = new SearchViewItem(this, searchMenuItem);
mSearchViewItem.setQueryCallback(this::submitQuery);
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
index 45b9396e..fc403661 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java
@@ -24,7 +24,7 @@ import org.androidannotations.annotations.ViewById;
* Created by Stardust on 2017/3/24.
*/
@EFragment(R.layout.fragment_task_manager)
-public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu.OnMenuItemClickListener {
+public class TaskManagerFragment extends ViewPagerFragment {
@ViewById(R.id.task_list)
TaskListRecyclerView mTaskListRecyclerView;
@@ -35,36 +35,17 @@ public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu.
@ViewById(R.id.swipe_refresh_layout)
SwipeRefreshLayout mSwipeRefreshLayout;
- @ViewById(R.id.task_manager_view)
- View mTaskManagerView;
-
- @ViewById(R.id.spinner)
- View mSpinner;
-
- @ViewById(R.id.spinner_current_item)
- TextView mSpinnerCurrentItem;
-
- @ViewById(R.id.console)
- ConsoleView mConsoleView;
-
- private StardustConsole mStardustConsole;
public TaskManagerFragment() {
super(45);
setArguments(new Bundle());
}
-
@AfterViews
void setUpViews() {
init();
final boolean noRunningScript = mTaskListRecyclerView.getAdapter().getItemCount() == 0;
mNoRunningScriptNotice.setVisibility(noRunningScript ? View.VISIBLE : View.GONE);
- mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole();
- mConsoleView.setConsole(mStardustConsole);
- if (getArguments().getBoolean("console_shown", false)) {
- showLog();
- }
}
private void init() {
@@ -90,51 +71,9 @@ public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu.
});
}
- @Click(R.id.spinner)
- void showPopupMenu() {
- PopupMenu popupMenu = new PopupMenu(getContext(), mSpinner);
- popupMenu.inflate(R.menu.menu_manager);
- popupMenu.show();
- popupMenu.setOnMenuItemClickListener(this);
- }
-
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- int id = item.getItemId();
- if (id == R.id.task_manage) {
- showTaskManager();
- } else {
- showLog();
- }
- return true;
- }
-
-
- private void showLog() {
- mTaskManagerView.setVisibility(View.GONE);
- mConsoleView.setVisibility(View.VISIBLE);
- mSpinnerCurrentItem.setText(R.string.text_log);
- }
-
- private void showTaskManager() {
- mConsoleView.setVisibility(View.GONE);
- mTaskManagerView.setVisibility(View.VISIBLE);
- mSpinnerCurrentItem.setText(R.string.text_task_manage);
- }
-
-
@Override
protected void onFabClick(FloatingActionButton fab) {
- if (mConsoleView.getVisibility() == View.VISIBLE) {
- mStardustConsole.clear();
- } else {
- AutoJs.getInstance().getScriptEngineService().stopAll();
- }
+ AutoJs.getInstance().getScriptEngineService().stopAll();
}
- @Override
- public void onPause() {
- super.onPause();
- getArguments().putBoolean("console_shown", mConsoleView.getVisibility() == View.VISIBLE);
- }
}
diff --git a/app/src/main/res/drawable-hdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_clear_white_48dp.png
new file mode 100644
index 00000000..6b717e0d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_clear_white_48dp.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-mdpi/ic_clear_white_48dp.png
new file mode 100644
index 00000000..b7c7ffd0
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_clear_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_ali_log.png b/app/src/main/res/drawable-xhdpi/ic_ali_log.png
new file mode 100644
index 00000000..a878c76a
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_ali_log.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_clear_white_48dp.png
new file mode 100644
index 00000000..39641921
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_clear_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_clear_white_48dp.png
new file mode 100644
index 00000000..4927bc24
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_clear_white_48dp.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_clear_white_48dp.png
new file mode 100644
index 00000000..bb21ce03
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_clear_white_48dp.png differ
diff --git a/app/src/main/res/layout/activity_log.xml b/app/src/main/res/layout/activity_log.xml
new file mode 100644
index 00000000..0987c6e6
--- /dev/null
+++ b/app/src/main/res/layout/activity_log.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml
index 888ec85a..2cd05ca2 100644
--- a/app/src/main/res/layout/fragment_task_manager.xml
+++ b/app/src/main/res/layout/fragment_task_manager.xml
@@ -1,80 +1,30 @@
-
+
-
+
+
+
+
+
+
+ android:layout_gravity="center"
+ android:gravity="center"
+ android:text="@string/notice_no_running_script"
+ android:textColor="#adadad"
+ android:textSize="16sp"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
\ 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
index bdf33d43..9a394757 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,6 +2,12 @@