Merge pull request #52 from heikkihautala/issue-28-nytphotosviewcontr…

…oller-crashes-on-tapping-share-button-on-ipad Issue 28 nytphotosviewcontroller crashes on tapping share button on ipad
nytimes · May 13, 2015 · 1cc78e8 · 1cc78e8
2 parents 84ec351 + 1d00753
commit 1cc78e8
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 5 deletions.
diff --git a/Example/NYTPhotoViewer/Base.lproj/Main_iPad.storyboard b/Example/NYTPhotoViewer/Base.lproj/Main_iPad.storyboard
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="5023" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14C109" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="BYZ-38-t0r">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <scenes>
-        <!--class Prefix:identifier View Controller-->
+        <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
                 <viewController id="BYZ-38-t0r" customClass="NYTViewController" sceneMemberID="viewController">
@@ -15,13 +17,38 @@
                     <view key="view" contentMode="scaleToFill" id="8bC-Xf-vdC">
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <button opaque="NO" contentMode="scaleAspectFit" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iq7-HY-cl8" userLabel="ImageButton">
+                                <rect key="frame" x="234" y="411" width="300" height="203"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="300" id="nTW-df-zCq"/>
+                                    <constraint firstAttribute="width" secondItem="iq7-HY-cl8" secondAttribute="height" multiplier="80:54" id="qro-x0-xtJ"/>
+                                </constraints>
+                                <state key="normal" image="NYTimesBuilding">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="imageButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="BYt-BH-9R9"/>
+                                </connections>
+                            </button>
+                        </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="centerX" secondItem="iq7-HY-cl8" secondAttribute="centerX" id="Elg-6Y-pFJ"/>
+                            <constraint firstAttribute="centerY" secondItem="iq7-HY-cl8" secondAttribute="centerY" id="IYU-vQ-nkL"/>
+                        </constraints>
                     </view>
+                    <connections>
+                        <outlet property="imageButton" destination="iq7-HY-cl8" id="1BO-Wt-P5z"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
             </objects>
         </scene>
     </scenes>
+    <resources>
+        <image name="NYTimesBuilding" width="800" height="540"/>
+    </resources>
     <simulatedMetricsContainer key="defaultSimulatedMetrics">
         <simulatedStatusBarMetrics key="statusBar"/>
         <simulatedOrientationMetrics key="orientation"/>

diff --git a/Pod/Classes/ios/NYTPhotosViewController.m b/Pod/Classes/ios/NYTPhotosViewController.m
@@ -29,6 +29,7 @@ @interface NYTPhotosViewController () <UIPageViewControllerDataSource, UIPageVie
 @property (nonatomic) id <NYTPhotosViewControllerDataSource> dataSource;
 @property (nonatomic) UIPageViewController *pageViewController;
 @property (nonatomic) NYTPhotoTransitionController *transitionController;
+@property (nonatomic) UIPopoverController *activityPopoverController;
 
 @property (nonatomic) UIPanGestureRecognizer *panGestureRecognizer;
 @property (nonatomic) UITapGestureRecognizer *singleTapGestureRecognizer;
@@ -243,8 +244,27 @@ - (void)actionButtonTapped:(id)sender {
                 [self.delegate photosViewController:self actionCompletedWithActivityType:activityType];
             }
         };
-
-        [self presentViewController:activityViewController animated:YES completion:nil];
+
+        [self displayActivityViewController:activityViewController animated:YES];
+    }
+}
+
+- (void)displayActivityViewController:(UIActivityViewController *)controller animated:(BOOL)animated {
+
+    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
+        [self presentViewController:controller animated:animated completion:nil];
+    }
+    else {
+        if ([controller respondsToSelector:@selector(popoverPresentationController)]) {
+            controller.popoverPresentationController.barButtonItem = self.rightBarButtonItem;
+            [self presentViewController:controller animated:animated completion:nil];
+        }
+        else {
+            self.activityPopoverController = [[UIPopoverController alloc] initWithContentViewController:controller];
+            [self.activityPopoverController presentPopoverFromBarButtonItem:self.rightBarButtonItem
+                                               permittedArrowDirections:UIPopoverArrowDirectionAny
+                                                               animated:animated];
+        }
     }
 }