From beaf6284fd089e28827d059ac9636aa2112ffd70 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 13 Dec 2020 22:35:14 -0500
Subject: [PATCH] Fixes to merged settings dialog and edit manga dialog

---
 .../tachiyomi/ui/manga/EditMangaDialog.kt     |  8 +---
 .../manga/merged/EditMergedSettingsDialog.kt  | 38 ++++++-------------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
index 197f8251e..72beaadcf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/EditMangaDialog.kt
@@ -62,17 +62,13 @@ class EditMangaDialog : DialogController {
     }
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
+        binding = EditMangaDialogBinding.inflate(activity!!.layoutInflater)
         val dialog = MaterialDialog(activity!!).apply {
-            customView(viewRes = R.layout.edit_manga_dialog, scrollable = true)
+            customView(view = binding.root, scrollable = true)
             negativeButton(android.R.string.cancel)
             positiveButton(R.string.action_save) { onPositiveButtonClick() }
         }
-        binding = EditMangaDialogBinding.bind(dialog.view.contentLayout.customView!!)
         onViewCreated()
-        dialog.setOnShowListener {
-            val dView = (it as? MaterialDialog)?.view
-            dView?.contentLayout?.scrollView?.scrollTo(0, 0)
-        }
         return dialog
     }
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
index 90ae1c242..fdd4579c9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/merged/EditMergedSettingsDialog.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.manga.merged
 
 import android.app.Dialog
 import android.os.Bundle
-import android.view.View
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
@@ -19,9 +18,6 @@ import exh.merged.sql.models.MergedMangaReference
 import uy.kohesive.injekt.injectLazy
 
 class EditMergedSettingsDialog : DialogController, EditMergedMangaAdapter.EditMergedMangaItemListener {
-
-    private var dialogView: View? = null
-
     private val manga: Manga
 
     val mergedMangas: MutableList<Pair<Manga?, MergedMangaReference>> = mutableListOf()
@@ -55,22 +51,17 @@ class EditMergedSettingsDialog : DialogController, EditMergedMangaAdapter.EditMe
     private var mergedMangaAdapter: EditMergedMangaAdapter? = null
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-        val dialog = MaterialDialog(activity!!).apply {
-            customView(viewRes = R.layout.edit_merged_settings_dialog, scrollable = true)
-            negativeButton(android.R.string.cancel)
-            positiveButton(R.string.action_save) { onPositiveButtonClick() }
-        }
-        dialogView = dialog.view
-        onViewCreated(dialog.view)
-        dialog.setOnShowListener {
-            val dView = (it as? MaterialDialog)?.view
-            dView?.contentLayout?.scrollView?.scrollTo(0, 0)
-        }
+        binding = EditMergedSettingsDialogBinding.inflate(activity!!.layoutInflater)
+        val dialog = MaterialDialog(activity!!)
+            .customView(view = binding.root, scrollable = true)
+            .negativeButton(android.R.string.cancel)
+            .positiveButton(R.string.action_save) { onPositiveButtonClick() }
+
+        onViewCreated()
         return dialog
     }
 
-    fun onViewCreated(view: View) {
-        binding = EditMergedSettingsDialogBinding.bind(view)
+    fun onViewCreated() {
         val mergedManga = db.getMergedMangas(manga.id!!).executeAsBlocking()
         val mergedReferences = db.getMergedMangaReferences(manga.id!!).executeAsBlocking()
         if (mergedReferences.isEmpty() || mergedReferences.size == 1) {
@@ -86,18 +77,13 @@ class EditMergedSettingsDialog : DialogController, EditMergedMangaAdapter.EditMe
         mergedHeaderAdapter = EditMergedSettingsHeaderAdapter(this, mergedMangaAdapter!!)
 
         binding.recycler.adapter = ConcatAdapter(mergedHeaderAdapter, mergedMangaAdapter)
-        binding.recycler.layoutManager = LinearLayoutManager(view.context)
+        binding.recycler.layoutManager = LinearLayoutManager(activity!!)
 
         mergedMangaAdapter?.isHandleDragEnabled = isPriorityOrder
 
         mergedMangaAdapter?.updateDataSet(mergedMangas.map { it.toModel() })
     }
 
-    override fun onDestroyView(view: View) {
-        super.onDestroyView(view)
-        dialogView = null
-    }
-
     private fun onPositiveButtonClick() {
         mangaController.presenter.updateMergeSettings(mergeReference, mergedMangas.map { it.second })
     }
@@ -115,7 +101,7 @@ class EditMergedSettingsDialog : DialogController, EditMergedMangaAdapter.EditMe
         val mergedMangaAdapter = mergedMangaAdapter ?: return
         val mergeMangaReference = mergedMangaAdapter.currentItems.getOrNull(position)?.mergedMangaReference ?: return
 
-        MaterialDialog(dialogView!!.context)
+        MaterialDialog(activity!!)
             .title(R.string.delete_merged_manga)
             .message(R.string.delete_merged_manga_desc)
             .positiveButton(android.R.string.ok) {
@@ -128,7 +114,7 @@ class EditMergedSettingsDialog : DialogController, EditMergedMangaAdapter.EditMe
     }
 
     override fun onToggleChapterUpdatesClicked(position: Int) {
-        MaterialDialog(dialogView!!.context)
+        MaterialDialog(activity!!)
             .title(R.string.chapter_updates_merged_manga)
             .message(R.string.chapter_updates_merged_manga_desc)
             .positiveButton(android.R.string.ok) {
@@ -152,7 +138,7 @@ class EditMergedSettingsDialog : DialogController, EditMergedMangaAdapter.EditMe
     }
 
     override fun onToggleChapterDownloadsClicked(position: Int) {
-        MaterialDialog(dialogView!!.context)
+        MaterialDialog(activity!!)
             .title(R.string.download_merged_manga)
             .message(R.string.download_merged_manga_desc)
             .positiveButton(android.R.string.ok) {