From 333c035fede73d0baca6550d8ce020ffb28f877c Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 28 Aug 2021 17:22:41 -0400
Subject: [PATCH] Clean up reader action sheet layout

---
 .../tachiyomi/ui/reader/ReaderPageSheet.kt    |  6 +-
 app/src/main/res/layout/reader_page_sheet.xml | 87 ++++++-------------
 2 files changed, 30 insertions(+), 63 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
index e47ac8a9f..f5a5d87e5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
@@ -22,9 +22,9 @@ class ReaderPageSheet(
     override fun createView(inflater: LayoutInflater): View {
         binding = ReaderPageSheetBinding.inflate(activity.layoutInflater, null, false)
 
-        binding.setAsCoverLayout.setOnClickListener { setAsCover() }
-        binding.shareLayout.setOnClickListener { share() }
-        binding.saveLayout.setOnClickListener { save() }
+        binding.setAsCover.setOnClickListener { setAsCover() }
+        binding.share.setOnClickListener { share() }
+        binding.save.setOnClickListener { save() }
 
         return binding.root
     }
diff --git a/app/src/main/res/layout/reader_page_sheet.xml b/app/src/main/res/layout/reader_page_sheet.xml
index 85971e1bd..ab581a65f 100644
--- a/app/src/main/res/layout/reader_page_sheet.xml
+++ b/app/src/main/res/layout/reader_page_sheet.xml
@@ -5,82 +5,49 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/set_as_cover_layout"
+    <TextView
+        android:id="@+id/set_as_cover"
         android:layout_width="match_parent"
         android:layout_height="56dp"
+        android:drawablePadding="32dp"
+        android:gravity="center_vertical"
         android:clickable="true"
         android:focusable="true"
+        android:paddingHorizontal="16dp"
         android:foreground="?attr/selectableItemBackground"
-        android:gravity="center"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
+        android:text="@string/set_as_cover"
+        android:textColor="?attr/colorOnBackground"
+        app:drawableStartCompat="@drawable/ic_photo_24dp"
+        app:drawableTint="?attr/colorOnBackground" />
 
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_photo_24dp"
-            app:tint="?attr/colorOnBackground" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/set_as_cover"
-            android:textColor="?attr/colorOnBackground" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/share_layout"
+    <TextView
+        android:id="@+id/share"
         android:layout_width="match_parent"
         android:layout_height="56dp"
+        android:drawablePadding="32dp"
+        android:gravity="center_vertical"
         android:clickable="true"
         android:focusable="true"
+        android:paddingHorizontal="16dp"
         android:foreground="?attr/selectableItemBackground"
-        android:gravity="center"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
+        android:text="@string/action_share"
+        android:textColor="?attr/colorOnBackground"
+        app:drawableStartCompat="@drawable/ic_share_24dp"
+        app:drawableTint="?attr/colorOnBackground" />
 
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_share_24dp"
-            app:tint="?attr/colorOnBackground" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_share"
-            android:textColor="?attr/colorOnBackground" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/save_layout"
+    <TextView
+        android:id="@+id/save"
         android:layout_width="match_parent"
         android:layout_height="56dp"
+        android:drawablePadding="32dp"
+        android:gravity="center_vertical"
         android:clickable="true"
         android:focusable="true"
+        android:paddingHorizontal="16dp"
         android:foreground="?attr/selectableItemBackground"
-        android:gravity="center"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
-
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_save_24dp"
-            app:tint="?attr/colorOnBackground" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_save"
-            android:textColor="?attr/colorOnBackground" />
-
-    </LinearLayout>
+        android:text="@string/action_save"
+        android:textColor="?attr/colorOnBackground"
+        app:drawableStartCompat="@drawable/ic_save_24dp"
+        app:drawableTint="?attr/colorOnBackground" />
 
 </LinearLayout>