Fix autocomplete removing valid prefixes
This commit is contained in:
parent
02b930d3e6
commit
ba0b212149
@ -45,22 +45,22 @@ open class AutoComplete(val filter: Filter.AutoComplete) : AbstractFlexibleItem<
|
|||||||
|
|
||||||
// select from auto complete
|
// select from auto complete
|
||||||
holder.autoComplete.setOnItemClickListener { adapterView, _, chipPosition, _ ->
|
holder.autoComplete.setOnItemClickListener { adapterView, _, chipPosition, _ ->
|
||||||
var name = (adapterView.getItemAtPosition(chipPosition) as String).trim()
|
val tag = (adapterView.getItemAtPosition(chipPosition) as String).trim()
|
||||||
filter.validPrefixes.find { name.startsWith(it) }?.let { name = name.removePrefix(it).trim() }
|
val tagNoPrefix = filter.validPrefixes.find { tag.startsWith(it) }?.let { tag.removePrefix(it).trim() } ?: tag
|
||||||
if (name !in filter.skipAutoFillTags) {
|
if (tagNoPrefix !in filter.skipAutoFillTags) {
|
||||||
holder.autoComplete.text = null
|
holder.autoComplete.text = null
|
||||||
addTag(name, holder)
|
addTag(tag, holder)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// done keyboard button is pressed
|
// done keyboard button is pressed
|
||||||
holder.autoComplete.setOnEditorActionListener { textView, actionId, _ ->
|
holder.autoComplete.setOnEditorActionListener { textView, actionId, _ ->
|
||||||
if (actionId != EditorInfo.IME_ACTION_DONE) return@setOnEditorActionListener false
|
if (actionId != EditorInfo.IME_ACTION_DONE) return@setOnEditorActionListener false
|
||||||
var name = textView.text.toString().trim()
|
val tag = textView.text.toString().trim()
|
||||||
filter.validPrefixes.find { name.startsWith(it) }?.let { name = name.removePrefix(it).trim() }
|
val tagNoPrefix = filter.validPrefixes.find { tag.startsWith(it) }?.let { tag.removePrefix(it).trim() } ?: tag
|
||||||
if (name !in filter.skipAutoFillTags) {
|
if (tagNoPrefix !in filter.skipAutoFillTags) {
|
||||||
textView.text = null
|
textView.text = null
|
||||||
addTag(name, holder)
|
addTag(tag, holder)
|
||||||
}
|
}
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user