git.iko.soy/dashared/GDproject
on master help sign in
improved log in process. almost done?
5707acaDarya Rednikina
GDproject/Controller/Profile/ProfileViewController.swift+2−5
compare with master
unifiedsplit
@@ -106,12 +106,9 @@ class ProfileViewController: UIViewController
106 let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)
106 let cancelAction = UIAlertAction(title: "Cancel", style: .cancel)
107 let logoutAction = UIAlertAction(title: "Log out", style: .destructive)
107 let logoutAction = UIAlertAction(title: "Log out", style: .destructive)
108 {
108 {
109− [weak self] (_) in
109+ (_) in
110
110
111− let root = UIStoryboard.navRoot()
111+ AppDelegate.logInAgain()
112− UIApplication.shared.keyWindow?.rootViewController = root
113− let coordinator = LogInCoordinator(navigationController: root, window: UIApplication.shared.keyWindow!)
114− coordinator.start()
115 }
112 }
116
113
117 optionMenu.addAction(editAction)
114 optionMenu.addAction(editAction)
GDproject/Supporting files/AppDelegate.swift+11−3
@@ -11,7 +11,7 @@ import UIKit
11@UIApplicationMain
11@UIApplicationMain
12class AppDelegate: UIResponder, UIApplicationDelegate {
12class AppDelegate: UIResponder, UIApplicationDelegate {
13
13
14− var coordinator: LogInCoordinator!
14+ static var coordinator: LogInCoordinator!
15 var tabCoordinator: TabbarCoordinator!
15 var tabCoordinator: TabbarCoordinator!
16
16
17 var window: UIWindow?
17 var window: UIWindow?
@@ -19,6 +19,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
19 return self.window!.rootViewController as? UINavigationController
19 return self.window!.rootViewController as? UINavigationController
20 }
20 }
21
21
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+
22 private func makeCoordinator(with: UINavigationController) -> ChannelsCoordinator {
30 private func makeCoordinator(with: UINavigationController) -> ChannelsCoordinator {
23 return ChannelsCoordinator(currentChannel: Channel(title: "example", subtitle: "ex", hashtags: ["none"], people: ["none"], posts: []), navigationController: with)
31 return ChannelsCoordinator(currentChannel: Channel(title: "example", subtitle: "ex", hashtags: ["none"], people: ["none"], posts: []), navigationController: with)
24 }
32 }
@@ -31,8 +39,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
31 tabCoordinator = TabbarCoordinator(window: window!)
39 tabCoordinator = TabbarCoordinator(window: window!)
32 tabCoordinator.start()
40 tabCoordinator.start()
33 } else {
41 } else {
34− coordinator = LogInCoordinator(navigationController: rootController!, window: window!)
42+ AppDelegate.coordinator = LogInCoordinator(navigationController: rootController!, window: window!)
35− coordinator.start()
43+ AppDelegate.coordinator.start()
36 }
44 }
37
45
38 return true
46 return true