Minimize unnecessary cursor shifting at editor, various fixes & improvements

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

@@ -20,6 +20,7 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.Menu;
@@ -150,7 +151,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         // It may cause reads or writes to _silently fail_
         // Instead we try to create it, and exit if that isn't possible
         if (isStateBad()) {
-            Toast.makeText(activity, R.string.document_error_exit, Toast.LENGTH_LONG).show();
+            Toast.makeText(activity, R.string.error_could_not_open_file, Toast.LENGTH_LONG).show();
             activity.finish();
             return;
         }
@@ -194,7 +195,6 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
             ((DocumentActivity) activity).setDocumentTitle(_document.getTitle());
         }
 
-        _hlEditor.setScrollView(_primaryScrollView);
         _hlEditor.setLineSpacing(0, _appSettings.getEditorLineSpacing());
         _hlEditor.setTextSize(TypedValue.COMPLEX_UNIT_SP, _appSettings.getDocumentFontSize(_document.getPath()));
         _hlEditor.setTypeface(GsFontPreferenceCompat.typeface(getContext(), _appSettings.getFontFamily(), Typeface.NORMAL));
@@ -234,6 +234,7 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
             updateUndoRedoIconStates();
         });
         _hlEditor.addTextChangedListener(GsTextWatcherAdapter.after(s -> debounced.run()));
+
     }
 
     @Override
@@ -358,15 +359,24 @@ private void updateUndoRedoIconStates() {
     }
 
     public boolean loadDocument() {
+        return loadDocument(false);
+    }
+
+    public boolean loadDocument(final boolean forceReload) {
         if (isSdStatusBad() || isStateBad()) {
             errorClipText();
             return false;
         }
 
-        // Only trigger the load process if constructing or file updated
-        if (_document.hasFileChangedSinceLastLoad()) {
+        // Only trigger the load process if constructing or file updated or force reload
+        if (forceReload || _document.hasFileChangedSinceLastLoad()) {
 
             final String content = _document.loadContent(getContext());
+            if (content == null) {
+                errorClipText();
+                return false;
+            }
+
             if (!_document.isContentSame(_hlEditor.getText())) {
 
                 final int[] sel = TextViewUtils.getSelection(_hlEditor);
@@ -427,7 +437,7 @@ public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
                 return true;
             }
             case R.id.action_reload: {
-                if (loadDocument()) {
+                if (loadDocument(true)) {
                     Toast.makeText(activity, "✔", Toast.LENGTH_SHORT).show();
                 }
                 return true;
@@ -651,6 +661,9 @@ private void setHorizontalScrollMode(final boolean wrap) {
 
             final int[] sel = TextViewUtils.getSelection(_hlEditor);
 
+            final boolean hlEnabled = _hlEditor.getHighlightingEnabled();
+            _hlEditor.setHighlightingEnabled(false);
+
             _primaryScrollView.removeAllViews();
             if (_hsView != null) {
                 _hsView.removeAllViews();
@@ -666,8 +679,10 @@ private void setHorizontalScrollMode(final boolean wrap) {
                 _primaryScrollView.addView(_hlEditor);
             }
 
+            _hlEditor.setHighlightingEnabled(hlEnabled);
+
             // Run after layout() of immediate parent completes
-            (wrap ? _primaryScrollView : _hsView).post(() -> TextViewUtils.setSelectionAndShow(_hlEditor, sel[0], sel[1]));
+            (wrap ? _primaryScrollView : _hsView).post(() -> TextViewUtils.setSelectionAndShow(_hlEditor, sel));
         }
     }
 
@@ -682,8 +697,10 @@ public void errorClipText() {
             Context context = getContext();
             context = context == null ? ApplicationObject.get().getApplicationContext() : context;
             new MarkorContextUtils(context).setClipboard(getContext(), text);
-            Toast.makeText(getContext(), R.string.document_error_clip, Toast.LENGTH_LONG).show();
         }
+        // Always show error message
+        Toast.makeText(getContext(), R.string.error_could_not_open_file, Toast.LENGTH_LONG).show();
+        Log.i(DocumentEditAndViewFragment.class.getName(), "Triggering error text clipping");
     }
 
     public boolean isSdStatusBad() {

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

@@ -30,7 +30,7 @@
 import net.gsantner.markor.R;
 import net.gsantner.markor.format.FormatRegistry;
 import net.gsantner.markor.format.plaintext.PlaintextSyntaxHighlighter;
-import net.gsantner.markor.format.todotxt.TodoTxtParser;
+import net.gsantner.markor.format.todotxt.TodoTxtTask;
 import net.gsantner.markor.frontend.NewFileDialog;
 import net.gsantner.markor.frontend.filebrowser.MarkorFileBrowserFactory;
 import net.gsantner.markor.frontend.settings.MarkorPermissionChecker;
@@ -197,10 +197,15 @@ private void appendToExistingDocument(final File file, final String separator, f
             final String shareIntoFormat = _cu.formatDateTime(context, _appSettings.getShareIntoPrefix(), System.currentTimeMillis());
             final boolean isTodoTxt = FormatRegistry.CONVERTER_TODOTXT.isFileOutOfThisFormat(file.getAbsolutePath());
 
-            final String newContent = document.loadContent(context).replaceAll("(^[\\r\\n]+|[\\r\\n]+$)", "")
-                    + separator
-                    + (isTodoTxt ? _sharedText : formatOrPrefixSharedText(shareIntoFormat, _sharedText));
-            document.saveContent(context, newContent);
+            final String oldContent = document.loadContent(context);
+            if (oldContent != null) {
+                final String newContent = oldContent.replaceAll("(^[\\r\\n]+|[\\r\\n]+$)", "")
+                        + separator
+                        + (isTodoTxt ? _sharedText : formatOrPrefixSharedText(shareIntoFormat, _sharedText));
+                document.saveContent(context, newContent);
+            } else {
+                Toast.makeText(context, R.string.error_could_not_open_file, Toast.LENGTH_LONG).show();
+            }
 
             if (showEditor) {
                 showInDocumentActivity(document);
@@ -311,7 +316,7 @@ public Boolean onPreferenceClicked(Preference preference, String key, int keyId)
                     if (permc.doIfExtStoragePermissionGranted()) {
                         String sep = "\n";
                         if (_appSettings.getDocumentAutoFormatEnabled(this._appSettings.getTodoFile().getAbsolutePath())) {
-                            sep += TodoTxtParser.getToday() + " ";
+                            sep += TodoTxtTask.getToday() + " ";
                         }
                         appendToExistingDocument(this._appSettings.getTodoFile(), sep, false);
                         close = true;

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

@@ -115,7 +115,7 @@ protected void onNewIntent(final Intent intent) {
         final File dir = getIntentDir(intent, null);
         final GsFileBrowserFragment frag = getNotebook();
         if (frag != null && dir != null) {
-            frag.post(() -> frag.getAdapter().setCurrentFolder(dir, false));
+            frag.post(() -> frag.getAdapter().setCurrentFolder(dir));
             _bottomNav.postDelayed(() -> _bottomNav.setSelectedItemId(R.id.nav_notebook), 10);
         }
     }
@@ -257,8 +257,7 @@ public boolean onLongClickFab(View view) {
         GsFileBrowserFragment fsFrag = getNotebook();
         if (fsFrag != null && permc.mkdirIfStoragePermissionGranted()) {
             fsFrag.getAdapter().setCurrentFolder(fsFrag.getCurrentFolder().equals(GsFileBrowserListAdapter.VIRTUAL_STORAGE_RECENTS)
-                            ? GsFileBrowserListAdapter.VIRTUAL_STORAGE_FAVOURITE : GsFileBrowserListAdapter.VIRTUAL_STORAGE_RECENTS
-                    , true);
+                    ? GsFileBrowserListAdapter.VIRTUAL_STORAGE_FAVOURITE : GsFileBrowserListAdapter.VIRTUAL_STORAGE_RECENTS);
         }
         return true;
     }

app/src/main/java/net/gsantner/markor/activity/openeditor/OpenEditorActivity.java

@@ -44,7 +44,9 @@ protected void openActivityAndClose(final Intent openIntent, File file) {
                     file.getParentFile().mkdirs();
                 }
                 if (!file.exists() && !file.isDirectory()) {
-                    GsFileUtils.writeFile(file, "", new GsFileUtils.FileInfo().withBom(_appSettings.getNewFileDialogLastUsedUtf8Bom()));
+                    final GsFileUtils.FileInfo info = new GsFileUtils.FileInfo();
+                    info.hasBom = _appSettings.getNewFileDialogLastUsedUtf8Bom();
+                    GsFileUtils.writeFile(file, "", info);
                 }
                 openIntent.putExtra(Document.EXTRA_PATH, openIntent.hasExtra(Document.EXTRA_PATH) ? openIntent.getSerializableExtra(Document.EXTRA_PATH) : file);
                 _cu.animateToActivity(this, openIntent, true, 1);

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

@@ -82,13 +82,13 @@ protected int getFormatActionsKey() {
     @SuppressLint("NonConstantResourceId")
     @Override
     public boolean onActionClick(final @StringRes int action) {
-        final List<TodoTxtParser> selTasks = TodoTxtParser.getSelectedTasks(_hlEditor);
+        final List<TodoTxtTask> selTasks = TodoTxtTask.getSelectedTasks(_hlEditor);
 
         switch (action) {
             case R.string.abid_todotxt_toggle_done: {
-                final String doneMark = "x" + (_appSettings.isTodoAddCompletionDateEnabled() ? (" " + TodoTxtParser.getToday()) : "") + " ";
+                final String doneMark = "x" + (_appSettings.isTodoAddCompletionDateEnabled() ? (" " + TodoTxtTask.getToday()) : "") + " ";
                 final String bodyWithPri = "(.*)(\\spri:([A-Z])(?=\\s|$))(.*)"; // +1 = pre, +2 = full tag, +3 = pri, +4 = post
-                final String doneWithDate = "^([Xx]\\s(?:" + TodoTxtParser.PT_DATE + "\\s)?)";
+                final String doneWithDate = "^([Xx]\\s(?:" + TodoTxtTask.PT_DATE + "\\s)?)";
                 final String startingPriority = "^\\(([A-Z])\\)\\s";
                 runRegexReplaceAction(
                         // If task not done and starts with a priority and contains a pri tag
@@ -106,17 +106,17 @@ public boolean onActionClick(final @StringRes int action) {
             }
             case R.string.abid_todotxt_add_context: {
                 final List<String> contexts = new ArrayList<>();
-                contexts.addAll(TodoTxtParser.getContexts(TodoTxtParser.getAllTasks(_hlEditor.getText())));
-                contexts.addAll(new TodoTxtParser(_appSettings.getTodotxtAdditionalContextsAndProjects()).getContexts());
+                contexts.addAll(TodoTxtTask.getContexts(TodoTxtTask.getAllTasks(_hlEditor.getText())));
+                contexts.addAll(new TodoTxtTask(_appSettings.getTodotxtAdditionalContextsAndProjects()).getContexts());
                 MarkorDialogFactory.showSttContextDialog(getActivity(), contexts, (context) -> {
                     insertUniqueItem((context.charAt(0) == '@') ? context : "@" + context);
                 });
                 return true;
             }
             case R.string.abid_todotxt_add_project: {
                 final List<String> projects = new ArrayList<>();
-                projects.addAll(TodoTxtParser.getProjects(TodoTxtParser.getAllTasks(_hlEditor.getText())));
-                projects.addAll(new TodoTxtParser(_appSettings.getTodotxtAdditionalContextsAndProjects()).getProjects());
+                projects.addAll(TodoTxtTask.getProjects(TodoTxtTask.getAllTasks(_hlEditor.getText())));
+                projects.addAll(new TodoTxtTask(_appSettings.getTodotxtAdditionalContextsAndProjects()).getProjects());
                 MarkorDialogFactory.showSttProjectDialog(getActivity(), projects, (project) -> {
                     insertUniqueItem((project.charAt(0) == '+') ? project : "+" + project);
                 });
@@ -126,10 +126,10 @@ public boolean onActionClick(final @StringRes int action) {
                 MarkorDialogFactory.showPriorityDialog(getActivity(), selTasks.get(0).getPriority(), (priority) -> {
                     ArrayList<ReplacePattern> patterns = new ArrayList<>();
                     if (priority.length() > 1) {
-                        patterns.add(new ReplacePattern(TodoTxtParser.PATTERN_PRIORITY_ANY, ""));
+                        patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, ""));
                     } else if (priority.length() == 1) {
                         final String _priority = String.format("(%c) ", priority.charAt(0));
-                        patterns.add(new ReplacePattern(TodoTxtParser.PATTERN_PRIORITY_ANY, _priority));
+                        patterns.add(new ReplacePattern(TodoTxtTask.PATTERN_PRIORITY_ANY, _priority));
                         patterns.add(new ReplacePattern("^\\s*", _priority));
                     }
                     runRegexReplaceAction(patterns);
@@ -145,17 +145,17 @@ public boolean onActionClick(final @StringRes int action) {
                 MarkorDialogFactory.showSttArchiveDialog(getActivity(), (callbackPayload) -> {
                     callbackPayload = Document.normalizeFilename(callbackPayload);
 
-                    final ArrayList<TodoTxtParser> keep = new ArrayList<>();
-                    final ArrayList<TodoTxtParser> move = new ArrayList<>();
-                    final List<TodoTxtParser> allTasks = TodoTxtParser.getAllTasks(_hlEditor.getText());
+                    final ArrayList<TodoTxtTask> keep = new ArrayList<>();
+                    final ArrayList<TodoTxtTask> move = new ArrayList<>();
+                    final List<TodoTxtTask> allTasks = TodoTxtTask.getAllTasks(_hlEditor.getText());
 
                     final int[] sel = TextViewUtils.getSelection(_hlEditor);
                     final CharSequence text = _hlEditor.getText();
                     final int[] selStart = TextViewUtils.getLineOffsetFromIndex(text, sel[0]);
                     final int[] selEnd = TextViewUtils.getLineOffsetFromIndex(text, sel[1]);
 
                     for (int i = 0; i < allTasks.size(); i++) {
-                        final TodoTxtParser task = allTasks.get(i);
+                        final TodoTxtTask task = allTasks.get(i);
                         if (task.isDone()) {
                             move.add(task);
                             if (i <= selStart[0]) selStart[0]--;
@@ -170,11 +170,11 @@ public boolean onActionClick(final @StringRes int action) {
                         if (doneFile.exists() && doneFile.canRead()) {
                             doneFileContents = GsFileUtils.readTextFileFast(doneFile).first.trim() + "\n";
                         }
-                        doneFileContents += TodoTxtParser.tasksToString(move) + "\n";
+                        doneFileContents += TodoTxtTask.tasksToString(move) + "\n";
 
                         // Write to done file
                         if (new Document(doneFile).saveContent(getActivity(), doneFileContents)) {
-                            final String tasksString = TodoTxtParser.tasksToString(keep);
+                            final String tasksString = TodoTxtTask.tasksToString(keep);
                             _hlEditor.setText(tasksString);
                             _hlEditor.setSelection(
                                     TextViewUtils.getIndexFromLineOffset(tasksString, selStart),
@@ -190,9 +190,9 @@ public boolean onActionClick(final @StringRes int action) {
                 MarkorDialogFactory.showSttSortDialogue(getActivity(), (orderBy, descending) -> new Thread() {
                     @Override
                     public void run() {
-                        final List<TodoTxtParser> tasks = TodoTxtParser.getAllTasks(_hlEditor.getText());
-                        TodoTxtParser.sortTasks(tasks, orderBy, descending);
-                        setEditorTextAsync(TodoTxtParser.tasksToString(tasks));
+                        final List<TodoTxtTask> tasks = TodoTxtTask.getAllTasks(_hlEditor.getText());
+                        TodoTxtTask.sortTasks(tasks, orderBy, descending);
+                        setEditorTextAsync(TodoTxtTask.tasksToString(tasks));
                         _appSettings.setStringList(LAST_SORT_ORDER_KEY, Arrays.asList(orderBy, Boolean.toString(descending)));
                     }
                 }.start());
@@ -219,9 +219,9 @@ public boolean onActionLongClick(final @StringRes int action) {
             case R.string.abid_todotxt_sort_todo: {
                 final List<String> last = _appSettings.getStringList(LAST_SORT_ORDER_KEY);
                 if (last != null && last.size() == 2) {
-                    final List<TodoTxtParser> tasks = TodoTxtParser.getAllTasks(_hlEditor.getText());
-                    TodoTxtParser.sortTasks(tasks, last.get(0), Boolean.parseBoolean(last.get(1)));
-                    setEditorTextAsync(TodoTxtParser.tasksToString(tasks));
+                    final List<TodoTxtTask> tasks = TodoTxtTask.getAllTasks(_hlEditor.getText());
+                    TodoTxtTask.sortTasks(tasks, last.get(0), Boolean.parseBoolean(last.get(1)));
+                    setEditorTextAsync(TodoTxtTask.tasksToString(tasks));
                 }
                 return true;
             }
@@ -289,13 +289,13 @@ private void insertInline(String thing) {
     }
 
     private static Calendar parseDateString(final String dateString, final Calendar fallback) {
-        if (dateString == null || dateString.length() != TodoTxtParser.DATEF_YYYY_MM_DD_LEN) {
+        if (dateString == null || dateString.length() != TodoTxtTask.DATEF_YYYY_MM_DD_LEN) {
             return fallback;
         }
 
         try {
             Calendar calendar = Calendar.getInstance();
-            calendar.setTime(TodoTxtParser.DATEF_YYYY_MM_DD.parse(dateString));
+            calendar.setTime(TodoTxtTask.DATEF_YYYY_MM_DD.parse(dateString));
             return calendar;
         } catch (ParseException e) {
             return fallback;
@@ -311,7 +311,7 @@ private void setDate() {
         DatePickerDialog.OnDateSetListener listener = (_view, year, month, day) -> {
             Calendar fmtCal = Calendar.getInstance();
             fmtCal.set(year, month, day);
-            final String newDate = TodoTxtParser.DATEF_YYYY_MM_DD.format(fmtCal.getTime());
+            final String newDate = TodoTxtTask.DATEF_YYYY_MM_DD.format(fmtCal.getTime());
             text.replace(sel[0], sel[1], newDate);
         };
 
@@ -324,24 +324,24 @@ private void setDate() {
 
 
     private void setDueDate(final int offset) {
-        final String dueString = TodoTxtParser.getSelectedTasks(_hlEditor).get(0).getDueDate();
+        final String dueString = TodoTxtTask.getSelectedTasks(_hlEditor).get(0).getDueDate();
         Calendar initDate = parseDateString(dueString, Calendar.getInstance());
         initDate.add(Calendar.DAY_OF_MONTH, (dueString == null || dueString.isEmpty()) ? offset : 0);
 
         final DatePickerDialog.OnDateSetListener listener = (_view, year, month, day) -> {
             Calendar fmtCal = Calendar.getInstance();
             fmtCal.set(year, month, day);
-            final String newDue = "due:" + TodoTxtParser.DATEF_YYYY_MM_DD.format(fmtCal.getTime());
+            final String newDue = "due:" + TodoTxtTask.DATEF_YYYY_MM_DD.format(fmtCal.getTime());
             runRegexReplaceAction(
                     // Replace due date
-                    new ReplacePattern(TodoTxtParser.PATTERN_DUE_DATE, "$1" + newDue + "$4"),
+                    new ReplacePattern(TodoTxtTask.PATTERN_DUE_DATE, "$1" + newDue + "$4"),
                     // Add due date to end if none already exists. Will correctly handle trailing whitespace.
                     new ReplacePattern("\\s*$", " " + newDue)
             );
         };
 
         final DatePickerDialog.OnClickListener clear = (dialog, which) -> {
-            runRegexReplaceAction(new ReplacePattern(TodoTxtParser.PATTERN_DUE_DATE, "$4"));
+            runRegexReplaceAction(new ReplacePattern(TodoTxtTask.PATTERN_DUE_DATE, "$4"));
         };
 
         new DateFragment()