kylefang/ParkedTextField
1
0
Fork 0
mirror of https://github.com/zhigang1992/ParkedTextField.git synced 2026-04-24 04:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Swift 4 String characters deprecation warnings

Browse Source
This commit is contained in:
Chris Ballinger
2017-11-20 20:06:30 -08:00
parent 46df17afda
commit 43f1d3b4b8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ParkedTextField/ParkedTextField/ParkedTextField.swift
View File

@@ -22,7 +22,7 @@ open class ParkedTextField: UITextField {
return
}
if !text.isEmpty {
let typed = text[text.startIndex..<text.characters.index(text.endIndex, offsetBy: -self.parkedText.characters.count)]
let typed = text[text.startIndex..<text.index(text.endIndex, offsetBy: -self.parkedText.count)]
text = typed + newValue
prevText = text
@@ -46,7 +46,7 @@ open class ParkedTextField: UITextField {
return ""
}
if text.hasSuffix(parkedText) {
return String(text[text.startIndex..<text.characters.index(text.endIndex, offsetBy: -parkedText.characters.count)])
return String(text[text.startIndex..<text.index(text.endIndex, offsetBy: -parkedText.count)])
} else {
return text
}
@@ -91,7 +91,7 @@ open class ParkedTextField: UITextField {
didSet {
if let placeholder = placeholder {
let attributedString = NSMutableAttributedString(string: placeholder)
let parkedTextRange = NSMakeRange(placeholderText.characters.count, parkedText.characters.count)
let parkedTextRange = NSMakeRange(placeholderText.count, parkedText.count)
if placeholder.hasSuffix(parkedText) {
attributedString.addAttributes(parkedTextAttributes, range: parkedTextRange)
attributedPlaceholder = attributedString
@@ -107,7 +107,7 @@ open class ParkedTextField: UITextField {
var beginningOfParkedText: UITextPosition? {
get {
return position(from: endOfDocument, offset: -parkedText.characters.count)
return position(from: endOfDocument, offset: -parkedText.count)
}
}
@@ -149,7 +149,7 @@ open class ParkedTextField: UITextField {
@objc func textChanged(_ sender: UITextField) {
switch typingState {
case .start where text!.characters.count > 0:
case .start where text!.count > 0:
text = typedText + parkedText
updateAttributedTextWith(text!)
prevText = text!