kylefang/react-native-vector-icons
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-vector-icons.git synced 2026-01-12 22:51:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactors android getImageForFont to use RN font manager.

Browse Source
This commit is contained in:
Joel Arvidsson
2015-11-25 08:33:25 -05:00
parent 7abdbb11dc
commit 3920656bc7
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
android/src/main/java/com/oblador/vectoricons/VectorIconsModule.java
View File

@@ -15,6 +15,7 @@ import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.Callback;
import com.facebook.react.views.text.ReactFontManager;
import java.io.File;
import java.io.FileOutputStream;
@@ -39,7 +40,7 @@ public class VectorIconsModule extends ReactContextBaseJavaModule {
}
@ReactMethod
public void getImageForFont(String fontFile, String glyph, Integer fontSize, Integer color, Callback callback) {
public void getImageForFont(String fontFamily, String glyph, Integer fontSize, Integer color, Callback callback) {
Context context = getReactApplicationContext();
File cacheFolder = context.getCacheDir();
String cacheFolderPath = cacheFolder.getAbsolutePath() + "/";
@@ -47,7 +48,7 @@ public class VectorIconsModule extends ReactContextBaseJavaModule {
float scale = context.getResources().getDisplayMetrics().density;
String scaleSuffix = "@" + (scale == (int) scale ? Integer.toString((int) scale) : Float.toString(scale)) + "x";
int size = Math.round(fontSize*scale);
String cacheKey = fontFile + ":" + glyph + ":" + color;
String cacheKey = fontFamily + ":" + glyph + ":" + color;
String hash = Integer.toString(cacheKey.hashCode(), 32);
String cacheFilePath = cacheFolderPath + hash + "_" + Integer.toString(fontSize) + scaleSuffix + ".png";
String cacheFileUrl = "file://" + cacheFilePath;
@@ -57,7 +58,7 @@ public class VectorIconsModule extends ReactContextBaseJavaModule {
callback.invoke(null, cacheFileUrl);
} else {
FileOutputStream fos = null;
Typeface typeface = this.getOrCreateTypeface(fontFile, context);
Typeface typeface = ReactFontManager.getInstance().getTypeface(fontFamily, 0, context.getAssets());
Paint paint = new Paint();
paint.setTypeface(typeface);
paint.setColor(color);
@@ -97,19 +98,4 @@ public class VectorIconsModule extends ReactContextBaseJavaModule {
}
}
public static Typeface getOrCreateTypeface(String fontFile, Context context) {
if (sTypefaceCache.get(fontFile) != null) {
return sTypefaceCache.get(fontFile);
}
try {
Typeface typeface = Typeface.createFromAsset(context.getAssets(), fontFile);
sTypefaceCache.put(fontFile, typeface);
return typeface;
} catch (Exception ex) {
Log.e(REACT_CLASS, "Error: " + ex.toString());
}
return null;
}
}

2
lib/create-icon-set.js
View File

@@ -178,7 +178,7 @@ function createIconSet(glyphMap : Object, fontFamily : string, fontFile : string
if(!cached || cached instanceof Error ) { reject(cached); }
return resolve({ uri: cached });
}
NativeIconAPI.getImageForFont(Platform.OS === 'android' ? fontFile : fontFamily, glyph, size, color, function(err, image) {
NativeIconAPI.getImageForFont(fontReference, glyph, size, color, function(err, image) {
if(typeof err === 'string') {
err = new Error(err);
}