diff --git a/bike-ios.xcodeproj/project.pbxproj b/bike-ios.xcodeproj/project.pbxproj index d3d26f2..45f3c61 100644 --- a/bike-ios.xcodeproj/project.pbxproj +++ b/bike-ios.xcodeproj/project.pbxproj @@ -7,8 +7,36 @@ objects = { /* Begin PBXBuildFile section */ + A388F4702324F087009EB5D3 /* MapLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F46F2324F087009EB5D3 /* MapLocation.swift */; }; + A388F4732324F0C7009EB5D3 /* MapLocationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4722324F0C7009EB5D3 /* MapLocationService.swift */; }; + A388F4782324F1F3009EB5D3 /* MainMapPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4772324F1F3009EB5D3 /* MainMapPresenter.swift */; }; + A388F47A2324F263009EB5D3 /* MainMapViewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4792324F263009EB5D3 /* MainMapViewData.swift */; }; + A388F47C2324F2A3009EB5D3 /* MainMapViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F47B2324F2A3009EB5D3 /* MainMapViewProtocol.swift */; }; + A388F47E2324F35C009EB5D3 /* MainMapViewController+ViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F47D2324F35C009EB5D3 /* MainMapViewController+ViewProtocol.swift */; }; + A388F4862324F510009EB5D3 /* StopoverLocation.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4852324F510009EB5D3 /* StopoverLocation.swift */; }; + A388F4882324F562009EB5D3 /* StopoverLocationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4872324F562009EB5D3 /* StopoverLocationService.swift */; }; + A388F48A2324F5A2009EB5D3 /* StopoverMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4892324F5A2009EB5D3 /* StopoverMapViewController.swift */; }; + A388F48C2324F5E1009EB5D3 /* StopoverMapViewController+ViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F48B2324F5E1009EB5D3 /* StopoverMapViewController+ViewProtocol.swift */; }; + A388F48E2324F5FD009EB5D3 /* StopoverMapViewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F48D2324F5FD009EB5D3 /* StopoverMapViewData.swift */; }; + A388F4902324F60D009EB5D3 /* StopoverMapViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F48F2324F60D009EB5D3 /* StopoverMapViewProtocol.swift */; }; + A388F4922324F652009EB5D3 /* StopoverMapPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4912324F651009EB5D3 /* StopoverMapPresenter.swift */; }; + A388F4972324F6E6009EB5D3 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4962324F6E6009EB5D3 /* Result.swift */; }; + A388F4992324F6F0009EB5D3 /* ResultService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4982324F6F0009EB5D3 /* ResultService.swift */; }; + A388F49B2324F70E009EB5D3 /* ResultViewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F49A2324F70E009EB5D3 /* ResultViewData.swift */; }; + A388F49D2324F718009EB5D3 /* ResultViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F49C2324F718009EB5D3 /* ResultViewProtocol.swift */; }; + A388F49F2324F725009EB5D3 /* ResultPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F49E2324F725009EB5D3 /* ResultPresenter.swift */; }; + A388F4A12324F74C009EB5D3 /* ResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4A02324F74C009EB5D3 /* ResultViewController.swift */; }; + A388F4A32324F75D009EB5D3 /* ResultViewController+ViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4A22324F75D009EB5D3 /* ResultViewController+ViewProtocol.swift */; }; + A388F4A82324F7D8009EB5D3 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4A72324F7D8009EB5D3 /* History.swift */; }; + A388F4AA2324F7E3009EB5D3 /* HistoryService.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4A92324F7E3009EB5D3 /* HistoryService.swift */; }; + A388F4AC2324F7FF009EB5D3 /* HistoryViewData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4AB2324F7FF009EB5D3 /* HistoryViewData.swift */; }; + A388F4AE2324F812009EB5D3 /* HistoryViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4AD2324F812009EB5D3 /* HistoryViewProtocol.swift */; }; + A388F4B02324F835009EB5D3 /* HistoryPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4AF2324F835009EB5D3 /* HistoryPresenter.swift */; }; + A388F4B22324F84E009EB5D3 /* HistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4B12324F84E009EB5D3 /* HistoryViewController.swift */; }; + A388F4B42324F85C009EB5D3 /* HistoryViewController+ViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4B32324F85C009EB5D3 /* HistoryViewController+ViewProtocol.swift */; }; + A388F4B62324F8E6009EB5D3 /* UIColor+.swift in Sources */ = {isa = PBXBuildFile; fileRef = A388F4B52324F8E6009EB5D3 /* UIColor+.swift */; }; A3C5E7A322E1F1C60098F520 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3C5E7A222E1F1C60098F520 /* AppDelegate.swift */; }; - A3C5E7A522E1F1C60098F520 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3C5E7A422E1F1C60098F520 /* ViewController.swift */; }; + A3C5E7A522E1F1C60098F520 /* MainMapViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3C5E7A422E1F1C60098F520 /* MainMapViewController.swift */; }; A3C5E7A822E1F1C60098F520 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A3C5E7A622E1F1C60098F520 /* Main.storyboard */; }; A3C5E7AA22E1F1C90098F520 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A3C5E7A922E1F1C90098F520 /* Assets.xcassets */; }; A3C5E7AD22E1F1C90098F520 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A3C5E7AB22E1F1C90098F520 /* LaunchScreen.storyboard */; }; @@ -17,9 +45,37 @@ /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + A388F46F2324F087009EB5D3 /* MapLocation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLocation.swift; sourceTree = ""; }; + A388F4722324F0C7009EB5D3 /* MapLocationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapLocationService.swift; sourceTree = ""; }; + A388F4772324F1F3009EB5D3 /* MainMapPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMapPresenter.swift; sourceTree = ""; }; + A388F4792324F263009EB5D3 /* MainMapViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMapViewData.swift; sourceTree = ""; }; + A388F47B2324F2A3009EB5D3 /* MainMapViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMapViewProtocol.swift; sourceTree = ""; }; + A388F47D2324F35C009EB5D3 /* MainMapViewController+ViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MainMapViewController+ViewProtocol.swift"; sourceTree = ""; }; + A388F4852324F510009EB5D3 /* StopoverLocation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopoverLocation.swift; sourceTree = ""; }; + A388F4872324F562009EB5D3 /* StopoverLocationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopoverLocationService.swift; sourceTree = ""; }; + A388F4892324F5A2009EB5D3 /* StopoverMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopoverMapViewController.swift; sourceTree = ""; }; + A388F48B2324F5E1009EB5D3 /* StopoverMapViewController+ViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "StopoverMapViewController+ViewProtocol.swift"; sourceTree = ""; }; + A388F48D2324F5FD009EB5D3 /* StopoverMapViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopoverMapViewData.swift; sourceTree = ""; }; + A388F48F2324F60D009EB5D3 /* StopoverMapViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopoverMapViewProtocol.swift; sourceTree = ""; }; + A388F4912324F651009EB5D3 /* StopoverMapPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopoverMapPresenter.swift; sourceTree = ""; }; + A388F4962324F6E6009EB5D3 /* Result.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = ""; }; + A388F4982324F6F0009EB5D3 /* ResultService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultService.swift; sourceTree = ""; }; + A388F49A2324F70E009EB5D3 /* ResultViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultViewData.swift; sourceTree = ""; }; + A388F49C2324F718009EB5D3 /* ResultViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultViewProtocol.swift; sourceTree = ""; }; + A388F49E2324F725009EB5D3 /* ResultPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultPresenter.swift; sourceTree = ""; }; + A388F4A02324F74C009EB5D3 /* ResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResultViewController.swift; sourceTree = ""; }; + A388F4A22324F75D009EB5D3 /* ResultViewController+ViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ResultViewController+ViewProtocol.swift"; sourceTree = ""; }; + A388F4A72324F7D8009EB5D3 /* History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = History.swift; sourceTree = ""; }; + A388F4A92324F7E3009EB5D3 /* HistoryService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryService.swift; sourceTree = ""; }; + A388F4AB2324F7FF009EB5D3 /* HistoryViewData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViewData.swift; sourceTree = ""; }; + A388F4AD2324F812009EB5D3 /* HistoryViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViewProtocol.swift; sourceTree = ""; }; + A388F4AF2324F835009EB5D3 /* HistoryPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryPresenter.swift; sourceTree = ""; }; + A388F4B12324F84E009EB5D3 /* HistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryViewController.swift; sourceTree = ""; }; + A388F4B32324F85C009EB5D3 /* HistoryViewController+ViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HistoryViewController+ViewProtocol.swift"; sourceTree = ""; }; + A388F4B52324F8E6009EB5D3 /* UIColor+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+.swift"; sourceTree = ""; }; A3C5E79F22E1F1C60098F520 /* bike-ios.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "bike-ios.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A3C5E7A222E1F1C60098F520 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; - A3C5E7A422E1F1C60098F520 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + A3C5E7A422E1F1C60098F520 /* MainMapViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainMapViewController.swift; sourceTree = ""; }; A3C5E7A722E1F1C60098F520 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; A3C5E7A922E1F1C90098F520 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; A3C5E7AC22E1F1C90098F520 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -50,6 +106,180 @@ name = Frameworks; sourceTree = ""; }; + A388F46A2324EF03009EB5D3 /* Main */ = { + isa = PBXGroup; + children = ( + A388F4742324F1BD009EB5D3 /* Model */, + A388F4752324F1C4009EB5D3 /* View */, + A388F4762324F1CA009EB5D3 /* Presenter */, + ); + path = Main; + sourceTree = ""; + }; + A388F46B2324EF09009EB5D3 /* Stopover */ = { + isa = PBXGroup; + children = ( + A388F4842324F4DD009EB5D3 /* Model */, + A388F4832324F4D7009EB5D3 /* View */, + A388F4822324F4CE009EB5D3 /* Presenter */, + ); + path = Stopover; + sourceTree = ""; + }; + A388F46C2324EF0C009EB5D3 /* Setting */ = { + isa = PBXGroup; + children = ( + A388F4A62324F7C4009EB5D3 /* Model */, + A388F4A52324F7BC009EB5D3 /* View */, + A388F4A42324F7B4009EB5D3 /* Presenter */, + ); + path = Setting; + sourceTree = ""; + }; + A388F46E2324EF39009EB5D3 /* End */ = { + isa = PBXGroup; + children = ( + A388F4932324F695009EB5D3 /* Model */, + A388F4942324F6A4009EB5D3 /* View */, + A388F4952324F6AC009EB5D3 /* Presenter */, + ); + path = End; + sourceTree = ""; + }; + A388F4742324F1BD009EB5D3 /* Model */ = { + isa = PBXGroup; + children = ( + A388F46F2324F087009EB5D3 /* MapLocation.swift */, + A388F4722324F0C7009EB5D3 /* MapLocationService.swift */, + ); + path = Model; + sourceTree = ""; + }; + A388F4752324F1C4009EB5D3 /* View */ = { + isa = PBXGroup; + children = ( + A3C5E7A422E1F1C60098F520 /* MainMapViewController.swift */, + A388F47D2324F35C009EB5D3 /* MainMapViewController+ViewProtocol.swift */, + ); + path = View; + sourceTree = ""; + }; + A388F4762324F1CA009EB5D3 /* Presenter */ = { + isa = PBXGroup; + children = ( + A388F4792324F263009EB5D3 /* MainMapViewData.swift */, + A388F47B2324F2A3009EB5D3 /* MainMapViewProtocol.swift */, + A388F4772324F1F3009EB5D3 /* MainMapPresenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + A388F47F2324F3EA009EB5D3 /* Common */ = { + isa = PBXGroup; + children = ( + ); + path = Common; + sourceTree = ""; + }; + A388F4802324F3F7009EB5D3 /* Resource */ = { + isa = PBXGroup; + children = ( + ); + path = Resource; + sourceTree = ""; + }; + A388F4812324F42D009EB5D3 /* Extension */ = { + isa = PBXGroup; + children = ( + A388F4B52324F8E6009EB5D3 /* UIColor+.swift */, + ); + path = Extension; + sourceTree = ""; + }; + A388F4822324F4CE009EB5D3 /* Presenter */ = { + isa = PBXGroup; + children = ( + A388F48D2324F5FD009EB5D3 /* StopoverMapViewData.swift */, + A388F48F2324F60D009EB5D3 /* StopoverMapViewProtocol.swift */, + A388F4912324F651009EB5D3 /* StopoverMapPresenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + A388F4832324F4D7009EB5D3 /* View */ = { + isa = PBXGroup; + children = ( + A388F4892324F5A2009EB5D3 /* StopoverMapViewController.swift */, + A388F48B2324F5E1009EB5D3 /* StopoverMapViewController+ViewProtocol.swift */, + ); + path = View; + sourceTree = ""; + }; + A388F4842324F4DD009EB5D3 /* Model */ = { + isa = PBXGroup; + children = ( + A388F4852324F510009EB5D3 /* StopoverLocation.swift */, + A388F4872324F562009EB5D3 /* StopoverLocationService.swift */, + ); + path = Model; + sourceTree = ""; + }; + A388F4932324F695009EB5D3 /* Model */ = { + isa = PBXGroup; + children = ( + A388F4962324F6E6009EB5D3 /* Result.swift */, + A388F4982324F6F0009EB5D3 /* ResultService.swift */, + ); + path = Model; + sourceTree = ""; + }; + A388F4942324F6A4009EB5D3 /* View */ = { + isa = PBXGroup; + children = ( + A388F4A02324F74C009EB5D3 /* ResultViewController.swift */, + A388F4A22324F75D009EB5D3 /* ResultViewController+ViewProtocol.swift */, + ); + path = View; + sourceTree = ""; + }; + A388F4952324F6AC009EB5D3 /* Presenter */ = { + isa = PBXGroup; + children = ( + A388F49A2324F70E009EB5D3 /* ResultViewData.swift */, + A388F49C2324F718009EB5D3 /* ResultViewProtocol.swift */, + A388F49E2324F725009EB5D3 /* ResultPresenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + A388F4A42324F7B4009EB5D3 /* Presenter */ = { + isa = PBXGroup; + children = ( + A388F4AB2324F7FF009EB5D3 /* HistoryViewData.swift */, + A388F4AD2324F812009EB5D3 /* HistoryViewProtocol.swift */, + A388F4AF2324F835009EB5D3 /* HistoryPresenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + A388F4A52324F7BC009EB5D3 /* View */ = { + isa = PBXGroup; + children = ( + A388F4B12324F84E009EB5D3 /* HistoryViewController.swift */, + A388F4B32324F85C009EB5D3 /* HistoryViewController+ViewProtocol.swift */, + ); + path = View; + sourceTree = ""; + }; + A388F4A62324F7C4009EB5D3 /* Model */ = { + isa = PBXGroup; + children = ( + A388F4A72324F7D8009EB5D3 /* History.swift */, + A388F4A92324F7E3009EB5D3 /* HistoryService.swift */, + ); + path = Model; + sourceTree = ""; + }; A3C5E79622E1F1C60098F520 = { isa = PBXGroup; children = ( @@ -73,11 +303,17 @@ isa = PBXGroup; children = ( A3C5E7A222E1F1C60098F520 /* AppDelegate.swift */, - A3C5E7A422E1F1C60098F520 /* ViewController.swift */, A3C5E7A622E1F1C60098F520 /* Main.storyboard */, A3C5E7A922E1F1C90098F520 /* Assets.xcassets */, A3C5E7AB22E1F1C90098F520 /* LaunchScreen.storyboard */, A3C5E7AE22E1F1C90098F520 /* Info.plist */, + A388F47F2324F3EA009EB5D3 /* Common */, + A388F4812324F42D009EB5D3 /* Extension */, + A388F4802324F3F7009EB5D3 /* Resource */, + A388F46A2324EF03009EB5D3 /* Main */, + A388F46B2324EF09009EB5D3 /* Stopover */, + A388F46E2324EF39009EB5D3 /* End */, + A388F46C2324EF0C009EB5D3 /* Setting */, ); path = "bike-ios"; sourceTree = ""; @@ -207,8 +443,36 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - A3C5E7A522E1F1C60098F520 /* ViewController.swift in Sources */, + A388F4992324F6F0009EB5D3 /* ResultService.swift in Sources */, + A3C5E7A522E1F1C60098F520 /* MainMapViewController.swift in Sources */, + A388F4A12324F74C009EB5D3 /* ResultViewController.swift in Sources */, + A388F4702324F087009EB5D3 /* MapLocation.swift in Sources */, + A388F48C2324F5E1009EB5D3 /* StopoverMapViewController+ViewProtocol.swift in Sources */, + A388F48A2324F5A2009EB5D3 /* StopoverMapViewController.swift in Sources */, + A388F4A32324F75D009EB5D3 /* ResultViewController+ViewProtocol.swift in Sources */, + A388F4B42324F85C009EB5D3 /* HistoryViewController+ViewProtocol.swift in Sources */, + A388F47A2324F263009EB5D3 /* MainMapViewData.swift in Sources */, + A388F4732324F0C7009EB5D3 /* MapLocationService.swift in Sources */, + A388F4972324F6E6009EB5D3 /* Result.swift in Sources */, + A388F4B02324F835009EB5D3 /* HistoryPresenter.swift in Sources */, + A388F4AA2324F7E3009EB5D3 /* HistoryService.swift in Sources */, A3C5E7A322E1F1C60098F520 /* AppDelegate.swift in Sources */, + A388F49D2324F718009EB5D3 /* ResultViewProtocol.swift in Sources */, + A388F48E2324F5FD009EB5D3 /* StopoverMapViewData.swift in Sources */, + A388F4A82324F7D8009EB5D3 /* History.swift in Sources */, + A388F49F2324F725009EB5D3 /* ResultPresenter.swift in Sources */, + A388F4902324F60D009EB5D3 /* StopoverMapViewProtocol.swift in Sources */, + A388F4862324F510009EB5D3 /* StopoverLocation.swift in Sources */, + A388F4B22324F84E009EB5D3 /* HistoryViewController.swift in Sources */, + A388F4AC2324F7FF009EB5D3 /* HistoryViewData.swift in Sources */, + A388F4882324F562009EB5D3 /* StopoverLocationService.swift in Sources */, + A388F4922324F652009EB5D3 /* StopoverMapPresenter.swift in Sources */, + A388F47E2324F35C009EB5D3 /* MainMapViewController+ViewProtocol.swift in Sources */, + A388F4B62324F8E6009EB5D3 /* UIColor+.swift in Sources */, + A388F49B2324F70E009EB5D3 /* ResultViewData.swift in Sources */, + A388F4AE2324F812009EB5D3 /* HistoryViewProtocol.swift in Sources */, + A388F47C2324F2A3009EB5D3 /* MainMapViewProtocol.swift in Sources */, + A388F4782324F1F3009EB5D3 /* MainMapPresenter.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/bike-ios/AppDelegate.swift b/bike-ios/AppDelegate.swift index fbc7bb3..bd3e6ea 100644 --- a/bike-ios/AppDelegate.swift +++ b/bike-ios/AppDelegate.swift @@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? - func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. return true @@ -41,6 +40,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate { // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. } - } - diff --git a/bike-ios/Base.lproj/Main.storyboard b/bike-ios/Base.lproj/Main.storyboard index f1bcf38..0cb75c7 100644 --- a/bike-ios/Base.lproj/Main.storyboard +++ b/bike-ios/Base.lproj/Main.storyboard @@ -1,15 +1,19 @@ - + + + + - + + - + - + diff --git a/bike-ios/End/Model/Result.swift b/bike-ios/End/Model/Result.swift new file mode 100644 index 0000000..81a4343 --- /dev/null +++ b/bike-ios/End/Model/Result.swift @@ -0,0 +1,13 @@ +// +// Result.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct Result { + +} diff --git a/bike-ios/End/Model/ResultService.swift b/bike-ios/End/Model/ResultService.swift new file mode 100644 index 0000000..e029527 --- /dev/null +++ b/bike-ios/End/Model/ResultService.swift @@ -0,0 +1,13 @@ +// +// ResultService.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class ResultService { + +} diff --git a/bike-ios/End/Presenter/ResultPresenter.swift b/bike-ios/End/Presenter/ResultPresenter.swift new file mode 100644 index 0000000..1ccc8e7 --- /dev/null +++ b/bike-ios/End/Presenter/ResultPresenter.swift @@ -0,0 +1,13 @@ +// +// ResultPresenter.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class ResultPresenter { + +} diff --git a/bike-ios/End/Presenter/ResultViewData.swift b/bike-ios/End/Presenter/ResultViewData.swift new file mode 100644 index 0000000..34260d1 --- /dev/null +++ b/bike-ios/End/Presenter/ResultViewData.swift @@ -0,0 +1,13 @@ +// +// ResultViewData.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct ResultViewData { + +} diff --git a/bike-ios/End/Presenter/ResultViewProtocol.swift b/bike-ios/End/Presenter/ResultViewProtocol.swift new file mode 100644 index 0000000..23afcbe --- /dev/null +++ b/bike-ios/End/Presenter/ResultViewProtocol.swift @@ -0,0 +1,13 @@ +// +// ResultViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +protocol ResultViewProtocol { + +} diff --git a/bike-ios/End/View/ResultViewController+ViewProtocol.swift b/bike-ios/End/View/ResultViewController+ViewProtocol.swift new file mode 100644 index 0000000..2c732c2 --- /dev/null +++ b/bike-ios/End/View/ResultViewController+ViewProtocol.swift @@ -0,0 +1,13 @@ +// +// ResultViewController+ViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +extension ResultViewController: ResultViewProtocol { + +} diff --git a/bike-ios/End/View/ResultViewController.swift b/bike-ios/End/View/ResultViewController.swift new file mode 100644 index 0000000..c4735cb --- /dev/null +++ b/bike-ios/End/View/ResultViewController.swift @@ -0,0 +1,29 @@ +// +// ResultViewController.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +class ResultViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/bike-ios/Extension/UIColor+.swift b/bike-ios/Extension/UIColor+.swift new file mode 100644 index 0000000..d9f9a74 --- /dev/null +++ b/bike-ios/Extension/UIColor+.swift @@ -0,0 +1,53 @@ +// +// UIColor+.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +extension UIColor { + + @nonobjc class var darkMint: UIColor { + return UIColor(red: 78.0 / 255.0, green: 184.0 / 255.0, blue: 138.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var paleTurquoise: UIColor { + return UIColor(red: 191.0 / 255.0, green: 226.0 / 255.0, blue: 210.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var brownishGrey: UIColor { + return UIColor(white: 112.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var white: UIColor { + return UIColor(white: 1.0, alpha: 1.0) + } + + @nonobjc class var oceanGreen: UIColor { + return UIColor(red: 50.0 / 255.0, green: 128.0 / 255.0, blue: 94.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var brownGrey: UIColor { + return UIColor(white: 172.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var brownGreyTwo: UIColor { + return UIColor(white: 140.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var lightTeal: UIColor { + return UIColor(red: 142.0 / 255.0, green: 213.0 / 255.0, blue: 182.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var duckEggBlue: UIColor { + return UIColor(red: 214.0 / 255.0, green: 229.0 / 255.0, blue: 222.0 / 255.0, alpha: 1.0) + } + + @nonobjc class var silver: UIColor { + return UIColor(red: 172.0 / 255.0, green: 213.0 / 255.0, blue: 195.0 / 255.0, alpha: 1.0) + } + +} diff --git a/bike-ios/Main/Model/MapLocation.swift b/bike-ios/Main/Model/MapLocation.swift new file mode 100644 index 0000000..26a091b --- /dev/null +++ b/bike-ios/Main/Model/MapLocation.swift @@ -0,0 +1,13 @@ +// +// MapLocation.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct MapLocation { + +} diff --git a/bike-ios/Main/Model/MapLocationService.swift b/bike-ios/Main/Model/MapLocationService.swift new file mode 100644 index 0000000..a6d913f --- /dev/null +++ b/bike-ios/Main/Model/MapLocationService.swift @@ -0,0 +1,13 @@ +// +// MapLocationService.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class MapLocationService { + +} diff --git a/bike-ios/Main/Presenter/MainMapPresenter.swift b/bike-ios/Main/Presenter/MainMapPresenter.swift new file mode 100644 index 0000000..07516f6 --- /dev/null +++ b/bike-ios/Main/Presenter/MainMapPresenter.swift @@ -0,0 +1,13 @@ +// +// MainMapPresenter.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class MainMapPresenter { + +} diff --git a/bike-ios/Main/Presenter/MainMapViewData.swift b/bike-ios/Main/Presenter/MainMapViewData.swift new file mode 100644 index 0000000..3cba68f --- /dev/null +++ b/bike-ios/Main/Presenter/MainMapViewData.swift @@ -0,0 +1,13 @@ +// +// MainMapViewData.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct MainMapViewData { + +} diff --git a/bike-ios/Main/Presenter/MainMapViewProtocol.swift b/bike-ios/Main/Presenter/MainMapViewProtocol.swift new file mode 100644 index 0000000..dba8023 --- /dev/null +++ b/bike-ios/Main/Presenter/MainMapViewProtocol.swift @@ -0,0 +1,13 @@ +// +// MainMapViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +protocol MainMapViewProtocol { + +} diff --git a/bike-ios/Main/View/MainMapViewController+ViewProtocol.swift b/bike-ios/Main/View/MainMapViewController+ViewProtocol.swift new file mode 100644 index 0000000..7b9e067 --- /dev/null +++ b/bike-ios/Main/View/MainMapViewController+ViewProtocol.swift @@ -0,0 +1,13 @@ +// +// MainMapViewController+ViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +extension MainMapViewController: MainMapViewProtocol { + +} diff --git a/bike-ios/ViewController.swift b/bike-ios/Main/View/MainMapViewController.swift similarity index 76% rename from bike-ios/ViewController.swift rename to bike-ios/Main/View/MainMapViewController.swift index fa8c72c..6015531 100644 --- a/bike-ios/ViewController.swift +++ b/bike-ios/Main/View/MainMapViewController.swift @@ -1,5 +1,5 @@ // -// ViewController.swift +// MainMapViewController.swift // bike-ios // // Created by JunHui Kim on 19/07/2019. @@ -8,13 +8,11 @@ import UIKit -class ViewController: UIViewController { +class MainMapViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() // Do any additional setup after loading the view. } - } - diff --git a/bike-ios/Setting/Model/History.swift b/bike-ios/Setting/Model/History.swift new file mode 100644 index 0000000..1c695dc --- /dev/null +++ b/bike-ios/Setting/Model/History.swift @@ -0,0 +1,13 @@ +// +// History.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct History { + +} diff --git a/bike-ios/Setting/Model/HistoryService.swift b/bike-ios/Setting/Model/HistoryService.swift new file mode 100644 index 0000000..04118d6 --- /dev/null +++ b/bike-ios/Setting/Model/HistoryService.swift @@ -0,0 +1,13 @@ +// +// HistoryService.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class HistoryService { + +} diff --git a/bike-ios/Setting/Presenter/HistoryPresenter.swift b/bike-ios/Setting/Presenter/HistoryPresenter.swift new file mode 100644 index 0000000..a7e597a --- /dev/null +++ b/bike-ios/Setting/Presenter/HistoryPresenter.swift @@ -0,0 +1,13 @@ +// +// HistoryPresenter.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class HistoryPresenter { + +} diff --git a/bike-ios/Setting/Presenter/HistoryViewData.swift b/bike-ios/Setting/Presenter/HistoryViewData.swift new file mode 100644 index 0000000..d3b598e --- /dev/null +++ b/bike-ios/Setting/Presenter/HistoryViewData.swift @@ -0,0 +1,13 @@ +// +// HistoryViewData.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct HistoryViewData { + +} diff --git a/bike-ios/Setting/Presenter/HistoryViewProtocol.swift b/bike-ios/Setting/Presenter/HistoryViewProtocol.swift new file mode 100644 index 0000000..8db1713 --- /dev/null +++ b/bike-ios/Setting/Presenter/HistoryViewProtocol.swift @@ -0,0 +1,13 @@ +// +// HistoryViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +protocol HistoryViewProtocol { + +} diff --git a/bike-ios/Setting/View/HistoryViewController+ViewProtocol.swift b/bike-ios/Setting/View/HistoryViewController+ViewProtocol.swift new file mode 100644 index 0000000..1d3eb62 --- /dev/null +++ b/bike-ios/Setting/View/HistoryViewController+ViewProtocol.swift @@ -0,0 +1,13 @@ +// +// HistoryViewController+ViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +extension HistoryViewController: HistoryViewProtocol { + +} diff --git a/bike-ios/Setting/View/HistoryViewController.swift b/bike-ios/Setting/View/HistoryViewController.swift new file mode 100644 index 0000000..148190e --- /dev/null +++ b/bike-ios/Setting/View/HistoryViewController.swift @@ -0,0 +1,29 @@ +// +// HistoryViewController.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +class HistoryViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +} diff --git a/bike-ios/Stopover/Model/StopoverLocation.swift b/bike-ios/Stopover/Model/StopoverLocation.swift new file mode 100644 index 0000000..6b3474b --- /dev/null +++ b/bike-ios/Stopover/Model/StopoverLocation.swift @@ -0,0 +1,13 @@ +// +// StopoverLocation.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct StopoverLocation { + +} diff --git a/bike-ios/Stopover/Model/StopoverLocationService.swift b/bike-ios/Stopover/Model/StopoverLocationService.swift new file mode 100644 index 0000000..0f21f2b --- /dev/null +++ b/bike-ios/Stopover/Model/StopoverLocationService.swift @@ -0,0 +1,13 @@ +// +// StopoverLocationService.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class StopoverLocationService { + +} diff --git a/bike-ios/Stopover/Presenter/StopoverMapPresenter.swift b/bike-ios/Stopover/Presenter/StopoverMapPresenter.swift new file mode 100644 index 0000000..000b05c --- /dev/null +++ b/bike-ios/Stopover/Presenter/StopoverMapPresenter.swift @@ -0,0 +1,13 @@ +// +// StopoverMapPresenter.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +class StopoverMapPresenter { + +} diff --git a/bike-ios/Stopover/Presenter/StopoverMapViewData.swift b/bike-ios/Stopover/Presenter/StopoverMapViewData.swift new file mode 100644 index 0000000..bc945a0 --- /dev/null +++ b/bike-ios/Stopover/Presenter/StopoverMapViewData.swift @@ -0,0 +1,13 @@ +// +// StopoverMapViewData.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +struct StopoverMapViewData { + +} diff --git a/bike-ios/Stopover/Presenter/StopoverMapViewProtocol.swift b/bike-ios/Stopover/Presenter/StopoverMapViewProtocol.swift new file mode 100644 index 0000000..aff591f --- /dev/null +++ b/bike-ios/Stopover/Presenter/StopoverMapViewProtocol.swift @@ -0,0 +1,13 @@ +// +// StopoverMapViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import Foundation + +protocol StopoverMapViewProtocol { + +} diff --git a/bike-ios/Stopover/View/StopoverMapViewController+ViewProtocol.swift b/bike-ios/Stopover/View/StopoverMapViewController+ViewProtocol.swift new file mode 100644 index 0000000..26ef0b3 --- /dev/null +++ b/bike-ios/Stopover/View/StopoverMapViewController+ViewProtocol.swift @@ -0,0 +1,13 @@ +// +// StopoverMapViewController+ViewProtocol.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +extension StopoverMapViewController: StopoverMapViewProtocol { + +} diff --git a/bike-ios/Stopover/View/StopoverMapViewController.swift b/bike-ios/Stopover/View/StopoverMapViewController.swift new file mode 100644 index 0000000..ac04700 --- /dev/null +++ b/bike-ios/Stopover/View/StopoverMapViewController.swift @@ -0,0 +1,29 @@ +// +// StopoverMapViewController.swift +// bike-ios +// +// Created by JunHui Kim on 08/09/2019. +// Copyright © 2019 gitturami. All rights reserved. +// + +import UIKit + +class StopoverMapViewController: UIViewController { + + override func viewDidLoad() { + super.viewDidLoad() + + // Do any additional setup after loading the view. + } + + /* + // MARK: - Navigation + + // In a storyboard-based application, you will often want to do a little preparation before navigation + override func prepare(for segue: UIStoryboardSegue, sender: Any?) { + // Get the new view controller using segue.destination. + // Pass the selected object to the new view controller. + } + */ + +}