From f8a0d8b9c5d11b281bd852b9699e23dc746c95f2 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 27 May 2023 22:49:12 +0800
Subject: [PATCH] Move searchDatabase out of EhDatabase

---
 .../main/java/com/hippo/ehviewer/dao/EhDatabase.kt    |  6 ------
 .../com/hippo/ehviewer/ui/scene/SearchBarScene.kt     | 11 +++++++++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
index 8e043a446..2dc28198f 100644
--- a/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
+++ b/app/src/main/java/com/hippo/ehviewer/dao/EhDatabase.kt
@@ -8,7 +8,6 @@ import androidx.room.Room
 import androidx.room.RoomDatabase
 import androidx.room.migration.AutoMigrationSpec
 import androidx.sqlite.db.SupportSQLiteDatabase
-import com.hippo.ehviewer.EhApplication
 
 @DeleteTable(tableName = "BOOKMARKS")
 class DropBookMarkDao : AutoMigrationSpec
@@ -101,8 +100,3 @@ fun buildCookiesDB(context: Context): CookiesDatabase {
 abstract class SearchDatabase : RoomDatabase() {
     abstract fun searchDao(): SearchDao
 }
-
-val searchDatabase by lazy {
-    val context = EhApplication.application
-    Room.databaseBuilder(context, SearchDatabase::class.java, "search_database.db").build()
-}
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 52ed849eb..2b294ca63 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
@@ -16,13 +16,15 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import androidx.room.Room
 import com.google.android.material.search.SearchView
 import com.google.android.material.search.SearchView.TransitionListener
 import com.google.android.material.shape.MaterialShapeDrawable
+import com.hippo.ehviewer.EhApplication
 import com.hippo.ehviewer.R
 import com.hippo.ehviewer.Settings
 import com.hippo.ehviewer.client.EhTagDatabase
-import com.hippo.ehviewer.dao.searchDatabase
+import com.hippo.ehviewer.dao.SearchDatabase
 import com.hippo.ehviewer.databinding.SceneSearchbarBinding
 import com.hippo.ehviewer.ui.legacy.BaseDialogBuilder
 import eu.kanade.tachiyomi.util.lang.launchIO
@@ -30,6 +32,11 @@ import eu.kanade.tachiyomi.util.lang.withUIContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
 
+private val searchDatabase by lazy {
+    val context = EhApplication.application
+    Room.databaseBuilder(context, SearchDatabase::class.java, "search_database.db").build()
+}
+
 abstract class SearchBarScene : BaseScene(), ToolBarScene {
     private var _binding: SceneSearchbarBinding? = null
     private val binding get() = _binding!!
@@ -37,7 +44,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
     private var mSuggestionAdapter: SuggestionAdapter? = null
     private var mSuggestionProvider: SuggestionProvider? = null
     private var mAllowEmptySearch = true
-    private val mSearchDatabase by lazy { searchDatabase.searchDao() }
+    private val mSearchDatabase = searchDatabase.searchDao()
     private var onApplySearch: (String) -> Unit = {}
 
     override fun onCreateView(