Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.swmansion.enriched.inputFilters

import android.text.InputFilter
import android.text.SpannableStringBuilder
import android.text.Spanned
import com.swmansion.enriched.constants.Strings
import com.swmansion.enriched.spans.interfaces.EnrichedNonEditableParagraphSpan
Expand Down Expand Up @@ -33,7 +34,7 @@ class NonEditableParagraphFilter : InputFilter {
val spanEnd = dest.getSpanEnd(replacingSpans.first())

if (spanEnd == dstart) {
return Strings.NEWLINE_STRING + source
return prependNewlineIfMissing(source, start, end)
}
Comment on lines 36 to 38
}

Expand All @@ -44,7 +45,7 @@ class NonEditableParagraphFilter : InputFilter {
if (dstart == dend) {
val spanBeforeCursor = getNonEditableSpanBeforeCursor(dest, dstart)
if (spanBeforeCursor != null && dest.getSpanEnd(spanBeforeCursor) == dstart) {
return Strings.NEWLINE_STRING + source
return prependNewlineIfMissing(source, start, end)
}
}

Expand Down Expand Up @@ -77,6 +78,19 @@ class NonEditableParagraphFilter : InputFilter {
return null
}

private fun prependNewlineIfMissing(
source: CharSequence,
start: Int,
end: Int,
): CharSequence? {
if (start >= end || source[start] == Strings.NEWLINE) {
return null
}

return SpannableStringBuilder(Strings.NEWLINE_STRING)
.append(source, start, end)
}

private fun getNonEditableSpanBeforeCursor(
dest: Spanned,
cursorPosition: Int,
Expand Down