Improve UIAlertController APIs in the SwiftCatalog sample app.

Cartfile

@@ -1 +1 @@
-github "facebook/facebook-ios-sdk" ~> 4.14
+github "facebook/facebook-ios-sdk" ~> 4.16

Cartfile.resolved

@@ -1,2 +1,2 @@
 github "BoltsFramework/Bolts-ObjC" "1.8.4"
-github "facebook/facebook-ios-sdk" "sdk-version-4.15.0"
+github "facebook/facebook-ios-sdk" "sdk-version-4.16.0"

FacebookCore.podspec

@@ -26,5 +26,5 @@ Pod::Spec.new do |s|
  s.pod_target_xcconfig = { 'ENABLE_TESTABILITY' => 'YES' }
 
  s.ios.dependency 'Bolts', '~> 1.8'
- s.ios.dependency 'FBSDKCoreKit', '~> 4.15'
+ s.ios.dependency 'FBSDKCoreKit', '~> 4.16'
 end

FacebookLogin.podspec

@@ -21,6 +21,6 @@ Pod::Spec.new do |s|
 
  s.ios.dependency 'FacebookCore', '~> 0.2'
  s.ios.dependency 'Bolts', '~> 1.8'
- s.ios.dependency 'FBSDKCoreKit', '~> 4.15'
- s.ios.dependency 'FBSDKLoginKit', '~> 4.15'
+ s.ios.dependency 'FBSDKCoreKit', '~> 4.16'
+ s.ios.dependency 'FBSDKLoginKit', '~> 4.16'
 end

FacebookShare.podspec

@@ -26,6 +26,6 @@ Pod::Spec.new do |s|
 
  s.ios.dependency 'FacebookCore', '~> 0.2'
  s.ios.dependency 'Bolts', '~> 1.8'
- s.ios.dependency 'FBSDKCoreKit', '~> 4.15'
- s.ios.dependency 'FBSDKShareKit', '~> 4.15'
+ s.ios.dependency 'FBSDKCoreKit', '~> 4.16'
+ s.ios.dependency 'FBSDKShareKit', '~> 4.16'
 end

Samples/Catalog/Sources/AlertController.swift

@@ -19,12 +19,94 @@
 import Foundation
 import UIKit
 
+extension UIAlertAction {
+
+ /// Action types most commonly used
+ public enum actionType{
+
+ ///Ok Option
+ case ok
+
+ /// Default Cancel Option
+ case cancel
+
+ /// Destructive action with custom title
+ case destructive(String)
+
+ /// Custom action with title and style
+ case custom(String,UIAlertActionStyle)
+
+ /**
+ Creates the action instance for UIAlertController
+ - parameter handler: Call Back function
+ - returns UIAlertAction Instance
+ */
+ public func action(handler:((String) -> Void)? = nil) -> UIAlertAction {
+
+ //Default value
+ var actionStyle = UIAlertActionStyle.default
+ var title = ""
+
+ // Action configuration based on the action type
+ switch self {
+
+ case .cancel:
+ actionStyle = .cancel
+ title = "Cancel"
+
+ case .destructive(let optionTitle):
+ title = optionTitle
+ actionStyle = .destructive
+
+ case .custom(let optionTitle, let style):
+ title = optionTitle
+ actionStyle = style
+
+ default:
+ title = "Ok"
+ }
+
+ //Creating UIAlertAction instance
+ let action = UIAlertAction(title:title,style:actionStyle, handler: {(nativeAction) in
+ if (handler != nil){
+ handler!(title)
+ }
+ })
+
+ return action
+ }
+ }
+}
+
 extension UIAlertController {
- convenience init(title: String, message: String) {
- self.init(title: title, message: message, preferredStyle: .alert)
- let action = UIAlertAction(title: NSLocalizedString("OK", comment: "OK action"),
- style: .default,
- handler: nil)
- addAction(action)
+
+ /**
+ Creates the alert view controller using the actions specified
+
+ - parameter title: Title of the alert.
+ - parameter message: Alert message body.
+ - parameter actions: Variable numbre of actions as an Array of actionType values.
+ - parameter style: UIAlertControllerStyle enum value
+ - parameter handler: Handler block/closure for the clicked option.
+
+ - let alert = UIAlertController.init(title:"Confirm",message:"Do you want to quit sign up and login with other account ?",actions:.custom("Yes,.default),.custom("Cancel",.destructive)){ (buttonTitle) in
+ if buttonTitle == "Yes"{
+ print("Yes Clicked")
+ }
+ }
+
+ self.present(alert, animated: true, completion: nil)
+
+ */
+ convenience init(title: String, message: String ,actions:[UIAlertAction.actionType] = [.ok],style: UIAlertControllerStyle = .alert,handler:((String) -> Swift.Void)? = nil) {
+
+ //initialize the contoller (self) instance
+ self.init(title: title, message: message, preferredStyle:style)
+
+ //Fetching actions specidied by the user and adding actions accordingly
+ for actionType in actions {
+ addAction(actionType.action(handler: handler))
+ }
  }
 }
+