diff --git a/filemojicompat-defaults/src/main/java/de/c1710/filemojicompat_defaults/DefaultEmojiPackList.kt b/filemojicompat-defaults/src/main/java/de/c1710/filemojicompat_defaults/DefaultEmojiPackList.kt index 3adf445..cc4f504 100644 --- a/filemojicompat-defaults/src/main/java/de/c1710/filemojicompat_defaults/DefaultEmojiPackList.kt +++ b/filemojicompat-defaults/src/main/java/de/c1710/filemojicompat_defaults/DefaultEmojiPackList.kt @@ -19,7 +19,7 @@ class DefaultEmojiPackList { URI("https://github.com/C1710/blobmoji/raw/main/fonts/BlobmojiCompat.ttf"), context.resources.getString(R.string.blobmoji_description), ResourcesCompat.getDrawable(context.resources, R.drawable.ic_blobmoji, null), - Version(intArrayOf(14, 0, 1)), + Version(intArrayOf(15, 0)), Uri.parse("https://github.com/C1710/blobmoji"), Uri.parse("https://raw.githubusercontent.com/C1710/blobmoji/emoji14/LICENSE"), context.resources.getString(R.string.blobmoji_description_long), @@ -28,7 +28,7 @@ class DefaultEmojiPackList { val fluent = DownloadableEmojiPack ( "fluent", - "Fluent Emoji", + context.resources.getString(R.string.fluent_broken_name), URI("https://github.com/C1710/fluentui-emoji/raw/main/fonts/FluentEmojiCompat.ttf"), context.resources.getString(R.string.fluent_description), ResourcesCompat.getDrawable(context.resources, R.drawable.ic_fluent, null), @@ -71,7 +71,7 @@ class DefaultEmojiPackList { URI("https://github.com/C1710/openmoji/raw/master/fonts/OpenMojiCompat.ttf"), context.resources.getString(R.string.openmoji_description), ResourcesCompat.getDrawable(context.resources, R.drawable.ic_openmoji, null), - Version(intArrayOf(14, 0)), + Version(intArrayOf(14, 0, 1)), Uri.parse("https://openmoji.org/"), Uri.parse("https://raw.githubusercontent.com/hfg-gmuend/openmoji/master/LICENSE.txt"), context.resources.getString(R.string.openmoji_description_long), @@ -79,7 +79,7 @@ class DefaultEmojiPackList { ) // Using alphabetical order here (although Blobmoji would probably stay on top anyway :P) - return arrayListOf(blobmoji, fluent, noto, openmoji, twemoji) + return arrayListOf(blobmoji, noto, openmoji, twemoji, fluent) } } } \ No newline at end of file diff --git a/filemojicompat-defaults/src/main/res/values-de/strings.xml b/filemojicompat-defaults/src/main/res/values-de/strings.xml index 8cd3129..94c6e71 100644 --- a/filemojicompat-defaults/src/main/res/values-de/strings.xml +++ b/filemojicompat-defaults/src/main/res/values-de/strings.xml @@ -9,5 +9,6 @@ Ein open-source Emoji-Paket Ein relativ neues Emoji-Paket mit einem minimalistischen Design.\nAll emojis designed by OpenMoji – the open-source emoji and icon project. License: CC BY-SA 4.0\nAngepasst auf die Nutzung mit EmojiCompat Die neuen Emojis von Microsoft - Das frische, neue Emoji-Paket in seiner flachen Version + Das frische, neue Emoji-Paket in seiner flachen Version\nCopyright (c) Microsoft Corporation.\nAngepasst auf die Nutzung mit EmojiCompat\nDerzeit fehlen Emojis mit Hauttönen, sowie die Büroklammer. + Fluent Emoji (derzeit unvollständig) \ No newline at end of file diff --git a/filemojicompat-defaults/src/main/res/values/strings.xml b/filemojicompat-defaults/src/main/res/values/strings.xml index ee3cf81..cb363a2 100644 --- a/filemojicompat-defaults/src/main/res/values/strings.xml +++ b/filemojicompat-defaults/src/main/res/values/strings.xml @@ -9,5 +9,6 @@ An open-source emoji pack A rather recent emoji pack featuring a minimalistic style.\nAll emojis designed by OpenMoji – the open-source emoji and icon project. License: CC BY-SA 4.0\nAdapted for usage with EmojiCompat The new emojis from Microsoft - The fresh, new emoji pack in its flat version.\nCopyright (c) Microsoft Corporation.\nAdapted for usage with EmojiCompat + The fresh, new emoji pack in its flat version.\nCopyright (c) Microsoft Corporation.\nAdapted for usage with EmojiCompat\nCurrently, emojis with skin tones, and the paperclip emoji are missing. + Fluent Emoji (currently incomplete) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 839a2ff..08ef723 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ android.useAndroidX=true # Some config for maven -VERSION_NAME=3.2.5 +VERSION_NAME=3.2.6 GROUP=de.c1710 POM_URL=https://github.com/c1710/filemojicompat