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

Handle enter press in search view

Browse Source
This commit is contained in:
Koitharu
2023-09-08 09:17:04 +03:00
parent ca47c475d3
commit c88a9dff36
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,8 @@ class SearchEditText @JvmOverloads constructor(
) : AppCompatEditText(context, attrs, defStyleAttr) { ) : AppCompatEditText(context, attrs, defStyleAttr) {
var searchSuggestionListener: SearchSuggestionListener? = null var searchSuggestionListener: SearchSuggestionListener? = null
private val clearIcon = ContextCompat.getDrawable(context, materialR.drawable.abc_ic_clear_material) private val clearIcon =
ContextCompat.getDrawable(context, materialR.drawable.abc_ic_clear_material)
private var isEmpty = text.isNullOrEmpty() private var isEmpty = text.isNullOrEmpty()
init { init {
@@ -52,12 +53,21 @@ class SearchEditText @JvmOverloads constructor(
if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) { if (keyCode == KeyEvent.KEYCODE_BACK && event.action == KeyEvent.ACTION_UP) {
if (hasFocus()) { if (hasFocus()) {
clearFocus() clearFocus()
// return true
} }
} }
return super.onKeyPreIme(keyCode, event) return super.onKeyPreIme(keyCode, event)
} }
override fun onKeyUp(keyCode: Int, event: KeyEvent): Boolean {
if (keyCode == KeyEvent.KEYCODE_ENTER && event.hasNoModifiers() && query.isNotEmpty()) {
cancelLongPress()
searchSuggestionListener?.onQueryClick(query, submit = true)
clearFocus()
return true
}
return super.onKeyUp(keyCode, event)
}
override fun onEditorAction(actionCode: Int) { override fun onEditorAction(actionCode: Int) {
super.onEditorAction(actionCode) super.onEditorAction(actionCode)
if (actionCode == EditorInfo.IME_ACTION_SEARCH) { if (actionCode == EditorInfo.IME_ACTION_SEARCH) {
@@ -88,7 +98,8 @@ class SearchEditText @JvmOverloads constructor(
@SuppressLint("ClickableViewAccessibility") @SuppressLint("ClickableViewAccessibility")
override fun onTouchEvent(event: MotionEvent): Boolean { override fun onTouchEvent(event: MotionEvent): Boolean {
if (event.action == MotionEvent.ACTION_UP) { if (event.action == MotionEvent.ACTION_UP) {
val drawable = compoundDrawablesRelative[DRAWABLE_END] ?: return super.onTouchEvent(event) val drawable =
compoundDrawablesRelative[DRAWABLE_END] ?: return super.onTouchEvent(event)
val isOnDrawable = drawable.isVisible && if (layoutDirection == LAYOUT_DIRECTION_RTL) { val isOnDrawable = drawable.isVisible && if (layoutDirection == LAYOUT_DIRECTION_RTL) {
event.x.toInt() in paddingLeft..(drawable.bounds.width() + paddingLeft) event.x.toInt() in paddingLeft..(drawable.bounds.width() + paddingLeft)
} else { } else {