Tweaks

harshad1 · Aug 25, 2024 · 1ca5698 · 1ca5698
1 parent 4631024
commit 1ca5698
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/app/src/main/java/net/gsantner/markor/frontend/MarkorDialogFactory.java b/app/src/main/java/net/gsantner/markor/frontend/MarkorDialogFactory.java
@@ -1016,4 +1016,4 @@ public static void baseConf(Activity activity, DialogOptions dopt) {
         dopt.highlightColor = ContextCompat.getColor(activity, R.color.accent);
         dopt.dialogStyle = R.style.Theme_AppCompat_DayNight_Dialog_Rounded;
     }
-}
+}
diff --git a/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java b/app/src/main/java/net/gsantner/markor/frontend/textview/TextViewUtils.java
@@ -50,7 +50,7 @@ private TextViewUtils() {
 
     public static int getLineStart(final CharSequence s, final int sel) {
         int i = sel;
-        if (GsTextUtils.isValidIndex(s, i)) {
+        if (GsTextUtils.isValidSelection(s, i)) {
             for (; i > 0; i--) {
                 if (s.charAt(i - 1) == '\n') {
                     break;
@@ -63,7 +63,7 @@ public static int getLineStart(final CharSequence s, final int sel) {
 
     public static int getLineEnd(final CharSequence s, final int sel) {
         int i = sel;
-        if (GsTextUtils.isValidIndex(s, i)) {
+        if (GsTextUtils.isValidSelection(s, i)) {
             for (; i < s.length(); i++) {
                 if (s.charAt(i) == '\n') {
                     break;

diff --git a/app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java b/app/src/main/java/net/gsantner/opoc/frontend/GsSearchOrCustomTextDialog.java
@@ -364,6 +364,10 @@ public static void showMultiChoiceDialogWithSearchFilterUI(final Activity activi
                 } else {
                     win.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE | WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN);
                 }
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                    win.setDecorFitsSystemWindows(true);
+                }
             }
 
             win.setLayout(

diff --git a/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java b/app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java
@@ -467,9 +467,7 @@ public boolean onOptionsItemSelected(final MenuItem item) {
                     if (confirmed) {
                         Runnable deleter = () -> {
                             WrMarkorSingleton.getInstance().deleteSelectedItems(currentSelection, getContext());
-                            _recyclerList.post(() -> {
-                                _filesystemViewerAdapter.reloadCurrentFolder();
-                            });
+                            _recyclerList.post(() -> _filesystemViewerAdapter.reloadCurrentFolder());
                         };
                         new Thread(deleter).start();
                     }
@@ -551,13 +549,13 @@ public void clearSelection() {
     ///////////////
     public void askForDeletingFilesRecursive(WrConfirmDialog.ConfirmDialogCallback confirmCallback) {
         final ArrayList<File> itemsToDelete = new ArrayList<>(_filesystemViewerAdapter.getCurrentSelection());
-        StringBuilder message = new StringBuilder(String.format(getString(R.string.do_you_really_want_to_delete_this_witharg), getResources().getQuantityString(R.plurals.documents, itemsToDelete.size())) + "\n\n");
+        final StringBuilder message = new StringBuilder(String.format(getString(R.string.do_you_really_want_to_delete_this_witharg), getResources().getQuantityString(R.plurals.documents, itemsToDelete.size())) + "\n\n");
 
-        for (File f : itemsToDelete) {
-            message.append("\n").append(f.getAbsolutePath());
+        for (final File f : itemsToDelete) {
+            message.append("\n").append(f.getName());
         }
 
-        WrConfirmDialog confirmDialog = WrConfirmDialog.newInstance(getString(R.string.confirm_delete), message.toString(), itemsToDelete, confirmCallback);
+        final WrConfirmDialog confirmDialog = WrConfirmDialog.newInstance(getString(R.string.confirm_delete), message.toString(), itemsToDelete, confirmCallback);
         confirmDialog.show(getChildFragmentManager(), WrConfirmDialog.FRAGMENT_TAG);
     }