Add iPhone X support

Add iPhone X support

Fix done button moving when the status bar is hidden

I've tried to keep the use of doneButtonTopInset to be the same even
with the new requirements for iPhone X

Fix iPhone X support bugs with orientation

There were issue when switching between landscape and portrait orientation
specifically to do with changes iPhone X safe area insets.

Fix present animation

Cleanup tests

Fix done button status bar bug

When the status bar is hidden, its height property is set
to zero, this makes it difficult to position elements relative
to that without them moving when its hidden. To fix this I've
hardcoded the value to twenty. There wasn't an easy way of getting
this number without displaying the status bar

Change present animation to simpler calculation

Update IDMUtils header

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;
 
@@ -190,8 +192,11 @@ - (id)init {
 
         _isdraggingPhoto = NO;
 
+        _statusBarHeight = 20.f;
         _doneButtonRightInset = 20.f;
-        _doneButtonTopInset = 30.f;
+        // relative to status bar and safeAreaInsets
+        _doneButtonTopInset = 10.f;
+
         _doneButtonSize = CGSizeMake(55.f, 26.f);
 
 		if ([self respondsToSelector:@selector(automaticallyAdjustsScrollViewInsets)]) {
@@ -478,8 +483,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 = UIEdgeInsetsZero;
+        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;
 
@@ -497,7 +513,6 @@ - (CGRect)animationFrameForImage:(UIImage *)image presenting:(BOOL)presenting sc
     if (!presenting) {
         animationFrame.origin.y += scrollView.frame.origin.y;
     }
-
     return animationFrame;
 }
 
@@ -1078,6 +1093,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;
 }
 
@@ -1116,27 +1132,45 @@ - (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 - self.doneButtonRightInset - self.doneButtonSize.width, self.doneButtonTopInset, self.doneButtonSize.width, self.doneButtonSize.height);
+    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 {
     CGRect pageFrame = [self frameForPageAtIndex:index];
 
+    CGFloat insetOffset = 0;
+    if (@available(iOS 11.0, *)) {
+        insetOffset += self.view.safeAreaInsets.bottom;
+    }
+
     CGSize captionSize = [captionView sizeThatFits:CGSizeMake(pageFrame.size.width, 0)];
-    CGRect captionFrame = CGRectMake(pageFrame.origin.x, pageFrame.size.height - captionSize.height - (_toolbar.superview?_toolbar.frame.size.height:0), pageFrame.size.width, captionSize.height);
+    CGRect captionFrame = CGRectMake(pageFrame.origin.x, pageFrame.size.height - captionSize.height - (_toolbar.superview?_toolbar.frame.size.height:0) - insetOffset, pageFrame.size.width, captionSize.height);
 
     return captionFrame;
 }
 
+- (CGRect)adjustForSafeArea:(CGRect)rect adjustForStatusBar:(BOOL)adjust {
+    if (@available(iOS 11.0, *)) {
+        return [self adjustForSafeArea:rect adjustForStatusBar:adjust forInsets:self.view.safeAreaInsets];
+    }
+    return rect;
+}
+
+- (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  {

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