diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt index 4187d9f6c..8aca99622 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt @@ -253,7 +253,7 @@ class LibraryController( } .launchIn(viewScope) - (activity!! as MainActivity).fixViewToBottom(binding.actionToolbar) + (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar) } override fun onChangeStarted(handler: ControllerChangeHandler, type: ControllerChangeType) { @@ -266,7 +266,7 @@ class LibraryController( override fun onDestroyView(view: View) { destroyActionModeIfNeeded() - (activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar) + (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar) binding.actionToolbar.destroy() adapter?.onDestroy() adapter = null 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 508f6c940..0012a6228 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 @@ -342,7 +342,7 @@ class MangaController : } .launchIn(viewScope) - (activity!! as MainActivity).fixViewToBottom(binding.actionToolbar) + (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar) settingsSheet = ChaptersSettingsSheet(router, presenter) { group -> if (group is ChaptersSettingsSheet.Filter.FilterGroup) { @@ -429,7 +429,7 @@ class MangaController : override fun onDestroyView(view: View) { destroyActionModeIfNeeded() - (activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar) + (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar) binding.actionToolbar.destroy() mangaInfoAdapter = null chaptersHeaderAdapter = null diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt index 73960a235..16c51c6a4 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recent/updates/UpdatesController.kt @@ -109,12 +109,12 @@ class UpdatesController : } .launchIn(viewScope) - (activity!! as MainActivity).fixViewToBottom(binding.actionToolbar) + (activity as? MainActivity)?.fixViewToBottom(binding.actionToolbar) } override fun onDestroyView(view: View) { destroyActionModeIfNeeded() - (activity!! as MainActivity).clearFixViewToBottom(binding.actionToolbar) + (activity as? MainActivity)?.clearFixViewToBottom(binding.actionToolbar) binding.actionToolbar.destroy() adapter = null super.onDestroyView(view)