zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-03 23:16:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'uxbert/5.5.1-load-image-from-url' into fix-display-none

Browse Source 
# Conflicts:
#	android/src/main/java/com/horcrux/svg/ImageShadowNode.java
#	ios/Elements/RNSVGImage.m
This commit is contained in:
Mikael Sand
2018-03-18 23:14:29 +02:00
parent ca9855b1cd 77ebefb650
commit 40a17c838d
4 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/src/main/java/com/horcrux/svg/ImageShadowNode.java
+10 -3
View File
@@ -32,6 +32,7 @@ import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.common.ReactConstants;
import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
import com.facebook.react.views.imagehelper.ImageSource;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -50,6 +51,7 @@ class ImageShadowNode extends RenderableShadowNode {
private String mW;
private String mH;
private Uri mUri;
private String uriString;
private int mImageWidth;
private int mImageHeight;
private String mAlign;
@@ -90,7 +92,7 @@ class ImageShadowNode extends RenderableShadowNode {
@ReactProp(name = "src")
public void setSrc(@Nullable ReadableMap src) {
if (src != null) {
String uriString = src.getString("uri");
uriString = src.getString("uri");
if (uriString == null || uriString.isEmpty()) {
//TODO: give warning about this
@@ -147,7 +149,9 @@ class ImageShadowNode extends RenderableShadowNode {
@Override
public void draw(final Canvas canvas, final Paint paint, final float opacity) {
if (!mLoading.get()) {
final ImageRequest request = ImageRequestBuilder.newBuilderWithSource(mUri).build();
final ImageSource imageSource = new ImageSource(getThemedContext(), uriString);
final ImageRequest request = ImageRequestBuilder.newBuilderWithSource(imageSource.getUri()).build();
if (Fresco.getImagePipeline().isInBitmapMemoryCache(request)) {
tryRender(request, canvas, paint, opacity * mOpacity);
} else {
@@ -170,7 +174,10 @@ class ImageShadowNode extends RenderableShadowNode {
@Override
public void onNewResultImpl(Bitmap bitmap) {
mLoading.set(false);
bitmapTryRender(bitmap, canvas, paint, opacity * mOpacity);
SvgViewShadowNode shadowNode = getSvgShadowNode();
if(shadowNode != null) {
shadowNode.markUpdated();
}
}
@Override