xander/main
1
0
Fork 0
mirror of https://github.com/googlefonts/noto-emoji.git synced 2025-07-08 21:36:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New fallback font which should work on more devices

Browse source
This commit is contained in:
Constantin A 2018-07-03 13:45:19 +02:00
parent fa57c7eb5e
commit 633f21f777
6 changed files with 113 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
emojicompat/FileMojiCompat/filemojicompat/build.gradle
View file

@ -18,7 +18,7 @@ ext {
libraryDescription = 'An EmojiCompat implementation using files from a local file or a file inside your assets directory'
siteUrl = 'https://github.com/c1710/blobmoji'
gitUrl = 'https://github.com/c1710/blobmoji.git'
libraryVersion = '1.0.11'
libraryVersion = '1.0.13'
developerId = 'c1710'
developerName = 'Constantin A.'
developerEmail = 'c1710.apps@outlook.com'
@ -33,8 +33,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 27
versionCode 12
versionName "1.0.12"
versionCode 13
versionName "1.0.13"
}
@ -49,6 +49,7 @@ dependencies {
implementation 'com.android.support:support-emoji:27.1.1'
}
apply from: 'https://raw.githubusercontent.com/numetriclabz/jcenter/master/installv.gradle'
apply from: 'https://raw.githubusercontent.com/numetriclabz/jcenter/master/bintrayv.gradle'

3
emojicompat/FileMojiCompat/filemojicompat/src/main/AndroidManifest.xml
View file

@ -1,2 +1 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.c1710.filemojicompat" />
<manifest package="de.c1710.filemojicompat" />

BIN
emojicompat/FileMojiCompat/filemojicompat/src/main/assets/NoEmojiCompat.ttf
View file

Binary file not shown.

2
emojicompat/FileMojiCompat/filemojicompat/src/main/java/de/c1710/filemojicompat/AssetEmojiCompatConfig.java
View file

@ -29,6 +29,7 @@ import android.support.text.emoji.MetadataRepo;
* Based on:
* https://android.googlesource.com/platform/frameworks/support/+/master/emoji/bundled/src/main/java/android/support/text/emoji/bundled/BundledEmojiCompatConfig.java
* Changes are marked with comments. Formatting and other simple changes are not always marked.
*
* @deprecated Please use {@link FileEmojiCompatConfig#createFromAsset(Context, String)} instead
* for greater flexibility.
*/
@ -38,6 +39,7 @@ public class AssetEmojiCompatConfig extends EmojiCompat.Config {
/**
* Create a new configuration for this EmojiCompat
*
* @param assetName The file name/path of the requested font
* @param context Context instance
*/

112
emojicompat/FileMojiCompat/filemojicompat/src/main/java/de/c1710/filemojicompat/FileEmojiCompatConfig.java
View file

@ -41,7 +41,10 @@ import java.io.InputStream;
public class FileEmojiCompatConfig extends EmojiCompat.Config {
// The class name is obviously changed from the original file
private final static String TAG = "FileEmojiCompatConfig";
/**
* The default name of the fallback font
*/
private static final String FONT_FALLBACK = "NoEmojiCompat.ttf";
/**
* This boolean indicates whether the fallback solution is used.
*/
@ -50,59 +53,10 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
* Indicates whether all emojis should be replaced when the fallback font is used.
*/
private boolean replaceAllOnFallback = false;
/**
* The default name of the fallback font
*/
private static final String FONT_FALLBACK = "NoEmojiCompat.ttf";
/**
* Creates a new FileEmojiCompatConfig based on an asset.
* <p/>
* This means that you can have the flexibility of {@link AssetEmojiCompatConfig}
* while giving your users the choice to optionally override the font.
* <p/>
* The default location for a substituting font is
* {@code /sdcard/Android/data/your.apps.package/files/EmojiCompat.ttf}.
*
* @param context The app's context is needed for several tasks
* @param assetPath The path inside the {@code assets} folder for the default font file
* @return A FileEmojiCompatConfig which will use the given font by default
*/
public FileEmojiCompatConfig createFromAsset(@NonNull Context context,
@Nullable String assetPath) {
if (assetPath != null) {
FileEmojiCompatConfig config = new FileEmojiCompatConfig(context,
new File(context.getExternalFilesDir(null), "EmojiCompat.ttf"),
assetPath);
config.replaceAllOnFallback = true;
return config;
} else {
return createFromAsset(context);
}
}
/**
* Creates a new FileEmojiCompatConfig based on an asset.
* <p/>
* This means that you can have the flexibility of {@link AssetEmojiCompatConfig}
* while giving your users the choice to optionally override the font.
* <p/>
* The default location for a substituting font is
* {@code /sdcard/Android/data/your.apps.package/files/EmojiCompat.ttf}.
* <p/>
* The default name for the Assets font is {@code NoEmojiCompat.ttf}.
* If you wish to use a different name for this font, please use
* {@link #createFromAsset(Context, String)}.
*
* @param context The app's context is needed for several tasks
* @return A FileEmojiCompatConfig which will use the given font by default
*/
public FileEmojiCompatConfig createFromAsset(@NonNull Context context) {
return createFromAsset(context, FONT_FALLBACK);
}
/**
* Create a new configuration for this EmojiCompat
*
* @param path The file name/path of the requested font
* @param context Context instance
*/
@ -115,6 +69,7 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
/**
* Create a new configuration for this EmojiCompat
*
* @param path The file name/path of the requested font
* @param context Context instance
* @param fallbackFont The asset path of the fallback font
@ -129,6 +84,7 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
/**
* Create a new configuration for this EmojiCompat based on a file
*
* @param context Context instance
* @param fontFile The file containing the EmojiCompat font
*/
@ -140,6 +96,7 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
/**
* Create a new configuration for this EmojiCompat based on a file
*
* @param context Context instance
* @param fontFile The file containing the EmojiCompat font
* @param fallbackFont The asset path of the fallback font
@ -185,6 +142,52 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
}
/**
* Creates a new FileEmojiCompatConfig based on an asset.
* <p>
* This means that you can have the flexibility of {@link AssetEmojiCompatConfig}
* while giving your users the choice to optionally override the font.
* <p>
* The default location for a substituting font is
* {@code /sdcard/Android/data/your.apps.package/files/EmojiCompat.ttf}.
*
* @param context The app's context is needed for several tasks
* @param assetPath The path inside the {@code assets} folder for the default font file
* @return A FileEmojiCompatConfig which will use the given font by default
*/
public FileEmojiCompatConfig createFromAsset(@NonNull Context context,
@Nullable String assetPath) {
if (assetPath != null) {
FileEmojiCompatConfig config = new FileEmojiCompatConfig(context,
new File(context.getExternalFilesDir(null), "EmojiCompat.ttf"),
assetPath);
config.replaceAllOnFallback = true;
return config;
} else {
return createFromAsset(context);
}
}
/**
* Creates a new FileEmojiCompatConfig based on an asset.
* <p>
* This means that you can have the flexibility of {@link AssetEmojiCompatConfig}
* while giving your users the choice to optionally override the font.
* <p>
* The default location for a substituting font is
* {@code /sdcard/Android/data/your.apps.package/files/EmojiCompat.ttf}.
* <p>
* The default name for the Assets font is {@code NoEmojiCompat.ttf}.
* If you wish to use a different name for this font, please use
* {@link #createFromAsset(Context, String)}.
*
* @param context The app's context is needed for several tasks
* @return A FileEmojiCompatConfig which will use the given font by default
*/
public FileEmojiCompatConfig createFromAsset(@NonNull Context context) {
return createFromAsset(context, FONT_FALLBACK);
}
@Override
public FileEmojiCompatConfig setReplaceAll(boolean replaceAll) {
return setReplaceAll(replaceAll, replaceAllOnFallback);
@ -192,6 +195,7 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
/**
* Replace all emojis
*
* @param replaceAll Whether all emojis should be replaced
* @param replaceAllOnFallback true if this is supposed to be the case even when using the fallback font.
* Useful if the NoEmojiCompat.ttf is overridden by a "real" EmojiCompat font.
@ -201,8 +205,7 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
this.replaceAllOnFallback = replaceAllOnFallback;
if (!fallback || replaceAllOnFallback) {
super.setReplaceAll(replaceAll);
}
else {
} else {
super.setReplaceAll(false);
if (replaceAll) {
// If replaceAll would have been set to false anyway, there's no need for apologizing.
@ -274,8 +277,7 @@ public class FileEmojiCompatConfig extends EmojiCompat.Config {
final InputStream stream = new FileInputStream(FONT_FILE);
MetadataRepo resourceIndex = MetadataRepo.create(typeface, stream);
loaderCallback.onLoaded(resourceIndex);
}
catch (Throwable t) {
} catch (Throwable t) {
// Instead of crashing, this one will first try to load the fallback font
try {
android.util.Log.w(TAG, "Error while loading the font file.", t);

4
emojicompat/FileMojiCompat/gradle.properties
View file

@ -1,16 +1,12 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx1024m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects