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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2024-04-24 19:51:02 +04:00
parent 89bec03bfa
commit c3e2eb19c8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
submodules/AuthorizationUI/Sources/AuthorizationSequenceCodeEntryControllerNode.swift
View File

@ -204,7 +204,7 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF
if #available(iOSApplicationExtension 10.0, iOS 10.0, *) { if #available(iOSApplicationExtension 10.0, iOS 10.0, *) {
self.textField.textField.textContentType = UITextContentType(rawValue: "") self.textField.textField.textContentType = UITextContentType(rawValue: "")
} }
self.textField.textField.returnKeyType = .default self.textField.textField.returnKeyType = .done
self.textField.textField.keyboardAppearance = self.theme.rootController.keyboardColor.keyboardAppearance self.textField.textField.keyboardAppearance = self.theme.rootController.keyboardColor.keyboardAppearance
self.textField.textField.disableAutomaticKeyboardHandling = [.forward, .backward] self.textField.textField.disableAutomaticKeyboardHandling = [.forward, .backward]
self.textField.textField.tintColor = self.theme.list.itemAccentColor self.textField.textField.tintColor = self.theme.list.itemAccentColor
@ -358,9 +358,9 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF
@objc private func pastePressed() { @objc private func pastePressed() {
if let text = UIPasteboard.general.string, !text.isEmpty { if let text = UIPasteboard.general.string, !text.isEmpty {
if checkValidity(text: text) { if checkValidity(text: text, isPaste: true) {
self.textField.textField.text = text self.textField.textField.text = text
self.updatePasteVisibility() self.textDidChange()
} }
} }
} }
@ -1016,17 +1016,22 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF
return false return false
} }
if string == "\n" {
self.proceedPressed()
return false
}
var updated = textField.text ?? "" var updated = textField.text ?? ""
updated.replaceSubrange(updated.index(updated.startIndex, offsetBy: range.lowerBound) ..< updated.index(updated.startIndex, offsetBy: range.upperBound), with: string) updated.replaceSubrange(updated.index(updated.startIndex, offsetBy: range.lowerBound) ..< updated.index(updated.startIndex, offsetBy: range.upperBound), with: string)
if updated.isEmpty { if updated.isEmpty {
return true return true
} else { } else {
return checkValidity(text: updated) && !updated.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty return checkValidity(text: updated, isPaste: false) && !updated.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
} }
} }
func checkValidity(text: String) -> Bool { func checkValidity(text: String, isPaste: Bool) -> Bool {
if let codeType = self.codeType { if let codeType = self.codeType {
switch codeType { switch codeType {
case let .word(startsWith): case let .word(startsWith):
@ -1040,7 +1045,7 @@ final class AuthorizationSequenceCodeEntryControllerNode: ASDisplayNode, UITextF
if let startsWith, !text.isEmpty { if let startsWith, !text.isEmpty {
let firstWord = text.components(separatedBy: " ").first ?? "" let firstWord = text.components(separatedBy: " ").first ?? ""
if !firstWord.isEmpty && !startsWith.hasPrefix(firstWord) { if !firstWord.isEmpty && !startsWith.hasPrefix(firstWord) {
if self.errorTextNode.alpha.isZero, text.count < 4 { if self.errorTextNode.alpha.isZero, text.count < 4 || isPaste {
self.animateError(text: self.strings.Login_WrongPhraseError) self.animateError(text: self.strings.Login_WrongPhraseError)
} }
return false return false