Last cleanup

vector/src/main/java/im/vector/riotx/core/utils/Emoji.kt

@@ -16,13 +16,6 @@
 
 package im.vector.riotx.core.utils
 
-import android.content.Context
-import com.squareup.moshi.Moshi
-import im.vector.riotx.R
-import im.vector.riotx.features.reactions.data.EmojiData
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
 import java.util.regex.Pattern
 
 private val emojisPattern = Pattern.compile("((?:[\uD83C\uDF00-\uD83D\uDDFF]" +

vector/src/main/java/im/vector/riotx/features/home/HomeDetailFragment.kt

@@ -25,7 +25,6 @@ import com.airbnb.mvrx.fragmentViewModel
 import com.airbnb.mvrx.withState
 import com.google.android.material.bottomnavigation.BottomNavigationItemView
 import com.google.android.material.bottomnavigation.BottomNavigationMenuView
-import im.vector.matrix.android.api.session.Session
 import im.vector.matrix.android.api.session.crypto.keysbackup.KeysBackupState
 import im.vector.matrix.android.api.session.group.model.GroupSummary
 import im.vector.riotx.R

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/edithistory/ViewEditHistoryBottomSheet.kt

@@ -19,7 +19,6 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.RecyclerView
 import butterknife.BindView
 import butterknife.ButterKnife

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

@@ -18,10 +18,10 @@ package im.vector.riotx.features.reactions
 import android.os.Bundle
 import android.view.View
 import androidx.lifecycle.observe
-import androidx.recyclerview.widget.RecyclerView
 import im.vector.riotx.R
 import im.vector.riotx.core.extensions.cleanup
 import im.vector.riotx.core.platform.VectorBaseFragment
+import kotlinx.android.synthetic.main.emoji_chooser_fragment.*
 import javax.inject.Inject
 
 class EmojiChooserFragment @Inject constructor(
@@ -41,10 +41,7 @@ class EmojiChooserFragment @Inject constructor(
         emojiRecyclerAdapter.reactionClickListener = this
         emojiRecyclerAdapter.interactionListener = this
 
-        (view as? RecyclerView)?.let {
+        emojiRecyclerView.adapter = emojiRecyclerAdapter
-            it.adapter = emojiRecyclerAdapter
-            it.adapter?.notifyDataSetChanged()
-        }
 
         viewModel.moveToSection.observe(viewLifecycleOwner) { section ->
             emojiRecyclerAdapter.scrollToSection(section)
@@ -60,7 +57,7 @@ class EmojiChooserFragment @Inject constructor(
     }
 
     override fun onDestroyView() {
-        (view as? RecyclerView)?.cleanup()
+        emojiRecyclerView.cleanup()
         emojiRecyclerAdapter.reactionClickListener = null
         emojiRecyclerAdapter.interactionListener = null
         super.onDestroyView()

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

@@ -72,4 +72,3 @@ data class EmojiItem(
         }
     }
 }
-

vector/src/main/res/layout/emoji_chooser_fragment.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/emoji_recycler_view"
+    android:id="@+id/emojiRecyclerView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbars="vertical"
@@ -9,6 +9,4 @@
     tools:itemCount="100"
     tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
     tools:listitem="@layout/grid_item_emoji"
-    tools:spanCount="10">
+    tools:spanCount="10" />
-
-</androidx.recyclerview.widget.RecyclerView>