From 6222b47a4f518a7c92631aa6962b42624f41ac4b Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Tue, 6 Apr 2021 22:31:26 -0400
Subject: [PATCH] Flip crop borders and orientation toggles

---
 .../tachiyomi/util/lang/RxCoroutineBridge.kt  |  2 +-
 app/src/main/res/layout/reader_activity.xml   | 34 +++++++++----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
index ce760e03d..19cb1886e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/util/lang/RxCoroutineBridge.kt
@@ -41,7 +41,7 @@ private suspend fun <T> Observable<T>.awaitOne(): T = suspendCancellableCoroutin
                 }
 
                 override fun onError(e: Throwable) {
-                    /*
+                /*
                        * Rx1 observable throws NoSuchElementException if cancellation happened before
                        * element emission. To mitigate this we try to atomically resume continuation with exception:
                        * if resume failed, then we know that continuation successfully cancelled itself
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index 0c8b2a8e1..b2079fc77 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -158,25 +158,12 @@
                     android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/viewer"
                     android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-                    app:layout_constraintEnd_toStartOf="@id/action_rotation"
+                    app:layout_constraintEnd_toStartOf="@id/action_crop_borders"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_reader_default_24dp"
                     app:tint="?attr/colorOnPrimary" />
 
-                <ImageButton
-                    android:id="@+id/action_rotation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/pref_rotation_type"
-                    android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-                    app:layout_constraintEnd_toStartOf="@id/action_crop_borders"
-                    app:layout_constraintStart_toEndOf="@+id/action_reading_mode"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_screen_rotation_24dp"
-                    app:tint="?attr/colorOnPrimary" />
-
                 <ImageButton
                     android:id="@+id/action_crop_borders"
                     android:layout_width="wrap_content"
@@ -184,12 +171,25 @@
                     android:background="?selectableItemBackgroundBorderless"
                     android:contentDescription="@string/pref_crop_borders"
                     android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-                    app:layout_constraintEnd_toStartOf="@id/action_settings"
-                    app:layout_constraintStart_toEndOf="@+id/action_rotation"
+                    app:layout_constraintEnd_toStartOf="@id/action_rotation"
+                    app:layout_constraintStart_toEndOf="@+id/action_reading_mode"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_crop_24dp"
                     app:tint="?attr/colorOnPrimary" />
 
+                <ImageButton
+                    android:id="@+id/action_rotation"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/pref_rotation_type"
+                    android:padding="@dimen/material_layout_keylines_screen_edge_margin"
+                    app:layout_constraintEnd_toStartOf="@id/action_settings"
+                    app:layout_constraintStart_toEndOf="@+id/action_crop_borders"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_screen_rotation_24dp"
+                    app:tint="?attr/colorOnPrimary" />
+
                 <ImageButton
                     android:id="@+id/action_settings"
                     android:layout_width="wrap_content"
@@ -198,7 +198,7 @@
                     android:contentDescription="@string/action_settings"
                     android:padding="@dimen/material_layout_keylines_screen_edge_margin"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@id/action_crop_borders"
+                    app:layout_constraintStart_toEndOf="@id/action_rotation"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_settings_24dp"
                     app:tint="?attr/colorOnPrimary" />