New emoji picker (#2395)
* Update to Emoji2 * Hopefully fix the emoji picker preference * Switch to released Filemojicompat version * Filemojicompat version as an own var * Remove an unused import * Small cleanup * Correct onDisplayPreferenceDialog; test TuskyApplication * Use TextViews instead of EmojiTextViews * Recreate the Main Activity if the emoji pack is updated * Enable coreLibraryDesugaring (for Java Streams); update Filemojicompat, downgrade Emoji2 * Update emoji font versions to 14 * Use FilemojiCompat 3.2.0-beta01 * Make ktLint happy again * Remove coreLibraryDesugaring and a FIXME * Use EmojiPickerPreference.get() * Disable emoji pack import * Update FilemojiCompat to Beta 2 * Update FilemojiCompat to Beta 3 * Update FilemojiCompat to Beta 3.2.0 final * Update FilemojiCompat to 3.2.1
This commit is contained in:
parent
2fcd6fdc14
commit
f15b3e61bb
32 changed files with 109 additions and 782 deletions
|
@ -18,16 +18,16 @@ package com.keylesspalace.tusky
|
|||
import android.app.Application
|
||||
import android.content.Context
|
||||
import android.content.res.Configuration
|
||||
import androidx.emoji.text.EmojiCompat
|
||||
import com.keylesspalace.tusky.util.LocaleManager
|
||||
import de.c1710.filemojicompat.FileEmojiCompatConfig
|
||||
import de.c1710.filemojicompat_defaults.DefaultEmojiPackList
|
||||
import de.c1710.filemojicompat_ui.helpers.EmojiPackHelper
|
||||
|
||||
// override TuskyApplication for Robolectric tests, only initialize the necessary stuff
|
||||
class TuskyApplication : Application() {
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
EmojiCompat.init(FileEmojiCompatConfig(this, ""))
|
||||
EmojiPackHelper.init(this, DefaultEmojiPackList.get(this))
|
||||
}
|
||||
|
||||
override fun attachBaseContext(base: Context) {
|
||||
|
|
|
@ -1,47 +0,0 @@
|
|||
package com.keylesspalace.tusky.util
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
class EmojiCompatFontTest {
|
||||
|
||||
@Test
|
||||
fun testCompareVersions() {
|
||||
|
||||
assertEquals(
|
||||
-1,
|
||||
EmojiCompatFont.compareVersions(
|
||||
listOf(0),
|
||||
listOf(1, 2, 3)
|
||||
)
|
||||
)
|
||||
assertEquals(
|
||||
1,
|
||||
EmojiCompatFont.compareVersions(
|
||||
listOf(1, 2, 3),
|
||||
listOf(0, 0, 0)
|
||||
)
|
||||
)
|
||||
assertEquals(
|
||||
-1,
|
||||
EmojiCompatFont.compareVersions(
|
||||
listOf(1, 0, 1),
|
||||
listOf(1, 1, 0)
|
||||
)
|
||||
)
|
||||
assertEquals(
|
||||
0,
|
||||
EmojiCompatFont.compareVersions(
|
||||
listOf(4, 5, 6),
|
||||
listOf(4, 5, 6)
|
||||
)
|
||||
)
|
||||
assertEquals(
|
||||
0,
|
||||
EmojiCompatFont.compareVersions(
|
||||
listOf(0, 0),
|
||||
listOf(0)
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue