Improve margin and lower case button

Signed-off-by: Joris Bodin <joris.bodin@infomaniak.com>

src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -84,7 +84,6 @@ import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 import com.owncloud.android.ui.dialog.RemoveFilesDialogFragment;
 import com.owncloud.android.ui.dialog.RenameFileDialogFragment;
 import com.owncloud.android.ui.dialog.SetupEncryptionDialogFragment;
-import com.owncloud.android.ui.dialog.SortingOrderDialogFragment;
 import com.owncloud.android.ui.dialog.SyncFileNotEnoughSpaceDialogFragment;
 import com.owncloud.android.ui.events.ChangeMenuEvent;
 import com.owncloud.android.ui.events.CommentsEvent;
@@ -132,6 +131,10 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import static com.owncloud.android.datamodel.OCFile.ROOT_PATH;
 import static com.owncloud.android.utils.DisplayUtils.openSortingOrderDialogFragment;
+import static com.owncloud.android.utils.FileSortOrder.sort_big_to_small_id;
+import static com.owncloud.android.utils.FileSortOrder.sort_new_to_old_id;
+import static com.owncloud.android.utils.FileSortOrder.sort_old_to_new_id;
+import static com.owncloud.android.utils.FileSortOrder.sort_small_to_big_id;
 
 /**
  * A Fragment that lists all files and folders in a given path.
@@ -1314,12 +1317,12 @@ public class OCFileListFragment extends ExtendedListFragment implements
     private void setSortButton(FileSortOrder sortOrder) {
         int nameId;
         switch (sortOrder.name) {
-            case "sort_new_to_old":
-            case "sort_old_to_new":
+            case sort_new_to_old_id:
+            case sort_old_to_new_id:
                 nameId = R.string.sort_by_date;
                 break;
-            case "sort_big_to_small":
-            case "sort_small_to_big":
+            case sort_big_to_small_id:
+            case sort_small_to_big_id:
                 nameId = R.string.sort_by_size;
                 break;
             default:
@@ -1329,9 +1332,9 @@ public class OCFileListFragment extends ExtendedListFragment implements
         mSortButton.setText(getString(nameId));
         Drawable icon;
         if (sortOrder.isAscending) {
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_keyboard_arrow_down);
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_arrow_down);
         } else {
-            icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_keyboard_arrow_up);
+            icon = ContextCompat.getDrawable(requireContext(), R.drawable.ic_arrow_up);
         }
         mSortButton.setIcon(icon);
     }

src/main/java/com/owncloud/android/utils/FileSortOrder.java

@@ -34,18 +34,24 @@ import java.util.Map;
  */
 
 public class FileSortOrder {
-    public static final FileSortOrder sort_a_to_z = new FileSortOrderByName("sort_a_to_z", true);
-    public static final FileSortOrder sort_z_to_a = new FileSortOrderByName("sort_z_to_a", false);
-    public static final FileSortOrder sort_old_to_new = new FileSortOrderByDate("sort_old_to_new", true);
-    public static final FileSortOrder sort_new_to_old = new FileSortOrderByDate("sort_new_to_old", false);
-    public static final FileSortOrder sort_small_to_big = new FileSortOrderBySize("sort_small_to_big", true);
-    public static final FileSortOrder sort_big_to_small = new FileSortOrderBySize("sort_big_to_small", false);
+    public static final String sort_a_to_z_id = "sort_a_to_z";
+    public static final String sort_z_to_a_id = "sort_z_to_a";
+    public static final String sort_old_to_new_id = "sort_old_to_new";
+    public static final String sort_new_to_old_id = "sort_new_to_old";
+    public static final String sort_small_to_big_id = "sort_small_to_big";
+    public static final String sort_big_to_small_id = "sort_big_to_small";
+
+    public static final FileSortOrder sort_a_to_z = new FileSortOrderByName(sort_a_to_z_id, true);
+    public static final FileSortOrder sort_z_to_a = new FileSortOrderByName(sort_z_to_a_id, false);
+    public static final FileSortOrder sort_old_to_new = new FileSortOrderByDate(sort_old_to_new_id, true);
+    public static final FileSortOrder sort_new_to_old = new FileSortOrderByDate(sort_new_to_old_id, false);
+    public static final FileSortOrder sort_small_to_big = new FileSortOrderBySize(sort_small_to_big_id, true);
+    public static final FileSortOrder sort_big_to_small = new FileSortOrderBySize(sort_big_to_small_id, false);
 
     public static final Map<String, FileSortOrder> sortOrders;
 
     public enum Type {
         trashBinView, localFileListView, uploadFilesView
-
     }
     static {
         sortOrders = new HashMap<>();

src/main/res/drawable/ic_keyboard_arrow_down.xml → src/main/res/drawable/ic_arrow_down.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#666666"
-        android:pathData="M7.41,7.84L12,12.42l4.59,-4.58L18,9.25l-6,6 -6,-6z" />
+        android:fillColor="#FFFFFF"
+        android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z" />
 </vector>

src/main/res/drawable/ic_keyboard_arrow_up.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#666666"
-        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z" />
-</vector>

src/main/res/layout/list_fragment.xml

@@ -42,14 +42,17 @@
                     style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
+                    android:layout_marginStart="8dp"
                     android:contentDescription="@string/actionbar_sort"
+                    android:minWidth="0dp"
                     android:text="@string/sort_by_name"
+                    android:textAlignment="textStart"
+                    android:textAllCaps="false"
                     android:textColor="@color/fontAppbar"
                     android:textSize="14sp"
-                    app:icon="@drawable/ic_keyboard_arrow_down"
+                    app:icon="@drawable/ic_arrow_up"
                     app:iconGravity="textEnd"
-                    app:iconPadding="3dp"
+                    app:iconSize="16dp"
                     app:iconTint="@color/fontAppbar"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
@@ -60,7 +63,6 @@
                     style="@style/Widget.AppTheme.Button.IconButton"
                     android:layout_width="48dp"
                     android:layout_height="48dp"
-                    android:layout_marginEnd="15dp"
                     android:contentDescription="@string/action_switch_grid_view"
                     app:cornerRadius="24dp"
                     app:icon="@drawable/ic_view_module"