Merge pull request #6 from rmrs/add_photo_timestamp_prop

erezrokah · web-flow · commit e615b9856bbe · 2017-10-29T00:19:51.000+03:00
Add photo timestamp prop
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ https://github.com/invertase/react-native-firebase
 
 For iOS add the following pod to your podfile:
 ```
-pod 'FirebaseUI/Storage'
+pod 'SDWebImage', '~> 4.0'
 ```
 and run pod install.
 
@@ -75,6 +75,7 @@ export class MyFirebaseImageView extends Component<void, void, void> {
       <ImageView
         {...imageProps}
         path='firebase/storage/path'
+        timestamp={0} //optional, can be used to specify last modified time for same storage path
         resizeMode='cover' //'cover', 'contain', 'stretch'
       />
     )
@@ -94,6 +95,7 @@ export class MyFirebasePhotoView extends Component<void, void, void> {
       <PhotoView
         {...imageProps}
         path='firebase/storage/path'
+        timestamp={0} //optional, can be used to specify last modified time for same storage path
         resizeMode='cover' //'cover', 'contain', 'stretch'
       />
     )
diff --git a/android/src/main/java/io/rumors/reactnativefirebaseui/storage/ExtendedImageView.java b/android/src/main/java/io/rumors/reactnativefirebaseui/storage/ExtendedImageView.java
@@ -17,6 +17,7 @@
 import com.bumptech.glide.load.resource.bitmap.FitCenter;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.MultiTransformation;
+import com.bumptech.glide.signature.MediaStoreSignature;
 import static com.bumptech.glide.request.RequestOptions.bitmapTransform;
 
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
@@ -27,6 +28,7 @@ public class ExtendedImageView extends ImageView {
   protected String mPath = null;
   protected Map<CornerType, Integer> mBorderRadii = new HashMap<CornerType, Integer>();
   protected ScaleType mScaleType;
+  protected long mTimestamp = 0;
 
   protected ThemedReactContext mContext = null;
 
@@ -39,6 +41,10 @@ public void setPath(String path) {
     mPath = path;
   }
 
+  public void setTimestamp(long timestamp) {
+    mTimestamp = timestamp;
+  }
+
   @Override
   public void setScaleType(ScaleType scaleType) {
     mScaleType = scaleType;
@@ -73,6 +79,8 @@ public void updateView() {
     GlideApp.with(mContext)
             .load(storageReference)
             .apply(bitmapTransform(multi))
+            //(String mimeType, long dateModified, int orientation)
+            .signature(new MediaStoreSignature("", mTimestamp, 0))
             .into(this);
   }
 }
diff --git a/android/src/main/java/io/rumors/reactnativefirebaseui/storage/ExtendedPhotoView.java b/android/src/main/java/io/rumors/reactnativefirebaseui/storage/ExtendedPhotoView.java
@@ -17,6 +17,7 @@
 import com.bumptech.glide.load.resource.bitmap.FitCenter;
 import com.bumptech.glide.load.resource.bitmap.CenterCrop;
 import com.bumptech.glide.load.MultiTransformation;
+import com.bumptech.glide.signature.MediaStoreSignature;
 import static com.bumptech.glide.request.RequestOptions.bitmapTransform;
 
 import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
@@ -27,6 +28,7 @@ public class ExtendedPhotoView extends PhotoView {
   protected String mPath = null;
   protected Map<CornerType, Integer> mBorderRadii = new HashMap<CornerType, Integer>();
   protected ScaleType mScaleType;
+  protected long mTimestamp = 0;
 
   protected ThemedReactContext mContext = null;
 
@@ -39,6 +41,10 @@ public void setPath(String path) {
     mPath = path;
   }
 
+  public void setTimestamp(long timestamp) {
+    mTimestamp = timestamp;
+  }
+
   @Override
   public void setScaleType(ScaleType scaleType) {
     mScaleType = scaleType;
@@ -72,6 +78,8 @@ public void updateView() {
     GlideApp.with(mContext)
             .load(storageReference)
             .apply(bitmapTransform(multi))
+            //(String mimeType, long dateModified, int orientation)
+            .signature(new MediaStoreSignature("", mTimestamp, 0))
             .into(this);
   }
 }
diff --git a/android/src/main/java/io/rumors/reactnativefirebaseui/storage/FirebaseImageViewManager.java b/android/src/main/java/io/rumors/reactnativefirebaseui/storage/FirebaseImageViewManager.java
@@ -32,6 +32,11 @@ public void setPath(ExtendedImageView imageView, @Nullable String path) {
     imageView.setPath(path);
   }
 
+  @ReactProp(name = "timestamp")
+  public void setTimestamp(ExtendedImageView imageView, @Nullable double timestamp) {
+    imageView.setTimestamp((long)timestamp);
+  }
+
   @ReactProp(name = ViewProps.RESIZE_MODE)
   public void setResizeMode(ExtendedImageView imageView, @Nullable String resizeMode) {
     ScaleType scaleType = ScaleType.CENTER_INSIDE;
diff --git a/android/src/main/java/io/rumors/reactnativefirebaseui/storage/FirebasePhotoViewManager.java b/android/src/main/java/io/rumors/reactnativefirebaseui/storage/FirebasePhotoViewManager.java
@@ -33,6 +33,11 @@ public void setPath(ExtendedPhotoView imageView, @Nullable String path) {
     imageView.setPath(path);
   }
 
+  @ReactProp(name = "timestamp")
+  public void setTimestamp(ExtendedImageView imageView, @Nullable double timestamp) {
+    imageView.setTimestamp((long)timestamp);
+  }
+
   @ReactProp(name = ViewProps.RESIZE_MODE)
   public void setResizeMode(ExtendedPhotoView imageView, @Nullable String resizeMode) {
     ScaleType scaleType = ScaleType.CENTER_INSIDE;
diff --git a/index.js b/index.js
@@ -6,6 +6,7 @@ var iface = {
   propTypes: {
     ...Image.propTypes,
     path: PropTypes.string,
+    timestamp: PropTypes.number,
     resizeMode: PropTypes.oneOf(['cover', 'contain', 'stretch']),
   },
 }
diff --git a/ios/FirebaseUIImageView.h b/ios/FirebaseUIImageView.h
@@ -7,14 +7,13 @@
 //
 
 #import "Firebase.h"
-#import <FirebaseStorageUI/FirebaseStorageUI.h>
 
 #import <React/RCTResizeMode.h>
 
 @interface FirebaseImageView : UIImageView
 
 @property (nonatomic, copy) NSString *path;
+@property (nonatomic, strong) NSNumber *timestamp;
 @property (nonatomic, assign) RCTResizeMode resizeMode;
 
 @end
-
diff --git a/ios/FirebaseUIImageView.m b/ios/FirebaseUIImageView.m
@@ -9,29 +9,32 @@
 
 #import "FirebaseUIImageView.h"
 #import "Firebase.h"
-#import <FirebaseStorageUI/FirebaseStorageUI.h>
+#import "UIImageView+FirebaseStorage.h"
 
 @implementation FirebaseImageView
+{
+    BOOL _needsReload;
+}
 
 - (void)setPath:(NSString *)path
 {
     _path = path;
-    
-    // Reference to an image file in Firebase Storage
-    FIRStorageReference *reference = [[FIRStorage storage] referenceWithPath:_path];
-    
-    // Placeholder image
-    UIImage *placeholderImage;
-    
-    // Load the image using SDWebImage
-    [self sd_setImageWithStorageReference:reference placeholderImage:placeholderImage];
+
+    _needsReload = YES;
+}
+
+-(void)setTimestamp:(NSNumber*)timestamp
+{
+    _timestamp = timestamp;
+
+    _needsReload = YES;
 }
 
 - (void)setResizeMode:(RCTResizeMode)resizeMode
 {
     if (_resizeMode != resizeMode) {
         _resizeMode = resizeMode;
-        
+
         if (_resizeMode == RCTResizeModeRepeat) {
             // Repeat resize mode is handled by the UIImage. Use scale to fill
             // so the repeated image fills the UIImageView.
@@ -44,4 +47,22 @@ - (void)setResizeMode:(RCTResizeMode)resizeMode
     }
 }
 
+- (void)didSetProps:(NSArray<NSString *> *)changedProps
+{
+    if (_needsReload) {
+        [self reloadImage];
+    }
+}
+
+-(void)reloadImage
+{
+    _needsReload = NO;
+    // Reference to an image file in Firebase Storage
+    FIRStorageReference *reference = [[FIRStorage storage] referenceWithPath:_path];
+
+    // Load the image using SDWebImage
+    NSString* timestamp = [_timestamp stringValue];
+    [self sd_setImageWithStorageReference:reference customKey:timestamp];
+}
+
 @end
diff --git a/ios/RCTFirebaseImageViewManager.m b/ios/RCTFirebaseImageViewManager.m
@@ -14,12 +14,14 @@ @implementation RCTFirebaseImageViewManager
 
 RCT_EXPORT_MODULE()
 RCT_EXPORT_VIEW_PROPERTY(path, NSString)
+RCT_EXPORT_VIEW_PROPERTY(timestamp, NSNumber)
 RCT_EXPORT_VIEW_PROPERTY(resizeMode, RCTResizeMode)
 
+
 - (UIView *)view
 {
     FirebaseImageView *imageView = [[FirebaseImageView alloc] init];
-    
+
     return imageView;
 }
 
diff --git a/ios/RNFirebaseUi.xcodeproj/project.pbxproj b/ios/RNFirebaseUi.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		B3E7B58A1CC2AC0600A0062D /* RCTFirebaseImageViewManager.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RCTFirebaseImageViewManager.m */; };
 		BA04DF251F1506A800122A3C /* FirebaseUIImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = BA04DF241F1506A800122A3C /* FirebaseUIImageView.m */; };
+		BAC95E541FA3D2C400E33F4D /* UIImageView+FirebaseStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = BAC95E511FA3D2C300E33F4D /* UIImageView+FirebaseStorage.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -29,6 +30,8 @@
 		BA04DF241F1506A800122A3C /* FirebaseUIImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FirebaseUIImageView.m; sourceTree = "<group>"; };
 		BA04DF261F1506CE00122A3C /* FirebaseUIImageView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseUIImageView.h; sourceTree = "<group>"; };
 		BA43A3101F14BB0300791965 /* RCTFirebaseImageViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTFirebaseImageViewManager.h; sourceTree = "<group>"; };
+		BAC95E511FA3D2C300E33F4D /* UIImageView+FirebaseStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+FirebaseStorage.m"; sourceTree = "<group>"; };
+		BAC95E531FA3D2C300E33F4D /* UIImageView+FirebaseStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+FirebaseStorage.h"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -53,6 +56,8 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				BAC95E531FA3D2C300E33F4D /* UIImageView+FirebaseStorage.h */,
+				BAC95E511FA3D2C300E33F4D /* UIImageView+FirebaseStorage.m */,
 				BA04DF261F1506CE00122A3C /* FirebaseUIImageView.h */,
 				BA04DF241F1506A800122A3C /* FirebaseUIImageView.m */,
 				B3E7B5891CC2AC0600A0062D /* RCTFirebaseImageViewManager.m */,
@@ -119,6 +124,7 @@
 			files = (
 				B3E7B58A1CC2AC0600A0062D /* RCTFirebaseImageViewManager.m in Sources */,
 				BA04DF251F1506A800122A3C /* FirebaseUIImageView.m in Sources */,
+				BAC95E541FA3D2C400E33F4D /* UIImageView+FirebaseStorage.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/ios/UIImageView+FirebaseStorage.h b/ios/UIImageView+FirebaseStorage.h
diff --git a/ios/UIImageView+FirebaseStorage.m b/ios/UIImageView+FirebaseStorage.m
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ var iface = {`
`6`	`6`	`propTypes: {`
`7`	`7`	`...Image.propTypes,`
`8`	`8`	`path: PropTypes.string,`
	`9`	`+ timestamp: PropTypes.number,`
`9`	`10`	`resizeMode: PropTypes.oneOf(['cover', 'contain', 'stretch']),`
`10`	`11`	`},`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,14 @@ @implementation RCTFirebaseImageViewManager`
`14`	`14`
`15`	`15`	`RCT_EXPORT_MODULE()`
`16`	`16`	`RCT_EXPORT_VIEW_PROPERTY(path, NSString)`
	`17`	`+RCT_EXPORT_VIEW_PROPERTY(timestamp, NSNumber)`
`17`	`18`	`RCT_EXPORT_VIEW_PROPERTY(resizeMode, RCTResizeMode)`
`18`	`19`
	`20`	`+`
`19`	`21`	`- (UIView *)view`
`20`	`22`	`{`
`21`	`23`	`FirebaseImageView *imageView = [[FirebaseImageView alloc] init];`
`22`		`-`
	`24`	`+`
`23`	`25`	`return imageView;`
`24`	`26`	`}`
`25`	`27`