From 27a395e697ef0ce2128127a8807b0313440c7b3a Mon Sep 17 00:00:00 2001
From: HapeLee <1321903405@qq.com>
Date: Fri, 24 Oct 2025 12:50:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=95=8C=E9=9D=A2=E9=94=AE?=
 =?UTF-8?q?=E7=9B=98=E5=9B=9E=E8=BD=A6=E5=8A=9F=E8=83=BD=20#133?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kazusa/ui/book/search/SearchActivity.kt   | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt
index ab0b75aed..181978e09 100644
--- a/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legato/kazusa/ui/book/search/SearchActivity.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.view.KeyEvent
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View.VISIBLE
@@ -206,18 +207,20 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         searchView.editText.hint = getString(R.string.search_book_key)
         searchView.editText.setOnEditorActionListener { _, actionId, _ ->
             if (actionId == EditorInfo.IME_ACTION_SEARCH) {
-                val key = searchView.text.toString().trim()
-                if (key.isNotEmpty()) {
-                    isManualStopSearch = false
-                    viewModel.saveSearchKey(key)
-                    viewModel.searchKey = ""
-                    viewModel.search(key)
-                    visibleInputHelp()
-                    searchView.hide()
-                    return@setOnEditorActionListener true
-                }
+                doSearch()
+                true
+            } else {
+                false
+            }
+        }
+
+        searchView.editText.setOnKeyListener { _, keyCode, event ->
+            if (keyCode == KeyEvent.KEYCODE_ENTER && event.action == KeyEvent.ACTION_DOWN) {
+                doSearch()
+                true
+            } else {
+                false
             }
-            false
         }
 
         searchView.editText.doAfterTextChanged {
@@ -241,6 +244,18 @@ class SearchActivity : VMBaseActivity<ActivityBookSearchBinding, SearchViewModel
         visibleInputHelp()
     }
 
+    private fun doSearch() {
+        val key = searchView.text.toString().trim()
+        if (key.isNotEmpty()) {
+            isManualStopSearch = false
+            viewModel.saveSearchKey(key)
+            viewModel.searchKey = ""
+            viewModel.search(key)
+            visibleInputHelp()
+            searchView.hide()
+        }
+    }
+
     private fun updateSelectedGroup() {
         val chip = binding.chipGroup
         val displayNames = viewModel.searchScope.displayNames