Skip to content

Add header support for Android #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add header support for Android #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions android/src/main/java/org/vovkasm/WebImage/WebImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.animation.GlideAnimation;
import com.bumptech.glide.request.target.ViewTarget;
import com.bumptech.glide.load.model.GlideUrl;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.WritableMap;
import com.facebook.react.uimanager.FloatUtil;
Expand All @@ -41,7 +42,7 @@ class WebImageView extends View {
public static final int DEFAULT_BORDER_COLOR = Color.TRANSPARENT;
public static final float DEFAULT_BORDER_RADIUS = 0f;

private Uri mUri;
private GlideUrl mUri;
private @ScaleType int mScaleType = SCALE_CONTAIN;

private BoxMetrics mBoxMetrics;
Expand Down Expand Up @@ -150,7 +151,7 @@ public void setScaleType(@ScaleType int scaleType) {
return mScaleType;
}

void setImageUri(Uri uri) {
void setImageUri(GlideUrl uri) {
if (uri.equals(mUri)) return;
mUri = uri;
ThemedReactContext ctx = getThemedReactContext();
Expand All @@ -164,7 +165,7 @@ void setImageUri(Uri uri) {
Glide.with(activity).load(mUri).asBitmap().into(mGlideTarget);
}

final Uri getImageUri() {
final GlideUrl getImageUri() {
return mUri;
}

Expand Down Expand Up @@ -243,7 +244,7 @@ public void onLoadFailed(Exception e, Drawable errorDrawable) {
} else {
event.putString("error", "Unknown");
}
final Uri uri = view.getImageUri();
final GlideUrl uri = view.getImageUri();
if (uri != null) {
event.putString("uri", uri.toString());
}
Expand Down
27 changes: 24 additions & 3 deletions android/src/main/java/org/vovkasm/WebImage/WebImageViewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package org.vovkasm.WebImage;

import android.graphics.Color;
import android.net.Uri;

import com.bumptech.glide.Glide;
import com.bumptech.glide.load.model.GlideUrl;
import com.bumptech.glide.load.model.LazyHeaders;
import com.facebook.react.bridge.NoSuchKeyException;
import com.facebook.react.bridge.ReadableMap;
import com.facebook.react.bridge.ReadableMapKeySetIterator;
import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.uimanager.BaseViewManager;
import com.facebook.react.uimanager.PixelUtil;
Expand Down Expand Up @@ -53,8 +56,26 @@ public Class<? extends WebImageShadowNode> getShadowNodeClass() {
public void setSrc(WebImageView view, @Nullable ReadableMap source) {
if (source == null) return;
final String uriProp = source.getString("uri");
final Uri uri = Uri.parse(uriProp);
view.setImageUri(uri);

// Get the headers prop and add to glideUrl
GlideUrl glideUrl;
try {
final ReadableMap headersMap = source.getMap("headers");
ReadableMapKeySetIterator headersIterator = headersMap.keySetIterator();
LazyHeaders.Builder headersBuilder = new LazyHeaders.Builder();
while (headersIterator.hasNextKey()) {
String key = headersIterator.nextKey();
String value = headersMap.getString(key);
headersBuilder.addHeader(key, value);
}
LazyHeaders headers = headersBuilder.build();
glideUrl = new GlideUrl(uriProp, headers);
} catch (NoSuchKeyException e) {
// If there is no headers object, return just the uri
glideUrl = new GlideUrl(uriProp);
}

view.setImageUri(glideUrl);
}

@ReactProp(name="resizeMode")
Expand Down