mirror of
https://github.com/nextcloud/talk-android
synced 2025-06-19 19:49:33 +01:00
moved some code around
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
parent
2c3448f328
commit
b72c829cd2
@ -156,10 +156,6 @@ class MessageInputFragment : Fragment() {
|
|||||||
saveState()
|
saveState()
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onResume() {
|
|
||||||
super.onResume()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onDestroyView() {
|
override fun onDestroyView() {
|
||||||
super.onDestroyView()
|
super.onDestroyView()
|
||||||
if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
|
if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
|
||||||
@ -356,9 +352,9 @@ class MessageInputFragment : Fragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val editable = binding.fragmentMessageInputView.inputEditText?.editableText
|
val editable = binding.fragmentMessageInputView.inputEditText?.editableText
|
||||||
|
if (editable != null && binding.fragmentMessageInputView.inputEditText != null) return
|
||||||
|
|
||||||
if (editable != null && binding.fragmentMessageInputView.inputEditText != null) {
|
val mentionSpans = editable!!.getSpans(
|
||||||
val mentionSpans = editable.getSpans(
|
|
||||||
0,
|
0,
|
||||||
binding.fragmentMessageInputView.inputEditText!!.length(),
|
binding.fragmentMessageInputView.inputEditText!!.length(),
|
||||||
Spans.MentionChipSpan::class.java
|
Spans.MentionChipSpan::class.java
|
||||||
@ -367,23 +363,21 @@ class MessageInputFragment : Fragment() {
|
|||||||
for (i in mentionSpans.indices) {
|
for (i in mentionSpans.indices) {
|
||||||
mentionSpan = mentionSpans[i]
|
mentionSpan = mentionSpans[i]
|
||||||
|
|
||||||
val what = editable.subSequence(
|
val spStart = editable.getSpanStart(mentionSpan)
|
||||||
editable.getSpanStart(mentionSpan),
|
val spEnd = editable.getSpanEnd(mentionSpan)
|
||||||
editable.getSpanEnd(mentionSpan)
|
|
||||||
).toString().trim { it <= ' ' }
|
val what = editable.subSequence(spStart, spEnd).toString().trim { it <= ' ' }
|
||||||
val error = what.length > mentionSpan.label.length
|
val error = what.length > mentionSpan.label.length
|
||||||
|
|
||||||
if (start >= editable.getSpanStart(mentionSpan) &&
|
if (start in spStart..< spEnd && what != mentionSpan.label) {
|
||||||
start < editable.getSpanEnd(mentionSpan) &&
|
|
||||||
what != mentionSpan.label
|
|
||||||
) {
|
|
||||||
editable.removeSpan(mentionSpan)
|
editable.removeSpan(mentionSpan)
|
||||||
|
}
|
||||||
|
|
||||||
if (error) {
|
if (error) {
|
||||||
Log.d("Julius", "Error: Fix mention")
|
Log.d("Julius", "Error: Fix mention")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun afterTextChanged(s: Editable) {
|
override fun afterTextChanged(s: Editable) {
|
||||||
|
Loading…
Reference in New Issue
Block a user