status-im
/
react-native-fast-image
mirror of https://github.com/status-im/react-native-fast-image.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wz366/react-native-fast-image into wz366-master

This commit is contained in:
Dylan Vann 2017-11-29 22:23:55 -05:00
parent cf07dd2a82 1d16c7c218
commit f4ab55c3d5
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java
View File

@ -140,7 +140,7 @@ class FastImageViewManager extends SimpleViewManager<ImageViewWithUrl> implement
eventEmitter.receiveEvent(viewId, REACT_ON_LOAD_START_EVENT, new WritableNativeMap()); eventEmitter.receiveEvent(viewId, REACT_ON_LOAD_START_EVENT, new WritableNativeMap());
Glide Glide
.with(view.getContext()) .with(view.getContext().getApplicationContext())
.load(glideUrl) .load(glideUrl)
.priority(priority) .priority(priority)
.placeholder(TRANSPARENT_DRAWABLE) .placeholder(TRANSPARENT_DRAWABLE)

2
ios/FastImage/FFFastImageView.h
View File

@ -2,7 +2,7 @@
#import <SDWebImage/UIImageView+WebCache.h> #import <SDWebImage/UIImageView+WebCache.h>
#import <SDWebImage/SDWebImageDownloader.h> #import <SDWebImage/SDWebImageDownloader.h>
#import "FLAnimatedImageView.h" #import <FLAnimatedImage/FLAnimatedImageView.h>
#import <React/RCTComponent.h> #import <React/RCTComponent.h>
#import <React/RCTResizeMode.h> #import <React/RCTResizeMode.h>

3
package.json
View File

@ -33,7 +33,8 @@
"format": "prettier --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./server/*.js", "format": "prettier --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./server/*.js",
"test": "yarn run test:pretty && yarn run test:jest", "test": "yarn run test:pretty && yarn run test:jest",
"test:jest": "jest *.js", "test:jest": "jest *.js",
"test:pretty": "prettier-check --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./server/*.js" "test:pretty": "prettier-check --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./server/*.js",
"postinstall": "git clone https://github.com/rs/SDWebImage.git ios/Vendor/SDWebImage && cd ios/Vendor/SDWebImage && git submodule update --init --recursive && cd ../../.."
}, },
"dependencies": { "dependencies": {
"prop-types": "^15.5.10" "prop-types": "^15.5.10"