Some renaming

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -52,7 +52,7 @@ private const val BUNDLE_CHAT_ROOM_TYPE = "chat_room_type"
 private const val BUNDLE_IS_CHAT_ROOM_READ_ONLY = "is_chat_room_read_only"
 private const val REQUEST_CODE_FOR_PERFORM_SAF = 42
 
-class ChatRoomFragment : Fragment(), ChatRoomView, EmojiFragment.EmojiKeyboardListener {
+class ChatRoomFragment : Fragment(), ChatRoomView, EmojiFragment.Listener {
     @Inject lateinit var presenter: ChatRoomPresenter
     @Inject lateinit var parser: MessageParser
     private lateinit var adapter: ChatRoomAdapter

app/src/main/java/chat/rocket/android/widget/emoji/CategoryPagerAdapter.kt

@@ -9,10 +9,12 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import chat.rocket.android.R
-import chat.rocket.android.widget.emoji.EmojiFragment.EmojiKeyboardListener
+import chat.rocket.android.widget.emoji.EmojiFragment.Listener
+import kotlinx.coroutines.experimental.CommonPool
+import kotlinx.coroutines.experimental.async
 import java.util.*
 
-class CategoryPagerAdapter(val listener: EmojiKeyboardListener) : PagerAdapter() {
+class CategoryPagerAdapter(val listener: Listener) : PagerAdapter() {
     override fun isViewFromObject(view: View, obj: Any): Boolean {
         return view == obj
     }
@@ -46,9 +48,8 @@ class CategoryPagerAdapter(val listener: EmojiKeyboardListener) : PagerAdapter()
 
     override fun getPageTitle(position: Int) = EmojiCategory.values()[position].textIcon()
 
-
-    class EmojiAdapter(val spanCount: Int, val listener: EmojiKeyboardListener) : RecyclerView.Adapter<EmojiRowViewHolder>() {
-        private var emojis: List<Emoji> = Collections.emptyList()
+    class EmojiAdapter(val spanCount: Int, val listener: Listener) : RecyclerView.Adapter<EmojiRowViewHolder>() {
+        private var emojis = Collections.emptyList<Emoji>()
 
         fun addEmojis(emojis: List<Emoji>) {
             this.emojis = emojis
@@ -67,7 +68,7 @@ class CategoryPagerAdapter(val listener: EmojiKeyboardListener) : PagerAdapter()
         override fun getItemCount(): Int = emojis.size
     }
 
-    class EmojiRowViewHolder(itemView: View, val itemCount: Int, val spanCount: Int, val listener: EmojiKeyboardListener) : RecyclerView.ViewHolder(itemView) {
+    class EmojiRowViewHolder(itemView: View, val itemCount: Int, val spanCount: Int, val listener: Listener) : RecyclerView.ViewHolder(itemView) {
         private val emojiView: TextView = itemView.findViewById(R.id.emoji)
 
         fun bind(emoji: Emoji) {

app/src/main/java/chat/rocket/android/widget/emoji/EmojiFragment.kt

@@ -24,7 +24,7 @@ class EmojiFragment : Fragment() {
     private var editor: View? = null
     private var decorLayoutListener: ViewTreeObserver.OnGlobalLayoutListener? = null
     var softKeyboardVisible = false
-    var listener: EmojiKeyboardListener? = null
+    var listener: Listener? = null
 
     companion object {
         const val PREF_EMOJI_RECENTS = "PREF_EMOJI_RECENTS"
@@ -131,16 +131,16 @@ class EmojiFragment : Fragment() {
     private fun setupViewPager() {
         activity?.let {
             val callback = when (it) {
-                is EmojiKeyboardListener -> it as EmojiKeyboardListener
+                is Listener -> it as Listener
                 else -> {
                     val fragments = it.supportFragmentManager.fragments
-                    if (fragments == null || fragments.size == 0 || !(fragments[0] is EmojiKeyboardListener)) {
-                        throw IllegalStateException("activity/fragment should implement EmojiKeyboardListener interface")
+                    if (fragments == null || fragments.size == 0 || !(fragments[0] is Listener)) {
+                        throw IllegalStateException("activity/fragment should implement Listener interface")
                     }
-                    fragments[0] as EmojiKeyboardListener
+                    fragments[0] as Listener
                 }
             }
-            viewPager.adapter = CategoryPagerAdapter(object : EmojiKeyboardListener {
+            viewPager.adapter = CategoryPagerAdapter(object : Listener {
                 override fun onEmojiPanelExpanded() {
                     // do nothing
                 }
@@ -270,7 +270,7 @@ class EmojiFragment : Fragment() {
      */
     fun isCollapsed() = parentContainer.visibility == View.GONE
 
-    interface EmojiKeyboardListener {
+    interface Listener {
         /**
          * When an emoji is selected on the picker.
          *