git.iko.soy/dashared/GDproject
on master help sign in
previous changes. coordinator improved. good version with card in news. will be removed soon...
commit1520ef7904db515f166af730da42173d615377ae authorDarya Rednikina <rednikina.com@yandex.ru> dateSat 20 Apr 2019, 10:55 (7 years ago) parente5bb705
9 files changed+28−6
compare with master
unifiedsplit
Cartfile+2−1 GDproject.xcodeproj/project.pbxproj+6 GDproject.xcodeproj/xcshareddata/xcschemes/GDproject.xcscheme+2−2 GDproject/Controller/ News and channels/NewsVC.swift+9 GDproject/Controller/Coordinators/BaseCoordinator.swift+1−1 GDproject/Controller/Coordinators/TabbarCoordinator.swift+1−1 GDproject/Controller/Profile/ProfileViewController.swift+1−1 GDproject/Simple model/Model.swift+2 GDproject/Supporting files/AppDelegate.swift+4
Cartfile+2−1
@@ -5,4 +5,5 @@ github "macteo/Marklight"
55github "Alamofire/Alamofire" "5.0.0-beta.2"
66github "whitesmith/WSTagsField"
77github "ReactiveCocoa/ReactiveCocoa" ~> 8.0
8−github "52inc/Pulley"
8+github "52inc/Pulley"
9+github "HeroTransitions/Hero"
GDproject.xcodeproj/project.pbxproj+6
@@ -22,6 +22,8 @@
2222 1291BE2D2221312D009D3F23 /* ChannelsCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */; };
2323 1291BE342221569B009D3F23 /* TabbarCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */; };
2424 1291BE3622218DBF009D3F23 /* LogInCoordinator1.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1291BE3522218DBF009D3F23 /* LogInCoordinator1.swift */; };
25+ 12924BD6224401D4003813B9 /* Hero.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 12924BD5224401D4003813B9 /* Hero.framework */; };
26+ 12924BD8224401DC003813B9 /* Hero.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 12924BD5224401D4003813B9 /* Hero.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2527 12BA4B9B224101A400DF93D7 /* ApplicationCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */; };
2628 12BA4B9D224101E700DF93D7 /* BaseCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */; };
2729 12BA4B9F224102B700DF93D7 /* LogInCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */; };
@@ -82,6 +84,7 @@
8284 12E36DBD221441D5006FCDD7 /* TinyConstraints.framework in Embed Frameworks */,
8385 12F3D6C02241130200A69214 /* ReactiveSwift.framework in Embed Frameworks */,
8486 12F3D6BC224112FD00A69214 /* ReactiveCocoa.framework in Embed Frameworks */,
87+ 12924BD8224401DC003813B9 /* Hero.framework in Embed Frameworks */,
8588 123AD0E5223C1C4300326173 /* WSTagsField.framework in Embed Frameworks */,
8689 12F3D6CA2242645800A69214 /* Pulley.framework in Embed Frameworks */,
8790 12E36DC2221441E1006FCDD7 /* MarkdownKit.framework in Embed Frameworks */,
@@ -105,6 +108,7 @@
105108 1291BE2C2221312C009D3F23 /* ChannelsCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChannelsCoordinator.swift; sourceTree = "<group>"; };
106109 1291BE332221569B009D3F23 /* TabbarCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabbarCoordinator.swift; sourceTree = "<group>"; };
107110 1291BE3522218DBF009D3F23 /* LogInCoordinator1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInCoordinator1.swift; sourceTree = "<group>"; };
111+ 12924BD5224401D4003813B9 /* Hero.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Hero.framework; path = Carthage/Build/iOS/Hero.framework; sourceTree = "<group>"; };
108112 12BA4B9A224101A400DF93D7 /* ApplicationCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApplicationCoordinator.swift; sourceTree = "<group>"; };
109113 12BA4B9C224101E700DF93D7 /* BaseCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseCoordinator.swift; sourceTree = "<group>"; };
110114 12BA4B9E224102B700DF93D7 /* LogInCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogInCoordinator.swift; sourceTree = "<group>"; };
@@ -156,6 +160,7 @@
156160 12F3D6B8224112E900A69214 /* Result.framework in Frameworks */,
157161 12F3D6B6224112E100A69214 /* ReactiveSwift.framework in Frameworks */,
158162 12E36DDB221594B1006FCDD7 /* MarkdownKit.framework in Frameworks */,
163+ 12924BD6224401D4003813B9 /* Hero.framework in Frameworks */,
159164 12E36DAF22143D40006FCDD7 /* Cartography.framework in Frameworks */,
160165 123AD0E3223C1C3900326173 /* WSTagsField.framework in Frameworks */,
161166 12E36DB322143D4E006FCDD7 /* Marklight.framework in Frameworks */,
@@ -204,6 +209,7 @@
204209 12E36D8F221424EA006FCDD7 = {
205210 isa = PBXGroup;
206211 children = (
212+ 12924BD5224401D4003813B9 /* Hero.framework */,
207213 12F3D6C72242644D00A69214 /* Pulley.framework */,
208214 12F3D6B9224112F500A69214 /* ReactiveCocoa.framework */,
209215 12F3D6B7224112E800A69214 /* Result.framework */,
GDproject.xcodeproj/xcshareddata/xcschemes/GDproject.xcscheme+2−2
@@ -43,8 +43,8 @@
4343 </TestAction>
4444 <LaunchAction
4545 buildConfiguration = "Debug"
46− selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47− selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
46+ selectedDebuggerIdentifier = ""
47+ selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
4848 launchStyle = "0"
4949 useCustomWorkingDirectory = "NO"
5050 ignoresPersistentStateOnLaunch = "NO"
GDproject/Controller/ News and channels/NewsVC.swift+9
@@ -98,6 +98,15 @@ class NewsVC: UIViewController, UITableViewDelegate, UITableViewDataSource{
9898 }
9999}
100100
101+//extension NewsVC {
102+// override func prepare(for segue: UIStoryboardSegue, sender: Any?)
103+// {
104+// if let currentCell = sender as? PostViewCell,
105+// let vc = segue.destination as? FullPostController {
106+//
107+// }
108+// }
109+//}
101110
102111enum HeaderType {
103112 case NONE
GDproject/Controller/Coordinators/BaseCoordinator.swift+1−1
@@ -23,7 +23,7 @@ class BaseCoordinator: Coordinator {
2323
2424 // add only unique object
2525 func addDependency(_ coordinator: Coordinator) {
26− guard !childCoordinators.contains(where: { $0 === coordinator }) else { return }
26+ guard !childCoordinators.contains(where: { $0 === coordinator }) else { return }
2727 childCoordinators.append(coordinator)
2828 }
2929
GDproject/Controller/Coordinators/TabbarCoordinator.swift+1−1
@@ -15,7 +15,7 @@ class TabBarCoordinator: BaseCoordinator {
1515 var didEndFlow: (()->())?
1616
1717 private let tabbarView: TabbarView
18− private let window: UIWindow?
18+ private weak var window: UIWindow?
1919
2020 init(tabbarView: TabbarView, window: UIWindow) {
2121 self.tabbarView = tabbarView
GDproject/Controller/Profile/ProfileViewController.swift+1−1
@@ -81,7 +81,7 @@ class ProfileViewController: UIViewController
8181 override func viewDidLoad()
8282 {
8383 super.viewDidLoad()
84−
84+ print("hell")
8585 posts.viewController = self
8686 posts.type = .NONE
8787
GDproject/Simple model/Model.swift+2
@@ -7,6 +7,7 @@
77//
88
99import Foundation
10+import UIKit
1011import Alamofire
1112
1213class Model{
@@ -17,6 +18,7 @@ class Model{
1718 print(responce)
1819 if responce == invalidTocken {
1920 DataStorage.standard.setIsLoggedIn(value: false, with: 0)
21+ (UIApplication.shared.delegate as! AppDelegate).relaunch()
2022 }
2123 }
2224
GDproject/Supporting files/AppDelegate.swift+4
@@ -28,5 +28,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
2828
2929 return true
3030 }
31+
32+ func relaunch(){
33+ appCoordinator.start()
34+ }
3135}
3236