From 938919bd9be821e1e24bdd583aaeb1ab430868a0 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Sat, 13 Mar 2021 16:24:44 -0500
Subject: [PATCH] Move reader setting related classes

---
 .../main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt  | 3 +++
 .../tachiyomi/ui/reader/{ => setting}/OrientationType.kt       | 2 +-
 .../ui/reader/{ => setting}/ReaderColorFilterSheet.kt          | 3 ++-
 .../tachiyomi/ui/reader/{ => setting}/ReaderColorFilterView.kt | 2 +-
 .../tachiyomi/ui/reader/{ => setting}/ReaderSettingsSheet.kt   | 3 ++-
 app/src/main/res/layout/reader_activity.xml                    | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)
 rename app/src/main/java/eu/kanade/tachiyomi/ui/reader/{ => setting}/OrientationType.kt (97%)
 rename app/src/main/java/eu/kanade/tachiyomi/ui/reader/{ => setting}/ReaderColorFilterSheet.kt (98%)
 rename app/src/main/java/eu/kanade/tachiyomi/ui/reader/{ => setting}/ReaderColorFilterView.kt (95%)
 rename app/src/main/java/eu/kanade/tachiyomi/ui/reader/{ => setting}/ReaderSettingsSheet.kt (98%)

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 ea549bf53..d7651535f 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
@@ -44,6 +44,9 @@ import eu.kanade.tachiyomi.ui.reader.ReaderPresenter.SetAsCoverResult.Success
 import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
 import eu.kanade.tachiyomi.ui.reader.model.ReaderPage
 import eu.kanade.tachiyomi.ui.reader.model.ViewerChapters
+import eu.kanade.tachiyomi.ui.reader.setting.OrientationType
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderColorFilterSheet
+import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsSheet
 import eu.kanade.tachiyomi.ui.reader.viewer.BaseViewer
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.L2RPagerViewer
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.R2LPagerViewer
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/OrientationType.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt
similarity index 97%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/reader/OrientationType.kt
rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt
index c22042f41..829371249 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/OrientationType.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/OrientationType.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.reader
+package eu.kanade.tachiyomi.ui.reader.setting
 
 import android.content.pm.ActivityInfo
 import android.content.res.Configuration
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSheet.kt
similarity index 98%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt
rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSheet.kt
index 139407bbb..b8239fa59 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterSheet.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.reader
+package eu.kanade.tachiyomi.ui.reader.setting
 
 import android.view.ViewGroup
 import android.widget.SeekBar
@@ -11,6 +11,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.ReaderColorFilterSheetBinding
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
 import eu.kanade.tachiyomi.widget.SimpleSeekBarListener
 import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterView.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterView.kt
similarity index 95%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterView.kt
rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterView.kt
index 4638c4dd1..7cf651d23 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderColorFilterView.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderColorFilterView.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.reader
+package eu.kanade.tachiyomi.ui.reader.setting
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
similarity index 98%
rename from app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
rename to app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
index 1cae74936..d53e8f604 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
@@ -1,4 +1,4 @@
-package eu.kanade.tachiyomi.ui.reader
+package eu.kanade.tachiyomi.ui.reader.setting
 
 import android.os.Bundle
 import android.widget.CompoundButton
@@ -12,6 +12,7 @@ import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.data.preference.asImmediateFlow
 import eu.kanade.tachiyomi.databinding.ReaderSettingsSheetBinding
+import eu.kanade.tachiyomi.ui.reader.ReaderActivity
 import eu.kanade.tachiyomi.ui.reader.viewer.pager.PagerViewer
 import eu.kanade.tachiyomi.ui.reader.viewer.webtoon.WebtoonViewer
 import eu.kanade.tachiyomi.widget.IgnoreFirstSpinnerListener
diff --git a/app/src/main/res/layout/reader_activity.xml b/app/src/main/res/layout/reader_activity.xml
index 63875467e..4a4139af1 100644
--- a/app/src/main/res/layout/reader_activity.xml
+++ b/app/src/main/res/layout/reader_activity.xml
@@ -37,7 +37,7 @@
 
     </FrameLayout>
 
-    <eu.kanade.tachiyomi.ui.reader.ReaderColorFilterView
+    <eu.kanade.tachiyomi.ui.reader.setting.ReaderColorFilterView
         android:id="@+id/color_overlay"
         android:layout_width="match_parent"
         android:layout_height="match_parent"