From 0f35fe3a3a6ba1ff44a0f8c8dc035e9845f3e54a Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Thu, 22 Feb 2018 14:03:35 +0800
Subject: [PATCH] adjust editor menu

---
 .../scriptdroid/ui/edit/EditorMenu.java       | 27 ++---------
 .../ui/edit/editor/CodeEditor.java            |  2 +
 app/src/main/res/menu/menu_editor.xml         | 45 +++++--------------
 3 files changed, 15 insertions(+), 59 deletions(-)

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 19e9b0e5..ddfee194 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
@@ -49,9 +49,6 @@ public class EditorMenu {
                 if (onEditOptionsSelected(item)) {
                     return true;
                 }
-                if (onRefactorOptionsSelected(item)) {
-                    return true;
-                }
                 if (onJumpOptionsSelected(item)) {
                     return true;
                 }
@@ -83,30 +80,12 @@ public class EditorMenu {
         return false;
     }
 
-    private boolean onRefactorOptionsSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_beautify:
-                beautifyCode();
-                return true;
-            case R.id.action_rename:
-                //mEditor.rename();
-                return true;
-            case R.id.action_select_variable:
-                //mEditor.selectName();
-                return true;
-        }
-        return false;
-    }
-
 
     private boolean onMoreOptionsSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.action_console:
                 showConsole();
                 return true;
-            case R.id.action_show_type:
-                // mEditor.showType();
-                return true;
             case R.id.action_editor_theme:
                 mEditorView.selectEditorTheme();
                 return true;
@@ -139,9 +118,6 @@ public class EditorMenu {
             case R.id.action_copy_all:
                 copyAll();
                 return true;
-            case R.id.action_paste:
-                paste();
-                return true;
             case R.id.action_copy_line:
                 copyLine();
                 return true;
@@ -151,6 +127,9 @@ public class EditorMenu {
             case R.id.action_clear:
                 mEditor.setText("");
                 return true;
+            case R.id.action_beautify:
+                beautifyCode();
+                return true;
         }
         return false;
     }
diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditor.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditor.java
index 75c6a35e..c7c671e2 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditor.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/editor/CodeEditor.java
@@ -178,6 +178,8 @@ public class CodeEditor extends HVScrollView {
             }
             mProcessDialog = new MaterialDialog.Builder(getContext())
                     .content(R.string.text_processing)
+                    .progress(true, 0)
+                    .cancelable(false)
                     .show();
         } else {
             if (mProcessDialog != null) {
diff --git a/app/src/main/res/menu/menu_editor.xml b/app/src/main/res/menu/menu_editor.xml
index 54b55538..7a08d49d 100644
--- a/app/src/main/res/menu/menu_editor.xml
+++ b/app/src/main/res/menu/menu_editor.xml
@@ -21,11 +21,6 @@
                 android:title="@string/text_copy_all"
                 app:showAsAction="never"/>
 
-            <item
-                android:id="@+id/action_paste"
-                android:title="@string/text_paste"
-                app:showAsAction="never"/>
-
             <item
                 android:id="@+id/action_copy_line"
                 android:title="@string/text_copy_line"
@@ -41,6 +36,11 @@
                 android:title="@string/text_clear"
                 app:showAsAction="never"/>
 
+            <item
+                android:id="@+id/action_beautify"
+                android:title="@string/text_code_beautify"
+                app:showAsAction="never"/>
+
         </menu>
 
     </item>
@@ -85,43 +85,22 @@
     </item>
 
 
-    <item android:title="@string/text_refactor">
-        <menu>
-            <item
-                android:id="@+id/action_rename"
-                android:title="@string/text_rename"
-                app:showAsAction="never"/>
-
-            <item
-                android:id="@+id/action_select_variable"
-                android:title="@string/text_select_variable"
-                app:showAsAction="never"/>
-
-            <item
-                android:id="@+id/action_beautify"
-                android:title="@string/text_code_beautify"
-                app:showAsAction="never"/>
-
-        </menu>
-    </item>
-
     <item
         android:id="@+id/action_log"
         android:title="@string/text_log"
         app:showAsAction="never"/>
 
+    <item
+        android:id="@+id/action_build_apk"
+        android:title="@string/text_build_apk"
+        app:showAsAction="never"/>
+
     <item android:title="@string/text_more">
         <menu>
             <item
                 android:id="@+id/action_console"
                 android:title="@string/text_console"
                 app:showAsAction="never"/>
-
-            <item
-                android:id="@+id/action_show_type"
-                android:title="@string/text_show_type"
-                app:showAsAction="never"/>
-
             <item
                 android:id="@+id/action_info"
                 android:title="@string/text_info"
@@ -137,10 +116,6 @@
                 android:title="@string/text_open_by_other_apps"
                 app:showAsAction="never"/>
 
-            <item
-                android:id="@+id/action_build_apk"
-                android:title="@string/text_build_apk"
-                app:showAsAction="never"/>
         </menu>
     </item>
 </menu>
\ No newline at end of file