From 98e297fec0c65335fff57d807ca6f9ec7c14bce3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 9 Nov 2020 12:34:38 +0100
Subject: [PATCH] move the Un/Set as defaul folder menu item a bit up

---
 app/build.gradle                     |  2 +-
 app/src/main/res/menu/menu_main.xml  | 52 +++++++++++------------
 app/src/main/res/menu/menu_media.xml | 62 ++++++++++++++--------------
 3 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7b3c48802..7c887d41a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,7 +77,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:5.31.28'
+    implementation 'com.simplemobiletools:commons:5.31.29'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
     implementation 'it.sephiroth.android.exif:library:1.0.1'
     implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.19'
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index b67c649d6..646b3f165 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,73 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
         android:icon="@drawable/ic_search_vector"
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="collapseActionView|always"/>
+        app:showAsAction="collapseActionView|always" />
     <item
         android:id="@+id/open_camera"
         android:icon="@drawable/ic_camera_vector"
         android:title="@string/open_camera"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/sort"
         android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/filter"
         android:icon="@drawable/ic_filter_vector"
         android:title="@string/filter_media"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/change_view_type"
         android:title="@string/change_view_type"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/temporarily_show_hidden"
         android:title="@string/temporarily_show_hidden"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/stop_showing_hidden"
         android:title="@string/stop_showing_hidden"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/show_all"
         android:title="@string/show_all"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/show_the_recycle_bin"
         android:title="@string/show_the_recycle_bin"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/hide_the_recycle_bin"
         android:title="@string/hide_the_recycle_bin"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/create_new_folder"
-        android:title="@string/create_new_folder"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/increase_column_count"
-        android:title="@string/increase_column_count"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/reduce_column_count"
-        android:title="@string/reduce_column_count"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/set_as_default_folder"
         android:title="@string/set_as_default_folder"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/create_new_folder"
+        android:title="@string/create_new_folder"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/increase_column_count"
+        android:title="@string/increase_column_count"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/reduce_column_count"
+        android:title="@string/reduce_column_count"
+        app:showAsAction="never" />
     <item
         android:id="@+id/settings"
         android:title="@string/settings"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/about"
         android:title="@string/about"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
 </menu>
diff --git a/app/src/main/res/menu/menu_media.xml b/app/src/main/res/menu/menu_media.xml
index d7cadafae..1c4c61146 100644
--- a/app/src/main/res/menu/menu_media.xml
+++ b/app/src/main/res/menu/menu_media.xml
@@ -1,94 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
         android:icon="@drawable/ic_search_vector"
         android:title="@string/search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        app:showAsAction="collapseActionView|ifRoom"/>
+        app:showAsAction="collapseActionView|ifRoom" />
     <item
         android:id="@+id/toggle_filename"
         android:icon="@drawable/ic_label_vector"
         android:title="@string/toggle_filename"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/sort"
         android:icon="@drawable/ic_sort_vector"
         android:title="@string/sort_by"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/filter"
         android:icon="@drawable/ic_filter_vector"
         android:title="@string/filter_media"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/change_view_type"
         android:title="@string/change_view_type"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/temporarily_show_hidden"
         android:title="@string/temporarily_show_hidden"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/stop_showing_hidden"
         android:title="@string/stop_showing_hidden"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/empty_recycle_bin"
         android:title="@string/empty_recycle_bin"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/empty_disable_recycle_bin"
         android:title="@string/empty_and_disable_recycle_bin"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/restore_all_files"
         android:title="@string/restore_all_files"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/folder_view"
         android:title="@string/folder_view"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/open_camera"
         android:icon="@drawable/ic_camera_vector"
         android:title="@string/open_camera"
-        app:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/group"
         android:title="@string/group_by"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/create_new_folder"
-        android:title="@string/create_new_folder"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/increase_column_count"
-        android:title="@string/increase_column_count"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/reduce_column_count"
-        android:title="@string/reduce_column_count"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/set_as_default_folder"
         android:title="@string/set_as_default_folder"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/unset_as_default_folder"
         android:title="@string/unset_as_default_folder"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/create_new_folder"
+        android:title="@string/create_new_folder"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/increase_column_count"
+        android:title="@string/increase_column_count"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/reduce_column_count"
+        android:title="@string/reduce_column_count"
+        app:showAsAction="never" />
     <item
         android:id="@+id/slideshow"
         android:title="@string/slideshow"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/settings"
         android:title="@string/settings"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
     <item
         android:id="@+id/about"
         android:title="@string/about"
-        app:showAsAction="never"/>
+        app:showAsAction="never" />
 </menu>