From 876304065de88dc9776021101d36fb69a0f17822 Mon Sep 17 00:00:00 2001
From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com>
Date: Wed, 6 Dec 2023 19:19:14 -0600
Subject: [PATCH] fix for SettingsDialogFragment.<init> []

---
 .../download/manga/OfflineMangaFragment.kt    | 12 +++++---
 .../ani/dantotsu/home/AnimePageAdapter.kt     |  7 ++---
 .../java/ani/dantotsu/home/HomeFragment.kt    | 28 +++++++++----------
 .../ani/dantotsu/home/MangaPageAdapter.kt     |  7 ++---
 .../settings/SettingsDialogFragment.kt        | 16 ++++++++++-
 5 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
index 3809dc9e..e81d2817 100644
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
@@ -69,10 +69,14 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
 
         val animeUserAvatar = view.findViewById<ShapeableImageView>(R.id.offlineMangaUserAvatar)
         animeUserAvatar.setSafeOnClickListener {
-            SettingsDialogFragment(SettingsDialogFragment.Companion.PageType.HOME).show(
-                (it.context as AppCompatActivity).supportFragmentManager,
-                "dialog"
-            )
+            animeUserAvatar.setSafeOnClickListener {
+                val dialogFragment = SettingsDialogFragment.newInstance(SettingsDialogFragment.Companion.PageType.HOME)
+                dialogFragment.show(
+                    (it.context as AppCompatActivity).supportFragmentManager,
+                    "dialog"
+                )
+            }
+
         }
 
         val colorOverflow = currContext()?.getSharedPreferences("Dantotsu", Context.MODE_PRIVATE)
diff --git a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
index 63ee9b84..65b69860 100644
--- a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
@@ -98,10 +98,9 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
         }
 
         binding.animeUserAvatar.setSafeOnClickListener {
-            SettingsDialogFragment(SettingsDialogFragment.Companion.PageType.ANIME).show(
-                (it.context as AppCompatActivity).supportFragmentManager,
-                "dialog"
-            )
+            val dialogFragment =
+                SettingsDialogFragment.newInstance(SettingsDialogFragment.Companion.PageType.ANIME)
+            dialogFragment.show((it.context as AppCompatActivity).supportFragmentManager, "dialog")
         }
 
         listOf(
diff --git a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
index 88df99fc..1f3255dd 100644
--- a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
+++ b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
@@ -113,8 +113,10 @@ class HomeFragment : Fragment() {
         }
 
         binding.homeUserAvatarContainer.setSafeOnClickListener {
-            SettingsDialogFragment(SettingsDialogFragment.Companion.PageType.HOME).show(
-                parentFragmentManager,
+            val dialogFragment =
+                SettingsDialogFragment.newInstance(SettingsDialogFragment.Companion.PageType.HOME)
+            dialogFragment.show(
+                (it.context as androidx.appcompat.app.AppCompatActivity).supportFragmentManager,
                 "dialog"
             )
         }
@@ -127,19 +129,17 @@ class HomeFragment : Fragment() {
 
         var reached = false
         val duration = (uiSettings.animationSpeed * 200).toLong()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            binding.homeScroll.setOnScrollChangeListener { _, _, _, _, _ ->
-                if (!binding.homeScroll.canScrollVertically(1)) {
-                    reached = true
-                    bottomBar.animate().translationZ(0f).setDuration(duration).start()
-                    ObjectAnimator.ofFloat(bottomBar, "elevation", 4f, 0f).setDuration(duration)
+        binding.homeScroll.setOnScrollChangeListener { _, _, _, _, _ ->
+            if (!binding.homeScroll.canScrollVertically(1)) {
+                reached = true
+                bottomBar.animate().translationZ(0f).setDuration(duration).start()
+                ObjectAnimator.ofFloat(bottomBar, "elevation", 4f, 0f).setDuration(duration)
+                    .start()
+            } else {
+                if (reached) {
+                    bottomBar.animate().translationZ(12f).setDuration(duration).start()
+                    ObjectAnimator.ofFloat(bottomBar, "elevation", 0f, 4f).setDuration(duration)
                         .start()
-                } else {
-                    if (reached) {
-                        bottomBar.animate().translationZ(12f).setDuration(duration).start()
-                        ObjectAnimator.ofFloat(bottomBar, "elevation", 0f, 4f).setDuration(duration)
-                            .start()
-                    }
                 }
             }
         }
diff --git a/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt b/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
index 7053df8a..17c0bf06 100644
--- a/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
+++ b/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
@@ -93,10 +93,9 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
         }
 
         binding.mangaUserAvatar.setSafeOnClickListener {
-            SettingsDialogFragment(SettingsDialogFragment.Companion.PageType.MANGA).show(
-                (it.context as AppCompatActivity).supportFragmentManager,
-                "dialog"
-            )
+            val dialogFragment =
+                SettingsDialogFragment.newInstance(SettingsDialogFragment.Companion.PageType.MANGA)
+            dialogFragment.show((it.context as AppCompatActivity).supportFragmentManager, "dialog")
         }
 
         binding.mangaSearchBar.setEndIconOnClickListener {
diff --git a/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt b/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
index f59f7e1d..72e621b1 100644
--- a/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/SettingsDialogFragment.kt
@@ -26,10 +26,16 @@ import ani.dantotsu.startMainActivity
 import ani.dantotsu.toast
 
 
-class SettingsDialogFragment(val pageType: PageType) : BottomSheetDialogFragment() {
+class SettingsDialogFragment() : BottomSheetDialogFragment() {
     private var _binding: BottomSheetSettingsBinding? = null
     private val binding get() = _binding!!
 
+    private lateinit var pageType: PageType
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        pageType = arguments?.getSerializable("pageType") as? PageType ?: PageType.HOME
+    }
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -136,5 +142,13 @@ class SettingsDialogFragment(val pageType: PageType) : BottomSheetDialogFragment
         enum class PageType {
             MANGA, ANIME, HOME
         }
+
+        fun newInstance(pageType: PageType): SettingsDialogFragment {
+            val fragment = SettingsDialogFragment()
+            val args = Bundle()
+            args.putSerializable("pageType", pageType)
+            fragment.arguments = args
+            return fragment
+        }
     }
 }
\ No newline at end of file