Skip to content

Swift 5 update #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavan-mobilefirstapplications wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Swift 5 update #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6140c13
updated to Swift 5
Dec 20, 2019
ab73296
Updated project and Toast to Swift 5
pavan-mobilefirstapplications Dec 21, 2019
06e9c9d
updated readme file
pavan-mobilefirstapplications Dec 21, 2019
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
12 changes: 6 additions & 6 deletions MFCard/Card /Helper Class/LBZSpinner.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ import UIKit

fileprivate func initCustomView() {
backgroundColor = UIColor.clear // clear black background
NotificationCenter.default.addObserver(self, selector: #selector(LBZSpinner.orientationChanged), name: NSNotification.Name.UIDeviceOrientationDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(LBZSpinner.orientationChanged), name: UIDevice.orientationDidChangeNotification, object: nil)

//Open spinner click
let gesture = UITapGestureRecognizer(target: self, action: #selector(LBZSpinner.openSpinner(_:)))
Expand Down Expand Up @@ -150,7 +150,7 @@ import UIKit
viewChooseDisable = UIView(frame: parentView.frame) // view back click

if(dDLblurEnable) { // with blur effect
let blurEffect = UIBlurEffect(style: UIBlurEffectStyle.dark)
let blurEffect = UIBlurEffect(style: UIBlurEffect.Style.dark)
blurEffectView = UIVisualEffectView(effect: blurEffect)
blurEffectView.effect = nil
blurEffectView.backgroundColor = UIColor.black.withAlphaComponent(0)
Expand Down Expand Up @@ -192,7 +192,7 @@ import UIKit

UIView.animate(withDuration: 0.3,
delay: 0.0,
options: UIViewAnimationOptions.transitionFlipFromBottom,
options: UIView.AnimationOptions.transitionFlipFromBottom,
animations: {
self.tableviewChoose.frame.size.height = self.heightTableview
self.tableviewChooseShadow.frame.size.height = self.heightTableview
Expand All @@ -214,7 +214,7 @@ import UIKit

UIView.animate(withDuration: 0.3,
delay: 0.0,
options: UIViewAnimationOptions.transitionFlipFromBottom,
options: UIView.AnimationOptions.transitionFlipFromBottom,
animations: {
self.tableviewChoose.frame.origin.y = globalPoint.y-self.heightTableview+self.frame.height
self.tableviewChoose.frame.size.height = self.heightTableview
Expand All @@ -240,7 +240,7 @@ import UIKit
tableviewChoose.isUserInteractionEnabled = true
tableviewChoose.showsHorizontalScrollIndicator = false
tableviewChoose.showsVerticalScrollIndicator = false
tableviewChoose.separatorStyle = UITableViewCellSeparatorStyle.none
tableviewChoose.separatorStyle = UITableViewCell.SeparatorStyle.none
tableviewChoose.layer.cornerRadius = 5

//Show stroke
Expand Down Expand Up @@ -277,7 +277,7 @@ import UIKit
if(tableviewChoose != nil) {
UIView.animate(withDuration: 0.3,
delay: 0.0,
options: UIViewAnimationOptions.transitionFlipFromBottom,
options: UIView.AnimationOptions.transitionFlipFromBottom,
animations: {
self.tableviewChoose.alpha = 0.0
self.tableviewChooseShadow.alpha = 0.0
Expand Down
36 changes: 18 additions & 18 deletions MFCard/Card /MFCardView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ extension MFCardDelegate{
public var toast = true
public var topDistance = 100

public var blurStyle:UIBlurEffect = UIBlurEffect(style: UIBlurEffectStyle.dark)
public var blurStyle:UIBlurEffect = UIBlurEffect(style: UIBlurEffect.Style.dark)

public var cardTypeAnimation :UIViewAnimationOptions = [.transitionFlipFromBottom, .curveLinear]
public var cardTypeAnimation :UIView.AnimationOptions = [.transitionFlipFromBottom, .curveLinear]
//MARK:
//MARK: initialization
public init(withViewController:UIViewController) {
Expand Down Expand Up @@ -116,7 +116,7 @@ extension MFCardDelegate{
self.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|", options: [], metrics: nil, views: ["view": self.view]))
self.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|", options: [], metrics: nil, views: ["view": self.view]))
//Orientation Observer
NotificationCenter.default.addObserver(self, selector: #selector(self.orientationDidChange), name: NSNotification.Name.UIDeviceOrientationDidChange, object: nil)
NotificationCenter.default.addObserver(self, selector: #selector(self.orientationDidChange), name: UIDevice.orientationDidChangeNotification, object: nil)

self.layoutIfNeeded()
self.updateConstraintsIfNeeded()
Expand Down Expand Up @@ -153,11 +153,11 @@ extension MFCardDelegate{
txtCardNoP4.delegate = self
txtCvc.delegate = self

txtCardNoP1.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControlEvents.editingChanged)
txtCardNoP2.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControlEvents.editingChanged)
txtCardNoP3.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControlEvents.editingChanged)
txtCardNoP4.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControlEvents.editingChanged)
txtCvc.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControlEvents.editingChanged)
txtCardNoP1.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControl.Event.editingChanged)
txtCardNoP2.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControl.Event.editingChanged)
txtCardNoP3.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControl.Event.editingChanged)
txtCardNoP4.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControl.Event.editingChanged)
txtCvc.addTarget(self, action: #selector(MFCardView.textFieldDidChange(_:)), for: UIControl.Event.editingChanged)
let leftSwipe = UISwipeGestureRecognizer(target: self, action: #selector(self.flip))
let rightSwipe = UISwipeGestureRecognizer(target: self, action: #selector(self.flip))

Expand Down Expand Up @@ -193,17 +193,17 @@ extension MFCardDelegate{
rootViewController.view.addSubview(view)

// center view horizontally in rootViewController.view
rootViewController.view.addConstraint(NSLayoutConstraint(item: view, attribute: NSLayoutAttribute.centerX, relatedBy: NSLayoutRelation.equal, toItem: rootViewController.view, attribute: NSLayoutAttribute.centerX, multiplier: 1.0, constant: 0.0));
rootViewController.view.addConstraint(NSLayoutConstraint(item: view, attribute: NSLayoutConstraint.Attribute.centerX, relatedBy: NSLayoutConstraint.Relation.equal, toItem: rootViewController.view, attribute: NSLayoutConstraint.Attribute.centerX, multiplier: 1.0, constant: 0.0));

// align view from the top
topConstraints = NSLayoutConstraint.constraints(withVisualFormat: "V:|-\(topDistance)-[view]", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: ["view": view])
topConstraints = NSLayoutConstraint.constraints(withVisualFormat: "V:|-\(topDistance)-[view]", options: NSLayoutConstraint.FormatOptions(rawValue: 0), metrics: nil, views: ["view": view])
rootViewController.view.addConstraints(topConstraints!);

// width constraint
rootViewController.view.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:[view(==300)]", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: ["view": view]));
rootViewController.view.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:[view(==300)]", options: NSLayoutConstraint.FormatOptions(rawValue: 0), metrics: nil, views: ["view": view]));

// height constraint
rootViewController.view.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:[view(==240)]", options: NSLayoutFormatOptions(rawValue: 0), metrics: nil, views: ["view": view]));
rootViewController.view.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:[view(==240)]", options: NSLayoutConstraint.FormatOptions(rawValue: 0), metrics: nil, views: ["view": view]));
animateCard()
// Animate it in

Expand Down Expand Up @@ -391,14 +391,14 @@ extension MFCardDelegate{
}

@objc fileprivate func orientationDidChange(){
if UIDeviceOrientationIsLandscape(UIDevice.current.orientation) {
if UIDevice.current.orientation.isLandscape {
if (topConstraints != nil){
topConstraints?[0].constant = 10
}

}

if UIDeviceOrientationIsPortrait(UIDevice.current.orientation) {
if UIDevice.current.orientation.isPortrait {
if (topConstraints != nil){
topConstraints?[0].constant = CGFloat(topDistance)
}
Expand Down Expand Up @@ -484,8 +484,8 @@ extension MFCardDelegate{
}

if (cardFrontView.isHidden == false) {
let transitionOptions: UIViewAnimationOptions = [.transitionFlipFromRight, .showHideTransitionViews]
btnCvc.setTitle("CARD", for: UIControlState())
let transitionOptions: UIView.AnimationOptions = [.transitionFlipFromRight, .showHideTransitionViews]
btnCvc.setTitle("CARD", for: UIControl.State())
UIView.transition(with: cardFrontView, duration: 1.0, options: transitionOptions, animations: {
self.cardFrontView.isHidden = true
}, completion: nil)
Expand All @@ -496,8 +496,8 @@ extension MFCardDelegate{
}, completion: nil)
}
else {
let transitionOptions: UIViewAnimationOptions = [.transitionFlipFromLeft, .showHideTransitionViews]
btnCvc.setTitle("CVC", for: UIControlState())
let transitionOptions: UIView.AnimationOptions = [.transitionFlipFromLeft, .showHideTransitionViews]
btnCvc.setTitle("CVC", for: UIControl.State())
UIView.transition(with: cardBackView, duration: 1.0, options: transitionOptions, animations: {
self.cardBackView.isHidden = true
}, completion: nil)
Expand Down
Loading