From 0a5461cbeaca8bc39eb1d5641cf60c744f7c79b2 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 28 Mar 2020 16:32:34 -0400
Subject: [PATCH] Use pill icon instead of text for sheet pull up indicator

---
 .../main/res/drawable/ic_drag_pill_24dp.xml   |  9 ++++
 .../main/res/layout/reader_settings_sheet.xml | 43 +++++++++++--------
 app/src/main/res/values/strings.xml           |  1 -
 3 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_drag_pill_24dp.xml

diff --git a/app/src/main/res/drawable/ic_drag_pill_24dp.xml b/app/src/main/res/drawable/ic_drag_pill_24dp.xml
new file mode 100644
index 000000000..51aca297e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drag_pill_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M22.15,13.85H1.85A1.86,1.86,0,0,1,0,12H0a1.86,1.86,0,0,1,1.85-1.85H22.15A1.86,1.86,0,0,1,24,12h0A1.86,1.86,0,0,1,22.15,13.85Z" />
+</vector>
diff --git a/app/src/main/res/layout/reader_settings_sheet.xml b/app/src/main/res/layout/reader_settings_sheet.xml
index afbfc49a6..860a73514 100644
--- a/app/src/main/res/layout/reader_settings_sheet.xml
+++ b/app/src/main/res/layout/reader_settings_sheet.xml
@@ -7,7 +7,28 @@
     android:background="?attr/colorSurface"
     android:clipToPadding="false"
     android:orientation="vertical"
-    android:padding="@dimen/material_component_dialogs_padding_around_content_area">
+    android:paddingStart="24dp"
+    android:paddingTop="0dp"
+    android:paddingEnd="24dp"
+    android:paddingBottom="24dp">
+
+    <ImageView
+        android:id="@id/pull_up_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="24dp"
+        android:alpha="0.5"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_drag_pill_24dp"
+        android:tint="?attr/colorOnBackground"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <android.widget.Space
+        android:id="@+id/spinner_end"
+        android:layout_width="16dp"
+        android:layout_height="0dp"
+        app:layout_constraintStart_toEndOf="parent" />
 
     <!-- General preferences -->
 
@@ -19,23 +40,7 @@
         android:textColor="?attr/colorAccent"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/pull_up_for_more"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:text="@string/reader_pull_up_for_more_options"
-        android:textColor="?android:attr/textColorHint"
-        app:layout_constraintStart_toEndOf="@id/general_prefs"
-        app:layout_constraintTop_toTopOf="@id/general_prefs" />
-
-    <android.widget.Space
-        android:id="@+id/spinner_end"
-        android:layout_width="16dp"
-        android:layout_height="0dp"
-        app:layout_constraintStart_toEndOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/pull_up_bar" />
 
     <TextView
         android:id="@+id/viewer_text"
@@ -54,7 +59,7 @@
         android:entries="@array/viewers_selector"
         app:layout_constraintEnd_toEndOf="@id/spinner_end"
         app:layout_constraintStart_toEndOf="@id/verticalcenter"
-        app:layout_constraintTop_toBottomOf="@id/pull_up_for_more" />
+        app:layout_constraintTop_toBottomOf="@id/general_prefs" />
 
     <TextView
         android:id="@+id/rotation_mode_text"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fc097e3a..fec805ffb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -505,7 +505,6 @@
     <string name="transition_no_previous">There\'s no previous chapter</string>
     <string name="transition_pages_loading">Loading pages…</string>
     <string name="transition_pages_error">Failed to load pages: %1$s</string>
-    <string name="reader_pull_up_for_more_options">Pull up for more options</string>
 
     <!-- Recent manga fragment -->
     <string name="recent_manga_source">%1$s - Ch.%2$s</string>