diff --git a/README.md b/README.md index de82b6c..d003fc1 100644 --- a/README.md +++ b/README.md @@ -12,12 +12,12 @@ The library is available on Maven Central, Github Packages are **not** maintaine Integrating this library is done in a few steps. 1. To use `Emoji2` without special widgets, you should use `androidx.appcompat` >= `1.4.0`. This way, all AppCompat components are already EmojiCompat-enabled. 2. You need to include a dependency for the library in your app's `build.gradle`. It is split into four parts - you only need one of these: - | Package name | Description | - |----------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| - | [`de.c1710:filemojicompat:3.2.2`](https://search.maven.org/artifact/de.c1710/filemojicompat) | The main library part. It supports emoji fonts to be placed in your app's `data` directory. Works like FilemojiCompat 2 | - | [`de.c1710:filemojicompat-ui:3.2.2`](https://search.maven.org/artifact/de.c1710/filemojicompat-ui) | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | - | [`de.c1710:filemojicompat-defaults:3.2.2`](https://search.maven.org/artifact/de.c1710/filemojicompat-defaults) | A default list of four downloadable emoji packs: Blobmoji, Noto-Emoji, Openmoji and Twemoji. Recommended if the app has internet permissions | - | [`de.c1710:filemojicompat-autoinit:3.2.2`](https://search.maven.org/artifact/de.c1710/filemojicompat-autoinit) | An extension for `filemojicompat-defaults` which uses the `androidx.startup` library to directly initialize EmojiCompat with FilemojiCompat without having to modify your `Application` class, similar to how `Emoji2` would work. Recommended if you don't want to change the defaults or add any other emoji packs. | + | Package name | Description | + |------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| + | `de.c1710:filemojicompat:3.2.6` | The main library part. It supports emoji fonts to be placed in your app's `data` directory. Works like FilemojiCompat 2 | + | `de.c1710:filemojicompat-ui:3.2.6` | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | + | `de.c1710:filemojicompat-defaults:3.2.6` | A default list of four downloadable emoji packs: Blobmoji, Noto-Emoji, Openmoji and Twemoji. Recommended if the app has internet permissions | + | `de.c1710:filemojicompat-autoinit:3.2.6` | An extension for `filemojicompat-defaults` which uses the `androidx.startup` library to directly initialize EmojiCompat with FilemojiCompat without having to modify your `Application` class, similar to how `Emoji2` would work. Recommended if you don't want to change the defaults or add any other emoji packs. | 3. If you don't want to use the emoji picker, you can continue with the [instructions for FilemojiCompat 2 below](#old-instructions-for-filemojicompat-2-maybe-not-up-to-date). Otherwise, you need to initialize EmojiCompat/Emoji2/FilemojiCompat. If you use `filemojicompat-autoinit`, you can skip this step. In your main `Application`''s `onCreate` function, the initialization can be done with one line (this example is for Kotlin, but it is the same for Java): diff --git a/build.gradle b/build.gradle index 7020284..2c450e6 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { - kotlin_version = '1.6.10' + kotlin_version = '1.7.10' } repositories { google() diff --git a/filemojicompat-defaults/build.gradle b/filemojicompat-defaults/build.gradle index 17d12bd..c3d95b7 100644 --- a/filemojicompat-defaults/build.gradle +++ b/filemojicompat-defaults/build.gradle @@ -34,7 +34,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.5.0' api project(path: ':filemojicompat-ui') } \ No newline at end of file diff --git a/filemojicompat-defaults/icons/ic_fluent.svg b/filemojicompat-defaults/icons/ic_fluent.svg new file mode 100644 index 0000000..4bd2140 --- /dev/null +++ b/filemojicompat-defaults/icons/ic_fluent.svg @@ -0,0 +1,7 @@ + + + + + + + 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 6303848..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,13 +19,26 @@ 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), tintableIcon = false ) + val fluent = DownloadableEmojiPack ( + "fluent", + 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), + Version(intArrayOf(14, 0)), + Uri.parse("https://github.com/microsoft/fluentui-emoji"), + Uri.parse("https://github.com/microsoft/fluentui-emoji/blob/main/LICENSE"), + context.resources.getString(R.string.fluent_description_long), + tintableIcon = false + ) + val noto = DownloadableEmojiPack ( "noto", "Noto Emoji", @@ -58,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(13, 1)), + 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), @@ -66,7 +79,7 @@ class DefaultEmojiPackList { ) // Using alphabetical order here (although Blobmoji would probably stay on top anyway :P) - return arrayListOf(blobmoji, noto, openmoji, twemoji) + return arrayListOf(blobmoji, noto, openmoji, twemoji, fluent) } } } \ No newline at end of file diff --git a/filemojicompat-defaults/src/main/res/drawable/ic_fluent.xml b/filemojicompat-defaults/src/main/res/drawable/ic_fluent.xml new file mode 100644 index 0000000..11d99dd --- /dev/null +++ b/filemojicompat-defaults/src/main/res/drawable/ic_fluent.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/filemojicompat-defaults/src/main/res/values-de/strings.xml b/filemojicompat-defaults/src/main/res/values-de/strings.xml index ec637de..94c6e71 100644 --- a/filemojicompat-defaults/src/main/res/values-de/strings.xml +++ b/filemojicompat-defaults/src/main/res/values-de/strings.xml @@ -8,4 +8,7 @@ Ein Emoji-Paket, das an vielen Stellen im Internet gefunden werden kann, darunter Twitter oder Mastodon.\nCC BY 4.0, Copyright 2020 Twitter, Inc and other contributors\nAngepasst auf die Nutzung mit EmojiCompat 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\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 082c66f..cb363a2 100644 --- a/filemojicompat-defaults/src/main/res/values/strings.xml +++ b/filemojicompat-defaults/src/main/res/values/strings.xml @@ -8,4 +8,7 @@ Twemoji is an emoji pack that can be found on many platforms throughout the internet, including Twitter and Mastodon.\nCC BY 4.0, Copyright 2020 Twitter, Inc and other contributors\nAdapted for usage with EmojiCompat 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\nCurrently, emojis with skin tones, and the paperclip emoji are missing. + Fluent Emoji (currently incomplete) \ No newline at end of file diff --git a/filemojicompat-ui/build.gradle b/filemojicompat-ui/build.gradle index 920d887..79a2615 100644 --- a/filemojicompat-ui/build.gradle +++ b/filemojicompat-ui/build.gradle @@ -28,19 +28,17 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - implementation 'androidx.core:core-ktx:1.7.0' - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'androidx.core:core-ktx:1.8.0' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.preference:preference-ktx:1.2.0' - implementation 'androidx.activity:activity-ktx:1.4.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.1' + implementation 'androidx.activity:activity-ktx:1.5.1' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.5.1' implementation 'androidx.preference:preference-ktx:1.2.0' implementation "androidx.multidex:multidex:2.0.1" - // We don't want to use an alpha version of okhttp here - //noinspection GradleDependency - implementation 'com.squareup.okhttp3:okhttp:4.9.0' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.emoji2:emoji2:1.1.0' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.code.gson:gson:2.9.0' + implementation 'androidx.emoji2:emoji2:1.2.0' api project(path: ':filemojicompat') } \ No newline at end of file diff --git a/filemojicompat/build.gradle b/filemojicompat/build.gradle index 0fcdb6b..43a44a4 100644 --- a/filemojicompat/build.gradle +++ b/filemojicompat/build.gradle @@ -30,6 +30,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.emoji2:emoji2:1.1.0' + implementation 'androidx.emoji2:emoji2:1.2.0' } diff --git a/gradle.properties b/gradle.properties index d349aec..08ef723 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ android.useAndroidX=true # Some config for maven -VERSION_NAME=3.2.2 +VERSION_NAME=3.2.6 GROUP=de.c1710 POM_URL=https://github.com/c1710/filemojicompat