filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore Onuray's code: do not allow to send blank text

This commit is contained in:
Benoit Marty 2021-06-10 14:30:53 +02:00 committed by Benoit Marty
parent 5097c45568
commit e91b09ca44
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
View File

@ -1189,7 +1189,7 @@ class RoomDetailFragment @Inject constructor(
return sendUri(contentUri) return sendUri(contentUri)
} }
override fun onTextEmptyStateChanged(isEmpty: Boolean) { override fun onTextBlankStateChanged(isBlank: Boolean) {
// No op // No op
} }
} }

10
vector/src/main/java/im/vector/app/features/home/room/detail/composer/ComposerEditText.kt
View File

@ -37,11 +37,11 @@ class ComposerEditText @JvmOverloads constructor(context: Context, attrs: Attrib
interface Callback { interface Callback {
fun onRichContentSelected(contentUri: Uri): Boolean fun onRichContentSelected(contentUri: Uri): Boolean
fun onTextEmptyStateChanged(isEmpty: Boolean) fun onTextBlankStateChanged(isBlank: Boolean)
} }
var callback: Callback? = null var callback: Callback? = null
private var isEmptyText = true private var isBlankText = true
override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection? { override fun onCreateInputConnection(editorInfo: EditorInfo): InputConnection? {
val ic = super.onCreateInputConnection(editorInfo) ?: return null val ic = super.onCreateInputConnection(editorInfo) ?: return null
@ -96,9 +96,9 @@ class ComposerEditText @JvmOverloads constructor(context: Context, attrs: Attrib
spanToRemove = null spanToRemove = null
} }
// Report blank status of EditText to be able to arrange other elements of the composer // Report blank status of EditText to be able to arrange other elements of the composer
if (s.isEmpty() != isEmptyText) { if (s.isBlank() != isBlankText) {
isEmptyText = !isEmptyText isBlankText = !isBlankText
callback?.onTextEmptyStateChanged(isEmptyText) callback?.onTextBlankStateChanged(isBlankText)
} }
} }
} }

4
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
View File

@ -70,8 +70,8 @@ class TextComposerView @JvmOverloads constructor(
return callback?.onRichContentSelected(contentUri) ?: false return callback?.onRichContentSelected(contentUri) ?: false
} }
override fun onTextEmptyStateChanged(isEmpty: Boolean) { override fun onTextBlankStateChanged(isBlank: Boolean) {
views.sendButton.isVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isEmpty views.sendButton.isVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isBlank
} }
} }
views.composerRelatedMessageCloseButton.setOnClickListener { views.composerRelatedMessageCloseButton.setOnClickListener {