Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix MangaController toolbar title showing when editing category (#6005)

Browse Source 
(cherry picked from commit ef993515c6b6169febf2a55df44fb9ca1b0b0a71)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
This commit is contained in:
Ivan Iskandar 2021-10-02 04:52:06 +07:00 committed by Jobobby04
parent 53592d1f57
commit 602b33705b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
View File

@ -56,6 +56,7 @@ import eu.kanade.tachiyomi.source.Source
import eu.kanade.tachiyomi.source.SourceManager import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.HttpSource import eu.kanade.tachiyomi.source.online.HttpSource
import eu.kanade.tachiyomi.source.online.MetadataSource import eu.kanade.tachiyomi.source.online.MetadataSource
import eu.kanade.tachiyomi.ui.base.controller.DialogController
import eu.kanade.tachiyomi.ui.base.controller.FabController import eu.kanade.tachiyomi.ui.base.controller.FabController
import eu.kanade.tachiyomi.ui.base.controller.NucleusController import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.ui.base.controller.getMainAppBarHeight import eu.kanade.tachiyomi.ui.base.controller.getMainAppBarHeight
@ -222,7 +223,7 @@ class MangaController :
private var trackSheet: TrackSheet? = null private var trackSheet: TrackSheet? = null
private var dialog: MangaFullCoverDialog? = null private var dialog: DialogController? = null
/** /**
* For [recyclerViewUpdatesToolbarTitleAlpha] * For [recyclerViewUpdatesToolbarTitleAlpha]
@ -726,8 +727,7 @@ class MangaController :
} }
}.toTypedArray() }.toTypedArray()
ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected) showChangeCategoryDialog(manga, categories, preselected)
.showDialog(router)
} }
} }
@ -851,8 +851,21 @@ class MangaController :
QuadStateTextView.State.UNCHECKED.ordinal QuadStateTextView.State.UNCHECKED.ordinal
} }
}.toTypedArray() }.toTypedArray()
ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected) showChangeCategoryDialog(manga, categories, preselected)
.showDialog(router) }
private fun showChangeCategoryDialog(manga: Manga, categories: List<Category>, preselected: Array<Int>) {
if (dialog != null) return
dialog = ChangeMangaCategoriesDialog(this, listOf(manga), categories, preselected)
dialog?.addLifecycleListener(
object : LifecycleListener() {
override fun postDestroy(controller: Controller) {
super.postDestroy(controller)
dialog = null
}
}
)
dialog?.showDialog(router)
} }
override fun updateCategoriesForMangas(mangas: List<Manga>, addCategories: List<Category>, removeCategories: List<Category>) { override fun updateCategoriesForMangas(mangas: List<Manga>, addCategories: List<Category>, removeCategories: List<Category>) {
@ -1047,7 +1060,7 @@ class MangaController :
fun onSetCoverSuccess() { fun onSetCoverSuccess() {
editMangaDialog?.loadCover() editMangaDialog?.loadCover()
mangaInfoAdapter?.notifyDataSetChanged() mangaInfoAdapter?.notifyDataSetChanged()
dialog?.setImage(manga) (dialog as? MangaFullCoverDialog)?.setImage(manga)
activity?.toast(R.string.cover_updated) activity?.toast(R.string.cover_updated)
} }