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

Dismiss add manga snackbar when leaving controller (closes #3614)

Browse Source 
(cherry picked from commit dda7e677a5d0e42f6cedae4ecf0fe58a11cab9ad)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
This commit is contained in:
arkon 2020-08-06 19:05:07 -04:00 committed by Jobobby04
parent aa6f1a0de5
commit a6d6a0fca6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,14 +150,15 @@ class MangaController :
private var chaptersHeaderAdapter: MangaChaptersHeaderAdapter? = null private var chaptersHeaderAdapter: MangaChaptersHeaderAdapter? = null
private var chaptersAdapter: ChaptersAdapter? = null private var chaptersAdapter: ChaptersAdapter? = null
/** // Sheet containing filter/sort/display items.
* Sheet containing filter/sort/display items.
*/
private var settingsSheet: ChaptersSettingsSheet? = null private var settingsSheet: ChaptersSettingsSheet? = null
private var actionFab: ExtendedFloatingActionButton? = null private var actionFab: ExtendedFloatingActionButton? = null
private var actionFabScrollListener: RecyclerView.OnScrollListener? = null private var actionFabScrollListener: RecyclerView.OnScrollListener? = null
// Snackbar to add manga to library after downloading chapter(s)
private var addSnackbar: Snackbar? = null
/** /**
* Action mode for multiple selection. * Action mode for multiple selection.
*/ */
@ -373,6 +374,7 @@ class MangaController :
mangaInfoItemAdapter = null mangaInfoItemAdapter = null
mangaMetaInfoAdapter = null mangaMetaInfoAdapter = null
// SY <-- // SY <--
addSnackbar?.dismiss()
updateToolbarTitleAlpha(255) updateToolbarTitleAlpha(255)
super.onDestroyView(view) super.onDestroyView(view)
} }
@ -533,12 +535,10 @@ class MangaController :
if (manga.favorite) { if (manga.favorite) {
toggleFavorite() toggleFavorite()
activity?.toast(activity?.getString(R.string.manga_removed_library)) activity?.toast(activity?.getString(R.string.manga_removed_library))
activity?.invalidateOptionsMenu()
} else { } else {
addToLibrary(manga) addToLibrary(manga)
} }
// Update menu to show migrate option
activity?.invalidateOptionsMenu()
} }
fun onTrackingClick() { fun onTrackingClick() {
@ -556,6 +556,7 @@ class MangaController :
toggleFavorite() toggleFavorite()
presenter.moveMangaToCategory(manga, defaultCategory) presenter.moveMangaToCategory(manga, defaultCategory)
activity?.toast(activity?.getString(R.string.manga_added_library)) activity?.toast(activity?.getString(R.string.manga_added_library))
activity?.invalidateOptionsMenu()
} }
// Automatic 'Default' or no categories // Automatic 'Default' or no categories
@ -563,6 +564,7 @@ class MangaController :
toggleFavorite() toggleFavorite()
presenter.moveMangaToCategory(manga, null) presenter.moveMangaToCategory(manga, null)
activity?.toast(activity?.getString(R.string.manga_added_library)) activity?.toast(activity?.getString(R.string.manga_added_library))
activity?.invalidateOptionsMenu()
} }
// Choose a category // Choose a category
@ -686,6 +688,7 @@ class MangaController :
if (!manga.favorite) { if (!manga.favorite) {
toggleFavorite() toggleFavorite()
activity?.toast(activity?.getString(R.string.manga_added_library)) activity?.toast(activity?.getString(R.string.manga_added_library))
activity?.invalidateOptionsMenu()
} }
presenter.moveMangaToCategories(manga, categories) presenter.moveMangaToCategories(manga, categories)
@ -1069,7 +1072,7 @@ class MangaController :
val manga = presenter.manga val manga = presenter.manga
presenter.downloadChapters(chapters) presenter.downloadChapters(chapters)
if (view != null && !manga.favorite) { if (view != null && !manga.favorite) {
activity!!.root_coordinator?.snack(view.context.getString(R.string.snack_add_to_library), Snackbar.LENGTH_INDEFINITE) { addSnackbar = activity!!.root_coordinator?.snack(view.context.getString(R.string.snack_add_to_library), Snackbar.LENGTH_INDEFINITE) {
setAction(R.string.action_add) { setAction(R.string.action_add) {
addToLibrary(manga) addToLibrary(manga)
} }