Navigation and highlighting improvements

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

@@ -37,18 +37,24 @@
 import net.gsantner.opoc.util.GsFileUtils;
 
 import java.io.File;
+import java.util.Stack;
 
 import other.so.AndroidBug5497Workaround;
 
 public class DocumentActivity extends MarkorBaseActivity {
-    public static final String EXTRA_DO_PREVIEW = "EXTRA_DO_PREVIEW";
 
     private Toolbar _toolbar;
-
     private FragmentManager _fragManager;
 
     private static boolean nextLaunchTransparentBg = false;
 
+    public static void launch(final Activity activity, final Intent intent) {
+        final File file = MarkorContextUtils.getIntentFile(intent, null);
+        final Integer lineNumber = intent.hasExtra(Document.EXTRA_FILE_LINE_NUMBER) ? intent.getIntExtra(Document.EXTRA_FILE_LINE_NUMBER, -1) : null;
+        final Boolean doPreview = intent.hasExtra(Document.EXTRA_DO_PREVIEW) ? intent.getBooleanExtra(Document.EXTRA_DO_PREVIEW, false) : null;
+        launch(activity, file, doPreview, lineNumber);
+    }
+
     public static void launch(
             final Activity activity,
             final File file,
@@ -90,18 +96,16 @@ private static void launch(
 
         intent.putExtra(Document.EXTRA_FILE, file);
 
-        if (lineNumber != null && lineNumber >= 0) {
+        if (lineNumber != null) {
             intent.putExtra(Document.EXTRA_FILE_LINE_NUMBER, lineNumber);
         }
 
         if (doPreview != null) {
-            intent.putExtra(DocumentActivity.EXTRA_DO_PREVIEW, doPreview);
+            intent.putExtra(Document.EXTRA_DO_PREVIEW, doPreview);
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && as.isMultiWindowEnabled()) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && as.isMultiWindowEnabled() && !(activity instanceof DocumentActivity)) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
-        } else {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         }
 
         nextLaunchTransparentBg = (activity instanceof MainActivity);
@@ -190,7 +194,7 @@ private void handleLaunchingIntent(final Intent intent) {
             final Document doc = new Document(file);
             Integer startLine = null;
             if (intent.hasExtra(Document.EXTRA_FILE_LINE_NUMBER)) {
-                startLine = intent.getIntExtra(Document.EXTRA_FILE_LINE_NUMBER, -1);
+                startLine = intent.getIntExtra(Document.EXTRA_FILE_LINE_NUMBER, Document.EXTRA_FILE_LINE_NUMBER_LAST);
             } else if (intentData != null) {
                 final String line = intentData.getQueryParameter("line");
                 if (line != null) {
@@ -203,7 +207,7 @@ private void handleLaunchingIntent(final Intent intent) {
             if (startLine != null) {
                 // If a line is requested, open in edit mode so the line is shown
                 startInPreview = false;
-            } else if (intent.getBooleanExtra(EXTRA_DO_PREVIEW, false) || file.getName().startsWith("index.")) {
+            } else if (intent.getBooleanExtra(Document.EXTRA_DO_PREVIEW, false) || file.getName().startsWith("index.")) {
                 startInPreview = true;
             }
 
@@ -272,7 +276,7 @@ public void setDocumentTitle(final String title) {
     }
 
     public void showTextEditor(final Document document, final Integer lineNumber, final Boolean startPreview) {
-        final GsFragmentBase currentFragment = getCurrentVisibleFragment();
+        final GsFragmentBase<?, ?> currentFragment = getCurrentVisibleFragment();
 
         final boolean sameDocumentRequested = (
                 currentFragment instanceof DocumentEditAndViewFragment &&
@@ -297,21 +301,15 @@ protected void onResume() {
     @Override
     @SuppressWarnings("StatementWithEmptyBody")
     public void onBackPressed() {
-        FragmentManager fragMgr = getSupportFragmentManager();
-        GsFragmentBase top = getCurrentVisibleFragment();
-        if (top != null) {
-            if (!top.onBackPressed()) {
-                if (fragMgr.getBackStackEntryCount() == 1) {
-                    // Back action was not handled by fragment, handle in activity
-                } else if (fragMgr.getBackStackEntryCount() > 0) {
-                    // Back action was to go one fragment back
-                    fragMgr.popBackStack();
-                    return;
-                }
-            } else {
-                // Was handled by child fragment
-                return;
-            }
+        final int entryCount = _fragManager.getBackStackEntryCount();
+        final GsFragmentBase<?, ?> top = getCurrentVisibleFragment();
+
+        // We pop the stack to go back to the previous fragment
+        // if the top fragment does not handle the back press
+        // Doesn't actually get called as we have 1 fragment in the stack
+        if (top != null && !top.onBackPressed() && entryCount > 1) {
+            _fragManager.popBackStack();
+            return;
         }
 
         // Handle in this activity
@@ -324,10 +322,10 @@ public void onBackPressed() {
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        return super.onReceiveKeyPress(getCurrentVisibleFragment(), keyCode, event) ? true : super.onKeyDown(keyCode, event);
+        return super.onReceiveKeyPress(getCurrentVisibleFragment(), keyCode, event) || super.onKeyDown(keyCode, event);
     }
 
-    public GsFragmentBase showFragment(GsFragmentBase fragment) {
+    public GsFragmentBase<?, ?> showFragment(GsFragmentBase<?, ?> fragment) {
         if (fragment != getCurrentVisibleFragment()) {
             _fragManager.beginTransaction()
                     .replace(R.id.document__placeholder_fragment, fragment, fragment.getFragmentTag())
@@ -338,11 +336,11 @@ public GsFragmentBase showFragment(GsFragmentBase fragment) {
         return fragment;
     }
 
-    public synchronized GsFragmentBase getExistingFragment(final String fragmentTag) {
-        return (GsFragmentBase) getSupportFragmentManager().findFragmentByTag(fragmentTag);
+    public synchronized GsFragmentBase<?, ?> getExistingFragment(final String fragmentTag) {
+        return (GsFragmentBase<?, ?>) getSupportFragmentManager().findFragmentByTag(fragmentTag);
     }
 
-    private GsFragmentBase getCurrentVisibleFragment() {
-        return (GsFragmentBase) getSupportFragmentManager().findFragmentById(R.id.document__placeholder_fragment);
+    private GsFragmentBase<?, ?> getCurrentVisibleFragment() {
+        return (GsFragmentBase<?, ?>) getSupportFragmentManager().findFragmentById(R.id.document__placeholder_fragment);
     }
 }

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

@@ -251,16 +251,9 @@ public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
                 }
             });
         }
-    }
-
-    @Override
-    public void onFragmentFirstTimeVisible() {
-        _primaryScrollView.invalidate();
-        int startPos = _appSettings.getLastEditPosition(_document.getPath(), _hlEditor.length());
 
-        // First start - overwrite start position if needed
-        if (_savedInstanceState == null) {
-            final Bundle args = getArguments();
+        if (savedInstanceState == null) {
+            int startPos = _appSettings.getLastEditPosition(_document.getPath(), _hlEditor.length());
             if (args != null && args.containsKey(Document.EXTRA_FILE_LINE_NUMBER)) {
                 final int lno = args.getInt(Document.EXTRA_FILE_LINE_NUMBER);
                 if (lno >= 0) {
@@ -269,9 +262,9 @@ public void onFragmentFirstTimeVisible() {
                     startPos = _hlEditor.length();
                 }
             }
-        }
 
-        TextViewUtils.setSelectionAndShow(_hlEditor, startPos);
+            TextViewUtils.setSelectionAndShow(_hlEditor, startPos);
+        }
     }
 
     @Override
@@ -442,8 +435,7 @@ public boolean loadDocument() {
                     _editTextUndoRedoHelper.setTextView(_hlEditor);
                 }
 
-                _hlEditor.setSelection(sel[0], sel[1]);
-                TextViewUtils.showSelection(_hlEditor);
+                TextViewUtils.setSelectionAndShow(_hlEditor, sel);
             }
             checkTextChangeState();
 

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

@@ -52,7 +52,7 @@
 
 import other.writeily.widget.WrMarkorWidgetProvider;
 
-public class MainActivity extends MarkorBaseActivity implements GsFileBrowserFragment.FilesystemFragmentOptionsListener, NavigationBarView.OnItemSelectedListener {
+public class MainActivity extends MarkorBaseActivity implements GsFileBrowserFragment.FilesystemFragmentOptionsListener {
 
     public static boolean IS_DEBUG_ENABLED = false;
 
@@ -101,7 +101,11 @@ public void onPageSelected(int position) {
         // Setup viewpager
         _viewPager.setAdapter(new SectionsPagerAdapter(getSupportFragmentManager()));
         _viewPager.setOffscreenPageLimit(4);
-        _bottomNav.setOnItemSelectedListener(this);
+        _bottomNav.setOnItemSelectedListener((item) -> {
+            _viewPager.setCurrentItem(tabIdToPos(item.getItemId()));
+            return true;
+        });
+
         reduceViewpagerSwipeSensitivity();
 
         // noinspection PointlessBooleanExpression - Send Test intent
@@ -343,12 +347,6 @@ public void onBackPressed() {
         new Handler().postDelayed(() -> _doubleBackToExitPressedOnce = false, 2000);
     }
 
-    @Override
-    public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-        _viewPager.setCurrentItem(tabIdToPos(item.getItemId()));
-        return true;
-    }
-
     public String getFileBrowserTitle() {
         final File file = _appSettings.getFileBrowserLastBrowsedFolder();
         String title = getString(R.string.app_name);
@@ -406,7 +404,7 @@ public void onViewPagerPageSelected(final int pos) {
 
         if (pos == tabIdToPos(R.id.nav_notebook)) {
             _fab.show();
-            _cu.showSoftKeyboard(this, false);
+            _cu.showSoftKeyboard(this, false, _notebook.getView());
         } else {
             _fab.hide();
             restoreDefaultToolbar();

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

@@ -5,9 +5,6 @@
 
 import net.gsantner.markor.activity.DocumentActivity;
 import net.gsantner.markor.activity.MarkorBaseActivity;
-import net.gsantner.markor.util.MarkorContextUtils;
-
-import java.io.File;
 
 /**
  * This Activity exists solely to launch DocumentActivity with the correct intent
@@ -28,10 +25,7 @@ protected void onNewIntent(final Intent intent) {
     }
 
     private void launchActivityAndFinish(Intent intent) {
-        final File file = MarkorContextUtils.getIntentFile(intent, null);
-        if (file != null) {
-            DocumentActivity.launch(this, file, null, null);
-        }
+        DocumentActivity.launch(this, intent);
         finish();
     }
 }

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

@@ -290,6 +290,7 @@ public static void showSttFilteringDialog(final Activity activity, final EditTex
 
                 // Delete view
                 doptView.neutralButtonText = R.string.delete;
+                doptView.isSoftInputVisible = false;
                 doptView.neutralButtonCallback = viewDialog -> {
                     final DialogOptions confirmDopt = new DialogOptions();
                     baseConf(activity, confirmDopt);

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

@@ -95,19 +95,12 @@ public static NewFileDialog newInstance(
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final File file = (File) getArguments().getSerializable(EXTRA_DIR);
         final boolean allowCreateDir = getArguments().getBoolean(EXTRA_ALLOW_CREATE_DIR);
-
-        LayoutInflater inflater = LayoutInflater.from(getActivity());
-        AlertDialog.Builder dialogBuilder = makeDialog(file, allowCreateDir, inflater);
-        AlertDialog dialog = dialogBuilder.show();
-        Window w;
-        if ((w = dialog.getWindow()) != null) {
-            w.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
-        }
-        return dialog;
+        final LayoutInflater inflater = LayoutInflater.from(getActivity());
+        return makeDialog(file, allowCreateDir, inflater);
     }
 
     @SuppressLint("SetTextI18n")
-    private AlertDialog.Builder makeDialog(final File basedir, final boolean allowCreateDir, LayoutInflater inflater) {
+    private AlertDialog makeDialog(final File basedir, final boolean allowCreateDir, LayoutInflater inflater) {
         final Activity activity = getActivity();
         final AppSettings appSettings = ApplicationObject.settings();
         final AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(inflater.getContext(), R.style.Theme_AppCompat_DayNight_Dialog_Rounded);
@@ -349,9 +342,15 @@ public void onTextChanged(CharSequence s, int start, int before, int count) {
         final List<Integer> indices = GsCollectionUtils.indices(formats, f -> f.format == lastUsedType);
         typeSpinner.setSelection(indices.isEmpty() ? 0 : indices.get(0));
 
-        titleEdit.requestFocus();
+        final AlertDialog dialog = dialogBuilder.show();
+        final Window win = dialog.getWindow();
+        if (win != null) {
+            win.setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT);
+            win.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        }
+        titleEdit.post(titleEdit::requestFocus);
 
-        return dialogBuilder;
+        return dialog;
     }
 
     private void callback(final File file) {

app/src/main/java/net/gsantner/markor/frontend/filebrowser/MarkorFileBrowserFactory.java

@@ -53,7 +53,6 @@ public static GsFileBrowserOptions.Options prepareFsViewerOpts(
         opts.newDirButtonText = R.string.create_folder;
         opts.upButtonEnable = true;
         opts.homeButtonEnable = true;
-        opts.mustStartWithRootFolder = false;
         opts.contentDescriptionFolder = R.string.folder;
         opts.contentDescriptionSelected = R.string.selected;
         opts.contentDescriptionFile = R.string.file;
@@ -68,6 +67,7 @@ public static GsFileBrowserOptions.Options prepareFsViewerOpts(
         opts.folderColor = R.color.folder;
         opts.fileImage = R.drawable.ic_file_white_24dp;
         opts.folderImage = R.drawable.ic_folder_white_24dp;
+        opts.descriptionFormat = appSettings.getString(R.string.pref_key__file_description_format, "");
 
         opts.titleText = R.string.select;
 
@@ -109,6 +109,7 @@ public static GsFileBrowserDialog showFileDialog(
     ) {
         final GsFileBrowserOptions.Options opts = prepareFsViewerOpts(context, false, listener);
         opts.fileOverallFilter = fileOverallFilter;
+        opts.descModtimeInsteadOfParent = true;
         return showDialog(fm, opts);
     }
 
@@ -119,6 +120,7 @@ public static GsFileBrowserDialog showFolderDialog(
     ) {
         final GsFileBrowserOptions.Options opts = prepareFsViewerOpts(context, true, listener);
         opts.okButtonText = R.string.select_this_folder;
+        opts.descModtimeInsteadOfParent = true;
         return showDialog(fm, opts);
     }
 }

app/src/main/java/net/gsantner/markor/frontend/textview/HighlightingEditor.java

@@ -122,8 +122,8 @@ protected void onDraw(Canvas canvas) {
     // ---------------------------------------------------------------------------------------------
 
     private boolean isScrollSignificant() {
-        return (_oldHlRect.top - _hlRect.top) > _hlShiftThreshold ||
-                (_hlRect.bottom - _oldHlRect.bottom) > _hlShiftThreshold;
+        return Math.abs(_oldHlRect.top - _hlRect.top) > _hlShiftThreshold ||
+                Math.abs(_hlRect.bottom - _oldHlRect.bottom) > _hlShiftThreshold;
     }
 
     private void updateHighlighting(final boolean recompute) {

app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java

@@ -366,7 +366,7 @@ public static void setSelectionAndShow(final EditText edit, final int... sel) {
                 }
 
                 edit.setSelection(start, end);
-                edit.postDelayed(() -> showSelection(edit, start, end), 250);
+                edit.post(() -> showSelection(edit, start, end));
             });
         }
     }

app/src/main/java/net/gsantner/markor/model/AppSettings.java

@@ -357,7 +357,7 @@ public void addRecentFile(final File file) {
     public void setFavouriteFiles(final Collection<File> files) {
         final Set<String> set = new LinkedHashSet<>();
         for (final File f : files) {
-            if (f != null && (f.exists() || GsFileBrowserListAdapter.isVirtualStorage(f))) {
+            if (f != null && (f.exists() || GsFileBrowserListAdapter.isVirtualFolder(f))) {
                 set.add(f.getAbsolutePath());
             }
         }
@@ -600,7 +600,7 @@ public static Set<File> getFileSet(final List<String> paths) {
         final Set<File> set = new LinkedHashSet<>();
         for (final String fp : paths) {
             final File f = new File(fp);
-            if (f.exists() || GsFileBrowserListAdapter.isVirtualStorage(f)) {
+            if (f.exists() || GsFileBrowserListAdapter.isVirtualFolder(f)) {
                 set.add(f);
             }
         }

app/src/main/java/net/gsantner/markor/model/Document.java

@@ -51,6 +51,7 @@ public class Document implements Serializable {
     public static final String EXTRA_DOCUMENT = "EXTRA_DOCUMENT"; // Document
     public static final String EXTRA_FILE = "EXTRA_FILE"; // java.io.File
     public static final String EXTRA_FILE_LINE_NUMBER = "EXTRA_FILE_LINE_NUMBER"; // int
+    public static final String EXTRA_DO_PREVIEW = "EXTRA_DO_PREVIEW";
     public static final int EXTRA_FILE_LINE_NUMBER_LAST = -919385553; // Flag for last line
 
     private final File _file;

app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java

@@ -359,6 +359,8 @@ public static void showMultiChoiceDialogWithSearchFilterUI(final Activity activi
             if (dopt.isSearchEnabled) {
                 if (dopt.isSoftInputVisible) {
                     win.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+                    searchEditText.postDelayed(() -> win.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED), 500);
+                    searchEditText.requestFocus();
                 } else {
                     win.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
                 }
@@ -377,10 +379,6 @@ public static void showMultiChoiceDialogWithSearchFilterUI(final Activity activi
             neutralButton.setOnClickListener((button) -> dopt.neutralButtonCallback.callback(dialog));
         }
 
-        if (dopt.isSearchEnabled) {
-            searchEditText.requestFocus();
-        }
-
         if (dopt.defaultText != null) {
             listAdapter.filter(searchEditText.getText());
         }
@@ -543,7 +541,6 @@ private static View makeSearchView(final Context context, final DialogOptions do
         final AppCompatEditText searchEditText = new AppCompatEditText(context);
         searchEditText.setText(dopt.defaultText);
         searchEditText.setSingleLine(true);
-        searchEditText.setMaxLines(1);
         searchEditText.setTextColor(dopt.textColor);
         searchEditText.setHintTextColor((dopt.textColor & 0x00FFFFFF) | 0x99000000);
         searchEditText.setHint(dopt.searchHintText);