Skip to content

Commit 733eeb3

Browse files
committed
use new glide version and revert code changes to class files
1 parent 6ae763d commit 733eeb3

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

android/build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ dependencies {
4040
implementation 'com.facebook.react:react-native:+'
4141

4242
// glide dependencies
43-
implementation 'com.github.bumptech.glide:glide:4.2.0'
43+
implementation 'com.github.bumptech.glide:glide:4.9.0'
44+
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
4445

4546
// FirebaseUI Storage only
4647
implementation 'com.firebaseui:firebase-ui-storage:3.0.0'

android/src/main/java/io/rumors/reactnativefirebaseui/storage/ExtendedImageView.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
2323
import com.bumptech.glide.load.MultiTransformation;
2424
import com.bumptech.glide.signature.MediaStoreSignature;
25-
import com.bumptech.glide.request.RequestOptions;
25+
import static com.bumptech.glide.request.RequestOptions.bitmapTransform;
2626

2727
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
2828
import jp.wasabeef.glide.transformations.RoundedCornersTransformation.CornerType;
@@ -85,12 +85,12 @@ public void updateView() {
8585

8686
MultiTransformation multi = new MultiTransformation<>(transformationsArray);
8787

88-
Glide .with(mContext)
88+
GlideApp.with(mContext)
8989
.load(storageReference)
90-
.apply(new RequestOptions().placeholder(mDefaultImageDrawable))
91-
.apply(new RequestOptions().bitmapTransform(multi))
90+
.placeholder(mDefaultImageDrawable)
91+
.apply(bitmapTransform(multi))
9292
//(String mimeType, long dateModified, int orientation)
93-
.apply(new RequestOptions().signature(new MediaStoreSignature("", mTimestamp, 0)))
93+
.signature(new MediaStoreSignature("", mTimestamp, 0))
9494
.into(this);
9595
}
9696
}

android/src/main/java/io/rumors/reactnativefirebaseui/storage/ExtendedPhotoView.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.bumptech.glide.load.resource.bitmap.CenterCrop;
2323
import com.bumptech.glide.load.MultiTransformation;
2424
import com.bumptech.glide.signature.MediaStoreSignature;
25-
import com.bumptech.glide.request.RequestOptions;
25+
import static com.bumptech.glide.request.RequestOptions.bitmapTransform;
2626

2727
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
2828
import jp.wasabeef.glide.transformations.RoundedCornersTransformation.CornerType;
@@ -84,12 +84,12 @@ public void updateView() {
8484
Transformation[] transformationsArray = transformations.toArray(new Transformation[transformations.size()]);
8585
MultiTransformation multi = new MultiTransformation<>(transformationsArray);
8686

87-
Glide.with(mContext)
87+
GlideApp.with(mContext)
8888
.load(storageReference)
89-
.apply(new RequestOptions().placeholder(mDefaultImageDrawable))
90-
.apply(new RequestOptions().bitmapTransform(multi))
89+
.placeholder(mDefaultImageDrawable)
90+
.apply(bitmapTransform(multi))
9191
//(String mimeType, long dateModified, int orientation)
92-
.apply(new RequestOptions().signature(new MediaStoreSignature("", mTimestamp, 0)))
92+
.signature(new MediaStoreSignature("", mTimestamp, 0))
9393
.into(this);
9494
}
9595
}

0 commit comments

Comments
 (0)