From add228407f2fea4f2762e5c06ce18b2b457ca30e Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 19 Apr 2023 22:43:36 -0400
Subject: [PATCH] Remove abstract TabeedBottomSheetDialog class

---
 .../ui/reader/setting/ReaderSettingsSheet.kt  | 55 +++++++++++++------
 .../widget/sheet/TabbedBottomSheetDialog.kt   | 43 ---------------
 2 files changed, 39 insertions(+), 59 deletions(-)
 delete mode 100644 app/src/main/java/eu/kanade/tachiyomi/widget/sheet/TabbedBottomSheetDialog.kt

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
index 14386d3c5..0f684736a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/setting/ReaderSettingsSheet.kt
@@ -2,20 +2,27 @@ package eu.kanade.tachiyomi.ui.reader.setting
 
 import android.animation.ValueAnimator
 import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import com.google.android.material.tabs.TabLayout
 import eu.kanade.tachiyomi.R
+import eu.kanade.tachiyomi.databinding.CommonTabbedSheetBinding
 import eu.kanade.tachiyomi.ui.reader.ReaderActivity
+import eu.kanade.tachiyomi.widget.ViewPagerAdapter
 import eu.kanade.tachiyomi.widget.listener.SimpleTabSelectedListener
-import eu.kanade.tachiyomi.widget.sheet.TabbedBottomSheetDialog
+import eu.kanade.tachiyomi.widget.sheet.BaseBottomSheetDialog
 
 class ReaderSettingsSheet(
     private val activity: ReaderActivity,
     private val showColorFilterSettings: Boolean = false,
-) : TabbedBottomSheetDialog(activity) {
+) : BaseBottomSheetDialog(activity) {
 
-    private val readingModeSettings = ReaderReadingModeSettings(activity)
-    private val generalSettings = ReaderGeneralSettings(activity)
-    private val colorFilterSettings = ReaderColorFilterSettings(activity)
+    private val tabs = listOf(
+        ReaderReadingModeSettings(activity) to R.string.pref_category_reading_mode,
+        ReaderGeneralSettings(activity) to R.string.pref_category_general,
+        ReaderColorFilterSettings(activity) to R.string.custom_filter,
+    )
 
     private val backgroundDimAnimator by lazy {
         val sheetBackgroundDim = window?.attributes?.dimAmount ?: 0.25f
@@ -27,13 +34,26 @@ class ReaderSettingsSheet(
         }
     }
 
+    private lateinit var binding: CommonTabbedSheetBinding
+
+    override fun createView(inflater: LayoutInflater): View {
+        binding = CommonTabbedSheetBinding.inflate(activity.layoutInflater)
+
+        val adapter = Adapter()
+        binding.pager.offscreenPageLimit = 2
+        binding.pager.adapter = adapter
+        binding.tabs.setupWithViewPager(binding.pager)
+
+        return binding.root
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         behavior.isFitToContents = false
         behavior.halfExpandedRatio = 0.25f
 
-        val filterTabIndex = getTabViews().indexOf(colorFilterSettings)
+        val filterTabIndex = tabs.indexOfFirst { it.first is ReaderColorFilterSettings }
         binding.tabs.addOnTabSelectedListener(
             object : SimpleTabSelectedListener() {
                 override fun onTabSelected(tab: TabLayout.Tab?) {
@@ -63,15 +83,18 @@ class ReaderSettingsSheet(
         }
     }
 
-    override fun getTabViews() = listOf(
-        readingModeSettings,
-        generalSettings,
-        colorFilterSettings,
-    )
+    private inner class Adapter : ViewPagerAdapter() {
 
-    override fun getTabTitles() = listOf(
-        R.string.pref_category_reading_mode,
-        R.string.pref_category_general,
-        R.string.custom_filter,
-    )
+        override fun createView(container: ViewGroup, position: Int): View {
+            return tabs[position].first
+        }
+
+        override fun getCount(): Int {
+            return tabs.size
+        }
+
+        override fun getPageTitle(position: Int): CharSequence {
+            return activity.resources!!.getString(tabs[position].second)
+        }
+    }
 }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/TabbedBottomSheetDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/TabbedBottomSheetDialog.kt
deleted file mode 100644
index 447a9c6b6..000000000
--- a/app/src/main/java/eu/kanade/tachiyomi/widget/sheet/TabbedBottomSheetDialog.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package eu.kanade.tachiyomi.widget.sheet
-
-import android.app.Activity
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import eu.kanade.tachiyomi.databinding.CommonTabbedSheetBinding
-import eu.kanade.tachiyomi.widget.ViewPagerAdapter
-
-abstract class TabbedBottomSheetDialog(private val activity: Activity) : BaseBottomSheetDialog(activity) {
-
-    lateinit var binding: CommonTabbedSheetBinding
-
-    override fun createView(inflater: LayoutInflater): View {
-        binding = CommonTabbedSheetBinding.inflate(activity.layoutInflater)
-
-        val adapter = LibrarySettingsSheetAdapter()
-        binding.pager.offscreenPageLimit = 2
-        binding.pager.adapter = adapter
-        binding.tabs.setupWithViewPager(binding.pager)
-
-        return binding.root
-    }
-
-    abstract fun getTabViews(): List<View>
-
-    abstract fun getTabTitles(): List<Int>
-
-    private inner class LibrarySettingsSheetAdapter : ViewPagerAdapter() {
-
-        override fun createView(container: ViewGroup, position: Int): View {
-            return getTabViews()[position]
-        }
-
-        override fun getCount(): Int {
-            return getTabViews().size
-        }
-
-        override fun getPageTitle(position: Int): CharSequence {
-            return activity.resources!!.getString(getTabTitles()[position])
-        }
-    }
-}