Replaced EmojiPicker in RenameConversationDialogFragment

Signed-off-by: Smarshal21 <[email protected]>
nextcloud · Nov 8, 2023 · ed3117b · ed3117b
1 parent 70e3ac3
commit ed3117b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 28 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt
@@ -22,7 +22,6 @@ package com.nextcloud.talk.conversation
 
 import android.annotation.SuppressLint
 import android.app.Dialog
-import android.content.res.ColorStateList
 import android.os.Bundle
 import android.text.Editable
 import android.text.TextUtils
@@ -32,21 +31,18 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
-import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.ViewModelProvider
 import autodagger.AutoInjector
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.conversation.viewmodel.RenameConversationViewModel
 import com.nextcloud.talk.conversationlist.ConversationsListActivity
 import com.nextcloud.talk.databinding.DialogRenameConversationBinding
 import com.nextcloud.talk.events.ConversationsListFetchDataEvent
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
-import com.vanniktech.emoji.EmojiPopup
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
@@ -64,8 +60,8 @@ class RenameConversationDialogFragment : DialogFragment() {
 
     private lateinit var binding: DialogRenameConversationBinding
     private lateinit var viewModel: RenameConversationViewModel
+    private var isEmojiPickerVisible = false
 
-    private var emojiPopup: EmojiPopup? = null
 
     private var roomToken = ""
     private var initialName = ""
@@ -106,7 +102,6 @@ class RenameConversationDialogFragment : DialogFragment() {
         setupListeners()
         setupStateObserver()
 
-        setupEmojiPopup()
     }
 
     override fun onStart() {
@@ -130,31 +125,20 @@ class RenameConversationDialogFragment : DialogFragment() {
     }
 
     private fun setupEmojiPopup() {
-        emojiPopup = binding.let {
-            EmojiPopup(
-                rootView = requireView(),
-                editText = it.textEdit,
-                onEmojiPopupShownListener = {
-                    viewThemeUtils.platform.colorImageView(it.smileyButton, ColorRole.PRIMARY)
-                },
-                onEmojiPopupDismissListener = {
-                    it.smileyButton.imageTintList = ColorStateList.valueOf(
-                        ResourcesCompat.getColor(
-                            resources,
-                            R.color.medium_emphasis_text,
-                            context?.theme
-                        )
-                    )
-                },
-                onEmojiClickListener = {
-                    binding.textEdit.editableText?.append(" ")
-                }
-            )
+        if (!isEmojiPickerVisible) {
+            binding.emojiPicker.visibility = View.VISIBLE
+            isEmojiPickerVisible = true
+        } else {
+            binding.emojiPicker.visibility = View.GONE
+            isEmojiPickerVisible = false
+        }
+        binding.emojiPicker.setOnEmojiPickedListener() {
+            binding.textEdit.editableText?.append(it.emoji)
         }
     }
 
     private fun setupListeners() {
-        binding.smileyButton.setOnClickListener { emojiPopup?.toggle() }
+        binding.smileyButton.setOnClickListener { setupEmojiPopup() }
         binding.textEdit.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
                 // unused atm
@@ -216,7 +200,12 @@ class RenameConversationDialogFragment : DialogFragment() {
         Log.e(TAG, "Failed to rename conversation")
         Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show()
     }
-
+    override fun onResume() {
+        super.onResume()
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT
+        )
+    }
     /**
      * Fragment creator
      */

diff --git a/app/src/main/res/layout/dialog_rename_conversation.xml b/app/src/main/res/layout/dialog_rename_conversation.xml
@@ -67,4 +67,12 @@
         app:tint="@color/medium_emphasis_text"
         tools:visibility="visible" />
 
+    <androidx.emoji2.emojipicker.EmojiPickerView
+        android:id="@+id/emoji_picker"
+        android:layout_width="match_parent"
+        android:layout_below="@id/text_input_layout"
+        android:visibility="gone"
+        android:layout_height="match_parent"
+        app:emojiGridColumns="9" />
+
 </RelativeLayout>