From f6fdb12db220c45bfd4f7696d91ae059e3a285cd Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sun, 24 Apr 2022 15:55:24 -0400
Subject: [PATCH] Adjust download menu item positioning (fixes #6932)

---
 app/src/main/res/menu/chapter_selection.xml     | 17 +++++++++--------
 app/src/main/res/menu/library_selection.xml     | 16 ++++++++--------
 .../main/res/menu/updates_chapter_selection.xml | 17 +++++++++--------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/menu/chapter_selection.xml b/app/src/main/res/menu/chapter_selection.xml
index c155517dc..dd6530232 100644
--- a/app/src/main/res/menu/chapter_selection.xml
+++ b/app/src/main/res/menu/chapter_selection.xml
@@ -3,14 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <item
-        android:id="@+id/action_download"
-        android:icon="@drawable/ic_get_app_24dp"
-        android:title="@string/action_download"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
     <item
         android:id="@+id/action_bookmark"
         android:icon="@drawable/ic_bookmark_border_24dp"
@@ -50,6 +42,15 @@
         app:iconTint="?attr/colorOnSurface"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
+
+    <item
+        android:id="@+id/action_download"
+        android:icon="@drawable/ic_get_app_24dp"
+        android:title="@string/action_download"
+        app:iconTint="?attr/colorOnSurface"
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction" />
+
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_24dp"
diff --git a/app/src/main/res/menu/library_selection.xml b/app/src/main/res/menu/library_selection.xml
index ea97c2b84..c9ac25118 100644
--- a/app/src/main/res/menu/library_selection.xml
+++ b/app/src/main/res/menu/library_selection.xml
@@ -11,14 +11,6 @@
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
-    <item
-        android:id="@+id/action_download_unread"
-        android:icon="@drawable/ic_get_app_24dp"
-        android:title="@string/action_download_unread"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
     <item
         android:id="@+id/action_mark_as_read"
         android:icon="@drawable/ic_done_24dp"
@@ -35,6 +27,14 @@
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
 
+    <item
+        android:id="@+id/action_download_unread"
+        android:icon="@drawable/ic_get_app_24dp"
+        android:title="@string/action_download_unread"
+        app:iconTint="?attr/colorOnSurface"
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction" />
+
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_24dp"
diff --git a/app/src/main/res/menu/updates_chapter_selection.xml b/app/src/main/res/menu/updates_chapter_selection.xml
index 4b5589e6e..d0d7b1a30 100644
--- a/app/src/main/res/menu/updates_chapter_selection.xml
+++ b/app/src/main/res/menu/updates_chapter_selection.xml
@@ -3,14 +3,6 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item
-        android:id="@+id/action_download"
-        android:icon="@drawable/ic_get_app_24dp"
-        android:title="@string/action_download"
-        app:iconTint="?attr/colorOnSurface"
-        app:showAsAction="always"
-        tools:ignore="AlwaysShowAction" />
-
     <item
         android:id="@+id/action_bookmark"
         android:icon="@drawable/ic_bookmark_border_24dp"
@@ -42,6 +34,15 @@
         app:iconTint="?attr/colorOnSurface"
         app:showAsAction="always"
         tools:ignore="AlwaysShowAction" />
+
+    <item
+        android:id="@+id/action_download"
+        android:icon="@drawable/ic_get_app_24dp"
+        android:title="@string/action_download"
+        app:iconTint="?attr/colorOnSurface"
+        app:showAsAction="always"
+        tools:ignore="AlwaysShowAction" />
+
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_delete_24dp"