From a06d23753aba18c640d153df63a265ab77b3d276 Mon Sep 17 00:00:00 2001 From: FooIbar <118464521+FooIbar@users.noreply.github.com> Date: Sat, 21 Oct 2023 11:37:51 +0800 Subject: [PATCH] Lock navi drawer on where doesn't have navi icon --- app/src/main/kotlin/com/hippo/ehviewer/ui/scene/BaseScene.kt | 2 +- app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryScene.kt | 2 ++ .../main/kotlin/com/hippo/ehviewer/ui/scene/ProgressScene.kt | 2 -- .../main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/BaseScene.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/BaseScene.kt index 5048c5d94..45a3be296 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/BaseScene.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/BaseScene.kt @@ -120,7 +120,7 @@ abstract class BaseScene : Fragment() { } } - open val showLeftDrawer = true + open val showLeftDrawer = false private fun createDrawerView(savedInstanceState: Bundle?): View? { drawerView = onCreateDrawerView(layoutInflater) diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryScene.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryScene.kt index 052796abc..1ebe24459 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryScene.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/HistoryScene.kt @@ -73,6 +73,8 @@ import eu.kanade.tachiyomi.util.system.pxToDp import kotlinx.coroutines.delay class HistoryScene : BaseScene() { + override val showLeftDrawer = true + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?) = ComposeView(inflater.context).apply { setMD3Content { val dialogState = rememberDialogState() diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressScene.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressScene.kt index 7af054dc3..c9c98567b 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressScene.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/ProgressScene.kt @@ -34,8 +34,6 @@ import eu.kanade.tachiyomi.util.lang.withUIContext import moe.tarsin.coroutines.runSuspendCatching class ProgressScene : BaseScene() { - override val showLeftDrawer = false - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { return ComposeView(inflater.context).apply { setMD3Content { diff --git a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt index 8576b4bf8..212501e69 100644 --- a/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt +++ b/app/src/main/kotlin/com/hippo/ehviewer/ui/scene/SearchBarScene.kt @@ -75,6 +75,8 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene { } } + override val showLeftDrawer = true + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { _binding = SceneSearchbarBinding.inflate(inflater, container, false) binding.appbar.statusBarForeground = MaterialShapeDrawable.createWithElevationOverlay(context)