improve UI show error, fix not change tab character in setting

Author: tranleduy2000

app/src/main/java/com/duy/pascal/frontend/autocomplete/autofix/AutoFixHelper.java

@@ -397,7 +397,7 @@ public void execute(EditorView editable) {
                 Matcher matcher = Patterns.VAR.matcher(scope.getText());
                 if (matcher.find()) {
                     insertPosition = matcher.end();
-                    textToInsert = "\n" + AutoIndentEditText.TAB_CHARACTER + name + ": ";
+                    textToInsert = "\n" + editable.getTabCharacter() + name + ": ";
 
                     startSelect = textToInsert.length();
                     endSelect = startSelect + type.length();
@@ -411,7 +411,7 @@ public void execute(EditorView editable) {
                     } else if ((matcher = Patterns.PROGRAM.matcher(scope.getText())).find()) {
                         insertPosition = matcher.end();
                     }
-                    textToInsert = "\nvar\n" + AutoIndentEditText.TAB_CHARACTER + name + ": ";
+                    textToInsert = "\nvar\n" + editable.getTabCharacter() + name + ": ";
 
                     startSelect = textToInsert.length();
                     endSelect = startSelect + type.length();

app/src/main/java/com/duy/pascal/frontend/autocomplete/autofix/dialog/ErrorAndQuickFixDialog.java

@@ -84,6 +84,8 @@ public void onClick(View v) {
         });
 
         if (exception instanceof ParsingException && ((ParsingException) exception).canQuickFix()) {
+            view.findViewById(R.id.container_command).setVisibility(View.VISIBLE);
+
             RecyclerView listCommand = view.findViewById(R.id.list_command);
             listCommand.setLayoutManager(new LinearLayoutManager(getActivity()));
             listCommand.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL));
@@ -97,7 +99,8 @@ public void onClick(AutoFixCommand command) {
                 }
             });
 
-            view.findViewById(R.id.txt_hint).setVisibility(View.VISIBLE);
+        } else {
+            view.findViewById(R.id.container_command).setVisibility(View.GONE);
         }
     }
 

app/src/main/java/com/duy/pascal/frontend/editor/EditorActivity.java

@@ -47,7 +47,6 @@
 import com.duy.pascal.frontend.autocomplete.completion.model.Description;
 import com.duy.pascal.frontend.code.CompileManager;
 import com.duy.pascal.frontend.code.sample.activities.DocumentActivity;
-import com.duy.pascal.frontend.editor.view.AutoIndentEditText;
 import com.duy.pascal.frontend.editor.view.EditorView;
 import com.duy.pascal.frontend.file.util.FileUtils;
 import com.duy.pascal.frontend.setting.PascalPreferences;
@@ -119,7 +118,21 @@ public void invalidateOptionsMenu() {
     }
 
     private void insertTab(View v) {
-        onKeyClick(v, AutoIndentEditText.TAB_CHARACTER);
+        EditorFragment currentFragment = mPagerAdapter.getCurrentFragment();
+        if (currentFragment != null) {
+            currentFragment.exciteCommand(new AutoFixCommand() {
+                @Override
+                public void execute(EditorView editable) {
+                    editable.insert(editable.getTabCharacter());
+                }
+
+                @NonNull
+                @Override
+                public CharSequence getTitle(Context context) {
+                    return null;
+                }
+            });
+        }
     }
 
     @Override

app/src/main/java/com/duy/pascal/frontend/editor/view/AutoIndentEditText.java

@@ -34,9 +34,9 @@
  */
 
 public class AutoIndentEditText extends AppCompatEditText {
-    public static final String TAB_CHARACTER = "  ";
     public static final String CURSOR = "\u2622";
     private static final String TAG = "AutoIndentEditText";
+    protected String mTabStr = "  ";
     protected EditorSetting mEditorSetting;
     private TextWatcher mBracketWatcher = new TextWatcher() {
         private int start;
@@ -115,7 +115,7 @@ public void applyTabWidth() {
 
     private void init(Context context) {
         mEditorSetting = new EditorSetting(context);
-
+        mTabStr = mEditorSetting.getTabCharacter();
         setFilters(new InputFilter[]{mInputFilter});
         addTextChangedListener(mBracketWatcher);
     }
@@ -219,7 +219,7 @@ else if (c == ')')
             indent += dest.subSequence(indexStart, indexEnd);
         }
         if (parenthesesCount < 0) {
-            indent += TAB_CHARACTER;
+            indent += mTabStr;
         }
         Log.d(TAG, "indentLine: " + dest.charAt(dend) + " " + dest.charAt(dstart));
 
@@ -245,6 +245,6 @@ else if (c == ')')
     }
 
     public String getTabCharacter() {
-        return TAB_CHARACTER;
+        return mTabStr;
     }
 }

app/src/main/java/com/duy/pascal/frontend/editor/view/UndoRedoSupportEditText.java

@@ -228,12 +228,10 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         } else {
             switch (keyCode) {
                 case KeyEvent.KEYCODE_TAB:
-                    String textToInsert = TAB_CHARACTER;
                     int start, end;
                     start = Math.max(getSelectionStart(), 0);
                     end = Math.max(getSelectionEnd(), 0);
-                    getText().replace(Math.min(start, end), Math.max(start, end),
-                            textToInsert, 0, textToInsert.length());
+                    getText().replace(Math.min(start, end), Math.max(start, end), mTabStr, 0, mTabStr.length());
                     return true;
                 default:
                     try {

app/src/main/java/com/duy/pascal/frontend/setting/PascalPreferences.java

@@ -346,4 +346,14 @@ public void setTheme(String name) {
     public boolean useAutoInsert() {
         return getBoolean(context.getString(R.string.key_auto_insert_bracket), false);
     }
+
+    public String getTabCharacter() {
+        int tabWidth = getInt("key_pref_tab_width", 2);
+        tabWidth = Math.min(6, Math.max(0, tabWidth));
+        String res = "";
+        for (int i = 0; i < tabWidth; i++) {
+            res += " ";
+        }
+        return res;
+    }
 }

app/src/main/res/layout/dialog_error.xml

@@ -43,7 +43,7 @@
                     android:layout_height="match_parent"
                     android:layout_marginBottom="8dp"
                     android:layout_weight="1"
-                    android:paddingTop="8dp"
+                    android:gravity="center_vertical"
                     android:text="@string/compile_error"
                     android:textAppearance="@style/TextAppearance.AppCompat.Title" />
 
@@ -69,6 +69,7 @@
     </android.support.v7.widget.CardView>
 
     <android.support.v7.widget.CardView
+        android:id="@+id/container_command"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:cardUseCompatPadding="true">
@@ -84,8 +85,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/some_suggestion"
-                android:textColor="?colorAccent"
-                android:visibility="gone" />
+                android:textColor="?colorAccent" />
 
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/list_command"