Skip to content

Swift 5 syntax changes #1

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
SarathPUnni wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Swift 5 syntax changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions SkyFloatingLabelTextField.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
5 changes: 3 additions & 2 deletions SkyFloatingLabelTextField/SkyFloatingLabelTextField.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
he,
Expand Down Expand Up @@ -632,7 +633,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -653,7 +654,7 @@
PRODUCT_BUNDLE_IDENTIFIER = net.skyscanner.SkyFloatingLabelTextField;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand Down
6 changes: 3 additions & 3 deletions Sources/SkyFloatingLabelTextField.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ open class SkyFloatingLabelTextField: UITextField { // swiftlint:disable:this ty
if let placeholder = placeholder, let font = placeholderFont ?? font {
attributedPlaceholder = NSAttributedString(
string: placeholder,
attributes: [NSForegroundColorAttributeName: placeholderColor, NSFontAttributeName: font]
attributes: [NSAttributedString.Key.foregroundColor: placeholderColor, NSAttributedString.Key.font: font]
)
}
}
Expand Down Expand Up @@ -293,7 +293,7 @@ open class SkyFloatingLabelTextField: UITextField { // swiftlint:disable:this ty
/**
Invoked when the editing state of the textfield changes. Override to respond to this change.
*/
open func editingChanged() {
@objc open func editingChanged() {
//Remove Error Message
if self.hasErrorMessage {
self.errorMessage = ""
Expand Down Expand Up @@ -468,7 +468,7 @@ open class SkyFloatingLabelTextField: UITextField { // swiftlint:disable:this ty
self.titleLabel.frame = frame
}
if animated {
let animationOptions: UIViewAnimationOptions = .curveEaseOut
let animationOptions: UIView.AnimationOptions = .curveEaseOut
let duration = isTitleVisible() ? titleFadeInDuration : titleFadeOutDuration
UIView.animate(withDuration: duration, delay: 0, options: animationOptions, animations: { () -> Void in
updateBlock()
Expand Down