Feature/big file fast load recyclerview

CONTRIBUTORS.md

@@ -55,3 +55,4 @@ Where:
 * **[Matthew White](https://github.com/mehw)**<br>~° Zim-Wiki link/attachment conformance
 * **[Markus Paintner](https://github.com/goli4thus)**<br/>~° Added duplicate lines action
 * **[Janez Pavel Žebovec](https://janezpavelzebovec.net/)**<br/>~° Slovenian translation
+* **[Stephen Karl Larroque](https://github.com/lrq3000/)**<br/>~° Bugfixes and large files speed performance

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

@@ -27,6 +27,7 @@
 import android.webkit.WebView;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -42,7 +43,7 @@
 import net.gsantner.markor.frontend.MarkorDialogFactory;
 import net.gsantner.markor.frontend.MarkorDialogFactory.Heading;
 import net.gsantner.markor.frontend.textsearch.TextSearchFragment;
-import net.gsantner.markor.frontend.textview.HighlightingEditor;
+import net.gsantner.markor.frontend.textview.MarkorEditor;
 import net.gsantner.markor.frontend.textview.TextViewUtils;
 import net.gsantner.markor.model.AppSettings;
 import net.gsantner.markor.model.Document;
@@ -74,7 +75,7 @@ public abstract class ActionButtonBase {
     private final int _buttonHorizontalMargin;
     private String _lastSnip;
 
-    protected HighlightingEditor _hlEditor;
+    protected MarkorEditor _hlEditor;
     protected WebView _webView;
     protected Document _document;
     protected AppSettings _appSettings;
@@ -458,7 +459,7 @@ public void runRegexReplaceAction(final String pattern, final String replace) {
         runRegexReplaceAction(Collections.singletonList(new ReplacePattern(pattern, replace)));
     }
 
-    public static void runRegexReplaceAction(final EditText editor, final ReplacePattern... patterns) {
+    public static void runRegexReplaceAction(final MarkorEditor editor, final ReplacePattern... patterns) {
         runRegexReplaceAction(editor, Arrays.asList(patterns));
     }
 
@@ -468,9 +469,17 @@ public static void runRegexReplaceAction(final EditText editor, final ReplacePat
      *
      * @param patterns An array of ReplacePattern
      */
+    public static void runRegexReplaceAction(final MarkorEditor editor, final List<ReplacePattern> patterns) {
+        editor.withAutoFormatDisabled(() -> runRegexReplaceAction(editor.getText(), patterns));
+    }
+
+    public static void runRegexReplaceAction(final EditText editor, final ReplacePattern... patterns) {
+        runRegexReplaceAction(editor, Arrays.asList(patterns));
+    }
+
     public static void runRegexReplaceAction(final EditText editor, final List<ReplacePattern> patterns) {
-        if (editor instanceof HighlightingEditor) {
-            ((HighlightingEditor) editor).withAutoFormatDisabled(() -> runRegexReplaceAction(editor.getText(), patterns));
+        if (editor instanceof MarkorEditor) {
+            runRegexReplaceAction((MarkorEditor) editor, patterns);
         } else {
             runRegexReplaceAction(editor.getText(), patterns);
         }
@@ -589,7 +598,7 @@ protected void runSurroundAction(final String open, final String close, final bo
         _hlEditor.setSelection(ss + ol, se + ol);
     }
 
-    public ActionButtonBase setUiReferences(@Nullable final Activity activity, @Nullable final HighlightingEditor hlEditor, @Nullable final WebView webview) {
+    public ActionButtonBase setUiReferences(@Nullable final Activity activity, @Nullable final MarkorEditor hlEditor, @Nullable final WebView webview) {
         _activity = activity;
         _hlEditor = hlEditor;
         _webView = webview;
@@ -657,7 +666,7 @@ protected final boolean runCommonAction(final @StringRes int action) {
                 return true;
             }
             case R.string.abid_common_accordion: {
-                _hlEditor.insertOrReplaceTextOnCursor("<details markdown='1'><summary>" + rstr(R.string.expand_collapse) + "</summary>\n" + HighlightingEditor.PLACE_CURSOR_HERE_TOKEN + "\n\n</details>");
+                _hlEditor.insertOrReplaceTextOnCursor("<details markdown='1'><summary>" + rstr(R.string.expand_collapse) + "</summary>\n" + MarkorEditor.PLACE_CURSOR_HERE_TOKEN + "\n\n</details>");
                 return true;
             }
             case R.string.abid_common_insert_audio: {
@@ -690,18 +699,18 @@ protected final boolean runCommonAction(final @StringRes int action) {
             }
             case R.string.abid_common_insert_snippet: {
                 MarkorDialogFactory.showInsertSnippetDialog(_activity, (snip) -> {
-                    _hlEditor.insertOrReplaceTextOnCursor(TextViewUtils.interpolateSnippet(snip, _document.title, TextViewUtils.getSelectedText(_hlEditor)));
+                    _hlEditor.insertOrReplaceTextOnCursor(TextViewUtils.interpolateSnippet(snip, _document.title, TextViewUtils.getSelectedText(_hlEditor.getText())));
                     _lastSnip = snip;
                 });
                 return true;
             }
             case R.string.abid_common_open_link_browser: {
-                final int sel = TextViewUtils.getSelection(_hlEditor)[0];
+                final int sel = TextViewUtils.getSelection(_hlEditor.getText())[0];
                 if (sel < 0) {
                     return true;
                 }
 
-                final String line = TextViewUtils.getSelectedLines(_hlEditor, sel);
+                final String line = TextViewUtils.getSelectedLines(_hlEditor.getText(), sel);
                 final int cursor = sel - TextViewUtils.getLineStart(_hlEditor.getText(), sel);
 
                 // First try to pull a resource
@@ -736,7 +745,7 @@ protected final boolean runCommonAction(final @StringRes int action) {
             }
             case R.string.abid_common_new_line_below: {
                 // Go to end of line, works with wrapped lines too
-                final int sel = TextViewUtils.getSelection(_hlEditor)[1];
+                final int sel = TextViewUtils.getSelection(_hlEditor.getText())[1];
                 if (sel > 0) {
                     _hlEditor.setSelection(TextViewUtils.getLineEnd(text, sel));
                     _hlEditor.simulateKeyPress(KeyEvent.KEYCODE_ENTER);
@@ -818,12 +827,14 @@ protected final boolean runCommonLongPressAction(@StringRes int action) {
             }
             case R.string.abid_common_move_text_one_line_up:
             case R.string.abid_common_move_text_one_line_down: {
-                TextViewUtils.showSelection(_hlEditor);
+                if (_hlEditor.getView() instanceof TextView) {
+                    TextViewUtils.showSelection((TextView) _hlEditor.getView());
+                }
                 return true;
             }
             case R.string.abid_common_insert_snippet: {
                 if (!TextUtils.isEmpty(_lastSnip)) {
-                    _hlEditor.insertOrReplaceTextOnCursor(TextViewUtils.interpolateSnippet(_lastSnip, _document.title, TextViewUtils.getSelectedText(_hlEditor)));
+                    _hlEditor.insertOrReplaceTextOnCursor(TextViewUtils.interpolateSnippet(_lastSnip, _document.title, TextViewUtils.getSelectedText(_hlEditor.getText())));
                 }
                 return true;
             }
@@ -886,7 +897,7 @@ public ActionItem setRepeatable(boolean repeatable) {
         }
     }
 
-    public static void moveLineSelectionBy1(final HighlightingEditor hlEditor, final boolean isUp) {
+    public static void moveLineSelectionBy1(final MarkorEditor hlEditor, final boolean isUp) {
         final Editable text = hlEditor.getText();
         final int[] sel = TextViewUtils.getSelection(text);
         if (text == null || sel[0] < 0) {
@@ -918,7 +929,7 @@ public static void moveLineSelectionBy1(final HighlightingEditor hlEditor, final
         }
     }
 
-    public static void duplicateLineSelection(final HighlightingEditor hlEditor) {
+    public static void duplicateLineSelection(final MarkorEditor hlEditor) {
         // Duplication is performed downwards, selection is moving alongside it and
         // cursor is preserved regarding column position (helpful for editing the
         // newly created line at the selected position right away).

app/src/main/java/net/gsantner/markor/format/markdown/MarkdownActionButtons.java

@@ -11,6 +11,7 @@
 import android.content.Context;
 import android.text.Editable;
 import android.view.KeyEvent;
+import android.widget.EditText;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -165,20 +166,20 @@ public boolean onActionClick(final @StringRes int action) {
      * @param delim   - Delimiter to surround text with
      */
     private void runLineSurroundAction(final Pattern pattern, final String delim) {
-        final int[] sel = TextViewUtils.getSelection(_hlEditor);
+        final int[] sel = TextViewUtils.getSelection(_hlEditor.getText());
         if (sel[0] < 0) {
             return;
         }
 
-        final String lineBefore = sel[0] == sel[1] ? TextViewUtils.getSelectedLines(_hlEditor, sel[0]) : null;
+        final String lineBefore = sel[0] == sel[1] ? TextViewUtils.getSelectedLines(_hlEditor.getText(), sel[0]) : null;
         runRegexReplaceAction(
                 new ReplacePattern(pattern, "$1$2$4$6"),
                 new ReplacePattern(LINE_NONE, "$1$2" + delim + "$3" + delim + "$4")
         );
 
         // This logic sets the cursor to the inside of the delimiters if the delimiters were empty
         if (lineBefore != null) {
-            final String lineAfter = TextViewUtils.getSelectedLines(_hlEditor, sel[0]);
+            final String lineAfter = TextViewUtils.getSelectedLines(_hlEditor.getText(), sel[0]);
             final String pair = delim + delim;
             if (lineAfter.length() - lineBefore.length() == pair.length() && lineAfter.trim().endsWith(pair)) {
                 final Editable text = _hlEditor.getText();
@@ -216,7 +217,14 @@ public boolean onActionLongClick(final @StringRes int action) {
             case R.string.abid_common_checkbox_list: {
                 MarkorDialogFactory.showDocumentChecklistDialog(
                         getActivity(), _hlEditor.getText(), CHECKED_LIST_LINE, 4, "xX", " ",
-                        pos -> TextViewUtils.setSelectionAndShow(_hlEditor, pos));
+                        pos -> {
+                            if (_hlEditor.getView() instanceof EditText) {
+                                TextViewUtils.setSelectionAndShow((EditText) _hlEditor.getView(), pos);
+                            } else {
+                                _hlEditor.requestFocus();
+                                _hlEditor.setSelection(pos);
+                            }
+                        });
                 return true;
             }
             default: {
@@ -264,7 +272,7 @@ public static Link extract(final CharSequence text, final int pos) {
     }
 
     private boolean followLinkUnderCursor() {
-        final int sel = TextViewUtils.getSelection(_hlEditor)[0];
+        final int sel = TextViewUtils.getSelection(_hlEditor.getText())[0];
         if (sel < 0) {
             return false;
         }
@@ -291,7 +299,7 @@ private void insertTableRow(int cols, boolean isHeaderEnabled) {
         _hlEditor.requestFocus();
 
         // Append if current line empty
-        final int[] sel = TextViewUtils.getLineSelection(_hlEditor);
+        final int[] sel = TextViewUtils.getLineSelection(_hlEditor.getText());
         if (sel[0] != -1 && sel[0] == sel[1]) {
             sb.append("\n");
         }

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

@@ -74,7 +74,7 @@ protected int getFormatActionsKey() {
     @SuppressLint("NonConstantResourceId")
     @Override
     public boolean onActionClick(final @StringRes int action) {
-        final List<TodoTxtTask> selTasks = TodoTxtTask.getSelectedTasks(_hlEditor);
+        final List<TodoTxtTask> selTasks = TodoTxtTask.getSelectedTasks(_hlEditor.getText(), TextViewUtils.getSelection(_hlEditor.getText()));
 
         switch (action) {
             case R.string.abid_todotxt_toggle_done: {
@@ -159,7 +159,7 @@ public boolean onActionLongClick(final @StringRes int action) {
             }
             case R.string.abid_todotxt_priority: {
                 final Editable text = _hlEditor.getText();
-                final int[] sel = TextViewUtils.getSelection(_hlEditor);
+                final int[] sel = TextViewUtils.getSelection(_hlEditor.getText());
                 final int lineStart = TextViewUtils.getLineStart(text, sel[0]);
                 final int lineEnd = TextViewUtils.getLineEnd(text, sel[1]);
                 final List<TodoTxtTask> tasks = TodoTxtTask.getTasks(text, new int[]{sel[0], sel[1]});
@@ -245,7 +245,7 @@ public void archiveDoneTasks() {
                 if (new Document(doneFile).saveContent(getActivity(), doneContents.toString())) {
                     final String tasksString = TodoTxtTask.tasksToString(keep);
                     _hlEditor.setText(tasksString);
-                    TextViewUtils.setSelectionFromOffsets(_hlEditor, offsets);
+                    TextViewUtils.setSelectionFromOffsets(_hlEditor.getText(), offsets);
                 }
             }
             _appSettings.setLastTodoDoneName(_document.path, doneName);
@@ -273,7 +273,7 @@ private void addRemoveItems(
         final TodoTxtTask additional = new TodoTxtTask(_appSettings.getTodotxtAdditionalContextsAndProjects());
         all.addAll(keyGetter.callback(Collections.singletonList(additional)));
 
-        final Set<String> current = new HashSet<>(keyGetter.callback(TodoTxtTask.getSelectedTasks(_hlEditor)));
+        final Set<String> current = new HashSet<>(keyGetter.callback(TodoTxtTask.getSelectedTasks(_hlEditor.getText(), TextViewUtils.getSelection(_hlEditor.getText()))));
 
         final boolean append = _appSettings.isTodoAppendProConOnEndEnabled();
 
@@ -396,7 +396,7 @@ private void setDate() {
 
 
     private void setDueDate(final int offset) {
-        final String dueString = TodoTxtTask.getSelectedTasks(_hlEditor).get(0).getDueDate();
+        final String dueString = TodoTxtTask.getSelectedTasks(_hlEditor.getText(), TextViewUtils.getSelection(_hlEditor.getText())).get(0).getDueDate();
         Calendar initDate = parseDateString(dueString, Calendar.getInstance());
         initDate.add(Calendar.DAY_OF_MONTH, (dueString == null || dueString.isEmpty()) ? offset : 0);
 
@@ -514,4 +514,4 @@ public void onCreate(final Bundle savedInstanceState) {
             }
         }
     }
-}
+}

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

@@ -32,6 +32,10 @@ public TodoTxtSyntaxHighlighter(final AppSettings as) {
     public SyntaxHighlighterBase configure(Paint paint) {
         super.configure(paint);
 
+        if (paint == null) {
+            paint = new Paint();
+        }
+
         _delay = _appSettings.getHighlightingDelayTodoTxt();
         final boolean dark = MarkorContextUtils.instance.isDarkModeEnabled(_appSettings.getContext());
         _paragraphSpan = new ParagraphDividerSpan(paint, dark ? 0x44FFFFFF : 0xFFDDDDDD);

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

@@ -82,6 +82,10 @@ public static List<TodoTxtTask> getSelectedTasks(final TextView view) {
         return getTasks(view.getText(), TextViewUtils.getSelection(view));
     }
 
+    public static List<TodoTxtTask> getSelectedTasks(final CharSequence text, final int[] sel) {
+        return getTasks(text, sel);
+    }
+
     public static List<TodoTxtTask> getAllTasks(final CharSequence text) {
         return getTasks(text, new int[]{0, text.length()});
     }

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

@@ -196,7 +196,7 @@ private void openLink() {
     }
 
     private String tryExtractWikitextLink() {
-        int cursorPos = TextViewUtils.getSelection(_hlEditor)[0];
+        int cursorPos = TextViewUtils.getSelection(_hlEditor.getText())[0];
         CharSequence text = _hlEditor.getText();
         int lineStart = TextViewUtils.getLineStart(text, cursorPos);
         int lineEnd = TextViewUtils.getLineEnd(text, cursorPos);
@@ -216,11 +216,11 @@ private void toggleHeading(int headingLevel) {
         final CharSequence text = _hlEditor.getText();
         runRegexReplaceAction(WikitextReplacePatternGenerator.setOrUnsetHeadingWithLevel(headingLevel));
 
-        final int[] lineSelection = TextViewUtils.getLineSelection(_hlEditor);
+        final int[] lineSelection = TextViewUtils.getLineSelection(_hlEditor.getText());
         Matcher m = WikitextSyntaxHighlighter.HEADING.matcher(text.subSequence(lineSelection[0], lineSelection[1]));
         if (m.find()) {
             final int afterHeadingTextOffset = m.end(3);
-            final int lineStart = TextViewUtils.getLineStart(text, TextViewUtils.getSelection(_hlEditor)[0]);
+            final int lineStart = TextViewUtils.getLineStart(text, TextViewUtils.getSelection(_hlEditor.getText())[0]);
             _hlEditor.setSelection(lineStart + afterHeadingTextOffset);
         }
     }
@@ -286,4 +286,4 @@ public boolean onReceiveKeyPress(final int keyCode, final KeyEvent event) {
 
         return super.onReceiveKeyPress(keyCode, event);
     }
-}
+}

app/src/main/java/net/gsantner/markor/frontend/DatetimeFormatDialog.java

@@ -28,7 +28,7 @@
 import androidx.core.os.ConfigurationCompat;
 
 import net.gsantner.markor.R;
-import net.gsantner.markor.frontend.textview.HighlightingEditor;
+import net.gsantner.markor.frontend.textview.MarkorEditor;
 import net.gsantner.markor.model.AppSettings;
 import net.gsantner.opoc.model.GsSharedPreferencesPropertyBackend;
 import net.gsantner.opoc.util.GsContextUtils;
@@ -78,10 +78,10 @@ public class DatetimeFormatDialog {
 
     /**
      * @param activity {@link Activity} from which is {@link DatetimeFormatDialog} called
-     * @param hlEditor {@link HighlightingEditor} which 'll add selected result to cursor position
+     * @param hlEditor {@link MarkorEditor} which 'll add selected result to cursor position
      */
     @SuppressLint({"ClickableViewAccessibility", "SetTextI18n, InflateParams"})
-    public static void showDatetimeFormatDialog(final Activity activity, final HighlightingEditor hlEditor) {
+    public static void showDatetimeFormatDialog(final Activity activity, final MarkorEditor hlEditor) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.Theme_AppCompat_DayNight_Dialog_Rounded);
         final View viewRoot = activity.getLayoutInflater().inflate(R.layout.time_format_dialog, null);
 
@@ -352,4 +352,4 @@ public static String getMostRecentDate(final Context context) {
             return "";
         }
     }
-}
+}