From 291f61551a4f9103d2cf2976c85b545fff9e2e93 Mon Sep 17 00:00:00 2001
From: ibo <41344259+sneazy-ibo@users.noreply.github.com>
Date: Wed, 13 Mar 2024 13:57:40 +0100
Subject: [PATCH] feat: hide scrollBar toggle (#238)

---
 .../manga/mangareader/MangaReaderActivity.kt  | 33 +++++++++++++++++++
 .../ReaderSettingsDialogFragment.kt           |  6 ++++
 .../settings/CurrentReaderSettings.kt         |  1 +
 .../settings/ReaderSettingsActivity.kt        |  6 ++++
 .../dantotsu/settings/saving/Preferences.kt   |  1 +
 .../res/drawable/ic_round_no_scroll_bar.xml   |  5 +++
 .../res/layout/activity_reader_settings.xml   | 20 +++++++++++
 .../bottom_sheet_current_reader_settings.xml  | 18 ++++++++++
 app/src/main/res/values/strings.xml           |  1 +
 9 files changed, 91 insertions(+)
 create mode 100644 app/src/main/res/drawable/ic_round_no_scroll_bar.xml

diff --git a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt
index 3665eb3e7d3..d74959f949f 100644
--- a/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt
@@ -88,6 +88,7 @@ class MangaReaderActivity : AppCompatActivity() {
 
     private var isContVisible = false
     private var showProgressDialog = true
+    private var hidescrollbar = false
 
     private var maxChapterPage = 0L
     private var currentChapterPage = 0L
@@ -781,6 +782,38 @@ class MangaReaderActivity : AppCompatActivity() {
                 hideBars()
                 checkNotch()
             }
+            // Hide the scrollbar completely
+            if (defaultSettings.hideScrollBar) {
+                binding.mangaReaderSliderContainer.visibility = View.GONE
+            } else {
+                if (defaultSettings.horizontalScrollBar) {
+                    binding.mangaReaderSliderContainer.updateLayoutParams {
+                        height = ViewGroup.LayoutParams.WRAP_CONTENT
+                        width = ViewGroup.LayoutParams.WRAP_CONTENT
+                    }
+
+                    binding.mangaReaderSlider.apply {
+                        updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                            width = ViewGroup.LayoutParams.MATCH_PARENT
+                        }
+                        rotation = 0f
+                    }
+
+                } else {
+                    binding.mangaReaderSliderContainer.updateLayoutParams {
+                        height = ViewGroup.LayoutParams.MATCH_PARENT
+                        width = 48f.px
+                    }
+
+                    binding.mangaReaderSlider.apply {
+                        updateLayoutParams {
+                            width = binding.mangaReaderSliderContainer.height - 16f.px
+                        }
+                        rotation = 90f
+                    }
+                }
+                binding.mangaReaderSliderContainer.visibility = View.VISIBLE
+            }
             //horizontal scrollbar
             if (defaultSettings.horizontalScrollBar) {
                 binding.mangaReaderSliderContainer.updateLayoutParams {
diff --git a/app/src/main/java/ani/dantotsu/media/manga/mangareader/ReaderSettingsDialogFragment.kt b/app/src/main/java/ani/dantotsu/media/manga/mangareader/ReaderSettingsDialogFragment.kt
index c9c42aab025..de69d399e7d 100644
--- a/app/src/main/java/ani/dantotsu/media/manga/mangareader/ReaderSettingsDialogFragment.kt
+++ b/app/src/main/java/ani/dantotsu/media/manga/mangareader/ReaderSettingsDialogFragment.kt
@@ -127,6 +127,12 @@ class ReaderSettingsDialogFragment : BottomSheetDialogFragment() {
             activity.applySettings()
         }
 
+        binding.readerHideScrollBar.isChecked = settings.hideScrollBar
+        binding.readerHideScrollBar.setOnCheckedChangeListener { _, isChecked ->
+            settings.hideScrollBar = isChecked
+            activity.applySettings()
+        }
+
         binding.readerHidePageNumbers.isChecked = settings.hidePageNumbers
         binding.readerHidePageNumbers.setOnCheckedChangeListener { _, isChecked ->
             settings.hidePageNumbers = isChecked
diff --git a/app/src/main/java/ani/dantotsu/settings/CurrentReaderSettings.kt b/app/src/main/java/ani/dantotsu/settings/CurrentReaderSettings.kt
index 2aca1b3e93a..be076fbdedc 100644
--- a/app/src/main/java/ani/dantotsu/settings/CurrentReaderSettings.kt
+++ b/app/src/main/java/ani/dantotsu/settings/CurrentReaderSettings.kt
@@ -15,6 +15,7 @@ data class CurrentReaderSettings(
     var trueColors: Boolean = PrefManager.getVal(PrefName.TrueColors),
     var rotation: Boolean = PrefManager.getVal(PrefName.Rotation),
     var padding: Boolean = PrefManager.getVal(PrefName.Padding),
+    var hideScrollBar: Boolean = PrefManager.getVal(PrefName.HideScrollBar),
     var hidePageNumbers: Boolean = PrefManager.getVal(PrefName.HidePageNumbers),
     var horizontalScrollBar: Boolean = PrefManager.getVal(PrefName.HorizontalScrollBar),
     var keepScreenOn: Boolean = PrefManager.getVal(PrefName.KeepScreenOn),
diff --git a/app/src/main/java/ani/dantotsu/settings/ReaderSettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/ReaderSettingsActivity.kt
index f3846245f0f..8cbdac58cef 100644
--- a/app/src/main/java/ani/dantotsu/settings/ReaderSettingsActivity.kt
+++ b/app/src/main/java/ani/dantotsu/settings/ReaderSettingsActivity.kt
@@ -148,6 +148,12 @@ class ReaderSettingsActivity : AppCompatActivity() {
             PrefManager.setVal(PrefName.KeepScreenOn, isChecked)
         }
 
+        binding.readerSettingsHideScrollBar.isChecked = defaultSettings.hideScrollBar
+        binding.readerSettingsHideScrollBar.setOnCheckedChangeListener { _, isChecked ->
+            defaultSettings.hideScrollBar = isChecked
+            PrefManager.setVal(PrefName.HideScrollBar, isChecked)
+        }
+
         binding.readerSettingsHidePageNumbers.isChecked = defaultSettings.hidePageNumbers
         binding.readerSettingsHidePageNumbers.setOnCheckedChangeListener { _, isChecked ->
             defaultSettings.hidePageNumbers = isChecked
diff --git a/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt b/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt
index b33ed1689fe..0e0a6a2250a 100644
--- a/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt
+++ b/app/src/main/java/ani/dantotsu/settings/saving/Preferences.kt
@@ -119,6 +119,7 @@ enum class PrefName(val data: Pref) {  //TODO: Split this into multiple files
     TrueColors(Pref(Location.Reader, Boolean::class, false)),
     Rotation(Pref(Location.Reader, Boolean::class, true)),
     Padding(Pref(Location.Reader, Boolean::class, true)),
+    HideScrollBar(Pref(Location.Reader, Boolean::class, false)),
     HidePageNumbers(Pref(Location.Reader, Boolean::class, false)),
     HorizontalScrollBar(Pref(Location.Reader, Boolean::class, true)),
     KeepScreenOn(Pref(Location.Reader, Boolean::class, false)),
diff --git a/app/src/main/res/drawable/ic_round_no_scroll_bar.xml b/app/src/main/res/drawable/ic_round_no_scroll_bar.xml
new file mode 100644
index 00000000000..c11b94ee6af
--- /dev/null
+++ b/app/src/main/res/drawable/ic_round_no_scroll_bar.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M4,16h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,14c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM10.5,16h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-3c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM17,16h3c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-3c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM4,20c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM8,20c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM12,20c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM16,20c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM20,20c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM4,12h6c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,10c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM14,12h6c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-6c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM3,5v2c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1L21,5c0,-0.55 -0.45,-1 -1,-1L4,4c-0.55,0 -1,0.45 -1,1z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/activity_reader_settings.xml b/app/src/main/res/layout/activity_reader_settings.xml
index be259b9622e..1b0706019da 100644
--- a/app/src/main/res/layout/activity_reader_settings.xml
+++ b/app/src/main/res/layout/activity_reader_settings.xml
@@ -484,6 +484,26 @@
                     app:showText="false"
                     app:thumbTint="@color/button_switch_track" />
 
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/readerSettingsHideScrollBar"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    android:drawableStart="@drawable/ic_round_no_scroll_bar"
+                    android:drawablePadding="16dp"
+                    android:elegantTextHeight="true"
+                    android:fontFamily="@font/poppins_bold"
+                    android:minHeight="64dp"
+                    android:paddingStart="32dp"
+                    android:paddingEnd="32dp"
+                    android:text="@string/hide_scroll_bar"
+                    android:textAlignment="viewStart"
+                    android:textColor="?attr/colorOnBackground"
+                    app:cornerRadius="0dp"
+                    app:drawableTint="?attr/colorPrimary"
+                    app:showText="false"
+                    app:thumbTint="@color/button_switch_track" />
+
                 <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/readerSettingsHidePageNumbers"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml b/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml
index 9fee4f93835..60bc62d61d8 100644
--- a/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml
+++ b/app/src/main/res/layout/bottom_sheet_current_reader_settings.xml
@@ -360,6 +360,24 @@
             app:showText="false"
             app:thumbTint="@color/button_switch_track" />
 
+        <com.google.android.material.materialswitch.MaterialSwitch
+            android:id="@+id/readerHideScrollBar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:drawableStart="@drawable/ic_round_no_scroll_bar"
+            android:drawablePadding="16dp"
+            android:elegantTextHeight="true"
+            android:fontFamily="@font/poppins_bold"
+            android:minHeight="64dp"
+            android:text="@string/hide_scroll_bar"
+            android:textAlignment="viewStart"
+            android:textColor="?attr/colorOnBackground"
+            app:cornerRadius="0dp"
+            app:drawableTint="?attr/colorPrimary"
+            app:showText="false"
+            app:thumbTint="@color/button_switch_track" />
+
         <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/readerHidePageNumbers"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1a0ab2f9d81..702606742d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -698,4 +698,5 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
     <string name="sampling">Sampling</string>
     <string name="blur_banners">Blur Banners</string>
     <string name="blur">Blur</string>
+    <string name="hide_scroll_bar">Hide Scroll Bar</string>
 </resources>