mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-23 06:35:51 +00:00
Various improvements
This commit is contained in:
Ilya Laktyushin
@@ -0,0 +1,258 @@
|
||||
import Foundation
|
||||
import UIKit
|
||||
import Display
|
||||
import AsyncDisplayKit
|
||||
import SwiftSignalKit
|
||||
import TelegramCore
|
||||
import Postbox
|
||||
import TelegramPresentationData
|
||||
import ProgressNavigationButtonNode
|
||||
import AccountContext
|
||||
import CountrySelectionUI
|
||||
import PhoneNumberFormat
|
||||
import DebugSettingsUI
|
||||
|
||||
final class AuthorizationSequencePhoneEntryController: ViewController {
|
||||
private var controllerNode: AuthorizationSequencePhoneEntryControllerNode {
|
||||
return self.displayNode as! AuthorizationSequencePhoneEntryControllerNode
|
||||
}
|
||||
|
||||
private let sharedContext: SharedAccountContext
|
||||
private var account: UnauthorizedAccount
|
||||
private let isTestingEnvironment: Bool
|
||||
private let otherAccountPhoneNumbers: ((String, AccountRecordId, Bool)?, [(String, AccountRecordId, Bool)])
|
||||
private let network: Network
|
||||
private let presentationData: PresentationData
|
||||
private let openUrl: (String) -> Void
|
||||
|
||||
private let back: () -> Void
|
||||
|
||||
private var currentData: (Int32, String?, String)?
|
||||
|
||||
var codeNode: ASDisplayNode {
|
||||
return self.controllerNode.codeNode
|
||||
}
|
||||
|
||||
var numberNode: ASDisplayNode {
|
||||
return self.controllerNode.numberNode
|
||||
}
|
||||
|
||||
var buttonNode: ASDisplayNode {
|
||||
return self.controllerNode.buttonNode
|
||||
}
|
||||
|
||||
var inProgress: Bool = false {
|
||||
didSet {
|
||||
// if self.inProgress {
|
||||
// let item = UIBarButtonItem(customDisplayNode: ProgressNavigationButtonNode(color: self.presentationData.theme.rootController.navigationBar.accentTextColor))
|
||||
// self.navigationItem.rightBarButtonItem = item
|
||||
// } else {
|
||||
// self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Next, style: .done, target: self, action: #selector(self.nextPressed))
|
||||
// }
|
||||
self.controllerNode.inProgress = self.inProgress
|
||||
self.confirmationController?.inProgress = self.inProgress
|
||||
}
|
||||
}
|
||||
var loginWithNumber: ((String, Bool) -> Void)?
|
||||
var accountUpdated: ((UnauthorizedAccount) -> Void)?
|
||||
|
||||
weak var confirmationController: PhoneConfirmationController?
|
||||
|
||||
private let termsDisposable = MetaDisposable()
|
||||
|
||||
private let hapticFeedback = HapticFeedback()
|
||||
|
||||
init(sharedContext: SharedAccountContext, account: UnauthorizedAccount, isTestingEnvironment: Bool, otherAccountPhoneNumbers: ((String, AccountRecordId, Bool)?, [(String, AccountRecordId, Bool)]), network: Network, presentationData: PresentationData, openUrl: @escaping (String) -> Void, back: @escaping () -> Void) {
|
||||
self.sharedContext = sharedContext
|
||||
self.account = account
|
||||
self.isTestingEnvironment = isTestingEnvironment
|
||||
self.otherAccountPhoneNumbers = otherAccountPhoneNumbers
|
||||
self.network = network
|
||||
self.presentationData = presentationData
|
||||
self.openUrl = openUrl
|
||||
self.back = back
|
||||
|
||||
super.init(navigationBarPresentationData: NavigationBarPresentationData(theme: AuthorizationSequenceController.navigationBarTheme(presentationData.theme), strings: NavigationBarStrings(presentationStrings: presentationData.strings)))
|
||||
|
||||
self.supportedOrientations = ViewControllerSupportedOrientations(regularSize: .all, compactSize: .portrait)
|
||||
|
||||
self.hasActiveInput = true
|
||||
|
||||
self.statusBar.statusBarStyle = presentationData.theme.intro.statusBarStyle.style
|
||||
self.attemptNavigation = { _ in
|
||||
return false
|
||||
}
|
||||
self.navigationBar?.backPressed = {
|
||||
back()
|
||||
}
|
||||
|
||||
if !otherAccountPhoneNumbers.1.isEmpty {
|
||||
self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(self.cancelPressed))
|
||||
}
|
||||
// self.navigationItem.rightBarButtonItem = UIBarButtonItem(title: presentationData.strings.Common_Next, style: .done, target: self, action: #selector(self.nextPressed))
|
||||
}
|
||||
|
||||
required init(coder aDecoder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
|
||||
deinit {
|
||||
self.termsDisposable.dispose()
|
||||
}
|
||||
|
||||
@objc private func cancelPressed() {
|
||||
self.back()
|
||||
}
|
||||
|
||||
func updateData(countryCode: Int32, countryName: String?, number: String) {
|
||||
self.currentData = (countryCode, countryName, number)
|
||||
if self.isNodeLoaded {
|
||||
self.controllerNode.codeAndNumber = (countryCode, countryName, number)
|
||||
}
|
||||
}
|
||||
|
||||
private var shouldAnimateIn = false
|
||||
private var transitionInArguments: (buttonFrame: CGRect, buttonTitle: String, animationSnapshot: UIView, textSnapshot: UIView)?
|
||||
|
||||
func animateWithSplashController(_ controller: AuthorizationSequenceSplashController) {
|
||||
self.shouldAnimateIn = true
|
||||
|
||||
if let animationSnapshot = controller.animationSnapshot, let textSnapshot = controller.textSnaphot {
|
||||
self.transitionInArguments = (controller.buttonFrame, controller.buttonTitle, animationSnapshot, textSnapshot)
|
||||
}
|
||||
}
|
||||
|
||||
override public func loadDisplayNode() {
|
||||
self.displayNode = AuthorizationSequencePhoneEntryControllerNode(sharedContext: self.sharedContext, account: self.account, strings: self.presentationData.strings, theme: self.presentationData.theme, debugAction: { [weak self] in
|
||||
guard let strongSelf = self else {
|
||||
return
|
||||
}
|
||||
strongSelf.view.endEditing(true)
|
||||
self?.present(debugController(sharedContext: strongSelf.sharedContext, context: nil, modal: true), in: .window(.root), with: ViewControllerPresentationArguments(presentationAnimation: .modalSheet))
|
||||
}, hasOtherAccounts: self.otherAccountPhoneNumbers.0 != nil)
|
||||
self.controllerNode.accountUpdated = { [weak self] account in
|
||||
guard let strongSelf = self else {
|
||||
return
|
||||
}
|
||||
strongSelf.account = account
|
||||
strongSelf.accountUpdated?(account)
|
||||
}
|
||||
|
||||
if let (code, name, number) = self.currentData {
|
||||
self.controllerNode.codeAndNumber = (code, name, number)
|
||||
}
|
||||
self.displayNodeDidLoad()
|
||||
|
||||
self.controllerNode.view.disableAutomaticKeyboardHandling = [.forward, .backward]
|
||||
|
||||
self.controllerNode.selectCountryCode = { [weak self] in
|
||||
if let strongSelf = self {
|
||||
let controller = AuthorizationSequenceCountrySelectionController(strings: strongSelf.presentationData.strings, theme: strongSelf.presentationData.theme)
|
||||
controller.completeWithCountryCode = { code, name in
|
||||
if let strongSelf = self, let currentData = strongSelf.currentData {
|
||||
strongSelf.updateData(countryCode: Int32(code), countryName: name, number: currentData.2)
|
||||
strongSelf.controllerNode.activateInput()
|
||||
}
|
||||
}
|
||||
controller.dismissed = {
|
||||
self?.controllerNode.activateInput()
|
||||
}
|
||||
strongSelf.push(controller)
|
||||
}
|
||||
}
|
||||
self.controllerNode.checkPhone = { [weak self] in
|
||||
self?.nextPressed()
|
||||
}
|
||||
|
||||
loadServerCountryCodes(accountManager: sharedContext.accountManager, engine: TelegramEngineUnauthorized(account: self.account), completion: { [weak self] in
|
||||
if let strongSelf = self {
|
||||
strongSelf.controllerNode.updateCountryCode()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
private var animatingIn = false
|
||||
override func viewWillAppear(_ animated: Bool) {
|
||||
super.viewWillAppear(animated)
|
||||
|
||||
if self.shouldAnimateIn {
|
||||
self.animatingIn = true
|
||||
if let (buttonFrame, buttonTitle, animationSnapshot, textSnapshot) = self.transitionInArguments {
|
||||
self.controllerNode.willAnimateIn(buttonFrame: buttonFrame, buttonTitle: buttonTitle, animationSnapshot: animationSnapshot, textSnapshot: textSnapshot)
|
||||
}
|
||||
Queue.mainQueue().justDispatch {
|
||||
self.controllerNode.activateInput()
|
||||
}
|
||||
} else {
|
||||
self.controllerNode.activateInput()
|
||||
}
|
||||
}
|
||||
|
||||
override func viewDidAppear(_ animated: Bool) {
|
||||
super.viewDidAppear(animated)
|
||||
|
||||
if !self.animatingIn {
|
||||
self.controllerNode.activateInput()
|
||||
}
|
||||
}
|
||||
|
||||
override func viewWillDisappear(_ animated: Bool) {
|
||||
super.viewWillDisappear(animated)
|
||||
|
||||
if let confirmationController = self.confirmationController {
|
||||
confirmationController.transitionOut()
|
||||
}
|
||||
}
|
||||
|
||||
override func containerLayoutUpdated(_ layout: ContainerViewLayout, transition: ContainedViewLayoutTransition) {
|
||||
super.containerLayoutUpdated(layout, transition: transition)
|
||||
|
||||
self.controllerNode.containerLayoutUpdated(layout, navigationBarHeight: self.navigationLayout(layout: layout).navigationFrame.maxY, transition: transition)
|
||||
|
||||
if self.shouldAnimateIn, let inputHeight = layout.inputHeight, inputHeight > 0.0 {
|
||||
if let (buttonFrame, buttonTitle, animationSnapshot, textSnapshot) = self.transitionInArguments {
|
||||
self.shouldAnimateIn = false
|
||||
self.controllerNode.animateIn(buttonFrame: buttonFrame, buttonTitle: buttonTitle, animationSnapshot: animationSnapshot, textSnapshot: textSnapshot)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@objc func nextPressed() {
|
||||
let (_, _, number) = self.controllerNode.codeAndNumber
|
||||
if !number.isEmpty {
|
||||
let logInNumber = formatPhoneNumber(self.controllerNode.currentNumber)
|
||||
var existing: (String, AccountRecordId)?
|
||||
for (number, id, isTestingEnvironment) in self.otherAccountPhoneNumbers.1 {
|
||||
if isTestingEnvironment == self.isTestingEnvironment && formatPhoneNumber(number) == logInNumber {
|
||||
existing = (number, id)
|
||||
}
|
||||
}
|
||||
|
||||
if let (_, id) = existing {
|
||||
var actions: [TextAlertAction] = []
|
||||
if let (current, _, _) = self.otherAccountPhoneNumbers.0, logInNumber != formatPhoneNumber(current) {
|
||||
actions.append(TextAlertAction(type: .genericAction, title: self.presentationData.strings.Login_PhoneNumberAlreadyAuthorizedSwitch, action: { [weak self] in
|
||||
self?.sharedContext.switchToAccount(id: id, fromSettingsController: nil, withChatListController: nil)
|
||||
self?.back()
|
||||
}))
|
||||
}
|
||||
actions.append(TextAlertAction(type: .defaultAction, title: self.presentationData.strings.Common_OK, action: {}))
|
||||
self.present(standardTextAlertController(theme: AlertControllerTheme(presentationData: self.presentationData), title: nil, text: self.presentationData.strings.Login_PhoneNumberAlreadyAuthorized, actions: actions), in: .window(.root))
|
||||
} else {
|
||||
let (code, formattedNumber) = self.controllerNode.formattedCodeAndNumber
|
||||
|
||||
let confirmationController = PhoneConfirmationController(theme: self.presentationData.theme, strings: self.presentationData.strings, code: code, number: formattedNumber, sourceController: self)
|
||||
confirmationController.proceed = { [weak self] in
|
||||
if let strongSelf = self {
|
||||
strongSelf.loginWithNumber?(strongSelf.controllerNode.currentNumber, strongSelf.controllerNode.syncContacts)
|
||||
}
|
||||
}
|
||||
(self.navigationController as? NavigationController)?.presentOverlay(controller: confirmationController, inGlobal: true, blockInteraction: true)
|
||||
self.confirmationController = confirmationController
|
||||
}
|
||||
} else {
|
||||
self.hapticFeedback.error()
|
||||
self.controllerNode.animateError()
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user