From bb3a88813b4c981f8b8f5d4dc6316e211ec36881 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Tue, 27 Jun 2023 12:00:27 +0800
Subject: [PATCH] Cleanup BaseScene

---
 .../java/com/hippo/ehviewer/ui/scene/BaseScene.kt    | 12 ++----------
 .../com/hippo/ehviewer/ui/scene/ProgressScene.kt     |  4 +---
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt
index 559a2b8fd..162ce932a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/BaseScene.kt
@@ -16,7 +16,6 @@
 package com.hippo.ehviewer.ui.scene
 
 import android.annotation.SuppressLint
-import android.content.res.Resources
 import android.content.res.Resources.Theme
 import android.os.Bundle
 import android.os.Parcelable
@@ -105,9 +104,7 @@ abstract class BaseScene : Fragment() {
         }
     }
 
-    open fun needShowLeftDrawer(): Boolean {
-        return true
-    }
+    open val showLeftDrawer = true
 
     fun recreateDrawerView() {
         val activity = mainActivity
@@ -157,7 +154,7 @@ abstract class BaseScene : Fragment() {
         view.background = requireActivity().theme.resolveDrawable(android.R.attr.windowBackground)
 
         // Update left drawer locked state
-        if (needShowLeftDrawer()) {
+        if (showLeftDrawer) {
             setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, GravityCompat.START)
         } else {
             setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, GravityCompat.START)
@@ -171,11 +168,6 @@ abstract class BaseScene : Fragment() {
         destroyDrawerView()
     }
 
-    val resourcesOrNull: Resources?
-        get() {
-            val context = context
-            return context?.resources
-        }
     val mainActivity: MainActivity?
         get() {
             val activity = activity
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt
index 550409f01..cbc5cc203 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/ProgressScene.kt
@@ -33,9 +33,7 @@ import eu.kanade.tachiyomi.util.lang.withUIContext
 import moe.tarsin.coroutines.runSuspendCatching
 
 class ProgressScene : BaseScene() {
-    override fun needShowLeftDrawer(): Boolean {
-        return false
-    }
+    override val showLeftDrawer = false
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return ComposeView(inflater.context).apply {