Merge pull request #321 from TimOliver/remove-ios-7

Remove iOS 7 Support

Author: TimOliver

Objective-C/TOCropViewController/TOCropViewController.m

@@ -67,12 +67,6 @@ @interface TOCropViewController () <UIActionSheetDelegate, UIViewControllerTrans
 /* Flag to perform initial setup on the first run */
 @property (nonatomic, assign) BOOL firstTime;
 
-/* On iOS 7, the popover view controller that appears when tapping 'Done' */
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-@property (nonatomic, strong) UIPopoverController *activityPopoverController;
-#pragma clang diagnostic pop
-
 @end
 
 @implementation TOCropViewController
@@ -456,11 +450,7 @@ - (void)viewDidLayoutSubviews
 
 #pragma mark - Rotation Handling -
 
-//TODO: Deprecate iOS 7 properly at the right time
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#pragma clang diagnostic ignored "-Wdeprecated-implementations"
-- (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)_willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
     self.toolbarSnapshotView = [self.toolbar snapshotViewAfterScreenUpdates:NO];
     self.toolbarSnapshotView.frame = self.toolbar.frame;
@@ -492,7 +482,7 @@ - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrie
     self.cropView.internalLayoutDisabled = YES;
 }
 
-- (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
+- (void)_willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration
 {
     //Remove all animations in the toolbar
     self.toolbar.frame = [self frameForToolbarWithVerticalLayout:!UIInterfaceOrientationIsLandscape(toInterfaceOrientation)];
@@ -517,7 +507,7 @@ - (void)willAnimateRotationToInterfaceOrientation:(UIInterfaceOrientation)toInte
     self.toolbar.alpha = 1.0f;
 }
 
-- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
+- (void)_didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation
 {
     [self.toolbarSnapshotView removeFromSuperview];
     self.toolbarSnapshotView = nil;
@@ -539,14 +529,13 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIVi
         orientation = UIInterfaceOrientationLandscapeLeft;
     }
 
-    [self willRotateToInterfaceOrientation:orientation duration:coordinator.transitionDuration];
+    [self _willRotateToInterfaceOrientation:orientation duration:coordinator.transitionDuration];
     [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {
-        [self willAnimateRotationToInterfaceOrientation:orientation duration:coordinator.transitionDuration];
+        [self _willAnimateRotationToInterfaceOrientation:orientation duration:coordinator.transitionDuration];
     } completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
-        [self didRotateFromInterfaceOrientation:orientation];
+        [self _didRotateFromInterfaceOrientation:orientation];
     }];
 }
-#pragma clang diagnostic pop
 
 #pragma mark - Reset -
 - (void)resetCropViewLayout

Objective-C/TOCropViewControllerExample/ViewController.m

@@ -18,11 +18,6 @@ @interface ViewController () <UINavigationControllerDelegate, UIImagePickerContr
 @property (nonatomic, assign) CGRect croppedFrame;
 @property (nonatomic, assign) NSInteger angle;
 
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-@property (nonatomic, strong) UIPopoverController *activityPopoverController;
-#pragma clang diagnostic pop
-
 @end
 
 @implementation ViewController
@@ -223,23 +218,15 @@ - (void)showCropViewController
     [self presentViewController:alertController animated:YES completion:nil];
 }
 
-- (void)sharePhoto
+- (void)sharePhoto:(id)sender
 {
     if (self.imageView.image == nil)
         return;
 
     UIActivityViewController *activityController = [[UIActivityViewController alloc] initWithActivityItems:@[self.imageView.image] applicationActivities:nil];
-    if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPhone) {
-        [self presentViewController:activityController animated:YES completion:nil];
-    }
-    else {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
-        [self.activityPopoverController dismissPopoverAnimated:NO];
-        self.activityPopoverController = [[UIPopoverController alloc] initWithContentViewController:activityController];
-        [self.activityPopoverController presentPopoverFromBarButtonItem:self.navigationItem.rightBarButtonItem permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
-#pragma clang diagnostic pop
-    }
+    activityController.modalPresentationStyle = UIModalPresentationPopover;
+    activityController.popoverPresentationController.barButtonItem = sender;
+    [self presentViewController:activityController animated:YES completion:nil];
 }
 
 - (void)dismissViewController {
@@ -258,7 +245,7 @@ - (void)viewDidLoad {
 #if TARGET_APP_EXTENSION
     self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(dismissViewController)];
 #else
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(sharePhoto)];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(sharePhoto:)];
     self.navigationItem.rightBarButtonItem.enabled = NO;
 #endif