Flip crop borders and orientation toggles

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

app/src/main/res/layout/reader_activity.xml

@@ -158,36 +158,36 @@
                     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:id="@+id/action_crop_borders"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/pref_rotation_type"
+                    android:contentDescription="@string/pref_crop_borders"
                     android:padding="@dimen/material_layout_keylines_screen_edge_margin"
-                    app:layout_constraintEnd_toStartOf="@id/action_crop_borders"
+                    app:layout_constraintEnd_toStartOf="@id/action_rotation"
                     app:layout_constraintStart_toEndOf="@+id/action_reading_mode"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_screen_rotation_24dp"
+                    app:srcCompat="@drawable/ic_crop_24dp"
                     app:tint="?attr/colorOnPrimary" />
 
                 <ImageButton
-                    android:id="@+id/action_crop_borders"
+                    android:id="@+id/action_rotation"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:background="?selectableItemBackgroundBorderless"
-                    android:contentDescription="@string/pref_crop_borders"
+                    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_rotation"
+                    app:layout_constraintStart_toEndOf="@+id/action_crop_borders"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_crop_24dp"
+                    app:srcCompat="@drawable/ic_screen_rotation_24dp"
                     app:tint="?attr/colorOnPrimary" />
 
                 <ImageButton
@@ -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" />