ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 22:55:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve country code extraction

Browse Source 
Use new formatting in phone number change section too
This commit is contained in:
Ilya Laktyushin
2020-08-25 19:06:24 +03:00
parent b901cdfb0d
commit 8d89ad6a38
6 changed files with 114 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
submodules/PhoneInputNode/Sources/PhoneInputNode.swift
View File

@@ -166,6 +166,7 @@ public final class PhoneInputNode: ASDisplayNode, UITextFieldDelegate {
public var returnAction: (() -> Void)?
private let phoneFormatter = InteractivePhoneFormatter()
public var customFormatter: ((String) -> String?)?
public var mask: NSAttributedString? {
didSet {
@@ -180,7 +181,7 @@ public final class PhoneInputNode: ASDisplayNode, UITextFieldDelegate {
if let text = self.numberField.textField.text {
mutableMask.replaceCharacters(in: NSRange(location: 0, length: min(text.count, mask.string.count)), with: text)
}
mutableMask.addAttribute(.foregroundColor, value: UIColor.clear, range: NSRange(location: 0, length: min(self.numberField.textField.text?.count ?? 0, mask.string.count)))
mutableMask.addAttribute(.foregroundColor, value: UIColor.clear, range: NSRange(location: 0, length: min(self.numberField.textField.text?.count ?? 0, mutableMask.string.count)))
mutableMask.addAttribute(.kern, value: 1.6, range: NSRange(location: 0, length: mask.string.count))
self.placeholderNode.attributedText = mutableMask
} else {
@@ -265,7 +266,12 @@ public final class PhoneInputNode: ASDisplayNode, UITextFieldDelegate {
}
private func updateNumber(_ inputText: String, tryRestoringInputPosition: Bool = true, forceNotifyCountryCodeUpdated: Bool = false) {
let (regionPrefix, text) = self.phoneFormatter.updateText(inputText)
var (regionPrefix, text) = self.phoneFormatter.updateText(inputText)
if let customFormatter = self.customFormatter, let customRegionPrefix = customFormatter(inputText) {
regionPrefix = "+\(customRegionPrefix)"
text = inputText
}
var realRegionPrefix: String
var numberText: String