Multiple bug fixes and changes

- Fixed options menu

- Fixed merge with another

- Migrate to MaterialFastScroll

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOneController.kt

@@ -2,12 +2,14 @@ package eu.kanade.tachiyomi.ui.manga
 
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
+import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import android.view.LayoutInflater
 import android.view.Menu
+import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
@@ -51,6 +53,7 @@ import eu.kanade.tachiyomi.ui.main.offsetAppbarHeight
 import eu.kanade.tachiyomi.ui.manga.chapter.ChapterHolder
 import eu.kanade.tachiyomi.ui.manga.chapter.ChapterItem
 import eu.kanade.tachiyomi.ui.manga.chapter.ChaptersAdapter
+import eu.kanade.tachiyomi.ui.manga.chapter.ChaptersPresenter
 import eu.kanade.tachiyomi.ui.manga.chapter.DeleteChaptersDialog
 import eu.kanade.tachiyomi.ui.manga.chapter.DownloadCustomChaptersDialog
 import eu.kanade.tachiyomi.ui.migration.manga.design.PreMigrationController
@@ -124,7 +127,7 @@ class MangaAllInOneController :
     }
 
     // EXH -->
-    constructor(redirect: MangaAllInOnePresenter.EXHRedirect) : super(
+    constructor(redirect: ChaptersPresenter.EXHRedirect) : super(
         Bundle().apply {
             putLong(MANGA_EXTRA, redirect.manga.id!!)
             putBoolean(UPDATE_EXTRA, redirect.update)
@@ -201,7 +204,6 @@ class MangaAllInOneController :
 
     init {
         setHasOptionsMenu(true)
-        setOptionsMenuHidden(true)
     }
 
     override fun getTitle(): String? {
@@ -209,7 +211,6 @@ class MangaAllInOneController :
     }
 
     override fun createPresenter(): MangaAllInOnePresenter {
-        // val ctrl = parentController as MangaController
         return MangaAllInOnePresenter(
             manga!!, source!!,
             chapterCountRelay, lastUpdateRelay, mangaFavoriteRelay, smartSearchConfig
@@ -415,7 +416,7 @@ class MangaAllInOneController :
     private fun openSmartSearch() {
         val smartSearchConfig = SourceController.SmartSearchConfig(presenter.manga.title, presenter.manga.id!!)
 
-        parentController?.router?.pushController(
+        router?.pushController(
             SourceController(
                 Bundle().apply {
                     putParcelable(SourceController.SMART_SEARCH_CONFIG, smartSearchConfig)
@@ -842,7 +843,7 @@ class MangaAllInOneController :
     /**
      * Perform a search using the provided query.
      *
-     * @param query the search query to the parent controller
+     * @param query the search query to the previous controller
      */
     private fun performSearch(query: String) {
         val router = router ?: return
@@ -872,6 +873,30 @@ class MangaAllInOneController :
     }
 
     // CHAPTER FUNCTIONS START HERE
+    override fun onDestroyView(view: View) {
+        destroyActionModeIfNeeded()
+        binding.actionToolbar.destroy()
+        adapter = null
+        super.onDestroyView(view)
+    }
+
+    override fun onActivityResumed(activity: Activity) {
+        if (view == null) return
+
+        // Check if animation view is visible
+        if (binding.revealView.visibility == View.VISIBLE) {
+            // Show the unreveal effect
+            val coordinates = binding.fab.getCoordinates()
+            binding.revealView.hideRevealEffect(coordinates.x, coordinates.y, 1920)
+        }
+
+        super.onActivityResumed(activity)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.chapters, menu)
+    }
+
     override fun onPrepareOptionsMenu(menu: Menu) {
         // Initialize menu items.
         val menuFilterRead = menu.findItem(R.id.action_filter_read) ?: return

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaAllInOnePresenter.kt

@@ -19,6 +19,7 @@ import eu.kanade.tachiyomi.source.online.all.MergedSource
 import eu.kanade.tachiyomi.ui.base.presenter.BasePresenter
 import eu.kanade.tachiyomi.ui.browse.source.SourceController
 import eu.kanade.tachiyomi.ui.manga.chapter.ChapterItem
+import eu.kanade.tachiyomi.ui.manga.chapter.ChaptersPresenter
 import eu.kanade.tachiyomi.util.chapter.syncChaptersWithSource
 import eu.kanade.tachiyomi.util.lang.isNullOrUnsubscribed
 import eu.kanade.tachiyomi.util.prepUpdateCover
@@ -91,9 +92,7 @@ class MangaAllInOnePresenter(
     // EXH -->
     private val updateHelper: EHentaiUpdateHelper by injectLazy()
 
-    val redirectUserRelay = BehaviorRelay.create<EXHRedirect>()
+    val redirectUserRelay = BehaviorRelay.create<ChaptersPresenter.EXHRedirect>()
-
-    data class EXHRedirect(val manga: Manga, val update: Boolean)
     // EXH <--
 
     /**
@@ -170,7 +169,7 @@ class MangaAllInOnePresenter(
                                         val acceptedChapterUrls = acceptedChain.chapters.map { it.url }.toSet()
                                         val update = (ourChapterUrls - acceptedChapterUrls).isNotEmpty()
                                         redirectUserRelay.call(
-                                            MangaAllInOnePresenter.EXHRedirect(
+                                            ChaptersPresenter.EXHRedirect(
                                                 acceptedChain.manga,
                                                 update
                                             )

app/src/main/res/layout-land/manga_all_in_one_controller.xml

@@ -412,13 +412,12 @@
 
     </eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout>
 
-    <eu.davidea.fastscroller.FastScroller
+    <eu.kanade.tachiyomi.ui.library.MaterialFastScroll
         android:id="@+id/fast_scroller"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_centerHorizontal="true"
         android:layout_gravity="end"
-        android:layoutDirection="ltr"
         app:fastScrollerBubbleEnabled="false"
         tools:visibility="visible" />
 

app/src/main/res/layout/manga_all_in_one_controller.xml

@@ -434,13 +434,12 @@
 
     </eu.kanade.tachiyomi.widget.ThemedSwipeRefreshLayout>
 
-    <eu.davidea.fastscroller.FastScroller
+    <eu.kanade.tachiyomi.ui.library.MaterialFastScroll
         android:id="@+id/fast_scroller"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_centerHorizontal="true"
         android:layout_gravity="end"
-        android:layoutDirection="ltr"
         app:fastScrollerBubbleEnabled="false"
         tools:visibility="visible" />