Improve EmojiChooserFragment: improve filtering result: sort

vector/src/main/java/im/vector/riotx/features/reactions/EmojiReactionPickerActivity.kt

@@ -95,12 +95,11 @@ class EmojiReactionPickerActivity : VectorBaseActivity(),
 
         viewModel.eventId = intent.getStringExtra(EXTRA_EVENT_ID)
 
-        emojiDataSource.rawData?.categories?.let { categories ->
+        emojiDataSource.rawData.categories.forEach { category ->
-            for (category in categories) {
             val s = category.emojis[0]
             tabLayout.newTab()
                     .also { tab ->
-                            tab.text = emojiDataSource.rawData!!.emojis[s]!!.emoji
+                        tab.text = emojiDataSource.rawData.emojis[s]!!.emoji
                         tab.contentDescription = category.name
                     }
                     .also { tab ->
@@ -108,7 +107,6 @@ class EmojiReactionPickerActivity : VectorBaseActivity(),
                     }
         }
         tabLayout.addOnTabSelectedListener(tabLayoutSelectionListener)
-        }
 
         viewModel.currentSection.observe(this, Observer { section ->
             section?.let {

vector/src/main/java/im/vector/riotx/features/reactions/EmojiRecyclerAdapter.kt

@@ -40,12 +40,11 @@ import kotlin.math.abs
 /**
  *
  * TODO: Configure Span using available width and emoji size
- * TODO: Search
  * TODO: Performances
  * TODO: Scroll to section - Find a way to snap section to the top
  */
 class EmojiRecyclerAdapter @Inject constructor(
-        private val dataSource: EmojiDataSource?
+        private val dataSource: EmojiDataSource
 ) :
         RecyclerView.Adapter<EmojiRecyclerAdapter.ViewHolder>() {
 
@@ -70,13 +69,12 @@ class EmojiRecyclerAdapter @Inject constructor(
     private val itemClickListener = View.OnClickListener { view ->
         mRecyclerView?.getChildLayoutPosition(view)?.let { itemPosition ->
             if (itemPosition != RecyclerView.NO_POSITION) {
-                val categories = dataSource?.rawData?.categories ?: return@OnClickListener
                 val sectionNumber = getSectionForAbsoluteIndex(itemPosition)
                 if (!isSection(itemPosition)) {
-                    val sectionMojis = categories[sectionNumber].emojis
+                    val sectionMojis = dataSource.rawData.categories[sectionNumber].emojis
                     val sectionOffset = getSectionOffset(sectionNumber)
                     val emoji = sectionMojis[itemPosition - sectionOffset]
-                    val item = dataSource.rawData!!.emojis.getValue(emoji).emoji
+                    val item = dataSource.rawData.emojis.getValue(emoji).emoji
                     reactionClickListener?.onReactionSelected(item)
                 }
             }
@@ -117,7 +115,7 @@ class EmojiRecyclerAdapter @Inject constructor(
     }
 
     fun scrollToSection(section: Int) {
-        if (section < 0 || section >= dataSource?.rawData?.categories?.size ?: 0) {
+        if (section < 0 || section >= dataSource.rawData.categories.size) {
             // ignore
             return
         }
@@ -149,15 +147,13 @@ class EmojiRecyclerAdapter @Inject constructor(
     }
 
     private fun isSection(position: Int): Boolean {
-        dataSource?.rawData?.categories?.let { categories ->
         var sectionOffset = 1
         var lastItemInSection: Int
-            for (category in categories) {
+        dataSource.rawData.categories.forEach { category ->
             lastItemInSection = sectionOffset + category.emojis.size - 1
             if (position == sectionOffset - 1) return true
             sectionOffset = lastItemInSection + 2
         }
-        }
         return false
     }
 
@@ -165,14 +161,12 @@ class EmojiRecyclerAdapter @Inject constructor(
         var sectionOffset = 1
         var lastItemInSection: Int
         var index = 0
-        dataSource?.rawData?.categories?.let {
+        dataSource.rawData.categories.forEach { category ->
-            for (category in it) {
             lastItemInSection = sectionOffset + category.emojis.size - 1
             if (position <= lastItemInSection) return index
             sectionOffset = lastItemInSection + 2
             index++
         }
-        }
         return index
     }
 
@@ -180,27 +174,24 @@ class EmojiRecyclerAdapter @Inject constructor(
         // Todo cache this for fast access
         var sectionOffset = 1
         var lastItemInSection: Int
-        dataSource?.rawData?.categories?.let {
+        dataSource.rawData.categories.forEachIndexed { index, category ->
-            for ((index, category) in it.withIndex()) {
             lastItemInSection = sectionOffset + category.emojis.size - 1
             if (section == index) return sectionOffset
             sectionOffset = lastItemInSection + 2
         }
-        }
         return sectionOffset
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         beginTraceSession("MyAdapter.onBindViewHolder")
-        dataSource?.rawData?.categories?.let { categories ->
         val sectionNumber = getSectionForAbsoluteIndex(position)
         if (isSection(position)) {
-                holder.bind(categories[sectionNumber].name)
+            holder.bind(dataSource.rawData.categories[sectionNumber].name)
         } else {
-                val sectionMojis = categories[sectionNumber].emojis
+            val sectionMojis = dataSource.rawData.categories[sectionNumber].emojis
             val sectionOffset = getSectionOffset(sectionNumber)
             val emoji = sectionMojis[position - sectionOffset]
-                val item = dataSource.rawData!!.emojis[emoji]!!.emoji
+            val item = dataSource.rawData.emojis[emoji]!!.emoji
             (holder as EmojiViewHolder).data = item
             if (scrollState != ScrollState.SETTLING || !isFastScroll) {
 //                    Log.i("PERF","Bind with draw at position:$position")
@@ -211,7 +202,6 @@ class EmojiRecyclerAdapter @Inject constructor(
                 holder.bind(null)
             }
         }
-        }
         endTraceSession()
     }
 
@@ -230,15 +220,8 @@ class EmojiRecyclerAdapter @Inject constructor(
         super.onViewRecycled(holder)
     }
 
-    override fun getItemCount(): Int {
+    override fun getItemCount() = dataSource.rawData.categories
-        return dataSource?.rawData?.categories?.let {
+            .sumBy { emojiCategory -> 1 /* Section */ + emojiCategory.emojis.size }
-            var count = /*number of sections*/ it.size
-            for (ad in it) {
-                count += ad.emojis.size
-            }
-            count
-        } ?: 0
-    }
 
     abstract class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
         abstract fun bind(s: String?)

vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultItem.kt

@@ -46,7 +46,7 @@ abstract class EmojiSearchResultItem : EpoxyModelWithHolder<EmojiSearchResultIte
         holder.emojiText.text = emojiItem.emoji
         holder.emojiText.typeface = emojiTypeFace ?: Typeface.DEFAULT
         holder.emojiNameText.text = emojiItem.name
-        holder.emojiKeywordText.setTextOrHide(emojiItem.keywords?.joinToString())
+        holder.emojiKeywordText.setTextOrHide(emojiItem.keywords.joinToString())
         holder.view.setOnClickListener {
             onClickListener?.onReactionSelected(emojiItem.emoji)
         }

vector/src/main/java/im/vector/riotx/features/reactions/EmojiSearchResultViewModel.kt

@@ -15,7 +15,10 @@
  */
 package im.vector.riotx.features.reactions
 
-import com.airbnb.mvrx.*
+import com.airbnb.mvrx.ActivityViewModelContext
+import com.airbnb.mvrx.MvRxState
+import com.airbnb.mvrx.MvRxViewModelFactory
+import com.airbnb.mvrx.ViewModelContext
 import com.squareup.inject.assisted.Assisted
 import com.squareup.inject.assisted.AssistedInject
 import im.vector.riotx.core.platform.VectorViewModel
@@ -52,21 +55,26 @@ class EmojiSearchResultViewModel @AssistedInject constructor(
     }
 
     private fun updateQuery(action: EmojiSearchAction.UpdateQuery) {
+        val words = action.queryString.split("\\s".toRegex())
         setState {
             copy(
                     query = action.queryString,
-                    results = dataSource.rawData?.emojis?.toList()
+                    // First add emojis with name matching query, sorted by name
-                            ?.map { it.second }
+                    // Then emojis with keyword matching any of the word in the query, sorted by name
-                            ?.filter {
+                    results = dataSource.rawData.emojis
-                                it.name.contains(action.queryString, true)
+                            .values
-                                        || action.queryString
+                            .filter { emojiItem ->
-                                        .split("\\s".toRegex())
+                                emojiItem.name.contains(action.queryString, true)
-                                        .fold(true, { prev, q ->
+                            }
-                                            prev
+                            .sortedBy { it.name }
-                                                    && (it.keywords?.any { it.contains(q, true) }
+                            + dataSource.rawData.emojis
-                                                    ?: false)
+                            .values
+                            .filter { emojiItem ->
+                                words.fold(true, { prev, word ->
+                                    prev && emojiItem.keywords.any { keyword -> keyword.contains(word, true) }
                                 })
-                            } ?: emptyList()
+                            }
+                            .sortedBy { it.name }
             )
         }
     }

vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiDataSource.kt

@@ -15,31 +15,22 @@
  */
 package im.vector.riotx.features.reactions.data
 
-import android.content.Context
+import android.content.res.Resources
 import com.squareup.moshi.Moshi
 import im.vector.riotx.R
 import im.vector.riotx.core.di.ScreenScope
-import timber.log.Timber
 import javax.inject.Inject
-import kotlin.system.measureTimeMillis
 
 @ScreenScope
 class EmojiDataSource @Inject constructor(
-        context: Context
+        resources: Resources
 ) {
-
+    val rawData = resources.openRawResource(R.raw.emoji_picker_datasource)
-    var rawData: EmojiData? = null
+            .use { input ->
-
+                Moshi.Builder()
-    init {
+                        .build()
-        measureTimeMillis {
+                        .adapter(EmojiData::class.java)
-            context.resources.openRawResource(R.raw.emoji_picker_datasource).use { input ->
+                        .fromJson(input.bufferedReader().use { it.readText() })
-                val moshi = Moshi.Builder().build()
-                val jsonAdapter = moshi.adapter(EmojiData::class.java)
-                val inputAsString = input.bufferedReader().use { it.readText() }
-                this.rawData = jsonAdapter.fromJson(inputAsString)
-            }
-        }.also {
-            Timber.e("Emoji: $it millis")
-        }
             }
+            ?: EmojiData(emptyList(), emptyMap(), emptyMap())
 }

vector/src/main/java/im/vector/riotx/features/reactions/data/EmojiItem.kt

@@ -40,7 +40,7 @@ import com.squareup.moshi.JsonClass
 data class EmojiItem(
         @Json(name = "a") val name: String,
         @Json(name = "b") val unicode: String,
-        @Json(name = "j") val keywords: List<String>?
+        @Json(name = "j") val keywords: List<String> = emptyList()
 ) {
     // Cannot be private...
     var cache: String? = null