Make sorting accessible

3 files changed, 19 insertions, 11 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index b448b82b..bc92fbb2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -405,7 +405,7 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
             }
             db.modifyCategoryOrder(localAccount.getId(), navigationSelection, method);
             refreshLists();
-            updateSortMethodIcon();
+            updateSortMethodIcon(localAccount.getId());
         });
     }
 
@@ -693,22 +693,27 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
         new LoadNotesListTask(localAccount.getId(), getApplicationContext(), callback, navigationSelection, query).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         new LoadCategoryListTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 
-        updateSortMethodIcon();
+        updateSortMethodIcon(localAccount.getId());
     }
 
     /**
      * Updates sorting method icon.
      */
-    private void updateSortMethodIcon() {
-        if (localAccount == null) {
-            return;
+    private void updateSortMethodIcon(long localAccountId) {
+        CategorySortingMethod method = db.getCategoryOrder(localAccountId, navigationSelection);
+        if (method == CategorySortingMethod.SORT_LEXICOGRAPHICAL_ASC) {
+            activityBinding.sortingMethod.setImageResource(R.drawable.alphabetical_asc);
+            activityBinding.sortingMethod.setContentDescription(getString(R.string.sort_last_modified));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                activityBinding.sortingMethod.setTooltipText(getString(R.string.sort_last_modified));
+            }
+        } else {
+            activityBinding.sortingMethod.setImageResource(R.drawable.modification_desc);
+            activityBinding.sortingMethod.setContentDescription(getString(R.string.sort_alphabetically));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                activityBinding.sortingMethod.setTooltipText(getString(R.string.sort_alphabetically));
+            }
         }
-        CategorySortingMethod method = db.getCategoryOrder(localAccount.getId(), navigationSelection);
-        activityBinding.sortingMethod.setImageResource(
-                method == CategorySortingMethod.SORT_LEXICOGRAPHICAL_ASC
-                        ? R.drawable.alphabetical_asc
-                        : R.drawable.modification_desc
-        );
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index 4e8b4f17..742647e4 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -85,6 +85,7 @@
                         android:contentDescription="@string/action_sorting_method"
                         android:padding="@dimen/spacer_2x"
                         android:tint="?attr/colorAccent"
+                        android:translationX="@dimen/spacer_1x"
                         app:srcCompat="@drawable/alphabetical_asc" />
 
                     <androidx.appcompat.widget.AppCompatImageView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3bef2020..c2729e34 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -298,4 +298,6 @@
     <string name="formatting_help_unsupported_body_3">Images</string>
     <string name="formatting_help_unsupported_body_4">If you are interested in contributing support for one of those features, get in contact with us via GitHub or E-Mail.</string>
     <string name="simple_other">Other</string>
+    <string name="sort_last_modified">Sort by modified date</string>
+    <string name="sort_alphabetically">Sort by alphabet</string>
 </resources>