git.iko.soy/dashared/GDproject
on master help sign in
improved log in process. almost done?
commit5707acab045586a2ec3484d94c620de7908cc099 authorDarya Rednikina <rednikina.com@yandex.ru> dateSat 23 Feb 2019, 19:26 (8 years ago) parent665bd8e
2 files changed+13−8
compare with master
unifiedsplit
GDproject/Controller/Profile/ProfileViewController.swift+2−5 GDproject/Supporting files/AppDelegate.swift+11−3
GDproject/Controller/Profile/ProfileViewController.swift+2−5
@@ -106,12 +106,9 @@ class ProfileViewController: UIViewController
106106 let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)
107107 let logoutAction = UIAlertAction(title: "Log out", style: .destructive)
108108 {
109− [weak self] (_) in
109+ (_) in
110110
111− let root = UIStoryboard.navRoot()
112− UIApplication.shared.keyWindow?.rootViewController = root
113− let coordinator = LogInCoordinator(navigationController: root, window: UIApplication.shared.keyWindow!)
114− coordinator.start()
111+ AppDelegate.logInAgain()
115112 }
116113
117114 optionMenu.addAction(editAction)
GDproject/Supporting files/AppDelegate.swift+11−3
@@ -11,7 +11,7 @@ import UIKit
1111@UIApplicationMain
1212class AppDelegate: UIResponder, UIApplicationDelegate {
1313
14− var coordinator: LogInCoordinator!
14+ static var coordinator: LogInCoordinator!
1515 var tabCoordinator: TabbarCoordinator!
1616
1717 var window: UIWindow?
@@ -19,6 +19,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
1919 return self.window!.rootViewController as? UINavigationController
2020 }
2121
22+ static func logInAgain(){
23+ let root = UIStoryboard.navRoot()
24+ UIApplication.shared.keyWindow?.rootViewController = root
25+ DataStorage.standard.setIsLoggedIn(value: false)
26+ coordinator = LogInCoordinator(navigationController: root, window: UIApplication.shared.keyWindow!)
27+ coordinator.start()
28+ }
29+
2230 private func makeCoordinator(with: UINavigationController) -> ChannelsCoordinator {
2331 return ChannelsCoordinator(currentChannel: Channel(title: "example", subtitle: "ex", hashtags: ["none"], people: ["none"], posts: []), navigationController: with)
2432 }
@@ -31,8 +39,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
3139 tabCoordinator = TabbarCoordinator(window: window!)
3240 tabCoordinator.start()
3341 } else {
34− coordinator = LogInCoordinator(navigationController: rootController!, window: window!)
35− coordinator.start()
42+ AppDelegate.coordinator = LogInCoordinator(navigationController: rootController!, window: window!)
43+ AppDelegate.coordinator.start()
3644 }
3745
3846 return true