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' into wz366-master 

# Conflicts:
#	package.json
This commit is contained in:
Dylan Vann 2017-11-29 22:34:02 -05:00
parent ddd57d32e1 40b4c88585
commit b45acef707
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,6 +142,7 @@ class FastImageViewManager extends SimpleViewManager<ImageViewWithUrl> implement
Glide
.with(view.getContext().getApplicationContext())
.load(glideUrl)
.dontTransform()
.priority(priority)
.placeholder(TRANSPARENT_DRAWABLE)
.listener(LISTENER)

6
example/index.js
View File

@ -1,4 +1,4 @@
import { AppRegistry } from 'react-native';
import App from './App';
import { AppRegistry } from 'react-native'
import App from './App'
AppRegistry.registerComponent('example', () => App);
AppRegistry.registerComponent('example', () => App)

4
package.json
View File

@ -30,11 +30,11 @@
"url": "git+https://github.com/DylanVann/react-native-fast-image.git"
},
"scripts": {
"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 ./example/fastImage/*.js ./server/*.js",
"prepare": "git submodule update --init --recursive",
"test": "yarn run test:pretty && yarn run test:jest",
"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 ./example/fastImage/*.js ./server/*.js"
},
"dependencies": {
"prop-types": "^15.5.10"