Update some emoji packs; ass broken notice to Fluent Emoji

C1710 · Oct 29, 2022 · 22091fb · 22091fb
1 parent ab6c6ee
commit 22091fb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/...ojicompat-defaults/src/main/java/de/c1710/filemojicompat_defaults/DefaultEmojiPackList.kt b/...ojicompat-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,15 +71,15 @@ 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),
                 tintableIcon = false
             )
 
             // 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)
         }
     }
 }
diff --git a/filemojicompat-defaults/src/main/res/values-de/strings.xml b/filemojicompat-defaults/src/main/res/values-de/strings.xml
@@ -9,5 +9,6 @@
     <string name="openmoji_description">Ein open-source Emoji-Paket</string>
     <string name="openmoji_description_long">Ein relativ neues Emoji-Paket mit einem minimalistischen Design.\n<i>All emojis designed by OpenMoji – the open-source emoji and icon project. License: CC BY-SA 4.0\nAngepasst auf die Nutzung mit EmojiCompat</i></string>
     <string name="fluent_description">Die neuen Emojis von Microsoft</string>
-    <string name="fluent_description_long">Das frische, neue Emoji-Paket in seiner flachen Version</string>
+    <string name="fluent_description_long">Das frische, neue Emoji-Paket in seiner flachen Version\n<i>Copyright (c) Microsoft Corporation.\nAngepasst auf die Nutzung mit EmojiCompat</i>\nDerzeit fehlen Emojis mit Hauttönen, sowie die Büroklammer.</string>
+    <string name="fluent_broken_name">Fluent Emoji (derzeit unvollständig)</string>
 </resources>
diff --git a/filemojicompat-defaults/src/main/res/values/strings.xml b/filemojicompat-defaults/src/main/res/values/strings.xml
@@ -9,5 +9,6 @@
     <string name="openmoji_description">An open-source emoji pack</string>
     <string name="openmoji_description_long">A rather recent emoji pack featuring a minimalistic style.\n<i>All emojis designed by OpenMoji – the open-source emoji and icon project. License: CC BY-SA 4.0\nAdapted for usage with EmojiCompat</i></string>
     <string name="fluent_description">The new emojis from Microsoft</string>
-    <string name="fluent_description_long">The fresh, new emoji pack in its flat version.\n<i>Copyright (c) Microsoft Corporation.\nAdapted for usage with EmojiCompat</i></string>
+    <string name="fluent_description_long">The fresh, new emoji pack in its flat version.\n<i>Copyright (c) Microsoft Corporation.\nAdapted for usage with EmojiCompat</i>\nCurrently, emojis with skin tones, and the paperclip emoji are missing.</string>
+    <string name="fluent_broken_name">Fluent Emoji (currently incomplete)</string>
 </resources>
diff --git 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