mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 22:25:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

Rollback emoji-google to 0.9.0

Browse source 
New version is not compatible with Jacoco for some reason

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
This commit is contained in:
Álvaro Brey 2022-09-16 16:36:52 +02:00
parent 2203dd089c
commit 25234fdb85
No known key found for this signature in database
GPG key ID: 2585783189A62105
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -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"

14
app/src/main/java/com/nextcloud/ui/SetStatusDialogFragment.kt
View file

@ -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)