mirror of
https://github.com/zhigang1992/react-native-vector-icons.git
synced 2026-01-12 22:51:07 +08:00
Fixes issue with RN 0.17-rc ignoring scale file suffix. Fixes #74
This commit is contained in:
@@ -19,6 +19,7 @@ var {
|
||||
requireNativeComponent,
|
||||
NativeModules,
|
||||
Platform,
|
||||
PixelRatio,
|
||||
processColor,
|
||||
} = React;
|
||||
|
||||
@@ -171,12 +172,13 @@ function createIconSet(glyphMap : Object, fontFamily : string, fontFile : string
|
||||
}
|
||||
|
||||
var cacheKey = glyph + ':' + size + ':' + color;
|
||||
var scale = PixelRatio.get();
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
var cached = imageSourceCache[cacheKey];
|
||||
if(typeof cached !== 'undefined') {
|
||||
if(!cached || cached instanceof Error ) { reject(cached); }
|
||||
return resolve({ uri: cached });
|
||||
return resolve({ uri: cached, scale });
|
||||
}
|
||||
NativeIconAPI.getImageForFont(fontReference, glyph, size, color, function(err, image) {
|
||||
if(typeof err === 'string') {
|
||||
@@ -184,7 +186,7 @@ function createIconSet(glyphMap : Object, fontFamily : string, fontFile : string
|
||||
}
|
||||
imageSourceCache[cacheKey] = image || err || false;
|
||||
if(!err && image) {
|
||||
return resolve({ uri: image });
|
||||
return resolve({ uri: image, scale });
|
||||
}
|
||||
reject(err);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user