From ea7a012e0a34c4d784fd9aa6a1d6027bb3177bfc Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Wed, 22 Feb 2023 19:57:05 +0800
Subject: [PATCH] Remove crop borders until we support it

---
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt   | 7 +++++--
 .../ui/reader/setting/ReaderReadingModeSettings.kt         | 4 ++--
 .../kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt | 4 ++--
 .../tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt    | 4 ++--
 app/src/main/res/layout/reader_activity.xml                | 6 ++++--
 app/src/main/res/layout/reader_pager_settings.xml          | 2 ++
 app/src/main/res/layout/reader_webtoon_settings.xml        | 2 ++
 7 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index eca70ce38..d8da70242 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -87,7 +87,6 @@ import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer
 import eu.kanade.tachiyomi.util.lang.launchIO
 import eu.kanade.tachiyomi.util.lang.launchUI
 import eu.kanade.tachiyomi.util.lang.withUIContext
-import eu.kanade.tachiyomi.util.preference.toggle
 import eu.kanade.tachiyomi.util.system.applySystemAnimatorScale
 import eu.kanade.tachiyomi.util.system.hasDisplayCutout
 import eu.kanade.tachiyomi.util.system.isNightMode
@@ -716,12 +715,13 @@ class ReaderActivity : EhActivity() {
                     readerPreferences.defaultReadingMode().set(newReadingMode.flagValue)
                     setGallery()
 
-                    updateCropBordersShortcut()
+                    // updateCropBordersShortcut()
                 }
             }
         }
 
         // Crop borders
+        /*
         with(binding.actionCropBorders) {
             setTooltip(R.string.pref_crop_borders)
 
@@ -742,6 +742,7 @@ class ReaderActivity : EhActivity() {
                     .onEach { updateCropBordersShortcut() }
                     .launchIn(lifecycleScope)
             }
+         */
 
         // Rotation
         with(binding.actionRotation) {
@@ -782,6 +783,7 @@ class ReaderActivity : EhActivity() {
         binding.actionRotation.setImageResource(orientation.iconRes)
     }
 
+    /*
     private fun updateCropBordersShortcut() {
         val isPagerType = ReadingModeType.isPagerType(readerPreferences.defaultReadingMode().get())
         val enabled = if (isPagerType) {
@@ -798,6 +800,7 @@ class ReaderActivity : EhActivity() {
             },
         )
     }
+     */
 
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
index f3319860e..4ebd6c0b5 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderReadingModeSettings.kt
@@ -100,7 +100,7 @@ class ReaderReadingModeSettings @JvmOverloads constructor(
         binding.pagerPrefsGroup.landscapeZoom.bindToPreference(readerPreferences.landscapeZoom())
 
         binding.pagerPrefsGroup.zoomStart.bindToPreference(readerPreferences.zoomStart(), 1)
-        binding.pagerPrefsGroup.cropBorders.bindToPreference(readerPreferences.cropBorders())
+        // binding.pagerPrefsGroup.cropBorders.bindToPreference(readerPreferences.cropBorders())
     }
 
     /**
@@ -119,7 +119,7 @@ class ReaderReadingModeSettings @JvmOverloads constructor(
         readerPreferences.navigationModeWebtoon()
             .asHotFlow { binding.webtoonPrefsGroup.tappingInverted.isVisible = it != 5 }
             .launchIn((context as ReaderActivity).lifecycleScope)
-        binding.webtoonPrefsGroup.cropBordersWebtoon.bindToPreference(readerPreferences.cropBordersWebtoon())
+        // binding.webtoonPrefsGroup.cropBordersWebtoon.bindToPreference(readerPreferences.cropBordersWebtoon())
         binding.webtoonPrefsGroup.webtoonSidePadding.bindToIntPreference(
             readerPreferences.webtoonSidePadding(),
             R.array.webtoon_side_padding_values
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
index a995ed202..9b17e51db 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerConfig.kt
@@ -63,8 +63,8 @@ class PagerConfig(
         readerPreferences.zoomStart()
             .register({ zoomTypeFromPreference(it) }, { imagePropertyChangedListener?.invoke() })
 
-        readerPreferences.cropBorders()
-            .register({ imageCropBorders = it }, { imagePropertyChangedListener?.invoke() })
+        // readerPreferences.cropBorders()
+        //     .register({ imageCropBorders = it }, { imagePropertyChangedListener?.invoke() })
 
         readerPreferences.navigateToPan()
             .register({ navigateToPan = it })
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
index 922997438..9bb4b35a0 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonConfig.kt
@@ -39,8 +39,8 @@ class WebtoonConfig(
     val theme = readerPreferences.readerTheme().get()
 
     init {
-        readerPreferences.cropBordersWebtoon()
-            .register({ imageCropBorders = it }, { imagePropertyChangedListener?.invoke() })
+        // readerPreferences.cropBordersWebtoon()
+        //     .register({ imageCropBorders = it }, { imagePropertyChangedListener?.invoke() })
 
         readerPreferences.webtoonSidePadding()
             .register({ sidePadding = it }, { imagePropertyChangedListener?.invoke() })
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index 088ec5645..44503b366 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -125,12 +125,13 @@
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:contentDescription="@string/viewer"
                     android:padding="@dimen/screen_edge_margin"
-                    app:layout_constraintEnd_toStartOf="@id/action_crop_borders"
+                    app:layout_constraintEnd_toStartOf="@id/action_rotation"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_reader_default_24dp"
                     app:tint="?attr/colorOnSurface" />
 
+                <!--
                 <ImageButton
                     android:id="@+id/action_crop_borders"
                     android:layout_width="wrap_content"
@@ -143,6 +144,7 @@
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_crop_24dp"
                     app:tint="?attr/colorOnSurface" />
+                    -->
 
                 <ImageButton
                     android:id="@+id/action_rotation"
@@ -152,7 +154,7 @@
                     android:contentDescription="@string/pref_rotation_type"
                     android:padding="@dimen/screen_edge_margin"
                     app:layout_constraintEnd_toStartOf="@id/action_settings"
-                    app:layout_constraintStart_toEndOf="@+id/action_crop_borders"
+                    app:layout_constraintStart_toEndOf="@+id/action_reading_mode"
                     app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_screen_rotation_24dp"
                     app:tint="?attr/colorOnSurface" />
diff --git a/app/src/main/res/layout/reader_pager_settings.xml b/app/src/main/res/layout/reader_pager_settings.xml
index 07e74b755..26241e30f 100644
--- a/app/src/main/res/layout/reader_pager_settings.xml
+++ b/app/src/main/res/layout/reader_pager_settings.xml
@@ -62,6 +62,7 @@
         android:entries="@array/zoom_start"
         app:title="@string/pref_zoom_start" />
 
+    <!--
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/crop_borders"
         android:layout_width="match_parent"
@@ -70,6 +71,7 @@
         android:paddingVertical="16dp"
         android:text="@string/pref_crop_borders"
         android:textColor="?android:attr/textColorSecondary" />
+        -->
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/tapping_prefs_group"
diff --git a/app/src/main/res/layout/reader_webtoon_settings.xml b/app/src/main/res/layout/reader_webtoon_settings.xml
index 0f525e0c1..2ccc3d3c0 100644
--- a/app/src/main/res/layout/reader_webtoon_settings.xml
+++ b/app/src/main/res/layout/reader_webtoon_settings.xml
@@ -37,6 +37,7 @@
         android:entries="@array/webtoon_side_padding"
         app:title="@string/pref_webtoon_side_padding" />
 
+    <!--
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/crop_borders_webtoon"
         android:layout_width="match_parent"
@@ -45,6 +46,7 @@
         android:paddingVertical="16dp"
         android:text="@string/pref_crop_borders"
         android:textColor="?android:attr/textColorSecondary" />
+        -->
 
     <androidx.constraintlayout.widget.Group
         android:id="@+id/tapping_prefs_group"