Update action sheet to iOS 8+ alert controller

robseward · Sep 16, 2015 · 1307d45 · 1307d45
1 parent ebb5121
commit 1307d45
Showing 1 changed file with 40 additions and 13 deletions.
diff --git a/GKClasses/GKImagePicker.m b/GKClasses/GKImagePicker.m
@@ -101,21 +101,48 @@ - (void)showActionSheetOnViewController:(UIViewController *)viewController onPop
 {
     self.presentingViewController = viewController;
     self.popoverView = popoverView;
+    NSString *fromCameraString = NSLocalizedString(@"Image from Camera", @"Image from Camera");
+    NSString *fromLibraryString = NSLocalizedString(@"Image from Library", @"Image from Library");
+    NSString *cancelTitle = NSLocalizedString(@"Cancel", @"Cancel");
 
-    UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:nil
-                                                             delegate:(id)self
-                                                    cancelButtonTitle:NSLocalizedString(@"Cancel", @"Cancel")
-                                               destructiveButtonTitle:nil
-                                                    otherButtonTitles:NSLocalizedString(@"Image from Camera", @"Image from Camera"), NSLocalizedString(@"Image from Library", @"Image from Library"), nil];
-    actionSheet.delegate = self;
-
-    if (UIUserInterfaceIdiomPad == UI_USER_INTERFACE_IDIOM()) {
-        [actionSheet showFromRect:self.popoverView.frame inView:self.presentingViewController.view animated:YES];
-    } else {
-        if (self.presentingViewController.navigationController.toolbar) {
-            [actionSheet showFromToolbar:self.presentingViewController.navigationController.toolbar];
+    if (NSFoundationVersionNumber >= NSFoundationVersionNumber_iOS_8_0) {
+        UIAlertController *alertController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:cancelTitle style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+
+        }];
+
+        UIAlertAction *fromCameraAction = [UIAlertAction actionWithTitle:fromCameraString style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [self showCameraImagePicker];
+        }];
+
+        UIAlertAction *fromLibraryAction = [UIAlertAction actionWithTitle:fromLibraryString style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            [self showGalleryImagePicker];
+        }];
+
+        [alertController addAction:cancelAction];
+        [alertController addAction:fromCameraAction];
+        [alertController addAction:fromLibraryAction];
+
+        [viewController presentViewController:alertController animated:YES completion:^{
+
+        }];
+    }
+    else {
+        UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:nil
+                                                                 delegate:(id)self
+                                                        cancelButtonTitle:NSLocalizedString(@"Cancel", @"Cancel")
+                                                   destructiveButtonTitle:nil
+                                                        otherButtonTitles:NSLocalizedString(@"Image from Camera", @"Image from Camera"), NSLocalizedString(@"Image from Library", @"Image from Library"), nil];
+        actionSheet.delegate = self;
+
+        if (UIUserInterfaceIdiomPad == UI_USER_INTERFACE_IDIOM()) {
+            [actionSheet showFromRect:self.popoverView.frame inView:self.presentingViewController.view animated:YES];
         } else {
-            [actionSheet showInView:self.presentingViewController.view];
+            if (self.presentingViewController.navigationController.toolbar) {
+                [actionSheet showFromToolbar:self.presentingViewController.navigationController.toolbar];
+            } else {
+                [actionSheet showInView:self.presentingViewController.view];
+            }
         }
     }
 }