From 2e38d5ae259fbdb764a9d89636581bd3a2afb274 Mon Sep 17 00:00:00 2001 From: Joel Arvidsson Date: Thu, 17 Dec 2015 19:01:16 +0100 Subject: [PATCH] Fixes issue with RN 0.17-rc ignoring scale file suffix. Fixes #74 --- lib/create-icon-set.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/create-icon-set.js b/lib/create-icon-set.js index c8ba8b5..9ddd8bc 100644 --- a/lib/create-icon-set.js +++ b/lib/create-icon-set.js @@ -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); });