Completion on emoji: display the first 50 results

This commit is contained in:
Benoit Marty 2019-12-22 09:21:56 +01:00
parent c8e67f8ab4
commit 0e5fcd071c
5 changed files with 64 additions and 13 deletions

View file

@ -47,7 +47,9 @@ class AutocompleteEmojiController @Inject constructor(
if (data.isNullOrEmpty()) { if (data.isNullOrEmpty()) {
return return
} }
data.forEach { emojiItem -> data
.take(MAX)
.forEach { emojiItem ->
autocompleteEmojiItem { autocompleteEmojiItem {
id(emojiItem.name) id(emojiItem.name)
emojiItem(emojiItem) emojiItem(emojiItem)
@ -61,10 +63,20 @@ class AutocompleteEmojiController @Inject constructor(
) )
} }
} }
if (data.size > MAX) {
autocompleteMoreResultItem {
id("more_result")
}
}
} }
override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) { override fun onDetachedFromRecyclerView(recyclerView: RecyclerView) {
super.onDetachedFromRecyclerView(recyclerView) super.onDetachedFromRecyclerView(recyclerView)
fontProvider.removeListener(fontProviderListener) fontProvider.removeListener(fontProviderListener)
} }
companion object {
const val MAX = 50
}
} }

View file

@ -0,0 +1,28 @@
/*
* Copyright 2019 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.riotx.features.autocomplete.emoji
import com.airbnb.epoxy.EpoxyModelClass
import im.vector.riotx.R
import im.vector.riotx.core.epoxy.VectorEpoxyHolder
import im.vector.riotx.core.epoxy.VectorEpoxyModel
@EpoxyModelClass(layout = R.layout.item_autocomplete_more_result)
abstract class AutocompleteMoreResultItem : VectorEpoxyModel<AutocompleteMoreResultItem.Holder>() {
class Holder : VectorEpoxyHolder()
}

View file

@ -166,7 +166,7 @@ class AutoCompleter @Inject constructor(
private fun setupEmojis(backgroundDrawable: Drawable, editText: EditText) { private fun setupEmojis(backgroundDrawable: Drawable, editText: EditText) {
Autocomplete.on<String>(editText) Autocomplete.on<String>(editText)
.with(CharPolicy(':', true)) .with(CharPolicy(':', false))
.with(autocompleteEmojiPresenter) .with(autocompleteEmojiPresenter)
.with(ELEVATION) .with(ELEVATION)
.with(backgroundDrawable) .with(backgroundDrawable)

View file

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?riotx_background"
android:padding="8dp"
android:text="@string/autocomplete_limited_results"
android:textColor="?riotx_text_secondary"
android:textSize="12sp" />

View file

@ -18,4 +18,6 @@
<string name="devices_current_device">Current device</string> <string name="devices_current_device">Current device</string>
<string name="devices_other_devices">Other devices</string> <string name="devices_other_devices">Other devices</string>
<string name="autocomplete_limited_results">Limited results, please type more letters…</string>
</resources> </resources>