Using AutoLayout for progressView since [UIScreen mainScreen].bounds …

Classes/IDMCaptionView.h

@@ -11,6 +11,9 @@
 
 @interface IDMCaptionView : UIView
 
+@property (nonatomic, strong) UILabel *label;
+@property (nonatomic, strong, readonly) id<IDMPhoto> photo;
+
 // Init
 - (id)initWithPhoto:(id<IDMPhoto>)photo;
 

Classes/IDMCaptionView.m

@@ -13,14 +13,17 @@
 static const CGFloat labelPadding = 10;
 
 // Private
-@interface IDMCaptionView () {
-    id<IDMPhoto> _photo;
-    UILabel *_label;    
-}
+@interface IDMCaptionView ()
+
+@property (nonatomic, strong, readwrite) id<IDMPhoto> photo;
+
 @end
 
 @implementation IDMCaptionView
 
+@synthesize label = _label;
+@synthesize photo = _photo;
+
 - (id)initWithPhoto:(id<IDMPhoto>)photo {
     CGRect screenBound = [[UIScreen mainScreen] bounds];
     CGFloat screenWidth = screenBound.size.width;
@@ -52,21 +55,11 @@ - (CGSize)sizeThatFits:(CGSize)size {
     /*CGSize textSizeOLD = [_label.text sizeWithFont:_label.font
                               constrainedToSize:CGSizeMake(size.width - labelPadding*2, maxHeight)
                                   lineBreakMode:_label.lineBreakMode];*/
-
-    NSString *text = _label.text;
+
     CGFloat width = size.width - labelPadding*2;
-    UIFont *font = _label.font;
-
-    NSAttributedString *attributedText = [[NSAttributedString alloc] initWithString:text
-                                                                         attributes:@{NSFontAttributeName: font}];
-
-    CGRect rect = [attributedText boundingRectWithSize:(CGSize){width, maxHeight}
-                                               options:NSStringDrawingUsesLineFragmentOrigin
-                                               context:nil];
-
-    CGSize textSize = rect.size;
 
-    return CGSizeMake(size.width, textSize.height + labelPadding * 2);
+    CGFloat height = [_label sizeThatFits:CGSizeMake(width, CGFLOAT_MAX)].height;
+    return CGSizeMake(size.width, height + labelPadding * 2);
 }
 
 - (void)setupCaption {

Classes/IDMPBLocalizations.bundle/nl.lproj/Localizable.strings

@@ -14,7 +14,7 @@
 "Dismiss" = "Annuleer";
 
 /* No comment provided by engineer. */
-"Done" = "Klaae";
+"Done" = "Klaar";
 
 /* No comment provided by engineer. */
 "Email" = "E-mail";

Classes/IDMPhoto.m

@@ -136,19 +136,20 @@ - (void)loadUnderlyingImageAndNotify {
             [self performSelectorInBackground:@selector(loadImageFromFileAsync) withObject:nil];
         } else if (_photoURL) {
             // Load async from web (using SDWebImageManager)
-            SDWebImageManager *manager = [SDWebImageManager sharedManager];
-            [manager downloadImageWithURL:_photoURL options:SDWebImageRetryFailed|SDWebImageHandleCookies progress:^(NSInteger receivedSize, NSInteger expectedSize) {
-                CGFloat progress = ((CGFloat)receivedSize)/((CGFloat)expectedSize);
-                if (self.progressUpdateBlock) {
-                    self.progressUpdateBlock(progress);
-                }
-            } completed:^(UIImage *image, NSError *error, SDImageCacheType cacheType, BOOL finished, NSURL *imageURL) {
-                if (image) {
-                    self.underlyingImage = image;
-                    [self performSelectorOnMainThread:@selector(imageLoadingComplete) withObject:nil waitUntilDone:NO];
-                }
-            }];
-
+
+			[[SDWebImageManager sharedManager] loadImageWithURL:_photoURL options:SDWebImageRetryFailed progress:^(NSInteger receivedSize, NSInteger expectedSize, NSURL * _Nullable targetURL) {
+				CGFloat progress = ((CGFloat)receivedSize)/((CGFloat)expectedSize);
+
+				if (self.progressUpdateBlock) {
+					self.progressUpdateBlock(progress);
+				}
+			} completed:^(UIImage * _Nullable image, NSData * _Nullable data, NSError * _Nullable error, SDImageCacheType cacheType, BOOL finished, NSURL * _Nullable imageURL) {
+				if (image) {
+					self.underlyingImage = image;
+				}
+
+				[self performSelectorOnMainThread:@selector(imageLoadingComplete) withObject:nil waitUntilDone:NO];
+			}];
         } else {
             // Failed - no source
             self.underlyingImage = nil;

Classes/IDMPhotoBrowser.h

@@ -12,6 +12,7 @@
 #import "IDMPhoto.h"
 #import "IDMPhotoProtocol.h"
 #import "IDMCaptionView.h"
+#import "IDMTapDetectingImageView.h"
 
 // Delgate
 @class IDMPhotoBrowser;
@@ -24,6 +25,7 @@
 - (void)photoBrowser:(IDMPhotoBrowser *)photoBrowser willDismissAtPageIndex:(NSUInteger)index;
 - (void)photoBrowser:(IDMPhotoBrowser *)photoBrowser didDismissActionSheetWithButtonIndex:(NSUInteger)buttonIndex photoIndex:(NSUInteger)photoIndex;
 - (IDMCaptionView *)photoBrowser:(IDMPhotoBrowser *)photoBrowser captionViewForPhotoAtIndex:(NSUInteger)index;
+- (void)photoBrowser:(IDMPhotoBrowser *)photoBrowser imageFailed:(NSUInteger)index imageView:(IDMTapDetectingImageView *)imageView;
 @end
 
 // IDMPhotoBrowser
@@ -40,12 +42,15 @@
 @property (nonatomic, strong) NSArray *actionButtonTitles;
 @property (nonatomic, weak) UIImage *leftArrowImage, *leftArrowSelectedImage;
 @property (nonatomic, weak) UIImage *rightArrowImage, *rightArrowSelectedImage;
+@property (nonatomic, weak) UIImage *actionButtonImage, *actionButtonSelectedImage;
 
 // View customization
 @property (nonatomic) BOOL displayDoneButton;
 @property (nonatomic) BOOL useWhiteBackgroundColor;
 @property (nonatomic, weak) UIImage *doneButtonImage;
 @property (nonatomic, weak) UIColor *trackTintColor, *progressTintColor;
+@property (nonatomic, assign) CGFloat doneButtonRightInset, doneButtonTopInset;
+@property (nonatomic, assign) CGSize doneButtonSize;
 
 @property (nonatomic, weak) UIImage *scaleImage;
 

Classes/IDMPhotoBrowser.m

@@ -9,6 +9,7 @@
 #import <QuartzCore/QuartzCore.h>
 #import "IDMPhotoBrowser.h"
 #import "IDMZoomingScrollView.h"
+#import "IDMUtils.h"
 
 #import "pop/POP.h"
 
@@ -62,6 +63,7 @@ @interface IDMPhotoBrowser () {
     BOOL _viewIsActive; // active as in it's in the view heirarchy
     BOOL _autoHide;
     NSInteger _initalPageIndex;
+    CGFloat _statusBarHeight;
 
     BOOL _isdraggingPhoto;
 
@@ -134,7 +136,7 @@ @implementation IDMPhotoBrowser
 
 // Properties
 @synthesize displayDoneButton = _displayDoneButton, displayToolbar = _displayToolbar, displayActionButton = _displayActionButton, displayCounterLabel = _displayCounterLabel, useWhiteBackgroundColor = _useWhiteBackgroundColor, doneButtonImage = _doneButtonImage;
-@synthesize leftArrowImage = _leftArrowImage, rightArrowImage = _rightArrowImage, leftArrowSelectedImage = _leftArrowSelectedImage, rightArrowSelectedImage = _rightArrowSelectedImage;
+@synthesize leftArrowImage = _leftArrowImage, rightArrowImage = _rightArrowImage, leftArrowSelectedImage = _leftArrowSelectedImage, rightArrowSelectedImage = _rightArrowSelectedImage, actionButtonImage = _actionButtonImage, actionButtonSelectedImage = _actionButtonSelectedImage;
 @synthesize displayArrowButton = _displayArrowButton, actionButtonTitles = _actionButtonTitles;
 @synthesize arrowButtonsChangePhotosAnimated = _arrowButtonsChangePhotosAnimated;
 @synthesize forceHideStatusBar = _forceHideStatusBar;
@@ -189,6 +191,13 @@ - (id)init {
         _scaleImage = nil;
 
         _isdraggingPhoto = NO;
+
+        _statusBarHeight = 20.f;
+        _doneButtonRightInset = 20.f;
+        // relative to status bar and safeAreaInsets
+        _doneButtonTopInset = 10.f;
+
+        _doneButtonSize = CGSizeMake(55.f, 26.f);
 
 		if ([self respondsToSelector:@selector(automaticallyAdjustsScrollViewInsets)]) {
             self.automaticallyAdjustsScrollViewInsets = NO;
@@ -371,6 +380,11 @@ - (void)performPresentAnimation {
     resizableImageView.clipsToBounds = YES;
     resizableImageView.contentMode = _senderViewForAnimation ? _senderViewForAnimation.contentMode : UIViewContentModeScaleAspectFill;
     resizableImageView.backgroundColor = [UIColor clearColor];
+    if (@available(iOS 11.0, *)) {
+        resizableImageView.accessibilityIgnoresInvertColors = YES;
+    } else {
+        // Fallback on earlier versions
+    }
     [_applicationWindow addSubview:resizableImageView];
     _senderViewForAnimation.hidden = YES;
 
@@ -428,6 +442,11 @@ - (void)performCloseAnimationWithScrollView:(IDMZoomingScrollView*)scrollView {
     resizableImageView.contentMode = _senderViewForAnimation ? _senderViewForAnimation.contentMode : UIViewContentModeScaleAspectFill;
     resizableImageView.backgroundColor = [UIColor clearColor];
     resizableImageView.clipsToBounds = YES;
+    if (@available(iOS 11.0, *)) {
+        resizableImageView.accessibilityIgnoresInvertColors = YES;
+    } else {
+        // Fallback on earlier versions
+    }
     [_applicationWindow addSubview:resizableImageView];
     self.view.hidden = YES;
 
@@ -474,8 +493,19 @@ - (CGRect)animationFrameForImage:(UIImage *)image presenting:(BOOL)presenting sc
 
     CGSize imageSize = image.size;
 
-    CGFloat maxWidth = CGRectGetWidth(_applicationWindow.bounds);
-    CGFloat maxHeight = CGRectGetHeight(_applicationWindow.bounds);
+    CGRect bounds = _applicationWindow.bounds;
+    // adjust bounds as the photo browser does
+    if (@available(iOS 11.0, *)) {
+        // use the windows safe area inset
+        UIWindow *window = [UIApplication sharedApplication].keyWindow;
+        UIEdgeInsets insets = UIEdgeInsetsMake(_statusBarHeight, 0, 0, 0);
+        if (window != NULL) {
+            insets = window.safeAreaInsets;
+        }
+        bounds = [self adjustForSafeArea:bounds adjustForStatusBar:NO forInsets:insets];
+    }
+    CGFloat maxWidth = CGRectGetWidth(bounds);
+    CGFloat maxHeight = CGRectGetHeight(bounds);
 
     CGRect animationFrame = CGRectZero;
 
@@ -493,7 +523,6 @@ - (CGRect)animationFrameForImage:(UIImage *)image presenting:(BOOL)presenting sc
     if (!presenting) {
         animationFrame.origin.y += scrollView.frame.origin.y;
     }
-
     return animationFrame;
 }
 
@@ -611,6 +640,7 @@ - (void)viewDidLoad {
         _doneButton.layer.cornerRadius = 3.0f;
         _doneButton.layer.borderColor = [UIColor colorWithWhite:0.9 alpha:0.9].CGColor;
         _doneButton.layer.borderWidth = 1.0f;
+        _doneButtonSize = _doneButton.frame.size;
     }
     else {
         [_doneButton setImage:_doneButtonImage forState:UIControlStateNormal];
@@ -657,9 +687,16 @@ - (void)viewDidLoad {
     _counterButton = [[UIBarButtonItem alloc] initWithCustomView:_counterLabel];
 
     // Action Button
-    _actionButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction
+    if(_actionButtonImage != nil && _actionButtonSelectedImage != nil) {
+        _actionButton = [[UIBarButtonItem alloc] initWithCustomView:[self customToolbarButtonImage:_actionButtonImage
+                                                                                   imageSelected:_actionButtonSelectedImage
+                                                                                          action:@selector(actionButtonPressed:)]];
+    }
+    else {
+        _actionButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction
                                                                   target:self
                                                                   action:@selector(actionButtonPressed:)];
+    }
 
     // Gesture
     _panGesture = [[UIPanGestureRecognizer alloc] initWithTarget:self action:@selector(panGestureRecognized:)];
@@ -938,6 +975,12 @@ - (void)handleIDMPhotoLoadingDidEndNotification:(NSNotification *)notification {
         } else {
             // Failed to load
             [page displayImageFailure];
+            if ([_delegate respondsToSelector:@selector(photoBrowser:imageFailed:imageView:)]) {
+                NSUInteger pageIndex = PAGE_INDEX(page);
+                [_delegate photoBrowser:self imageFailed:pageIndex imageView:page.photoImageView];
+            }
+            // make sure the page is completely updated
+            [page setNeedsLayout];
         }
     }
 }
@@ -1028,7 +1071,9 @@ - (void)configurePage:(IDMZoomingScrollView *)page forIndex:(NSUInteger)index {
     __block __weak IDMPhoto *photo = (IDMPhoto*)page.photo;
     __weak IDMZoomingScrollView* weakPage = page;
     photo.progressUpdateBlock = ^(CGFloat progress){
-        [weakPage setProgress:progress forPhoto:photo];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakPage setProgress:progress forPhoto:photo];
+        });
     };
 }
 
@@ -1060,6 +1105,7 @@ - (CGRect)frameForPagingScrollView {
     CGRect frame = self.view.bounds;
     frame.origin.x -= PADDING;
     frame.size.width += (2 * PADDING);
+    frame = [self adjustForSafeArea:frame adjustForStatusBar:false];
     return frame;
 }
 
@@ -1098,16 +1144,18 @@ - (CGRect)frameForToolbarAtOrientation:(UIInterfaceOrientation)orientation {
     if ([self isLandscape:orientation])
         height = 32;
 
-    return CGRectMake(0, self.view.bounds.size.height - height, self.view.bounds.size.width, height);
+    CGRect rtn = CGRectMake(0, self.view.bounds.size.height - height, self.view.bounds.size.width, height);
+    rtn = [self adjustForSafeArea:rtn adjustForStatusBar:true];
+    return rtn;
 }
 
 - (CGRect)frameForDoneButtonAtOrientation:(UIInterfaceOrientation)orientation {
     CGRect screenBound = self.view.bounds;
     CGFloat screenWidth = screenBound.size.width;
 
-    // if ([self isLandscape:orientation]) screenWidth = screenBound.size.height;
-
-    return CGRectMake(screenWidth - 75, 30, 55, 26);
+    CGRect rtn = CGRectMake(screenWidth - self.doneButtonRightInset - self.doneButtonSize.width, self.doneButtonTopInset, self.doneButtonSize.width, self.doneButtonSize.height);
+    rtn = [self adjustForSafeArea:rtn adjustForStatusBar:true];
+    return rtn;
 }
 
 - (CGRect)frameForCaptionView:(IDMCaptionView *)captionView atIndex:(NSUInteger)index {
@@ -1119,6 +1167,18 @@ - (CGRect)frameForCaptionView:(IDMCaptionView *)captionView atIndex:(NSUInteger)
     return captionFrame;
 }
 
+- (CGRect)adjustForSafeArea:(CGRect)rect adjustForStatusBar:(BOOL)adjust {
+    if (@available(iOS 11.0, *)) {
+        return [self adjustForSafeArea:rect adjustForStatusBar:adjust forInsets:self.view.safeAreaInsets];
+    }
+    UIEdgeInsets insets = UIEdgeInsetsMake(_statusBarHeight, 0, 0, 0);
+    return [self adjustForSafeArea:rect adjustForStatusBar:adjust forInsets:insets];
+}
+
+- (CGRect)adjustForSafeArea:(CGRect)rect adjustForStatusBar:(BOOL)adjust forInsets:(UIEdgeInsets) insets {
+    return [IDMUtils adjustRect:rect forSafeAreaInsets:insets forBounds:self.view.bounds adjustForStatusBar:adjust statusBarHeight:_statusBarHeight];
+}
+
 #pragma mark - UIScrollView Delegate
 
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView  {
@@ -1379,5 +1439,4 @@ - (void)animateView:(UIView *)view toFrame:(CGRect)frame completion:(void (^)(vo
 		}];
 	}
 }
-
 @end

Classes/IDMUtils.h

@@ -0,0 +1,12 @@
+//
+//  IDMUtils.h
+//  PhotoBrowserDemo
+//
+//  Created by Oliver ONeill on 2/12/17.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface IDMUtils : NSObject
++ (CGRect)adjustRect:(CGRect)rect forSafeAreaInsets:(UIEdgeInsets)insets forBounds:(CGRect)bounds adjustForStatusBar:(BOOL)adjust statusBarHeight:(int)statusBarHeight;
+@end

Classes/IDMUtils.m

@@ -0,0 +1,52 @@
+//
+//  IDMUtils.m
+//  PhotoBrowserDemo
+//
+//  Created by Oliver ONeill on 2/12/17.
+//
+
+#import "IDMUtils.h"
+
+@implementation IDMUtils
+/**
+ * Adjust a rect to be moved into a safe area specified by `insets`.
+ *
+ * NOTE: this does not cover all cases. Given a rect it will reposition it if it
+ * falls into an unsafe area according to `insets` and `bounds`. When
+ * `adjustForStatusBar` is true, the rect y position will be based from the edge
+ * of the safe area, otherwise it will be based from zero. This allows views to
+ * sit behind the status bar. Status bar height is also used
+ * to keep positioning consistent when toggling the status bar on and off
+ */
++ (CGRect)adjustRect:(CGRect)rect forSafeAreaInsets:(UIEdgeInsets)insets forBounds:(CGRect)bounds adjustForStatusBar:(BOOL)adjust statusBarHeight:(int)statusBarHeight {
+    BOOL isLeft = rect.origin.x <= insets.left;
+    // If the safe area is not specified via insets we should fall back to the
+    // status bar height
+    CGFloat insetTop = insets.top > 0 ? insets.top : statusBarHeight;
+    // Don't adjust for y positioning when adjustForStatusBar is false
+    BOOL isAtTop = (rect.origin.y <= insetTop);
+    BOOL isRight = rect.origin.x + rect.size.width >= bounds.size.width - insets.right;
+    BOOL isAtBottom = rect.origin.y + rect.size.height >= bounds.size.height - insets.bottom;
+    if ((isLeft) && (isRight)) {
+        rect.origin.x += insets.left;
+        rect.size.width -= insets.right + insets.left;
+    } else if (isLeft) {
+        rect.origin.x += insets.left;
+    } else if (isRight) {
+        rect.origin.x -= insets.right;
+    }
+    // if we're adjusting for status bar then we should move the view out of
+    // the inset
+    if ((adjust) && (isAtTop) && (isAtBottom)) {
+        rect.origin.y += insetTop;
+        rect.size.height -= insets.bottom + insetTop;
+    } else if ((adjust) && (isAtTop)) {
+        rect.origin.y += insetTop;
+    } else if ((isAtTop) && (isAtBottom)) {
+        rect.size.height -= insets.bottom;
+    } else if (isAtBottom) {
+        rect.origin.y -= insets.bottom;
+    }
+    return rect;
+}
+@end