Keyboard TAB key handling, syntax highlighting performance, filebrowser navigation (PR #2487 closes #2469 #2484)

* Keypress handler
* Restored option, fixed duplicate calls to loadFolder on resume
* Made some small changes for highlighting performance
---------

Co-authored-by: Gregor Santner <[email protected]>

Author: harshad1

app/src/main/java/net/gsantner/markor/activity/ActionButtonSettingsActivity.java

@@ -32,10 +32,10 @@
 import net.gsantner.markor.format.ActionButtonBase.ActionItem.DisplayMode;
 import net.gsantner.markor.format.asciidoc.AsciidocActionButtons;
 import net.gsantner.markor.format.markdown.MarkdownActionButtons;
+import net.gsantner.markor.format.orgmode.OrgmodeActionButtons;
 import net.gsantner.markor.format.plaintext.PlaintextActionButtons;
 import net.gsantner.markor.format.todotxt.TodoTxtActionButtons;
 import net.gsantner.markor.format.wikitext.WikitextActionButtons;
-import net.gsantner.markor.format.orgmode.OrgmodeActionButtons;
 import net.gsantner.opoc.util.GsCollectionUtils;
 
 import java.util.ArrayList;

app/src/main/java/net/gsantner/markor/activity/DocumentActivity.java

@@ -38,7 +38,6 @@
 import net.gsantner.opoc.util.GsFileUtils;
 
 import java.io.File;
-import java.util.Stack;
 
 import other.so.AndroidBug5497Workaround;
 

app/src/main/java/net/gsantner/markor/activity/DocumentEditAndViewFragment.java

@@ -365,6 +365,10 @@ public boolean onQueryTextChange(String text) {
 
     @Override
     public boolean onReceiveKeyPress(int keyCode, KeyEvent event) {
+        if (_format != null && _format.getActions().onReceiveKeyPress(keyCode, event)) {
+            return true;
+        }
+
         if (event.isCtrlPressed()) {
             if (event.isShiftPressed() && keyCode == KeyEvent.KEYCODE_Z) {
                 if (_editTextUndoRedoHelper != null && _editTextUndoRedoHelper.getCanRedo()) {

app/src/main/java/net/gsantner/markor/activity/MainActivity.java

@@ -193,10 +193,11 @@ protected void onNewIntent(final Intent intent) {
         if (_notebook != null && file != null) {
             _viewPager.setCurrentItem(tabIdToPos(R.id.nav_notebook), false);
             if (file.isDirectory() || GsFileBrowserListAdapter.isVirtualFolder(file)) {
-                _notebook.setCurrentFolder(file);
+                _notebook.getAdapter().setCurrentFolder(file);
             } else {
                 _notebook.getAdapter().showFile(file);
             }
+            _notebook.setReloadRequiredOnResume(false);
         }
     }
 
@@ -296,7 +297,7 @@ public void onClickFab(final View view) {
             return;
         }
 
-        if (_notebook.getAdapter().isCurrentFolderVirtual()) {
+        if (!_notebook.getAdapter().isCurrentFolderWriteable()) {
             _notebook.getAdapter().setCurrentFolder(_appSettings.getNotebookDirectory());
             return;
         }
@@ -307,10 +308,6 @@ public void onClickFab(final View view) {
                 return;
             }
 
-            if (!_notebook.getAdapter().isCurrentFolderWriteable()) {
-                return;
-            }
-
             NewFileDialog.newInstance(_notebook.getCurrentFolder(), true, this::newItemCallback)
                     .show(getSupportFragmentManager(), NewFileDialog.FRAGMENT_TAG);
         }

app/src/main/java/net/gsantner/markor/format/ActionButtonBase.java

@@ -1014,4 +1014,12 @@ public void runJumpBottomTopAction(ActionItem.DisplayMode displayMode) {
         }
     }
 
+    public boolean onReceiveKeyPress(final int keyCode, final KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_TAB && _appSettings.isIndentWithTabKey()) {
+            runIndentLines(event.isShiftPressed());
+            runRenumberOrderedListIfRequired();
+            return true;
+        }
+        return false;
+    }
 }

app/src/main/java/net/gsantner/markor/format/TextConverterBase.java

@@ -200,9 +200,9 @@ protected String getContentType() {
     }
 
     public boolean isFileOutOfThisFormat(final @NonNull File file) {
-        final String name = file.getName().toLowerCase().replace(JavaPasswordbasedCryption.DEFAULT_ENCRYPTION_EXTENSION, "");
-        final String ext = name.replaceAll(".*\\.", ".");
-        return isFileOutOfThisFormat(file, name, ext);
+        final String name = file.getName().toLowerCase().replace(JavaPasswordbasedCryption.DEFAULT_ENCRYPTION_EXTENSION, "").trim();
+        final String extWithDot = GsFileUtils.getFilenameExtension(name);
+        return isFileOutOfThisFormat(file, name, extWithDot);
     }
 
     protected abstract boolean isFileOutOfThisFormat(final File file, final String name, final String ext);

app/src/main/java/net/gsantner/markor/format/asciidoc/AsciidocActionButtons.java

@@ -15,7 +15,6 @@
 import net.gsantner.markor.R;
 import net.gsantner.markor.format.ActionButtonBase;
 import net.gsantner.markor.frontend.MarkorDialogFactory;
-import net.gsantner.markor.frontend.textview.TextViewUtils;
 import net.gsantner.markor.model.Document;
 
 import java.util.Arrays;

app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtActionButtons.java

@@ -184,17 +184,15 @@ public boolean onActionLongClick(final @StringRes int action) {
                     }
                 }
                 if (areAllSamePriority) {
-                    if(prevPriority != tasks.get(0).getPriority() && prevPriority != '\0') {
+                    if (prevPriority != tasks.get(0).getPriority() && prevPriority != '\0') {
                         setPriority(prevPriority);
-                    }
-                    else if(nextPriority != tasks.get(tasks.size() - 1).getPriority() && nextPriority != '\0') {
+                    } else if (nextPriority != tasks.get(tasks.size() - 1).getPriority() && nextPriority != '\0') {
                         setPriority(nextPriority);
-                    }
-                    else {
+                    } else {
                         setPriority(TodoTxtTask.PRIORITY_NONE);
                     }
                 } else {
-                    if(prevPriority != '\0') {
+                    if (prevPriority != '\0') {
                         setPriority(prevPriority);
                     } else {
                         setPriority(tasks.get(0).getPriority());
@@ -236,7 +234,7 @@ public void archiveDoneTasks() {
             }
 
             if (!move.isEmpty() && _document.testCreateParent()) {
-                final File doneFile = new File(_document.file.getParentFile(),  doneName);
+                final File doneFile = new File(_document.file.getParentFile(), doneName);
                 final StringBuilder doneContents = new StringBuilder();
                 if (doneFile.exists() && doneFile.canRead()) {
                     doneContents.append(GsFileUtils.readTextFileFast(doneFile).first.trim()).append("\n");
@@ -250,7 +248,7 @@ public void archiveDoneTasks() {
                     TextViewUtils.setSelectionFromOffsets(_hlEditor, offsets);
                 }
             }
-            _appSettings.setLastTodoDoneName(_document.path,  doneName);
+            _appSettings.setLastTodoDoneName(_document.path, doneName);
         });
     }
 

app/src/main/java/net/gsantner/markor/format/todotxt/TodoTxtTask.java

@@ -83,7 +83,7 @@ public static List<TodoTxtTask> getSelectedTasks(final TextView view) {
     }
 
     public static List<TodoTxtTask> getAllTasks(final CharSequence text) {
-        return getTasks(text, new int[] {0, text.length()});
+        return getTasks(text, new int[]{0, text.length()});
     }
 
     public static List<String> getProjects(final List<TodoTxtTask> tasks) {

app/src/main/java/net/gsantner/markor/format/wikitext/WikitextActionButtons.java

@@ -9,6 +9,7 @@
 
 import android.content.Context;
 import android.os.Build;
+import android.view.KeyEvent;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -271,4 +272,19 @@ public boolean runTitleClick() {
     protected void renumberOrderedList() {
         AutoTextFormatter.renumberOrderedList(_hlEditor.getText(), WikitextReplacePatternGenerator.formatPatterns);
     }
+
+    @Override
+    public boolean onReceiveKeyPress(final int keyCode, final KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_TAB && _appSettings.isIndentWithTabKey()) {
+            if (event.isShiftPressed()) {
+                runRegexReplaceAction(WikitextReplacePatternGenerator.deindentOneTab());
+            } else {
+                runRegexReplaceAction(WikitextReplacePatternGenerator.indentOneTab());
+            }
+            runRenumberOrderedListIfRequired();
+            return true;
+        }
+
+        return super.onReceiveKeyPress(keyCode, event);
+    }
 }