Fix load and skin tone on reactions

emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt

@@ -165,8 +165,11 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
                 textView.setImageResource(category.resourceIcon())
             }
 
-            val currentTab = if (EmojiRepository.getRecents().isEmpty()) EmojiCategory.PEOPLE.ordinal else
+            val currentTab = if (EmojiRepository.getRecents().isEmpty()) {
+                EmojiCategory.PEOPLE.ordinal
+            } else {
                 EmojiCategory.RECENTS.ordinal
+            }
             viewPager.currentItem = currentTab
         }
     }

emoji/src/main/java/chat/rocket/android/emoji/EmojiPickerPopup.kt

@@ -7,14 +7,19 @@ import android.view.LayoutInflater
 import android.view.Window
 import android.view.WindowManager
 import android.widget.ImageView
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+import androidx.core.content.edit
 import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.EmojiPagerAdapter
+import chat.rocket.android.emoji.internal.PREF_EMOJI_SKIN_TONE
 import kotlinx.android.synthetic.main.emoji_picker.*
 
 
 class EmojiPickerPopup(context: Context) : Dialog(context) {
 
     var listener: EmojiKeyboardListener? = null
+    private lateinit var adapter: EmojiPagerAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,7 +40,7 @@ class EmojiPickerPopup(context: Context) : Dialog(context) {
     }
 
     private fun setupViewPager() {
-        pager_categories.adapter = EmojiPagerAdapter(object : EmojiKeyboardListener {
+        adapter = EmojiPagerAdapter(object : EmojiKeyboardListener {
             override fun onEmojiAdded(emoji: Emoji) {
                 EmojiRepository.addToRecents(emoji)
                 dismiss()
@@ -43,6 +48,14 @@ class EmojiPickerPopup(context: Context) : Dialog(context) {
             }
         })
 
+        val sharedPreferences = context.getSharedPreferences("emoji", Context.MODE_PRIVATE)
+        sharedPreferences.getString(PREF_EMOJI_SKIN_TONE, "")?.let {
+            changeSkinTone(Fitzpatrick.valueOf(it))
+        }
+
+        pager_categories.adapter = adapter
+        pager_categories.offscreenPageLimit = EmojiCategory.values().size
+
         for (category in EmojiCategory.values()) {
             val tab = tabs.getTabAt(category.ordinal)
             val tabView = LayoutInflater.from(context).inflate(R.layout.emoji_picker_tab, null)
@@ -51,8 +64,15 @@ class EmojiPickerPopup(context: Context) : Dialog(context) {
             textView.setImageResource(category.resourceIcon())
         }
 
-        val currentTab = if (EmojiRepository.getRecents().isEmpty()) EmojiCategory.PEOPLE.ordinal else
+        val currentTab = if (EmojiRepository.getRecents().isEmpty()) {
+            EmojiCategory.PEOPLE.ordinal
+        } else {
             EmojiCategory.RECENTS.ordinal
+        }
         pager_categories.currentItem = currentTab
     }
+
+    private fun changeSkinTone(tone: Fitzpatrick) {
+        adapter.setFitzpatrick(tone)
+    }
 }
\ No newline at end of file