Bläddra i källkod

Merge pull request #11480 from nextcloud/dependabot/gradle/com.vanniktech-emoji-google-0.16.0

Build(deps): Bump com.vanniktech:emoji-google from 0.9.0 to 0.16.0
Andy Scherzinger 2 år sedan
förälder
incheckning
17dd15943c
2 ändrade filer med 12 tillägg och 13 borttagningar
  1. 1 1
      app/build.gradle
  2. 11 12
      app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt

+ 1 - 1
app/build.gradle

@@ -270,7 +270,7 @@ dependencies {
     }
     implementation 'com.caverock:androidsvg:1.4'
     implementation 'androidx.annotation:annotation:1.6.0'
-    implementation 'com.vanniktech:emoji-google:0.9.0'
+    implementation 'com.vanniktech:emoji-google:0.16.0'
 
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido:$fidoVersion"
     implementation "com.github.nextcloud-deps.hwsecurity:hwsecurity-fido2:$fidoVersion"

+ 11 - 12
app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt

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