From 4176cf729962e321e41334d1fec5ede2dc53c44e Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 30 Apr 2018 15:55:08 -0400 Subject: [PATCH] #1028 - Fix backspace not working when searching for contacts --- .../src/main/java/common/widget/QkEditText.kt | 29 +++++++++++++++++++ .../main/java/feature/compose/ChipsAdapter.kt | 17 ++--------- .../java/feature/compose/ComposeActivity.kt | 3 +- .../main/java/feature/compose/ComposeView.kt | 3 +- .../java/feature/compose/ComposeViewModel.kt | 17 ++--------- 5 files changed, 37 insertions(+), 32 deletions(-) diff --git a/presentation/src/main/java/common/widget/QkEditText.kt b/presentation/src/main/java/common/widget/QkEditText.kt index 6c51aacf..60c22990 100644 --- a/presentation/src/main/java/common/widget/QkEditText.kt +++ b/presentation/src/main/java/common/widget/QkEditText.kt @@ -21,6 +21,10 @@ package common.widget import android.content.Context import android.graphics.Typeface import android.util.AttributeSet +import android.view.KeyEvent +import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputConnection +import android.view.inputmethod.InputConnectionWrapper import android.widget.EditText import com.moez.QKSMS.R import com.uber.autodispose.android.scope @@ -35,6 +39,7 @@ import injection.appComponent import io.reactivex.Observable import io.reactivex.rxkotlin.Observables import io.reactivex.subjects.BehaviorSubject +import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject import util.Preferences import javax.inject.Inject @@ -65,6 +70,8 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet @Inject lateinit var fontProvider: FontProvider @Inject lateinit var prefs: Preferences + val backspaces: Subject = PublishSubject.create() + private var textColorObservable: Observable? = null private var textColorHintObservable: Observable? = null @@ -169,4 +176,26 @@ class QkEditText @JvmOverloads constructor(context: Context, attrs: AttributeSet .subscribe() } + override fun onCreateInputConnection(outAttrs: EditorInfo): InputConnection { + return object : InputConnectionWrapper(super.onCreateInputConnection(outAttrs), true) { + + override fun sendKeyEvent(event: KeyEvent): Boolean { + if (event.action == KeyEvent.ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_DEL) { + backspaces.onNext(Unit) + } + return super.sendKeyEvent(event) + } + + + override fun deleteSurroundingText(beforeLength: Int, afterLength: Int): Boolean { + // magic: in latest Android, deleteSurroundingText(1, 0) will be called for backspace + return if (beforeLength == 1 && afterLength == 0) { + sendKeyEvent(KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_DEL)) && sendKeyEvent(KeyEvent(KeyEvent.ACTION_UP, KeyEvent.KEYCODE_DEL)) + } else super.deleteSurroundingText(beforeLength, afterLength) + + } + + } + } + } \ No newline at end of file diff --git a/presentation/src/main/java/feature/compose/ChipsAdapter.kt b/presentation/src/main/java/feature/compose/ChipsAdapter.kt index 1cfb0150..76624e59 100755 --- a/presentation/src/main/java/feature/compose/ChipsAdapter.kt +++ b/presentation/src/main/java/feature/compose/ChipsAdapter.kt @@ -20,14 +20,11 @@ package feature.compose import android.content.Context import android.support.v7.widget.RecyclerView -import android.view.KeyEvent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.EditText import android.widget.RelativeLayout import com.google.android.flexbox.FlexboxLayoutManager -import com.jakewharton.rxbinding2.view.keys import com.jakewharton.rxbinding2.widget.editorActions import com.jakewharton.rxbinding2.widget.textChanges import com.moez.QKSMS.R @@ -37,7 +34,7 @@ import common.util.Colors import common.util.extensions.dpToPx import common.util.extensions.setBackgroundTint import common.util.extensions.showKeyboard -import io.reactivex.functions.Predicate +import common.widget.QkEditText import io.reactivex.subjects.PublishSubject import kotlinx.android.synthetic.main.contact_chip.view.* import model.Contact @@ -51,21 +48,13 @@ class ChipsAdapter @Inject constructor(private val context: Context, private val } private val hint: String = context.getString(R.string.title_compose) - private val editText = View.inflate(context, R.layout.chip_input_list_item, null) as EditText + private val editText = View.inflate(context, R.layout.chip_input_list_item, null) as QkEditText var view: RecyclerView? = null val chipDeleted: PublishSubject = PublishSubject.create() val textChanges = editText.textChanges() val actions = editText.editorActions() - - /** - * On certain devices, not returning false in this predicate for number entry will result in - * the user not being able to enter numbers into the text field. As a result, we have to only - * pass the events that we're looking for - */ - val keyEvents = editText.keys(Predicate { event -> - event.keyCode == KeyEvent.KEYCODE_BACK || event.keyCode == KeyEvent.KEYCODE_DEL - }) + val backspaces = editText.backspaces init { val wrap = ViewGroup.LayoutParams.WRAP_CONTENT diff --git a/presentation/src/main/java/feature/compose/ComposeActivity.kt b/presentation/src/main/java/feature/compose/ComposeActivity.kt index 2cf52f9e..f9ddee9a 100644 --- a/presentation/src/main/java/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/feature/compose/ComposeActivity.kt @@ -23,7 +23,6 @@ import android.graphics.PorterDuff import android.net.Uri import android.os.Bundle import android.support.v7.widget.LinearLayoutManager -import android.view.KeyEvent import android.view.Menu import android.view.MenuItem import com.google.android.flexbox.FlexboxLayoutManager @@ -54,7 +53,7 @@ class ComposeActivity : QkThemedActivity(), ComposeView { override val viewModelClass = ComposeViewModel::class override val activityVisibleIntent: Subject = PublishSubject.create() override val queryChangedIntent: Observable by lazy { chipsAdapter.textChanges } - override val queryKeyEventIntent: Observable by lazy { chipsAdapter.keyEvents } + override val queryBackspaceIntent: Observable<*> by lazy { chipsAdapter.backspaces } override val queryEditorActionIntent: Observable by lazy { chipsAdapter.actions } override val chipSelectedIntent: Subject by lazy { contactsAdapter.contactSelected } override val chipDeletedIntent: Subject by lazy { chipsAdapter.chipDeleted } diff --git a/presentation/src/main/java/feature/compose/ComposeView.kt b/presentation/src/main/java/feature/compose/ComposeView.kt index 02b6b18d..83b1656b 100644 --- a/presentation/src/main/java/feature/compose/ComposeView.kt +++ b/presentation/src/main/java/feature/compose/ComposeView.kt @@ -19,7 +19,6 @@ package feature.compose import android.net.Uri -import android.view.KeyEvent import common.MenuItem import common.base.QkView import io.reactivex.Observable @@ -31,7 +30,7 @@ interface ComposeView : QkView { val activityVisibleIntent: Observable val queryChangedIntent: Observable - val queryKeyEventIntent: Observable + val queryBackspaceIntent: Observable<*> val queryEditorActionIntent: Observable val chipSelectedIntent: Subject val chipDeletedIntent: Subject diff --git a/presentation/src/main/java/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/feature/compose/ComposeViewModel.kt index b2d77fcc..605ef54a 100644 --- a/presentation/src/main/java/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/feature/compose/ComposeViewModel.kt @@ -23,7 +23,6 @@ import android.content.Intent import android.net.Uri import android.telephony.PhoneNumberUtils import android.telephony.SmsMessage -import android.view.KeyEvent import android.view.inputmethod.EditorInfo import com.mlsdev.rximagepicker.RxImagePicker import com.mlsdev.rximagepicker.Sources @@ -241,21 +240,11 @@ class ComposeViewModel(intent: Intent) : QkViewModel( // Backspaces should delete the most recent contact if there's no text input // Close the activity if user presses back - view.queryKeyEventIntent - .filter { event -> event.action == KeyEvent.ACTION_DOWN } + view.queryBackspaceIntent .withLatestFrom(selectedContacts, view.queryChangedIntent, { event, contacts, query -> - when (event.keyCode) { - KeyEvent.KEYCODE_DEL -> { - if (contacts.isNotEmpty() && query.isEmpty()) { - contactsReducer.onNext { it.dropLast(1) } - } - } - - KeyEvent.KEYCODE_BACK -> { - newState { it.copy(hasError = true) } - } + if (contacts.isNotEmpty() && query.isEmpty()) { + contactsReducer.onNext { it.dropLast(1) } } - }) .autoDisposable(view.scope()) .subscribe()