From e58896bdfbd4de2d8ed39fca2f8c399cad85f42c Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 2 May 2020 10:41:56 -0400
Subject: [PATCH] Separate out series viewer setting to its own group in reader
 sheet

---
 .../main/res/layout/reader_settings_sheet.xml | 53 ++++++++++++-------
 app/src/main/res/values/strings.xml           |  3 +-
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml
index 211d23174..d7170ff69 100644
--- a/app/src/main/res/layout/reader_settings_sheet.xml
+++ b/app/src/main/res/layout/reader_settings_sheet.xml
@@ -29,13 +29,13 @@
         android:layout_height="0dp"
         app:layout_constraintStart_toEndOf="parent" />
 
-    <!-- General preferences -->
+    <!-- Series-specific preferences -->
 
     <TextView
-        android:id="@+id/general_prefs"
+        android:id="@+id/series_prefs"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="@string/pref_category_general"
+        android:text="@string/pref_category_for_this_series"
         android:textColor="?attr/colorAccent"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
@@ -45,7 +45,7 @@
         android:id="@+id/viewer_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="@string/viewer_for_this_series"
+        android:text="@string/viewer"
         app:layout_constraintBaseline_toBaselineOf="@id/viewer"
         app:layout_constraintEnd_toStartOf="@id/verticalcenter"
         app:layout_constraintStart_toStartOf="parent" />
@@ -58,7 +58,20 @@
         android:entries="@array/viewers_selector"
         app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintTop_toBottomOf="@id/general_prefs" />
+        app:layout_constraintTop_toBottomOf="@id/series_prefs" />
+
+    <!-- General preferences -->
+
+    <TextView
+        android:id="@+id/general_prefs"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="32dp"
+        android:text="@string/pref_category_general"
+        android:textColor="?attr/colorAccent"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/viewer" />
 
     <TextView
         android:id="@+id/rotation_mode_text"
@@ -78,7 +91,7 @@
         android:entries="@array/rotation_type"
         app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintTop_toBottomOf="@id/viewer" />
+        app:layout_constraintTop_toBottomOf="@id/general_prefs" />
 
     <TextView
         android:id="@+id/background_color_text"
@@ -108,23 +121,13 @@
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintTop_toBottomOf="@id/background_color" />
 
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/true_color"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/pref_true_color"
-        android:textColor="?android:attr/textColorSecondary"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/show_page_number"
-        tools:visibility="visible" />
-
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/fullscreen"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/pref_fullscreen"
         android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/true_color" />
+        app:layout_constraintTop_toBottomOf="@id/show_page_number" />
 
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/cutout_short"
@@ -150,13 +153,23 @@
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintTop_toBottomOf="@id/keepscreen" />
 
+    <com.google.android.material.switchmaterial.SwitchMaterial
+        android:id="@+id/true_color"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/pref_true_color"
+        android:textColor="?android:attr/textColorSecondary"
+        android:visibility="gone"
+        app:layout_constraintTop_toBottomOf="@id/long_tap"
+        tools:visibility="visible" />
+
     <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/always_show_chapter_transition"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/pref_always_show_chapter_transition"
         android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintTop_toBottomOf="@id/long_tap" />
+        app:layout_constraintTop_toBottomOf="@id/true_color" />
 
     <android.widget.Space
         android:id="@+id/end_general_preferences"
@@ -170,7 +183,7 @@
         android:id="@+id/pager_prefs"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:text="@string/pager_viewer"
         android:textColor="?attr/colorAccent"
         android:textStyle="bold"
@@ -238,7 +251,7 @@
         android:id="@+id/webtoon_prefs"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="24dp"
         android:text="@string/webtoon_viewer"
         android:textColor="?attr/colorAccent"
         android:textStyle="bold"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 172eeb62c..aa9435701 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -523,7 +523,8 @@
     <string name="no_previous_chapter">Previous chapter not found</string>
     <string name="decode_image_error">The image couldn\'t be loaded</string>
     <string name="confirm_set_image_as_cover">Use this image as cover art?</string>
-    <string name="viewer_for_this_series">Viewer for this series</string>
+    <string name="pref_category_for_this_series">For this series</string>
+    <string name="viewer">Viewer</string>
     <string name="transition_finished">Finished:</string>
     <string name="transition_current">Current:</string>
     <string name="transition_next">Next:</string>