Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// swift-tools-version:5.5
import PackageDescription

let package = Package(
name: "SweetAlert",
platforms: [.iOS(.v12)],
products: [
.library(name: "SweetAlert", targets: ["SweetAlert"])
],
targets: [
.target(
name: "SweetAlert",
path: "SweetAlert",
exclude: ["AppDelegate.swift", "ViewController.swift", "Base.lproj", "Images.xcassets", "Info.plist", "logo_big.png", "SweetAlert.png"],
sources: ["SweetAlert.swift"]
)
],
swiftLanguageVersions: [.v5]
)
48 changes: 24 additions & 24 deletions SweetAlert/SweetAlert.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ open class SweetAlert: UIViewController {
var userAction:((_ isOtherButton: Bool) -> Void)? = nil
let kFont = "Helvetica"

init() {
public 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)

Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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)
}

Expand All @@ -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 UIApplication.shared.statusBarOrientation.isLandscape {
let ssz = sz
sz = CGSize(width:ssz.height, height:ssz.width)
}
Expand All @@ -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()
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -272,19 +272,19 @@ 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
buttons.append(button)
}

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)
}
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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")


Expand All @@ -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")
}

Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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(),
Expand All @@ -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
Expand Down