From f8f2d020eb10ad0d2908b62f8328607608f77561 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Sat, 17 Jun 2023 17:32:08 +0800
Subject: [PATCH] Upgrade mdc for searchbar predictive back

---
 app/build.gradle.kts                                        | 4 ++--
 .../main/java/com/hippo/ehviewer/ui/scene/SearchBarScene.kt | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 8e7869f11..8f9acfb89 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -64,7 +64,7 @@ android {
     defaultConfig {
         applicationId = "moe.tarsin.ehviewer"
         minSdk = 28
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 180042
         versionName = "1.8.9.0-SNAPSHOT"
         resourceConfigurations.addAll(
@@ -214,7 +214,7 @@ dependencies {
     val accompanist_version = "0.31.3-SNAPSHOT"
     implementation("com.google.accompanist:accompanist-themeadapter-material3:$accompanist_version")
     implementation("com.google.accompanist:accompanist-webview:$accompanist_version")
-    implementation("com.google.android.material:material:1.9.0")
+    implementation("com.google.android.material:material:1.10.0-alpha04")
 
     val splitties = "3.0.0"
     implementation("com.louiscad.splitties:splitties-appctx:$splitties")
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 8cff37297..e8c836fb8 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
@@ -118,7 +118,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
 
     @CallSuper
     open fun onSearchViewHidden() {
-        binding.toolbar.text = binding.searchview.text
+        binding.toolbar.setText(binding.searchview.text)
         privLockModeStart?.let { setDrawerLockMode(it, GravityCompat.START) }
         privLockModeStart = null
         privLockModeEnd?.let { setDrawerLockMode(it, GravityCompat.END) }
@@ -130,7 +130,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
     }
 
     fun setSearchBarText(text: String?) {
-        binding.toolbar.text = text
+        binding.toolbar.setText(text)
         binding.searchview.setText(text)
     }
 
@@ -159,7 +159,7 @@ abstract class SearchBarScene : BaseScene(), ToolBarScene {
     }
 
     fun onApplySearch() {
-        binding.toolbar.text = binding.searchview.text
+        binding.toolbar.setText(binding.searchview.text)
         binding.searchview.hide()
         val query = binding.toolbar.text.toString().trim()
         if (!mAllowEmptySearch && query.isEmpty()) {