Merge branch 'mkirk/media-detail-tap-shift'

7 years ago · 929233c9e1
parent e0294b238f c6e5d4369b
commit 929233c9e1
1 changed files with 6 additions and 1 deletions
--- a/Signal/src/ViewControllers/MediaDetailViewController.m
+++ b/Signal/src/ViewControllers/MediaDetailViewController.m
@ -250,7 +250,12 @@ NS_ASSUME_NONNULL_BEGIN
    scrollView.showsVerticalScrollIndicator = NO;
    scrollView.showsHorizontalScrollIndicator = NO;
    scrollView.decelerationRate = UIScrollViewDecelerationRateFast;
-    self.automaticallyAdjustsScrollViewInsets = NO;
+
+    if (@available(iOS 11.0, *)) {
+        scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    } else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }

    [scrollView autoPinToSuperviewEdges];