prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix search action #495

Browse Source
This commit is contained in:
Koitharu
2023-09-18 13:34:08 +03:00
parent 6e1cd05fa8
commit 65d83e0921
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/kotlin/org/koitharu/kotatsu/main/ui/MainActivity.kt
View File

@@ -239,10 +239,11 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), AppBarOwner, BottomNav
override fun onQueryClick(query: String, submit: Boolean) { override fun onQueryClick(query: String, submit: Boolean) {
viewBinding.searchView.query = query viewBinding.searchView.query = query
if (submit) { if (submit && query.isNotEmpty()) {
if (query.isNotEmpty()) { startActivity(MultiSearchActivity.newIntent(this, query))
startActivity(MultiSearchActivity.newIntent(this, query)) searchSuggestionViewModel.saveQuery(query)
searchSuggestionViewModel.saveQuery(query) viewBinding.searchView.post {
closeSearchCallback.handleOnBackPressed()
} }
} }
} }

7
app/src/main/kotlin/org/koitharu/kotatsu/search/ui/widget/SearchEditText.kt
View File

@@ -7,6 +7,7 @@ import android.text.Spannable
import android.text.SpannableString import android.text.SpannableString
import android.text.style.TextAppearanceSpan import android.text.style.TextAppearanceSpan
import android.util.AttributeSet import android.util.AttributeSet
import android.view.InputDevice
import android.view.KeyEvent import android.view.KeyEvent
import android.view.MotionEvent import android.view.MotionEvent
import android.view.SoundEffectConstants import android.view.SoundEffectConstants
@@ -59,7 +60,11 @@ class SearchEditText @JvmOverloads constructor(
} }
override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean { override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_ENTER && event.hasNoModifiers() && query.isNotEmpty()) { if (event.isFromSource(InputDevice.SOURCE_KEYBOARD)
&& (keyCode == KeyEvent.KEYCODE_ENTER || keyCode == KeyEvent.KEYCODE_NUMPAD_ENTER)
&& event.hasNoModifiers()
&& query.isNotEmpty()
) {
cancelLongPress() cancelLongPress()
searchSuggestionListener?.onQueryClick(query, submit = true) searchSuggestionListener?.onQueryClick(query, submit = true)
clearFocus() clearFocus()