From b530216f2127ada2f1291c7d18036a4332f38897 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

(cherry picked from commit 333c035fede73d0baca6550d8ce020ffb28f877c)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPageSheet.kt
#	app/src/main/res/layout/reader_page_sheet.xml
---
 .../tachiyomi/ui/reader/ReaderPageSheet.kt    |  32 +--
 app/src/main/res/layout/reader_page_sheet.xml | 247 ++++++------------
 2 files changed, 93 insertions(+), 186 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 ec9988d90..e319c213a 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
@@ -26,26 +26,26 @@ class ReaderPageSheet(
     override fun createView(inflater: LayoutInflater): View {
         binding = ReaderPageSheetBinding.inflate(activity.layoutInflater, null, false)
 
-        binding.setAsCoverLayout.setOnClickListener { setAsCover(page) }
-        binding.shareLayout.setOnClickListener { share(page) }
-        binding.saveLayout.setOnClickListener { save(page) }
+        binding.setAsCover.setOnClickListener { setAsCover(page) }
+        binding.share.setOnClickListener { share(page) }
+        binding.save.setOnClickListener { save(page) }
 
         if (extraPage != null) {
-            binding.setAsCoverItem.setText(R.string.action_set_first_page_cover)
-            binding.shareItem.setText(R.string.action_share_first_page)
-            binding.saveItem.setText(R.string.action_save_first_page)
+            binding.setAsCover.setText(R.string.action_set_first_page_cover)
+            binding.share.setText(R.string.action_share_first_page)
+            binding.save.setText(R.string.action_save_first_page)
 
-            binding.setAsCoverLayoutExtra.isVisible = true
-            binding.setAsCoverLayoutExtra.setOnClickListener { setAsCover(extraPage) }
-            binding.shareLayoutExtra.isVisible = true
-            binding.shareLayoutExtra.setOnClickListener { share(extraPage) }
-            binding.saveLayoutExtra.isVisible = true
-            binding.saveLayoutExtra.setOnClickListener { save(extraPage) }
+            binding.setAsCoverExtra.isVisible = true
+            binding.setAsCoverExtra.setOnClickListener { setAsCover(extraPage) }
+            binding.shareExtra.isVisible = true
+            binding.shareExtra.setOnClickListener { share(extraPage) }
+            binding.saveExtra.isVisible = true
+            binding.saveExtra.setOnClickListener { save(extraPage) }
 
-            binding.shareLayoutCombined.isVisible = true
-            binding.shareLayoutCombined.setOnClickListener { shareCombined() }
-            binding.saveLayoutCombined.isVisible = true
-            binding.saveLayoutCombined.setOnClickListener { saveCombined() }
+            binding.shareCombined.isVisible = true
+            binding.shareCombined.setOnClickListener { shareCombined() }
+            binding.saveCombined.isVisible = true
+            binding.saveCombined.setOnClickListener { saveCombined() }
         }
 
         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 64b31e2a2..e0559b65b 100644
--- a/app/src/main/res/layout/reader_page_sheet.xml
+++ b/app/src/main/res/layout/reader_page_sheet.xml
@@ -5,223 +5,130 @@
     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:id="@+id/set_as_cover_item"
-            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/set_as_cover_layout_extra"
+    <TextView
+        android:id="@+id/set_as_cover_extra"
         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:visibility="gone">
+        android:text="@string/action_set_second_page_cover"
+        android:textColor="?attr/colorOnBackground"
+        android:visibility="gone"
+        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:id="@+id/set_as_cover_item_extra"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_set_second_page_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:id="@+id/share_item"
-            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/share_layout_extra"
+    <TextView
+        android:id="@+id/share_extra"
         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:visibility="gone">
+        android:text="@string/action_share_second_page"
+        android:textColor="?attr/colorOnBackground"
+        android:visibility="gone"
+        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:id="@+id/share_item_extra"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_share_second_page"
-            android:textColor="?attr/colorOnBackground" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/share_layout_combined"
+    <TextView
+        android:id="@+id/share_combined"
         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:visibility="gone">
+        android:text="@string/action_share_combined_page"
+        android:textColor="?attr/colorOnBackground"
+        android:visibility="gone"
+        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:id="@+id/share_item_combined"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_share_combined_page"
-            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">
+        android:text="@string/action_save"
+        android:textColor="?attr/colorOnBackground"
+        app:drawableStartCompat="@drawable/ic_save_24dp"
+        app:drawableTint="?attr/colorOnBackground" />
 
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_save_24dp"
-            app:tint="?attr/colorOnBackground" />
-
-        <TextView
-            android:id="@+id/save_item"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_save"
-            android:textColor="?attr/colorOnBackground" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/save_layout_extra"
+    <TextView
+        android:id="@+id/save_extra"
         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:visibility="gone">
+        android:text="@string/action_save_second_page"
+        android:textColor="?attr/colorOnBackground"
+        android:visibility="gone"
+        app:drawableStartCompat="@drawable/ic_save_24dp"
+        app:drawableTint="?attr/colorOnBackground" />
 
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_get_app_24dp"
-            app:tint="?attr/colorOnBackground" />
-
-        <TextView
-            android:id="@+id/save_item_extra"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_save_second_page"
-            android:textColor="?attr/colorOnBackground" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/save_layout_combined"
+    <TextView
+        android:id="@+id/save_combined"
         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:visibility="gone">
-
-        <ImageView
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_get_app_24dp"
-            app:tint="?attr/colorOnBackground" />
-
-        <TextView
-            android:id="@+id/save_item_combined"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:text="@string/action_save_combined_page"
-            android:textColor="?attr/colorOnBackground" />
-    </LinearLayout>
-
-
-
+        android:text="@string/action_save_combined_page"
+        android:textColor="?attr/colorOnBackground"
+        android:visibility="gone"
+        app:drawableStartCompat="@drawable/ic_save_24dp"
+        app:drawableTint="?attr/colorOnBackground" />
 
 </LinearLayout>