Per folder sort order #2499

harshad1 · 2025-01-04T17:10:38Z

In this PR I add per-folder sort support. This addresses #2435

Sample use cases:

I always want downloads to be sorted by time
I don't want folders to be first in my 'projects' folder

…rder

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

harshad1 · 2025-01-04T17:11:31Z

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

@@ -85,7 +87,7 @@ public boolean isPreferViewMode() {
    }

    public void setNotebookDirectory(final File file) {
-        setString(R.string.pref_key__notebook_directory, Document.getPath(file));
+        setString(R.string.pref_key__notebook_directory, GsFileUtils.getPath(file));


Moved this routine to GsFileUtils

harshad1 · 2025-01-04T17:12:25Z

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

@@ -88,6 +88,7 @@ public static class DialogOptions {
        public List<? extends CharSequence> data = null;
        public List<? extends CharSequence> highlightData = null;
        public List<Integer> iconsForData;
+        public Collection<Integer> radioSet = null;


Allows us to have radio buttons in the dialog

harshad1 · 2025-01-04T17:13:01Z

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java

@@ -340,31 +355,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
        _cu.tintMenuItems(menu, true, Color.WHITE);
        _cu.setSubMenuIconsVisibility(menu, true);

-        MenuItem item;


All this moved from menu to dialog

harshad1 · 2025-01-04T17:13:36Z

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserListAdapter.java

@@ -663,6 +664,10 @@ private void loadFolder(final File folder, final File show) {
            _currentFolder = GsCollectionUtils.getOrDefault(_virtualMapping, folder, folder);
        }

+        if (folderChanged) {
+            _dopt.listener.onFsViewerFolderChange(_currentFolder);


This is a new callback which is called right before a folder is (re)loaded

harshad1 · 2025-01-04T17:14:20Z

app/src/main/res/menu/filesystem__menu.xml

-        app:showAsAction="always">
-
-        <menu>
-            <group


All of these moved to dialog

harshad1 · 2025-01-04T17:18:19Z

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

+        if (GsTextUtils.isNullOrEmpty(path) || json == null) {
+            sortOrder.sortByType = getFileBrowserSortByType();
+            sortOrder.reverse = isFileBrowserSortReverse();
+            sortOrder.folderFirst = isFileBrowserSortFolderFirst();


Fall back to global if this folder does not have a custom setting

harshad1 · 2025-01-05T00:22:49Z

New sort menu is a dialog
Note that GsSearchOrCustomTextDialog now supports one or more options being radio buttons!
Checking 'Save' means that the sort settings will be local to this folder. Unchecking means that they will be applied globally.
I need a better word than 'save'

harshad1 · 2025-01-05T00:29:15Z

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

        public boolean isMultiSelectEnabled = false;
+        public Collection<Integer> preSelected = null;  // Indices of pre-selected items
+        public Collection<Integer> radioIndices = null; // Only one item can be selected among these
+        public boolean showCountInOkButton = true;


Just collected the multi-select related options to one place

harshad1 · 2025-01-05T00:30:20Z

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

                } else {
-                    listAdapter._selectedItems.clear();
+                    listAdapter._selectedItems.removeAll(listAdapter._filteredItems);


Select all adds and removes all visible options now

harshad1 · 2025-01-06T07:08:55Z

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

@@ -1070,43 +1090,4 @@ public void setFormatShareAsLink(final boolean asLink) {
    public boolean getFormatShareAsLink() {
        return getBool(R.string.pref_key__format_share_as_link, true);
    }
-
-    private static String mapToJsonString(final Map<String, String> map) {


Moved these to GsTextUtils

harshad1 · 2025-01-06T07:11:30Z

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

+        public Collection<Integer> preSelected = null;  // Indices of pre-selected items
+        public boolean showSelectAllButton = true;
+        public boolean showCountInOkButton = true;
+        public GsCallback.a1<Set<Integer>> selectionChangedCallback = null;


Allows us to add a lot of dynamic functionality into the dialog. In this PR I have used it to implement Radio buttons

harshad1 · 2025-01-06T07:12:15Z

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java

+
+            final MenuItem sortItem = _fragmentMenu.findItem(R.id.action_sort);
+            if (sortItem != null) {
+                _cu.tintDrawable(sortItem.getIcon(), _dopt.sortOrder.isFolderLocal ? GsFileBrowserListAdapter.FAVOURITE_COLOR : Color.WHITE);


Highlight the sort icon when the folder has a custom sort. This is a little visual hint

harshad1 · 2025-01-09T17:53:23Z

app/src/main/java/net/gsantner/opoc/frontend/filebrowser/GsFileBrowserFragment.java

+                    // Set new sort order to folder or global as needed
+                    _appSettings.setFolderSortOrder(order.isFolderLocal ? currentFolder : null, _dopt.sortOrder);
+
+                    _dopt.sortOrder = order;


TODO - this should be first line in the callback

harshad1 · 2025-01-11T06:28:21Z

Here we see:

The dialog
Hint that the folder order is saved (icon colour)
Radio buttons
Dynamic dialog - unchecking the 'Folder local' order reverts to global
The functionality

harshad1 added 5 commits January 2, 2025 22:26

Initial system with janky ui

34f98b9

Merge remote-tracking branch 'upstream/master' into per_folder_sort_o…

54ba2a6

…rder

Separate options - aborting

a02026d

Switching to dialog

6f79ce0

Switching to dialog based sort

20b7c5e

harshad1 commented Jan 4, 2025

View reviewed changes

app/src/main/java/net/gsantner/markor/activity/MainActivity.java Show resolved Hide resolved

harshad1 commented Jan 4, 2025

View reviewed changes

app/src/main/res/menu/filesystem__menu.xml

app:showAsAction="always">

<menu>

<group

Copy link

Collaborator Author

harshad1 Jan 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of these moved to dialog

harshad1 commented Jan 4, 2025

View reviewed changes

Cleanups to dialog

5a01163

harshad1 commented Jan 5, 2025

View reviewed changes

New approach to dialog using change callback

2f6cfcb

harshad1 commented Jan 6, 2025

View reviewed changes

Must check in the callback :)

342d83a

harshad1 commented Jan 9, 2025

View reviewed changes

harshad1 added 3 commits January 10, 2025 08:51

Fixes, wrap improvements

3237d18

Reverted reflow settings

b4d1d1a

Fixed diff

b35b3d5

harshad1 changed the title ~~WIP: Per folder sort order~~ Per folder sort order Jan 11, 2025

Better icon

2f6c5c1

Merge branch 'master' into per_folder_sort_order

ebb636c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Per folder sort order #2499

Per folder sort order #2499

harshad1 commented Jan 4, 2025 •

edited

Loading

harshad1 Jan 4, 2025

harshad1 Jan 4, 2025

harshad1 Jan 4, 2025

harshad1 Jan 4, 2025 •

edited

Loading

harshad1 Jan 4, 2025

harshad1 Jan 4, 2025

harshad1 commented Jan 5, 2025

harshad1 Jan 5, 2025

harshad1 Jan 5, 2025

harshad1 Jan 6, 2025

harshad1 Jan 6, 2025

harshad1 Jan 6, 2025

harshad1 Jan 9, 2025

harshad1 commented Jan 11, 2025

Per folder sort order #2499

Are you sure you want to change the base?

Per folder sort order #2499

Conversation

harshad1 commented Jan 4, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

harshad1 Jan 4, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

harshad1 commented Jan 5, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

harshad1 commented Jan 11, 2025

harshad1 commented Jan 4, 2025 •

edited

Loading

harshad1 Jan 4, 2025 •

edited

Loading