From fa8787dcad95c52c599144bb2a9676bc6eb8b1b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Sklena=CC=81r=CC=8C?= Date: Tue, 24 Nov 2015 17:36:43 +0100 Subject: [PATCH] Use static image resources introduced in React Native 0.14 --- app/helpers/getImage.js | 2 +- .../AuthorAvatar.png | Bin .../AuthorAvatar@2x.png | Bin .../AuthorAvatar@3x.png | Bin .../AuthorAvatar.imageset/Contents.json | 23 ------------------ 5 files changed, 1 insertion(+), 24 deletions(-) rename {ios/DribbbleApp/Images.xcassets/AuthorAvatar.imageset => img}/AuthorAvatar.png (100%) rename iOS/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar-1.png => img/AuthorAvatar@2x.png (100%) rename iOS/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar-2.png => img/AuthorAvatar@3x.png (100%) delete mode 100644 ios/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/Contents.json diff --git a/app/helpers/getImage.js b/app/helpers/getImage.js index 61cfed0..eb20676 100644 --- a/app/helpers/getImage.js +++ b/app/helpers/getImage.js @@ -11,7 +11,7 @@ module.exports = { uri = player.avatar_url; return {uri}; } else { - uri = require('image!AuthorAvatar'); + uri = require('../../img/AuthorAvatar.png'); return uri; } } diff --git a/ios/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar.png b/img/AuthorAvatar.png similarity index 100% rename from ios/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar.png rename to img/AuthorAvatar.png diff --git a/iOS/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar-1.png b/img/AuthorAvatar@2x.png similarity index 100% rename from iOS/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar-1.png rename to img/AuthorAvatar@2x.png diff --git a/iOS/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar-2.png b/img/AuthorAvatar@3x.png similarity index 100% rename from iOS/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/AuthorAvatar-2.png rename to img/AuthorAvatar@3x.png diff --git a/ios/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/Contents.json b/ios/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/Contents.json deleted file mode 100644 index bbdc89d..0000000 --- a/ios/DribbbleApp/Images.xcassets/AuthorAvatar.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "AuthorAvatar.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "AuthorAvatar-1.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "AuthorAvatar-2.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file