浏览代码

Rollback emoji-google to 0.9.0

New version is not compatible with Jacoco for some reason

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 年之前
父节点
当前提交
25234fdb85
共有 2 个文件被更改,包括 7 次插入9 次删除
  1. 1 1
      app/build.gradle
  2. 6 8
      app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt

+ 1 - 1
app/build.gradle

@@ -252,7 +252,7 @@ dependencies {
     }
     implementation 'com.caverock:androidsvg:1.4'
     implementation 'androidx.annotation:annotation:1.4.0'
-    implementation 'com.vanniktech:emoji-google:0.15.0'
+    implementation 'com.vanniktech:emoji-google:0.9.0'
 
     implementation "com.github.cotechde.hwsecurity:hwsecurity-fido:$fidoVersion"
     implementation "com.github.cotechde.hwsecurity:hwsecurity-fido2:$fidoVersion"

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

@@ -59,8 +59,6 @@ import com.owncloud.android.utils.theme.ThemeTextInputUtils
 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
@@ -171,18 +169,18 @@ class SetStatusDialogFragment :
         binding.setStatus.setOnClickListener { setStatusMessage() }
         binding.emoji.setOnClickListener { popup.show() }
 
-        popup = EmojiPopup(
-            view, binding.emoji,
-            onEmojiClickListener = {
+        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)
             }
-        )
-        binding.emoji.installDisableKeyboardInput(popup)
-        binding.emoji.installForceSingleEmoji()
+            .build(binding.emoji)
+        binding.emoji.disableKeyboardInput(popup)
+        binding.emoji.forceSingleEmoji()
 
         val adapter = ArrayAdapter<String>(requireContext(), android.R.layout.simple_spinner_item)
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)