Merge pull request #2 from hryk224/feature/swift2.2

Feature/swift2.2

Example/Podfile.lock

@@ -11,4 +11,4 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
  PCLBlurEffectAlert: e1b1dd96e6a401f9d7916789057760afe66f9eae
 
-COCOAPODS: 0.38.2
+COCOAPODS: 0.39.0

PCLBlurEffectAlert.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = "PCLBlurEffectAlert"
- s.version = "1.0.1"
+ s.version = "1.0.2"
  s.summary = "Custom Swift AlertController."
  s.homepage = "https://github.com/hryk224/PCLBlurEffectAlert"
  s.screenshots = "https://raw.githubusercontent.com/wiki/hryk224/PCLBlurEffectAlert/images/sample1.gif"

PCLBlurEffectAlert/PCLBlurEffectAlert.swift

@@ -2,7 +2,7 @@
 // PCLBlurEffectAlert.swift
 // Pods
 //
-// Created by hiroyuki yoshida on 2015/10/14.
+// Created by hryk224 on 2015/10/14.
 //
 //
 
@@ -101,7 +101,7 @@ public class PCLBlurEffectAlert {
 
  // UI
  public var cornerRadius: CGFloat = 0
- public var thin: CGFloat = 0.5
+ public var thin: CGFloat = 0.5 * (2 / UIScreen.mainScreen().scale)
 
  // OverlayView
  private var overlayView = UIView()
@@ -715,7 +715,7 @@ public class PCLBlurEffectAlert {
  action.button.frame.size.width -= thin
  }
  action.button.addTarget(self,
- action: Selector("buttonWasTouchUpInside:"),
+ action: #selector(Controller.buttonWasTouchUpInside(_:)),
  forControlEvents: .TouchUpInside)
  cornerView.addSubview(action.button)
  }
@@ -737,7 +737,7 @@ public class PCLBlurEffectAlert {
  action.button.setTitleColor(buttonDisableTextColor[action.style], forState: .Disabled)
  action.button.titleLabel?.font = buttonFont[action.style]
  action.button.addTarget(self,
- action: Selector("buttonWasTouchUpInside:"),
+ action: #selector(Controller.buttonWasTouchUpInside(_:)),
  forControlEvents: .TouchUpInside)
  cornerView.addSubview(action.button)
  cornerViewHeight += buttonHeight
@@ -764,7 +764,7 @@ public class PCLBlurEffectAlert {
  action.button.setTitleColor(buttonDisableTextColor[action.style], forState: .Disabled)
  action.button.titleLabel?.font = buttonFont[action.style]
  action.button.addTarget(self,
- action: Selector("buttonWasTouchUpInside:"),
+ action: #selector(Controller.buttonWasTouchUpInside(_:)),
  forControlEvents: .TouchUpInside)
  cornerView.addSubview(action.button)
  cornerViewHeight += buttonHeight
@@ -789,7 +789,7 @@ public class PCLBlurEffectAlert {
  action.button.setTitleColor(buttonDisableTextColor[action.style], forState: .Disabled)
  action.button.titleLabel?.font = buttonFont[action.style]
  action.button.addTarget(self,
- action: Selector("buttonWasTouchUpInside:"),
+ action: #selector(Controller.buttonWasTouchUpInside(_:)),
  forControlEvents: .TouchUpInside)
 
  action.backgroundView.clipsToBounds = true
@@ -837,33 +837,6 @@ public class PCLBlurEffectAlert {
 
  }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
  // MARK: - TransitionAnimator
  public class TransitionAnimator: NSObject, UIViewControllerAnimatedTransitioning {
  private typealias TransitionAnimator = Alert.TransitionAnimator
@@ -1050,16 +1023,16 @@ extension PCLBlurEffectAlert.Controller : PCLAlertKeyboardNotificationObserver,
 }
 
 // MARK: - keyboard
-protocol PCLAlertKeyboardNotificationObserver: class {
+@objc protocol PCLAlertKeyboardNotificationObserver: class {
  func keyboardWillShow(notification: NSNotification)
  func keyboardWillHide(notification: NSNotification)
 }
 
 private extension PCLBlurEffectAlert.NotificationManager {
 
  func addKeyboardNotificationObserver(observer: PCLAlertKeyboardNotificationObserver) {
- notificationCenter.addObserver(observer, selector: "keyboardWillShow:", name: UIKeyboardWillShowNotification, object: nil)
- notificationCenter.addObserver(observer, selector: "keyboardWillHide:", name: UIKeyboardWillHideNotification, object: nil)
+ notificationCenter.addObserver(observer, selector: #selector(PCLAlertKeyboardNotificationObserver.keyboardWillShow(_:)), name: UIKeyboardWillShowNotification, object: nil)
+ notificationCenter.addObserver(observer, selector: #selector(PCLAlertKeyboardNotificationObserver.keyboardWillHide(_:)), name: UIKeyboardWillHideNotification, object: nil)
  }
 
  func removeKeyboardNotificationObserver(observer: PCLAlertKeyboardNotificationObserver) {
@@ -1077,7 +1050,7 @@ private extension PCLBlurEffectAlert.NotificationManager {
 }
 
 // MARK: - AlertActionEnabledDidChange
-protocol PCLAlertActionEnabledDidChangeNotificationObserver: class {
+@objc protocol PCLAlertActionEnabledDidChangeNotificationObserver: class {
  func didAlertActionEnabledDidChange(notification: NSNotification)
 }
 
@@ -1086,7 +1059,7 @@ private extension PCLBlurEffectAlert.NotificationManager {
  static let DidAlertActionEnabledDidChangeNotification = "DidAlertActionEnabledDidChangeNotification"
 
  func addAlertActionEnabledDidChangeNotificationObserver(observer: PCLAlertActionEnabledDidChangeNotificationObserver) {
- notificationCenter.addObserver(observer, selector: "didAlertActionEnabledDidChange:", name: Manager.DidAlertActionEnabledDidChangeNotification , object: nil)
+ notificationCenter.addObserver(observer, selector: #selector(PCLAlertActionEnabledDidChangeNotificationObserver.didAlertActionEnabledDidChange(_:)), name: Manager.DidAlertActionEnabledDidChangeNotification , object: nil)
  }
 
  func removeAlertActionEnabledDidChangeNotificationObserver(observer: PCLAlertActionEnabledDidChangeNotificationObserver) {