diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index b125053a..fc079041 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -2,12 +2,10 @@ package com.moez.QKSMS.presentation.compose import android.content.Context import android.support.v7.widget.RecyclerView -import android.text.InputType import android.view.KeyEvent import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.inputmethod.EditorInfo import android.widget.EditText import android.widget.RelativeLayout import com.google.android.flexbox.FlexboxLayoutManager @@ -45,12 +43,6 @@ class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter } editText.hint = hint - editText.textSize = 16f - editText.setBackgroundResource(android.R.color.transparent) - editText.inputType = InputType.TYPE_TEXT_VARIATION_FILTER or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS - editText.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI - editText.privateImeOptions = "nm" - editText.keys() .filter { event -> event.action == KeyEvent.ACTION_DOWN } .filter { event -> event.keyCode == KeyEvent.KEYCODE_DEL } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt index d286e5b5..f6939d9d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -65,11 +65,9 @@ class ComposeActivity : QkActivity(), ComposeView { chips.itemAnimator = null chips.layoutManager = FlexboxLayoutManager(this) - chips.adapter = chipsAdapter contacts.itemAnimator = null contacts.layoutManager = LinearLayoutManager(this) - contacts.adapter = contactsAdapter val layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } @@ -143,6 +141,10 @@ class ComposeActivity : QkActivity(), ComposeView { contacts.setVisible(state.contactsVisible) composeBar.setVisible(!state.contactsVisible) + // Don't set the adapters unless needed + if (state.editingMode && chips.adapter == null) chips.adapter = chipsAdapter + if (state.editingMode && contacts.adapter == null) contacts.adapter = contactsAdapter + toolbar.menu.findItem(R.id.call)?.run { isVisible = !state.editingMode } diff --git a/qksms/src/main/res/layout/chip_input_list_item.xml b/qksms/src/main/res/layout/chip_input_list_item.xml index b35ab866..ac23d2e8 100644 --- a/qksms/src/main/res/layout/chip_input_list_item.xml +++ b/qksms/src/main/res/layout/chip_input_list_item.xml @@ -3,5 +3,10 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@null" + android:imeOptions="flagNoExtractUi" + android:inputType="textFilter|textNoSuggestions" + android:privateImeOptions="nm" + android:textSize="16sp" app:textColor="primary" app:textColorHint="tertiary" /> \ No newline at end of file