filippodb/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-12-24 16:51:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4281 from vector-im/feature/aris/broken_edittext_4276

Browse Source 
Fix Broken EditText when using FromEditTextItem
This commit is contained in:
Benoit Marty 2021-10-21 17:28:41 +02:00 committed by GitHub
commit a7d5c6a437
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4276.bugfix Normal file
View File

@ -0,0 +1 @@
Fix Broken EditText when using FromEditTextItem

32
vector/src/main/java/im/vector/app/features/form/FormEditTextItem.kt
View File

@ -18,6 +18,7 @@ package im.vector.app.features.form
import android.text.Editable import android.text.Editable
import android.text.InputFilter import android.text.InputFilter
import android.text.InputType
import android.view.View import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.widget.TextView import android.widget.TextView
@ -106,9 +107,9 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
} }
holder.textInputEditText.isEnabled = enabled holder.textInputEditText.isEnabled = enabled
inputType?.let { holder.textInputEditText.inputType = it }
holder.textInputEditText.isSingleLine = singleLine configureInputType(holder)
holder.textInputEditText.imeOptions = imeOptions ?: EditorInfo.IME_ACTION_NONE configureImeOptions(holder)
holder.textInputEditText.addTextChangedListenerOnce(onTextChangeListener) holder.textInputEditText.addTextChangedListenerOnce(onTextChangeListener)
holder.textInputEditText.setOnEditorActionListener(editorActionListener) holder.textInputEditText.setOnEditorActionListener(editorActionListener)
@ -124,6 +125,31 @@ abstract class FormEditTextItem : VectorEpoxyModel<FormEditTextItem.Holder>() {
} }
} }
/**
* Configure the inputType of the EditText, input type should be always defined
* especially when we want to use a single line, we set the InputType to InputType.TYPE_CLASS_TEXT
* while the default for the EditText is InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
*/
private fun configureInputType(holder: Holder) = holder.textInputEditText.setRawInputType(
inputType ?: when (singleLine) {
true -> InputType.TYPE_CLASS_TEXT
false -> InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
}
)
/**
* Configure the imeOptions of the EditText, when imeOptions are not defined by the developer
* EditorInfo.IME_ACTION_NEXT will be used for singleLine EditTexts to disable "new line"
* while EditorInfo.IME_ACTION_NONE will be used for all the other cases
*/
private fun configureImeOptions(holder: Holder) {
holder.textInputEditText.imeOptions =
imeOptions ?: when (singleLine) {
true -> EditorInfo.IME_ACTION_NEXT
false -> EditorInfo.IME_ACTION_NONE
}
}
override fun shouldSaveViewState(): Boolean { override fun shouldSaveViewState(): Boolean {
return false return false
} }