diff --git a/qksms/src/main/java/presentation/feature/compose/ChipsAdapter.kt b/qksms/src/main/java/presentation/feature/compose/ChipsAdapter.kt index 59540cd6..1d7e4275 100755 --- a/qksms/src/main/java/presentation/feature/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/presentation/feature/compose/ChipsAdapter.kt @@ -27,6 +27,7 @@ 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 import common.util.Colors @@ -54,6 +55,7 @@ class ChipsAdapter @Inject constructor(private val context: Context, private val val chipDeleted: PublishSubject = PublishSubject.create() val textChanges = editText.textChanges() val keyEvents = editText.keys() + val actions = editText.editorActions() init { val wrap = ViewGroup.LayoutParams.WRAP_CONTENT diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt index f61d1df6..ac2ff044 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeActivity.kt @@ -57,6 +57,7 @@ class ComposeActivity : QkActivity(), ComposeView { override val activityVisibleIntent: Subject = PublishSubject.create() override val queryChangedIntent: Observable by lazy { chipsAdapter.textChanges } override val queryKeyEventIntent: Observable by lazy { chipsAdapter.keyEvents } + override val queryEditorActionIntent: Observable by lazy { chipsAdapter.actions } override val chipSelectedIntent: Subject by lazy { contactsAdapter.contactSelected } override val chipDeletedIntent: Subject by lazy { chipsAdapter.chipDeleted } override val menuReadyIntent: Observable = menu.map { Unit } diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeView.kt b/qksms/src/main/java/presentation/feature/compose/ComposeView.kt index 036ded8c..288fd4cb 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeView.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeView.kt @@ -31,6 +31,7 @@ interface ComposeView : QkView { val activityVisibleIntent: Observable val queryChangedIntent: Observable val queryKeyEventIntent: Observable + val queryEditorActionIntent: Observable val chipSelectedIntent: Subject val chipDeletedIntent: Subject val menuReadyIntent: Observable diff --git a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt index 4da60b06..df98f50a 100644 --- a/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/presentation/feature/compose/ComposeViewModel.kt @@ -23,6 +23,7 @@ import android.content.Intent import android.net.Uri import android.telephony.PhoneNumberUtils import android.view.KeyEvent +import android.view.inputmethod.EditorInfo import com.mlsdev.rximagepicker.RxImagePicker import com.mlsdev.rximagepicker.Sources import com.moez.QKSMS.R @@ -210,17 +211,37 @@ class ComposeViewModel(intent: Intent) : QkViewModel( .subscribe { contacts -> newState { it.copy(contacts = contacts) } } // 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 } - .filter { event -> event.keyCode == KeyEvent.KEYCODE_DEL } - .withLatestFrom(selectedContacts, view.queryChangedIntent, { _, contacts, query -> - if (contacts.isNotEmpty() && query.isEmpty()) { - contactsReducer.onNext { it.dropLast(1) } + .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) } + } } + }) .autoDisposable(view.scope()) .subscribe() + // Enter the first contact suggestion if the enter button is pressed + view.queryEditorActionIntent + .filter { actionId -> actionId == EditorInfo.IME_ACTION_DONE } + .withLatestFrom(state, { _, state -> state }) + .autoDisposable(view.scope()) + .subscribe { state -> + state.contacts.firstOrNull()?.let { contact -> + contactsReducer.onNext { contacts -> contacts + contact } + } + } + // Update the list of selected contacts when a new contact is selected or an existing one is deselected Observable.merge( view.chipDeletedIntent.doOnNext { contact ->