From 7bfc3498cbf1c465a6328ef8dfe3ee1e74e41879 Mon Sep 17 00:00:00 2001 From: ourang-zeb Date: Sun, 28 Oct 2018 11:43:14 +0300 Subject: [PATCH] Swift 4.2 Xcode 10 Changed syntax to swift 4.2 --- .DS_Store | Bin 0 -> 6148 bytes SweetAlert.xcodeproj/project.pbxproj | 21 +++++- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++ SweetAlert/AppDelegate.swift | 2 +- SweetAlert/SweetAlert.swift | 68 +++++++++--------- SweetAlert/ViewController.swift | 2 +- 6 files changed, 63 insertions(+), 38 deletions(-) create mode 100644 .DS_Store create mode 100644 SweetAlert.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c994e07e89d313f7b582bc18a39322e1289e0bee GIT binary patch literal 6148 zcmeHKJ5Iwu5PbtFBGIIvpxhH68D`Kz1(Dc3fz%C-9D7MBHci3Q!7iiy$4-0ty!%dbsK1yX@jAQeaj&QyV@g5#?* zJ%1iM6-Wh6E1>s7p)1zF-qEfO4%Pw?M+}?s*?I|L(Ezaq_Ku9u#HmE5O0*c_bjC~M z)xh4-=@8qQ>%`6y9g5iQj2BCXRL2}sfmGmFflHrGwEi#XC;I + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SweetAlert/AppDelegate.swift b/SweetAlert/AppDelegate.swift index b005a4f..5414a37 100644 --- a/SweetAlert/AppDelegate.swift +++ b/SweetAlert/AppDelegate.swift @@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true } diff --git a/SweetAlert/SweetAlert.swift b/SweetAlert/SweetAlert.swift index 6c7b30a..ff41315 100644 --- a/SweetAlert/SweetAlert.swift +++ b/SweetAlert/SweetAlert.swift @@ -39,7 +39,7 @@ open class SweetAlert: UIViewController { init() { super.init(nibName: nil, bundle: nil) self.view.frame = UIScreen.main.bounds - self.view.autoresizingMask = [UIViewAutoresizing.flexibleHeight, UIViewAutoresizing.flexibleWidth] + self.view.autoresizingMask = [UIView.AutoresizingMask.flexibleHeight, UIView.AutoresizingMask.flexibleWidth] self.view.backgroundColor = UIColor(red:0, green:0, blue:0, alpha:kBakcgroundTansperancy) self.view.addSubview(contentView) @@ -108,7 +108,7 @@ open class SweetAlert: UIViewController { // Subtitle if self.subTitleTextView.text.isEmpty == false { let subtitleString = subTitleTextView.text! as NSString - let rect = subtitleString.boundingRect(with: CGSize(width: width, height: 0.0), options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes: [NSFontAttributeName:subTitleTextView.font!], context: nil) + let rect = subtitleString.boundingRect(with: CGSize(width: width, height: 0.0), options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes: [NSAttributedString.Key.font:subTitleTextView.font!], context: nil) textViewHeight = ceil(rect.size.height) + 10.0 subTitleTextView.frame = CGRect(x: x, y: y, width: width, height: textViewHeight) contentView.addSubview(subTitleTextView) @@ -117,8 +117,8 @@ open class SweetAlert: UIViewController { var buttonRect:[CGRect] = [] for button in buttons { - let string = button.title(for: UIControlState())! as NSString - buttonRect.append(string.boundingRect(with: CGSize(width: width, height:0.0), options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes:[NSFontAttributeName:button.titleLabel!.font], context:nil)) + let string = button.title(for: UIControl.State())! as NSString + buttonRect.append(string.boundingRect(with: CGSize(width: width, height:0.0), options: NSStringDrawingOptions.usesLineFragmentOrigin, attributes:[NSAttributedString.Key.font:button.titleLabel!.font], context:nil)) } var totalWidth: CGFloat = 0.0 @@ -136,7 +136,7 @@ open class SweetAlert: UIViewController { buttonX = buttons[i].frame.origin.x + kWidthMargin + buttonRect[i].size.width + 20.0 buttons[i].layer.cornerRadius = 5.0 self.contentView.addSubview(buttons[i]) - buttons[i].addTarget(self, action: #selector(SweetAlert.pressed(_:)), for: UIControlEvents.touchUpInside) + buttons[i].addTarget(self, action: #selector(SweetAlert.pressed(_:)), for: UIControl.Event.touchUpInside) } y += kHeightMargin + buttonRect[0].size.height + 10.0 @@ -157,7 +157,7 @@ open class SweetAlert: UIViewController { contentView.clipsToBounds = true } - open func pressed(_ sender: UIButton!) { + @objc open func pressed(_ sender: UIButton!) { self.closeAlert(sender.tag) } @@ -168,7 +168,7 @@ open class SweetAlert: UIViewController { let ver = sver.floatValue if ver < 8.0 { // iOS versions before 7.0 did not switch the width and height on device roration - if UIInterfaceOrientationIsLandscape(UIApplication.shared.statusBarOrientation) { + if UIDevice.current.orientation.isLandscape { let ssz = sz sz = CGSize(width:ssz.height, height:ssz.width) } @@ -184,7 +184,7 @@ open class SweetAlert: UIViewController { SweetAlertContext.shouldNotAnimate = false } - UIView.animate(withDuration: 0.5, delay: 0.0, options: UIViewAnimationOptions.curveEaseOut, animations: { () -> Void in + UIView.animate(withDuration: 0.5, delay: 0.0, options: UIView.AnimationOptions.curveEaseOut, animations: { () -> Void in self.view.alpha = 0.0 }) { (Bool) -> Void in self.view.removeFromSuperview() @@ -242,7 +242,7 @@ open class SweetAlert: UIViewController { userAction = action let window: UIWindow = UIApplication.shared.keyWindow! window.addSubview(view) - window.bringSubview(toFront: view) + window.bringSubviewToFront(view) view.frame = window.bounds self.setupContentView() self.setupTitleLabel() @@ -272,8 +272,8 @@ open class SweetAlert: UIViewController { } buttons = [] if buttonTitle.isEmpty == false { - let button: UIButton = UIButton(type: UIButtonType.custom) - button.setTitle(buttonTitle, for: UIControlState()) + let button: UIButton = UIButton(type: UIButton.ButtonType.custom) + button.setTitle(buttonTitle, for: UIControl.State()) button.backgroundColor = buttonColor button.isUserInteractionEnabled = true button.tag = 0 @@ -281,10 +281,10 @@ open class SweetAlert: UIViewController { } if otherButtonTitle != nil && otherButtonTitle!.isEmpty == false { - let button: UIButton = UIButton(type: UIButtonType.custom) - button.setTitle(otherButtonTitle, for: UIControlState()) + let button: UIButton = UIButton(type: UIButton.ButtonType.custom) + button.setTitle(otherButtonTitle, for: UIControl.State()) button.backgroundColor = otherButtonColor - button.addTarget(self, action: #selector(SweetAlert.pressed(_:)), for: UIControlEvents.touchUpInside) + button.addTarget(self, action: #selector(SweetAlert.pressed(_:)), for: UIControl.Event.touchUpInside) button.tag = 1 buttons.append(button) } @@ -355,7 +355,7 @@ class CancelAnimatedView: AnimatableView { setupLayers() var t = CATransform3DIdentity; t.m34 = 1.0 / -500.0; - t = CATransform3DRotate(t, CGFloat(90.0 * M_PI / 180.0), 1, 0, 0); + t = CATransform3DRotate(t, CGFloat(90.0 * Double.pi / 180.0), 1, 0, 0); circleLayer.transform = t crossPathLayer.opacity = 0.0 } @@ -370,8 +370,8 @@ class CancelAnimatedView: AnimatableView { fileprivate var outlineCircle: CGPath { let path = UIBezierPath() - let startAngle: CGFloat = CGFloat((0) / 180.0 * M_PI) //0 - let endAngle: CGFloat = CGFloat((360) / 180.0 * M_PI) //360 + let startAngle: CGFloat = CGFloat((0) / 180.0 * Double.pi) //0 + let endAngle: CGFloat = CGFloat((360) / 180.0 * Double.pi) //360 path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.width/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false) return path.cgPath @@ -392,7 +392,7 @@ class CancelAnimatedView: AnimatableView { circleLayer.path = outlineCircle circleLayer.fillColor = UIColor.clear.cgColor; circleLayer.strokeColor = UIColor.colorFromRGB(0xF27474).cgColor; - circleLayer.lineCap = kCALineCapRound + circleLayer.lineCap = CAShapeLayerLineCap.round circleLayer.lineWidth = 4; circleLayer.frame = CGRect(x: 0, y: 0, width: self.frame.size.width, height: self.frame.size.height) circleLayer.position = CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.height/2.0) @@ -401,7 +401,7 @@ class CancelAnimatedView: AnimatableView { crossPathLayer.path = crossPath crossPathLayer.fillColor = UIColor.clear.cgColor; crossPathLayer.strokeColor = UIColor.colorFromRGB(0xF27474).cgColor; - crossPathLayer.lineCap = kCALineCapRound + crossPathLayer.lineCap = CAShapeLayerLineCap.round crossPathLayer.lineWidth = 4; crossPathLayer.frame = CGRect(x: 0, y: 0, width: self.frame.size.width, height: self.frame.size.height) crossPathLayer.position = CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.height/2.0) @@ -412,11 +412,11 @@ class CancelAnimatedView: AnimatableView { override func animate() { var t = CATransform3DIdentity; t.m34 = 1.0 / -500.0; - t = CATransform3DRotate(t, CGFloat(90.0 * M_PI / 180.0), 1, 0, 0); + t = CATransform3DRotate(t, CGFloat(90.0 * Double.pi / 180.0), 1, 0, 0); var t2 = CATransform3DIdentity; t2.m34 = 1.0 / -500.0; - t2 = CATransform3DRotate(t2, CGFloat(-M_PI), 1, 0, 0); + t2 = CATransform3DRotate(t2, CGFloat(-Double.pi), 1, 0, 0); let animation = CABasicAnimation(keyPath: "transform") let time = 0.3 @@ -424,7 +424,7 @@ class CancelAnimatedView: AnimatableView { animation.fromValue = NSValue(caTransform3D: t) animation.toValue = NSValue(caTransform3D:t2) animation.isRemovedOnCompletion = false - animation.fillMode = kCAFillModeForwards + animation.fillMode = CAMediaTimingFillMode.forwards self.circleLayer.add(animation, forKey: "transform") @@ -446,7 +446,7 @@ class CancelAnimatedView: AnimatableView { fadeInAnimation.fromValue = 0.3 fadeInAnimation.toValue = 1.0 fadeInAnimation.isRemovedOnCompletion = false - fadeInAnimation.fillMode = kCAFillModeForwards + fadeInAnimation.fillMode = CAMediaTimingFillMode.forwards self.crossPathLayer.add(fadeInAnimation, forKey: "opacity") } @@ -472,8 +472,8 @@ class InfoAnimatedView: AnimatableView { var outlineCircle: CGPath { let path = UIBezierPath() - let startAngle: CGFloat = CGFloat((0) / 180.0 * M_PI) //0 - let endAngle: CGFloat = CGFloat((360) / 180.0 * M_PI) //360 + let startAngle: CGFloat = CGFloat((0) / 180.0 * Double.pi) //0 + let endAngle: CGFloat = CGFloat((360) / 180.0 * Double.pi) //360 path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.width/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false) let factor:CGFloat = self.frame.size.width / 1.5 @@ -489,7 +489,7 @@ class InfoAnimatedView: AnimatableView { circleLayer.path = outlineCircle circleLayer.fillColor = UIColor.clear.cgColor; circleLayer.strokeColor = UIColor.colorFromRGB(0xF8D486).cgColor; - circleLayer.lineCap = kCALineCapRound + circleLayer.lineCap = CAShapeLayerLineCap.round circleLayer.lineWidth = 4; circleLayer.frame = CGRect(x: 0, y: 0, width: self.frame.size.width, height: self.frame.size.height) circleLayer.position = CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.height/2.0) @@ -501,7 +501,7 @@ class InfoAnimatedView: AnimatableView { let colorAnimation = CABasicAnimation(keyPath:"strokeColor") colorAnimation.duration = 1.0; colorAnimation.repeatCount = HUGE - colorAnimation.timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseInEaseOut) + colorAnimation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeInEaseOut) colorAnimation.autoreverses = true colorAnimation.fromValue = UIColor.colorFromRGB(0xF7D58B).cgColor colorAnimation.toValue = UIColor.colorFromRGB(0xF2A665).cgColor @@ -533,16 +533,16 @@ class SuccessAnimatedView: AnimatableView { var outlineCircle: CGPath { let path = UIBezierPath() - let startAngle: CGFloat = CGFloat((0) / 180.0 * M_PI) //0 - let endAngle: CGFloat = CGFloat((360) / 180.0 * M_PI) //360 + let startAngle: CGFloat = CGFloat((0) / 180.0 * Double.pi) //0 + let endAngle: CGFloat = CGFloat((360) / 180.0 * Double.pi) //360 path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.height/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false) return path.cgPath } var path: CGPath { let path = UIBezierPath() - let startAngle:CGFloat = CGFloat((60) / 180.0 * M_PI) //60 - let endAngle:CGFloat = CGFloat((200) / 180.0 * M_PI) //190 + let startAngle:CGFloat = CGFloat((60) / 180.0 * Double.pi) //60 + let endAngle:CGFloat = CGFloat((200) / 180.0 * Double.pi) //190 path.addArc(withCenter: CGPoint(x: self.frame.size.width/2.0, y: self.frame.size.height/2.0), radius: self.frame.size.width/2.0, startAngle: startAngle, endAngle: endAngle, clockwise: false) path.addLine(to: CGPoint(x: 36.0 - 10.0 ,y: 60.0 - 10.0)) path.addLine(to: CGPoint(x: 85.0 - 20.0, y: 30.0 - 20.0)) @@ -557,7 +557,7 @@ class SuccessAnimatedView: AnimatableView { outlineLayer.path = outlineCircle outlineLayer.fillColor = UIColor.clear.cgColor; outlineLayer.strokeColor = UIColor(red: 150.0/255.0, green: 216.0/255.0, blue: 115.0/255.0, alpha: 1.0).cgColor; - outlineLayer.lineCap = kCALineCapRound + outlineLayer.lineCap = CAShapeLayerLineCap.round outlineLayer.lineWidth = 4; outlineLayer.opacity = 0.1 self.layer.addSublayer(outlineLayer) @@ -567,7 +567,7 @@ class SuccessAnimatedView: AnimatableView { circleLayer.path = path circleLayer.fillColor = UIColor.clear.cgColor; circleLayer.strokeColor = UIColor(red: 150.0/255.0, green: 216.0/255.0, blue: 115.0/255.0, alpha: 1.0).cgColor; - circleLayer.lineCap = kCALineCapRound + circleLayer.lineCap = CAShapeLayerLineCap.round circleLayer.lineWidth = 4; circleLayer.actions = [ "strokeStart": NSNull(), @@ -591,7 +591,7 @@ class SuccessAnimatedView: AnimatableView { strokeStart.toValue = 0.68 strokeStart.duration = 7.0*factor strokeStart.beginTime = CACurrentMediaTime() + 3.0*factor - strokeStart.fillMode = kCAFillModeBackwards + strokeStart.fillMode = CAMediaTimingFillMode.backwards strokeStart.timingFunction = timing circleLayer.strokeStart = 0.68 circleLayer.strokeEnd = 0.93 diff --git a/SweetAlert/ViewController.swift b/SweetAlert/ViewController.swift index ab5ada2..13a0a10 100644 --- a/SweetAlert/ViewController.swift +++ b/SweetAlert/ViewController.swift @@ -68,7 +68,7 @@ class ViewController: UIViewController { } @IBAction func customIconAlert(_ sender: AnyObject) { - _ = SweetAlert().showAlert("Sweet!", subTitle: "Here's a custom image.", style: AlertStyle.customImag(imageFile: "thumb.jpg")) + _ = SweetAlert().showAlert("Sweet!", subTitle: "Here's a custom image.", style: AlertStyle.customImage(imageFile: "thumb.jpg")) } }