From 025d794962b8524a101a748dcf9944dcb81b73ac Mon Sep 17 00:00:00 2001 From: arkon Date: Mon, 3 Aug 2020 14:12:34 -0400 Subject: [PATCH] Fix snackbars not being in viewport properly (cherry picked from commit 060f0682f49bd20b95d77bf091d34e4073308d58) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt # app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt --- .../ui/browse/source/browse/BrowseSourceController.kt | 3 ++- app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt | 2 -- .../main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt index 4461d6d1b..12a8455e7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt @@ -56,6 +56,7 @@ import eu.kanade.tachiyomi.widget.EmptyView import exh.EXHSavedSearch import exh.isEhBasedSource import kotlinx.android.parcel.Parcelize +import kotlinx.android.synthetic.main.main_activity.root_coordinator import kotlinx.coroutines.Job import kotlinx.coroutines.flow.drop import kotlinx.coroutines.flow.filter @@ -578,7 +579,7 @@ open class BrowseSourceController(bundle: Bundle) : binding.emptyView.show(message, actions) } else { - snack = binding.catalogueView.snack(message, Snackbar.LENGTH_INDEFINITE) { + snack = activity!!.root_coordinator?.snack(message, Snackbar.LENGTH_INDEFINITE) { setAction(R.string.action_retry, retryAction) } } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt index 2d6eb76e2..c2d62a427 100755 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt @@ -183,8 +183,6 @@ class MainActivity : BaseActivity() { // WhatsNewDialogController().showDialog(router) // } -// WhatsNewDialogController().showDialog(router) - // EXH --> // Perform EXH specific migrations if (EXHMigrations.upgrade(preferences)) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt index 1e5a3ef26..69e7fdc3f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt @@ -1060,7 +1060,7 @@ class MangaController : val manga = presenter.manga presenter.downloadChapters(chapters) if (view != null && !manga.favorite) { - binding.recycler.snack(view.context.getString(R.string.snack_add_to_library), Snackbar.LENGTH_INDEFINITE) { + activity!!.root_coordinator?.snack(view.context.getString(R.string.snack_add_to_library), Snackbar.LENGTH_INDEFINITE) { setAction(R.string.action_add) { addToLibrary(manga) }