remodeling 更新

BFRImageViewController/BFRBackLoadedImageSource.h

@@ -9,14 +9,16 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+typedef void(^onHiResDownloadComplete)(UIImage * _Nullable,  NSError * _Nullable);
+
 /*! This class allows you to show an image that you already have available initially, while loading a higher fidelity version in the background which will replace the lower fidelity one. This class assumes that the new image will have the same aspect ratio as the old one. */
 @interface BFRBackLoadedImageSource : NSObject
 
 /*! The image that is available for use right away. */
 @property (strong, nonatomic, readonly, nonnull) UIImage *image;
 
-/*! This is called on the main thread when the higher resolution image is finished loading. */
-@property (copy) void (^ _Nonnull onHighResImageLoaded)(UIImage * _Nullable highResImage);
+/*! This is called on the main thread when the higher resolution image is finished loading. Assign to this if you wish to do any specific logic when the download completes. NOTE: Do not attempt to assign the image to any @c BFRImageContainerViewController, this is done for you. Use this block soley for any other business logic you might have to carry out. */
+@property (copy) onHiResDownloadComplete _Nullable onCompletion;
 
 /*! Use initWithInitialImage:hiResURL instead. */
 - (instancetype _Nullable)init NS_UNAVAILABLE;

BFRImageViewController/BFRBackLoadedImageSource.m

@@ -7,6 +7,7 @@
 //
 
 #import "BFRBackLoadedImageSource.h"
+#import "BFRImageViewerConstants.h"
 #import <UIKit/UIKit.h>
 #import <PINRemoteImage/PINRemoteImage.h>
 #import <PINRemoteImage/PINImageView+PINRemoteImage.h>
@@ -24,6 +25,7 @@ @interface BFRBackLoadedImageSource()
 @implementation BFRBackLoadedImageSource
 
 #pragma mark - Initializers
+
 - (instancetype)initWithInitialImage:(UIImage *)image hiResURL:(NSURL *)url {
     self = [super init];
 
@@ -38,18 +40,23 @@ - (instancetype)initWithInitialImage:(UIImage *)image hiResURL:(NSURL *)url {
 }
 
 #pragma mark - Backloading
+
 - (void)loadHighFidelityImage {
     [[PINRemoteImageManager sharedImageManager] downloadImageWithURL:self.url options:PINRemoteImageManagerDisallowAlternateRepresentations progressDownload:nil completion:^(PINRemoteImageManagerResult * _Nonnull result) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            if (result.image) {
-                if (self.onHighResImageLoaded != nil) {
-                    dispatch_async(dispatch_get_main_queue(), ^ {
-                        self.onHighResImageLoaded(result.image);
-                    });
+            if (self.onCompletion != nil) {
+                if (result.image) {
+                    self.onCompletion(result.image, nil);
+                } else {
+                    NSLog(@"BFRImageViewer: Unable to load high resolution photo via backloading.");
+                    NSError *downloadError = [NSError errorWithDomain:HI_RES_IMG_ERROR_DOMAIN
+                                                                 code:HI_RES_IMG_ERROR_CODE
+                                                             userInfo:@{NSLocalizedFailureReasonErrorKey:[NSString stringWithFormat:@"Failed to download an image for high resolution url %@", self.url.absoluteString]}];
+                    self.onCompletion(nil, downloadError);
                 }
-            } else {
-                NSLog(@"BFRImageViewer: Unable to load high resolution photo via backloading.");
             }
+
+            [[NSNotificationCenter defaultCenter] postNotificationName:NOTE_HI_RES_IMG_DOWNLOADED object:result.image];
         });
     }];
 }

BFRImageViewController/BFRImageContainerViewController.h

@@ -8,24 +8,41 @@
 
 #import <UIKit/UIKit.h>
 
+typedef NS_ENUM(NSUInteger, BFRImageAssetType) {
+    BFRImageAssetTypeImage,
+    BFRImageAssetTypeRemoteImage,
+    BFRImageAssetTypeGIF,
+    BFRImageAssetTypeLivePhoto,
+    BFRImageAssetTypeUnknown
+};
+
 /*! This class holds an image to view, if you need an image viewer alloc @C BFRImageViewController instead. This class isn't meant to instanitated outside of it. */
 @interface BFRImageContainerViewController : UIViewController
 
 /*! Source of the image, which should either be @c NSURL or @c UIIimage. */
-@property (strong, nonatomic, nonnull) id imgSrc;
+@property(strong, nonatomic, nonnull) id imgSrc;
+
+/*! The type of asset that is being represented by the given @p imgSrc. */
+@property(nonatomic, assign) BFRImageAssetType assetType;
 
 /*! This will determine whether to change certain behaviors for 3D touch considerations based on its value. */
-@property (nonatomic, getter=isBeingUsedFor3DTouch) BOOL usedFor3DTouch;
+@property(nonatomic, getter=isBeingUsedFor3DTouch) BOOL usedFor3DTouch;
 
 /*! A helper integer to simplify using this view controller inside a @c UIPagerViewController when swiping between views. */
-@property (nonatomic, assign) NSUInteger pageIndex;
+@property(nonatomic, assign) NSUInteger pageIndex;
 
-/*! Assigning YES to this property will make the background transparent. */
-@property (nonatomic, getter=isUsingTransparentBackground) BOOL useTransparentBackground;
+/*! Assigning YES to this property will make the background transparent. You typically don't set this property yourself, instead, the value is derived from the containing @c BFRImageViewController instance. */
+@property(nonatomic, getter=isUsingTransparentBackground) BOOL useTransparentBackground;
+
+/*! Assigning YES to this property will disable long pressing media to present the activity view controller. You typically don't set this property yourself, instead, the value is derived from the containing @c BFRImageViewController instance. */
+@property(nonatomic, getter=shouldDisableSharingLongPress) BOOL disableSharingLongPress;
 
 /*! If there is more than one image in the containing @c BFRImageViewController - this property is set to YES to make swiping from image to image easier. */
-@property (nonatomic, getter=shouldDisableHorizontalDrag) BOOL disableHorizontalDrag;
+@property(nonatomic, getter=shouldDisableHorizontalDrag) BOOL disableHorizontalDrag;
+
+@property(strong, nonatomic, nullable) NSURLSessionConfiguration *configuration;
 
-@property (strong, nonatomic, nullable) NSURLSessionConfiguration *configuration;
+/*! Assigning YES to this property will disable autoplay for live photos when it used with 3DTouch peek feature */
+@property(nonatomic, getter=shouldDisableAutoplayForLivePhoto) BOOL disableAutoplayForLivePhoto;
 
 @end