Эх сурвалжийг харах

SetStatusDialogFragment: fix EmojiPopup after API changes

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 3 жил өмнө
parent
commit
b2630f532a

+ 8 - 6
app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt

@@ -59,6 +59,8 @@ import com.owncloud.android.utils.theme.ThemeTextInputUtils
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.EmojiManager
 import com.vanniktech.emoji.EmojiPopup
 import com.vanniktech.emoji.EmojiPopup
 import com.vanniktech.emoji.google.GoogleEmojiProvider
 import com.vanniktech.emoji.google.GoogleEmojiProvider
+import com.vanniktech.emoji.installDisableKeyboardInput
+import com.vanniktech.emoji.installForceSingleEmoji
 import java.util.Calendar
 import java.util.Calendar
 import java.util.Locale
 import java.util.Locale
 import javax.inject.Inject
 import javax.inject.Inject
@@ -169,18 +171,18 @@ class SetStatusDialogFragment :
         binding.setStatus.setOnClickListener { setStatusMessage() }
         binding.setStatus.setOnClickListener { setStatusMessage() }
         binding.emoji.setOnClickListener { popup.show() }
         binding.emoji.setOnClickListener { popup.show() }
 
 
-        popup = EmojiPopup.Builder
-            .fromRootView(view)
-            .setOnEmojiClickListener { _, _ ->
+        popup = EmojiPopup(
+            view, binding.emoji,
+            onEmojiClickListener = {
                 popup.dismiss()
                 popup.dismiss()
                 binding.emoji.clearFocus()
                 binding.emoji.clearFocus()
                 val imm: InputMethodManager = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as
                 val imm: InputMethodManager = context?.getSystemService(Context.INPUT_METHOD_SERVICE) as
                     InputMethodManager
                     InputMethodManager
                 imm.hideSoftInputFromWindow(binding.emoji.windowToken, 0)
                 imm.hideSoftInputFromWindow(binding.emoji.windowToken, 0)
             }
             }
-            .build(binding.emoji)
-        binding.emoji.disableKeyboardInput(popup)
-        binding.emoji.forceSingleEmoji()
+        )
+        binding.emoji.installDisableKeyboardInput(popup)
+        binding.emoji.installForceSingleEmoji()
 
 
         val adapter = ArrayAdapter<String>(requireContext(), android.R.layout.simple_spinner_item)
         val adapter = ArrayAdapter<String>(requireContext(), android.R.layout.simple_spinner_item)
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)