refactor code

Author: tranleduy2000

.idea/inspectionProfiles/Project_Default.xml

@@ -87,7 +87,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    protected void populaceDiagnostic(@NonNull DiagnosticPresenter diagnosticPresenter) {
+    protected void populateDiagnostic(@NonNull DiagnosticPresenter diagnosticPresenter) {
         PatternAwareOutputParser[] parsers = {
                 new CppCheckOutputParser(),
                 new GccOutputParser()

app/src/main/java/com/duy/ccppcompiler/ide/editor/CodeEditorActivity.java

@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
         classpath 'com.google.gms:google-services:3.2.0'
         classpath 'io.fabric.tools:gradle:1.25.1'
         // NOTE: Do not place your application dependencies here; they belong

build.gradle

@@ -8,6 +8,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
 
     testOptions {

lib-n-ide/build.gradle

@@ -172,4 +172,31 @@ public static boolean createNewFile(File file) throws IOException {
         }
         return false;
     }
+
+    public static boolean isSameFile(File file1, File file2) {
+        final boolean file1Exists = file1.exists();
+        if (file1Exists != file2.exists()) {
+            return false;
+        }
+
+        if (!file1Exists) {
+            // two not existing files are equal
+            return true;
+        }
+
+        if (file1.length() != file2.length()) {
+            // lengths differ, cannot be equal
+            return false;
+        }
+
+        try {
+            if (file1.getCanonicalFile().equals(file2.getCanonicalFile())) {
+                // same file
+                return true;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return false;
+    }
 }

lib-n-ide/src/main/java/com/duy/file/explorer/util/FileUtils.java

@@ -50,6 +50,7 @@
 
 import com.duy.common.StoreUtil;
 import com.duy.file.explorer.FileExplorerActivity;
+import com.duy.ide.database.SQLHelper;
 import com.duy.ide.diagnostic.DiagnosticPresenter;
 import com.duy.ide.diagnostic.view.DiagnosticFragment;
 import com.duy.ide.editor.editor.BuildConfig;
@@ -75,7 +76,6 @@
 import com.jecelyin.editor.v2.manager.MenuManager;
 import com.jecelyin.editor.v2.manager.RecentFilesManager;
 import com.jecelyin.editor.v2.manager.TabManager;
-import com.duy.ide.database.SQLHelper;
 import com.jecelyin.editor.v2.widget.SymbolBarLayout;
 import com.jecelyin.editor.v2.widget.menu.MenuDef;
 import com.jecelyin.editor.v2.widget.menu.MenuFactory;
@@ -128,6 +128,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mEditorPager = findViewById(R.id.editor_view_pager);
         mDrawerLayout = findViewById(R.id.drawer_layout);
+        mDrawerLayout.setKeepScreenOn(mPreferences.isKeepScreenOn());
         mDrawerLayout.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
             @Override
             public void onDrawerOpened(View drawerView) {
@@ -136,8 +137,7 @@ public void onDrawerOpened(View drawerView) {
             }
         });
         ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(
-                this, mDrawerLayout, mToolbar, R.string.open_drawer, R.string.close_drawer
-        );
+                this, mDrawerLayout, mToolbar, R.string.open_drawer, R.string.close_drawer);
         mDrawerLayout.addDrawerListener(actionBarDrawerToggle);
         actionBarDrawerToggle.syncState();
 
@@ -153,20 +153,24 @@ public void onClick(View v, String text) {
             }
         });
 
-        bindPreferences();
         setScreenOrientation();
 
         TextView versionView = findViewById(R.id.versionTextView);
         versionView.setText(SysUtils.getVersionName(this));
-        mEditorPager.setVisibility(View.VISIBLE);
+
         mTabManager = new TabManager(this);
 
         initMenuView();
         intiDiagnosticView();
         processIntent();
+
+        mPreferences.registerOnSharedPreferenceChangeListener(this);
     }
 
     private void intiDiagnosticView() {
+        if (mTabManager == null) {
+            throw new RuntimeException("Create TabManager before call intiDiagnosticView");
+        }
 
         final View toggleView = findViewById(R.id.btn_toggle_panel);
         mSlidingUpPanelLayout = findViewById(R.id.diagnostic_panel);
@@ -188,16 +192,15 @@ public void onPanelSlide(View panel, float slideOffset) {
                 .replace(R.id.container_diagnostic_list_view, diagnosticFragment, tag)
                 .commit();
         mDiagnosticPresenter = new DiagnosticPresenter(diagnosticFragment, this, mTabManager, mHandler);
-        populaceDiagnostic(mDiagnosticPresenter);
+        populateDiagnostic(mDiagnosticPresenter);
     }
 
-    protected abstract void populaceDiagnostic(@NonNull DiagnosticPresenter diagnosticPresenter);
-
+    /**
+     * Called when create diagnostic view
+     */
+    protected abstract void populateDiagnostic(@NonNull DiagnosticPresenter diagnosticPresenter);
 
     private void bindPreferences() {
-        mDrawerLayout.setKeepScreenOn(mPreferences.isKeepScreenOn());
-        mSymbolBarLayout.setVisibility(mPreferences.isReadOnly() ? View.GONE : View.VISIBLE);
-        mPreferences.registerOnSharedPreferenceChangeListener(this);
     }
 
     @Override
@@ -218,7 +221,6 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
 
     private void setScreenOrientation() {
         int orgi = mPreferences.getScreenOrientation();
-
         if (Preferences.SCREEN_ORIENTATION_AUTO == orgi) {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         } else if (Preferences.SCREEN_ORIENTATION_LANDSCAPE == orgi) {
@@ -229,18 +231,16 @@ private void setScreenOrientation() {
     }
 
     private void initMenuView() {
-        if (mMenuManager == null) {
-            mMenuManager = new MenuManager(this);
-            NavigationView rightMenu = findViewById(R.id.menuNavView);
-            Menu menu = rightMenu.getMenu();
-            onCreateNavigationMenu(menu);
-            rightMenu.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
-                @Override
-                public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-                    return onOptionsItemSelected(item);
-                }
-            });
-        }
+        mMenuManager = new MenuManager(this);
+        NavigationView rightMenu = findViewById(R.id.menuNavView);
+        Menu menu = rightMenu.getMenu();
+        onCreateNavigationMenu(menu);
+        rightMenu.setNavigationItemSelectedListener(new NavigationView.OnNavigationItemSelectedListener() {
+            @Override
+            public boolean onNavigationItemSelected(@NonNull MenuItem item) {
+                return onOptionsItemSelected(item);
+            }
+        });
     }
 
 

lib-n-ide/src/main/java/com/duy/ide/core/IdeActivity.java

@@ -18,6 +18,7 @@
 package com.duy.ide.editor.view;
 
 import android.content.Context;
+import android.graphics.Rect;
 import android.util.AttributeSet;
 import android.view.ActionMode;
 
@@ -38,4 +39,9 @@ public CodeEditor(Context context, AttributeSet attrs, int defStyleAttr) {
     public void setCustomSelectionActionModeCallback(ActionMode.Callback actionModeCallback) {
         super.setCustomSelectionActionModeCallback(actionModeCallback);
     }
+
+    @Override
+    public boolean requestFocus(int direction, Rect previouslyFocusedRect) {
+        return super.requestFocus(direction, previouslyFocusedRect);
+    }
 }

lib-n-ide/src/main/java/com/duy/ide/editor/view/CodeEditor.java

@@ -30,7 +30,7 @@
 import com.duy.ide.editor.content.UndoManager;
 import com.duy.ide.editor.model.EditorIndex;
 
-public class EditActionSupportEditor extends ZoomSupportEditor {
+public class EditActionSupportEditor extends GestureSupportEditor {
     private IUndoManager mUndoManager;
     private ClipboardCompat mClipboard;
     private KeyListener mLastKeyListener;
@@ -81,17 +81,13 @@ public boolean doCopy() {
 
     @Override
     public boolean doPaste() {
-        if (!onTextContextMenuItem(android.R.id.paste)) {
-            CharSequence clipboard = mClipboard.getClipboard();
-            if (clipboard != null) {
-                //clear all span
-
-                int selectionStart = getSelectionStart();
-                selectionStart = Math.max(0, selectionStart);
-                getText().insert(selectionStart, cleanupForPaste(clipboard));
-                return true;
-            }
-        } else {
+        CharSequence clipboard = mClipboard.getClipboard();
+        if (clipboard != null) {
+            //clear all span
+
+            int selectionStart = getSelectionStart();
+            selectionStart = Math.max(0, selectionStart);
+            getText().insert(selectionStart, cleanupForPaste(clipboard));
             return true;
         }
         return false;
@@ -111,8 +107,7 @@ private String cleanupForPaste(CharSequence clipboard) {
     public boolean onTextContextMenuItem(int id) {
         switch (id) {
             case android.R.id.paste:
-                doPaste();
-                return true;
+                return doPaste();
         }
         return super.onTextContextMenuItem(id);
     }

lib-n-ide/src/main/java/com/duy/ide/editor/view/EditActionSupportEditor.java

@@ -32,7 +32,7 @@
 import com.duy.ide.editor.model.EditorIndex;
 import com.jecelyin.editor.v2.Preferences;
 
-public abstract class ZoomSupportEditor extends HighlightEditorView
+public abstract class GestureSupportEditor extends HighlightEditorView
         implements IEditAreaView, GestureDetector.OnGestureListener {
 
     private final Rect mVisibleRect = new Rect();
@@ -48,16 +48,16 @@ public abstract class ZoomSupportEditor extends HighlightEditorView
      */
     private boolean mIsTextScaling = false;
 
-    public ZoomSupportEditor(Context context) {
+    public GestureSupportEditor(Context context) {
         this(context, null);
     }
 
-    public ZoomSupportEditor(Context context, AttributeSet attrs) {
+    public GestureSupportEditor(Context context, AttributeSet attrs) {
         super(context, attrs);
         init(context);
     }
 
-    public ZoomSupportEditor(Context context, AttributeSet attrs, int defStyleAttr) {
+    public GestureSupportEditor(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init(context);
     }
@@ -151,7 +151,6 @@ public void computeScroll() {
             super.computeScroll();
         }
     }
-
     /**
      * @see GestureDetector.OnGestureListener#onFling(MotionEvent,
      * MotionEvent, float, float)

lib-n-ide/src/main/java/com/duy/ide/editor/view/ZoomSupportEditor.java renamed to lib-n-ide/src/main/java/com/duy/ide/editor/view/GestureSupportEditor.java

@@ -83,7 +83,6 @@ public HighlightEditorView(Context context) {
     public HighlightEditorView(Context context, AttributeSet attrs) {
         super(context, attrs);
         init(context);
-
     }
 
     public HighlightEditorView(Context context, AttributeSet attrs, int defStyleAttr) {