From d2e01bb319abd5c5215943569bafbc449b0ed4c8 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Thu, 7 Jul 2022 20:53:34 +0200 Subject: [PATCH 01/10] Update Openmoji version code to 14.0 --- .../de/c1710/filemojicompat_defaults/DefaultEmojiPackList.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..6dd90d3 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 @@ -58,7 +58,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)), 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), From 7181b462dd43394a447e1d90abbfb186bfa31644 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Thu, 7 Jul 2022 20:56:45 +0200 Subject: [PATCH 02/10] Version bump --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d349aec..74d2692 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.3 GROUP=de.c1710 POM_URL=https://github.com/c1710/filemojicompat From 189a79a6bc960b5e79b7687fd3e75bfbcf8a6285 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Thu, 7 Jul 2022 21:03:26 +0200 Subject: [PATCH 03/10] Version bump in README.md --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3481cea..8285b7d 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ Integrating this library is done in a few steps. 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.1` | 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.1` | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | - | `de.c1710:filemojicompat-defaults:3.2.1` | 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.1` | 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. | + | `de.c1710:filemojicompat:3.2.3` | 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.3` | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | + | `de.c1710:filemojicompat-defaults:3.2.3` | 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.3` | 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): @@ -67,7 +67,7 @@ However, it requires a Activity that supports the Android Activity Results API a > ## How do I get this library? > That's relatively easy: Just add the following line to your module's > `build.gradle` inside `dependencies`: > ``` -> implementation 'de.c1710:filemojicompat:3.2.1' +> implementation 'de.c1710:filemojicompat:3.2.3' > ``` > > ## Migration from FilemojiCompat 1.x From d1d0cf7a4667db8b90cadfe20d9ec3e6d5cfabf8 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Wed, 10 Aug 2022 22:03:22 +0200 Subject: [PATCH 04/10] Add Fluent emojis, version bump --- README.md | 10 +++++----- filemojicompat-defaults/icons/ic_fluent.svg | 7 +++++++ .../DefaultEmojiPackList.kt | 15 ++++++++++++++- .../src/main/res/drawable/ic_fluent.xml | 9 +++++++++ .../src/main/res/values-de/strings.xml | 2 ++ .../src/main/res/values/strings.xml | 2 ++ gradle.properties | 2 +- 7 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 filemojicompat-defaults/icons/ic_fluent.svg create mode 100644 filemojicompat-defaults/src/main/res/drawable/ic_fluent.xml diff --git a/README.md b/README.md index 8285b7d..1c48818 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ Integrating this library is done in a few steps. 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.3` | 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.3` | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | - | `de.c1710:filemojicompat-defaults:3.2.3` | 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.3` | 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. | + | `de.c1710:filemojicompat:3.2.4` | 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.4` | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | + | `de.c1710:filemojicompat-defaults:3.2.4` | 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.4` | 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): @@ -67,7 +67,7 @@ However, it requires a Activity that supports the Android Activity Results API a > ## How do I get this library? > That's relatively easy: Just add the following line to your module's > `build.gradle` inside `dependencies`: > ``` -> implementation 'de.c1710:filemojicompat:3.2.3' +> implementation 'de.c1710:filemojicompat:3.2.4' > ``` > > ## Migration from FilemojiCompat 1.x 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 6dd90d3..3adf445 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 @@ -26,6 +26,19 @@ class DefaultEmojiPackList { tintableIcon = false ) + val fluent = DownloadableEmojiPack ( + "fluent", + "Fluent Emoji", + 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", @@ -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, fluent, noto, openmoji, twemoji) } } } \ 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..8cd3129 100644 --- a/filemojicompat-defaults/src/main/res/values-de/strings.xml +++ b/filemojicompat-defaults/src/main/res/values-de/strings.xml @@ -8,4 +8,6 @@ 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 \ 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..e851a84 100644 --- a/filemojicompat-defaults/src/main/res/values/strings.xml +++ b/filemojicompat-defaults/src/main/res/values/strings.xml @@ -8,4 +8,6 @@ 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. \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 74d2692..cc9bdb2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ android.useAndroidX=true # Some config for maven -VERSION_NAME=3.2.3 +VERSION_NAME=3.2.4 GROUP=de.c1710 POM_URL=https://github.com/c1710/filemojicompat From 9c272d5050786580ce83ec0e1cee82d02a0ab641 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Wed, 10 Aug 2022 22:35:18 +0200 Subject: [PATCH 05/10] Update okhttp --- filemojicompat-ui/build.gradle | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/filemojicompat-ui/build.gradle b/filemojicompat-ui/build.gradle index c9d59be..4039d1a 100644 --- a/filemojicompat-ui/build.gradle +++ b/filemojicompat-ui/build.gradle @@ -36,9 +36,7 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.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.squareup.okhttp3:okhttp:4.10.0' implementation 'com.google.android.material:material:1.5.0' implementation 'com.google.code.gson:gson:2.9.0' api project(path: ':filemojicompat') From ea0614624aaa7b646b1a5950e82eff12a7977bb3 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Wed, 10 Aug 2022 22:37:19 +0200 Subject: [PATCH 06/10] Add emoji2 dependency in filemojicompat-ui as well --- filemojicompat-ui/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/filemojicompat-ui/build.gradle b/filemojicompat-ui/build.gradle index 4039d1a..b2de105 100644 --- a/filemojicompat-ui/build.gradle +++ b/filemojicompat-ui/build.gradle @@ -39,5 +39,6 @@ dependencies { implementation 'com.squareup.okhttp3:okhttp:4.10.0' implementation 'com.google.android.material:material:1.5.0' implementation 'com.google.code.gson:gson:2.9.0' + implementation 'androidx.emoji2:emoji2:1.1.0' api project(path: ':filemojicompat') } \ No newline at end of file From ae925caca8e724d11650199bc38282b26db2ecad Mon Sep 17 00:00:00 2001 From: Constantin A Date: Wed, 10 Aug 2022 23:07:58 +0200 Subject: [PATCH 07/10] Update dependencies --- build.gradle | 2 +- filemojicompat-defaults/build.gradle | 4 ++-- filemojicompat-ui/build.gradle | 14 +++++++------- filemojicompat/build.gradle | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) 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-ui/build.gradle b/filemojicompat-ui/build.gradle index b2de105..79a2615 100644 --- a/filemojicompat-ui/build.gradle +++ b/filemojicompat-ui/build.gradle @@ -28,17 +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" implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation 'com.google.android.material:material:1.5.0' + implementation 'com.google.android.material:material:1.6.1' implementation 'com.google.code.gson:gson:2.9.0' - implementation 'androidx.emoji2:emoji2:1.1.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' } From c6126a4c4414acab25080dce19ae1bc8299e89a8 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Wed, 10 Aug 2022 23:08:13 +0200 Subject: [PATCH 08/10] Update long description for Fluent emoji --- filemojicompat-defaults/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/filemojicompat-defaults/src/main/res/values/strings.xml b/filemojicompat-defaults/src/main/res/values/strings.xml index e851a84..ee3cf81 100644 --- a/filemojicompat-defaults/src/main/res/values/strings.xml +++ b/filemojicompat-defaults/src/main/res/values/strings.xml @@ -9,5 +9,5 @@ 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. + The fresh, new emoji pack in its flat version.\nCopyright (c) Microsoft Corporation.\nAdapted for usage with EmojiCompat \ No newline at end of file From ab6c6ee29f627e63abf9a8f0482e0f38e17c2a91 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Wed, 10 Aug 2022 23:09:47 +0200 Subject: [PATCH 09/10] Version bump --- README.md | 10 +++++----- gradle.properties | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 1c48818..5ddf166 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ Integrating this library is done in a few steps. 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.4` | 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.4` | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | - | `de.c1710:filemojicompat-defaults:3.2.4` | 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.4` | 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. | + | `de.c1710:filemojicompat:3.2.5` | 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.5` | Includes an emoji picker and an emoji pack management. Can be integrated with `androidx.preferences`. Recommended | + | `de.c1710:filemojicompat-defaults:3.2.5` | 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.5` | 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): @@ -67,7 +67,7 @@ However, it requires a Activity that supports the Android Activity Results API a > ## How do I get this library? > That's relatively easy: Just add the following line to your module's > `build.gradle` inside `dependencies`: > ``` -> implementation 'de.c1710:filemojicompat:3.2.4' +> implementation 'de.c1710:filemojicompat:3.2.5' > ``` > > ## Migration from FilemojiCompat 1.x diff --git a/gradle.properties b/gradle.properties index cc9bdb2..839a2ff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,7 +20,7 @@ android.useAndroidX=true # Some config for maven -VERSION_NAME=3.2.4 +VERSION_NAME=3.2.5 GROUP=de.c1710 POM_URL=https://github.com/c1710/filemojicompat From 22091fbf8587c659dfa9bc19f542b771826c36e1 Mon Sep 17 00:00:00 2001 From: Constantin A Date: Sat, 29 Oct 2022 21:54:22 +0200 Subject: [PATCH 10/10] Update some emoji packs; ass broken notice to Fluent Emoji --- .../c1710/filemojicompat_defaults/DefaultEmojiPackList.kt | 8 ++++---- .../src/main/res/values-de/strings.xml | 3 ++- filemojicompat-defaults/src/main/res/values/strings.xml | 3 ++- gradle.properties | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) 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