Skip to content

Commit b45acef

Browse files
committed
Merge branch 'master' into wz366-master
# Conflicts: # package.json
2 parents ddd57d3 + 40b4c88 commit b45acef

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

android/src/main/java/com/dylanvann/fastimage/FastImageViewManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ public void setSrc(ImageViewWithUrl view, @Nullable ReadableMap source) {
142142
Glide
143143
.with(view.getContext().getApplicationContext())
144144
.load(glideUrl)
145+
.dontTransform()
145146
.priority(priority)
146147
.placeholder(TRANSPARENT_DRAWABLE)
147148
.listener(LISTENER)

example/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { AppRegistry } from 'react-native';
2-
import App from './App';
1+
import { AppRegistry } from 'react-native'
2+
import App from './App'
33

4-
AppRegistry.registerComponent('example', () => App);
4+
AppRegistry.registerComponent('example', () => App)

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
"url": "git+https://github.com/DylanVann/react-native-fast-image.git"
3131
},
3232
"scripts": {
33-
"format": "prettier --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./server/*.js",
33+
"format": "prettier --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./example/fastImage/*.js ./server/*.js",
3434
"prepare": "git submodule update --init --recursive",
3535
"test": "yarn run test:pretty && yarn run test:jest",
3636
"test:jest": "jest *.js",
37-
"test:pretty": "prettier-check --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./server/*.js"
37+
"test:pretty": "prettier-check --write --no-semi --single-quote --trailing-comma all ./FastImage.js ./example/*.js ./example/fastImage/*.js ./server/*.js"
3838
},
3939
"dependencies": {
4040
"prop-types": "^15.5.10"

0 commit comments

Comments
 (0)