From 0d5e76589509054703aca51915581d514e4ad1c2 Mon Sep 17 00:00:00 2001 From: Shezad Ahamed Date: Thu, 3 Jan 2019 18:13:27 +0530 Subject: [PATCH] Updated to swift 4.2 --- .../ActionButton.xcodeproj/project.pbxproj | 4 +-- .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++ .../UserInterfaceState.xcuserstate | Bin 0 -> 24383 bytes Example/ActionButton/AppDelegate.swift | 2 +- Example/ActionButton/ViewController.swift | 2 +- Source/ActionButton.swift | 26 +++++++++--------- Source/ActionButtonItem.swift | 6 ++-- 7 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 Example/ActionButton.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 Example/ActionButton.xcodeproj/project.xcworkspace/xcuserdata/focaloidtechnologies.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/Example/ActionButton.xcodeproj/project.pbxproj b/Example/ActionButton.xcodeproj/project.pbxproj index b0ea25a..7f2c490 100644 --- a/Example/ActionButton.xcodeproj/project.pbxproj +++ b/Example/ActionButton.xcodeproj/project.pbxproj @@ -365,7 +365,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -379,7 +379,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.2; }; name = Release; }; diff --git a/Example/ActionButton.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Example/ActionButton.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/Example/ActionButton.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/Example/ActionButton.xcodeproj/project.xcworkspace/xcuserdata/focaloidtechnologies.xcuserdatad/UserInterfaceState.xcuserstate b/Example/ActionButton.xcodeproj/project.xcworkspace/xcuserdata/focaloidtechnologies.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..b5de6b71b1feaa6e3fe273aadda006fd8c50dc56 GIT binary patch literal 24383 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 Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/Example/ActionButton/ViewController.swift b/Example/ActionButton/ViewController.swift index fe8d521..fe94d8e 100644 --- a/Example/ActionButton/ViewController.swift +++ b/Example/ActionButton/ViewController.swift @@ -42,7 +42,7 @@ class ViewController: UIViewController { actionButton = ActionButton(attachedToView: self.view, items: [twitter, google]) actionButton.action = { button in button.toggleMenu() } - actionButton.setTitle("+", forState: UIControlState()) + actionButton.setTitle("+", forState: UIControl.State()) actionButton.backgroundColor = UIColor(red: 238.0/255.0, green: 130.0/255.0, blue: 34.0/255.0, alpha:1.0) } diff --git a/Source/ActionButton.swift b/Source/ActionButton.swift index 39976ea..a8f2701 100755 --- a/Source/ActionButton.swift +++ b/Source/ActionButton.swift @@ -89,8 +89,8 @@ open class ActionButton: NSObject { self.floatButton.layer.shadowRadius = 2 self.floatButton.layer.shadowOffset = CGSize(width: 1, height: 1) self.floatButton.layer.shadowColor = UIColor.gray.cgColor - self.floatButton.setTitle("+", for: UIControlState()) - self.floatButton.setImage(nil, for: UIControlState()) + self.floatButton.setTitle("+", for: UIControl.State()) + self.floatButton.setImage(nil, for: UIControl.State()) self.floatButton.backgroundColor = self.backgroundColor self.floatButton.titleLabel!.font = UIFont(name: "HelveticaNeue-Light", size: 35) self.floatButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 8, right: 0) @@ -117,13 +117,13 @@ open class ActionButton: NSObject { } //MARK: - Set Methods - open func setTitle(_ title: String?, forState state: UIControlState) { + open func setTitle(_ title: String?, forState state: UIControl.State) { floatButton.setImage(nil, for: state) floatButton.setTitle(title, for: state) floatButton.contentEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 8, right: 0) } - open func setImage(_ image: UIImage?, forState state: UIControlState) { + open func setImage(_ image: UIImage?, forState state: UIControl.State) { setTitle(nil, forState: state) floatButton.setImage(image, for: state) floatButton.adjustsImageWhenHighlighted = false @@ -136,19 +136,19 @@ open class ActionButton: NSObject { */ fileprivate func installConstraints() { let views: [String: UIView] = ["floatButton":self.floatButton, "parentView":self.parentView] - let width = NSLayoutConstraint.constraints(withVisualFormat: "H:[floatButton(\(floatButtonRadius))]", options: NSLayoutFormatOptions.alignAllCenterX, metrics: nil, views: views) - let height = NSLayoutConstraint.constraints(withVisualFormat: "V:[floatButton(\(floatButtonRadius))]", options: NSLayoutFormatOptions.alignAllCenterX, metrics: nil, views: views) + let width = NSLayoutConstraint.constraints(withVisualFormat: "H:[floatButton(\(floatButtonRadius))]", options: NSLayoutConstraint.FormatOptions.alignAllCenterX, metrics: nil, views: views) + let height = NSLayoutConstraint.constraints(withVisualFormat: "V:[floatButton(\(floatButtonRadius))]", options: NSLayoutConstraint.FormatOptions.alignAllCenterX, metrics: nil, views: views) self.floatButton.addConstraints(width) self.floatButton.addConstraints(height) - let trailingSpacing = NSLayoutConstraint.constraints(withVisualFormat: "V:[floatButton]-15-|", options: NSLayoutFormatOptions.alignAllCenterX, metrics: nil, views: views) - let bottomSpacing = NSLayoutConstraint.constraints(withVisualFormat: "H:[floatButton]-15-|", options: NSLayoutFormatOptions.alignAllCenterX, metrics: nil, views: views) + let trailingSpacing = NSLayoutConstraint.constraints(withVisualFormat: "V:[floatButton]-15-|", options: NSLayoutConstraint.FormatOptions.alignAllCenterX, metrics: nil, views: views) + let bottomSpacing = NSLayoutConstraint.constraints(withVisualFormat: "H:[floatButton]-15-|", options: NSLayoutConstraint.FormatOptions.alignAllCenterX, metrics: nil, views: views) self.parentView.addConstraints(trailingSpacing) self.parentView.addConstraints(bottomSpacing) } //MARK: - Button Actions Methods - func buttonTapped(_ sender: UIControl) { + @objc func buttonTapped(_ sender: UIControl) { animatePressingWithScale(1.0) if let unwrappedAction = self.action { @@ -156,12 +156,12 @@ open class ActionButton: NSObject { } } - func buttonTouchDown(_ sender: UIButton) { + @objc func buttonTouchDown(_ sender: UIButton) { animatePressingWithScale(0.9) } //MARK: - Gesture Recognizer Methods - func backgroundTapped(_ gesture: UIGestureRecognizer) { + @objc func backgroundTapped(_ gesture: UIGestureRecognizer) { if self.active { self.toggle() } @@ -207,7 +207,7 @@ open class ActionButton: NSObject { fileprivate func animateMenu() { let rotation = self.active ? 0 : CGFloat(M_PI_4) - UIView.animate(withDuration: 0.3, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.1, options: UIViewAnimationOptions.allowAnimatedContent, animations: { + UIView.animate(withDuration: 0.3, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.1, options: UIView.AnimationOptions.allowAnimatedContent, animations: { if self.floatButton.imageView?.image == nil { self.floatButton.transform = CGAffineTransform(rotationAngle: rotation) @@ -259,7 +259,7 @@ open class ActionButton: NSObject { - parameter scale: how much the button should be scaled */ fileprivate func animatePressingWithScale(_ scale: CGFloat) { - UIView.animate(withDuration: 0.2, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.1, options: UIViewAnimationOptions.allowAnimatedContent, animations: { + UIView.animate(withDuration: 0.2, delay: 0, usingSpringWithDamping: 1, initialSpringVelocity: 0.1, options: UIView.AnimationOptions.allowAnimatedContent, animations: { self.floatButton.transform = CGAffineTransform(scaleX: scale, y: scale) }, completion: nil) } diff --git a/Source/ActionButtonItem.swift b/Source/ActionButtonItem.swift index 3709793..8b7fcc0 100755 --- a/Source/ActionButtonItem.swift +++ b/Source/ActionButtonItem.swift @@ -83,7 +83,7 @@ open class ActionButtonItem: NSObject { self.button.addTarget(self, action: #selector(ActionButtonItem.buttonPressed(_:)), for: .touchUpInside) if let unwrappedImage = image { - self.button.setImage(unwrappedImage, for: UIControlState()) + self.button.setImage(unwrappedImage, for: UIControl.State()) } if let text = optionalTitle , text.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty == false { @@ -126,14 +126,14 @@ open class ActionButtonItem: NSObject { } //MARK: - Button Action Methods - func buttonPressed(_ sender: UIButton) { + @objc func buttonPressed(_ sender: UIButton) { if let unwrappedAction = self.action { unwrappedAction(self) } } //MARK: - Gesture Recognizer Methods - func labelTapped(_ gesture: UIGestureRecognizer) { + @objc func labelTapped(_ gesture: UIGestureRecognizer) { if let unwrappedAction = self.action { unwrappedAction(self) }