From 80fcda149b98e607c15b936c34949f55158173b0 Mon Sep 17 00:00:00 2001 From: tarsin Date: Mon, 2 Jan 2023 21:03:47 +0800 Subject: [PATCH] Resolve #615 --- .../main/java/com/hippo/ehviewer/ui/scene/BaseToolbarScene.kt | 1 + app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseToolbarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseToolbarScene.kt index c90e62166..fd1d9e53f 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseToolbarScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseToolbarScene.kt @@ -84,6 +84,7 @@ abstract class BaseToolbarScene : BaseScene(), ToolBarScene { } fun setTitle(title: CharSequence?) { + _binding ?: return binding.toolbar.title = title } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt index 46e9359a3..fa98dcd6a 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt @@ -319,6 +319,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene { @SuppressLint("NotifyDataSetChanged") private fun updateSuggestions(scrollToTop: Boolean = true) { + _binding ?: return viewLifecycleOwner.lifecycleScope.launch { val suggestions = mutableListOf() mergedSuggestionFlow().collect { @@ -362,6 +363,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene { } fun showSearchBar() { + _binding ?: return binding.appbar.setExpanded(true) }