Merge pull request #19 from DDD-3/visitor

Visitor 프로토타이핑 (#18)

Author: junyng

Podfile

@@ -5,5 +5,8 @@ target 'gigi' do
 
   pod 'Then'
   pod 'SnapKit'
-
+  pod 'RxSwift'
+  pod 'RxCocoa'
+  pod 'RxOptional'
+  pod 'RxViewController'
 end

Podfile.lock

@@ -1,20 +1,46 @@
 PODS:
+  - RxCocoa (5.0.1):
+    - RxRelay (~> 5)
+    - RxSwift (~> 5)
+  - RxOptional (4.1.0):
+    - RxCocoa (~> 5)
+    - RxSwift (~> 5)
+  - RxRelay (5.0.1):
+    - RxSwift (~> 5)
+  - RxSwift (5.0.0)
+  - RxViewController (1.0.0):
+    - RxCocoa (~> 5.0)
+    - RxSwift (~> 5.0)
   - SnapKit (5.0.1)
   - Then (2.6.0)
 
 DEPENDENCIES:
+  - RxCocoa
+  - RxOptional
+  - RxSwift
+  - RxViewController
   - SnapKit
   - Then
 
 SPEC REPOS:
   trunk:
+    - RxCocoa
+    - RxOptional
+    - RxRelay
+    - RxSwift
+    - RxViewController
     - SnapKit
     - Then
 
 SPEC CHECKSUMS:
+  RxCocoa: e741b9749968e8a143e2b787f1dfbff2b63d0a5c
+  RxOptional: b1fcd60856807a564c0215c2184b8d33e7826dc2
+  RxRelay: 89d54507f4fd4d969e6ec1d4bd7f3673640b4640
+  RxSwift: 8b0671caa829a763bbce7271095859121cbd895f
+  RxViewController: 7330a46e5c31cd680db169da4c9fc8676e975a81
   SnapKit: 97b92857e3df3a0c71833cce143274bf6ef8e5eb
   Then: 90cd104fd951cec1980a03f57704ad8f784d4d79
 
-PODFILE CHECKSUM: 56cb4175a7f7666772e2260ee0bba9ac886e4df0
+PODFILE CHECKSUM: 7cb51eaee1a44078c519092e0491f4aa5631f203
 
 COCOAPODS: 1.8.3

SwiftUI를_선택하지_못한_이유.md

@@ -53,3 +53,7 @@
   - 다른 사람들도 많이 겪은 문제
 
 - 이 문제가 발생하고 나서 SwiftUI를 사용할 수 없겠다고 결론을 내림
+
+---
+
+Combine도 안쓸거다

gigi.xcodeproj/project.pbxproj

@@ -0,0 +1,107 @@
+// swiftlint:disable all
+// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
+
+#if os(OSX)
+  import AppKit.NSImage
+  internal typealias AssetColorTypeAlias = NSColor
+  internal typealias AssetImageTypeAlias = NSImage
+#elseif os(iOS) || os(tvOS) || os(watchOS)
+  import UIKit.UIImage
+  internal typealias AssetColorTypeAlias = UIColor
+  internal typealias AssetImageTypeAlias = UIImage
+#endif
+
+// swiftlint:disable superfluous_disable_command
+// swiftlint:disable file_length
+
+// MARK: - Asset Catalogs
+
+// swiftlint:disable identifier_name line_length nesting type_body_length type_name
+internal enum Asset {}
+
+// swiftlint:enable identifier_name line_length nesting type_body_length type_name
+
+// MARK: - Implementation Details
+
+internal struct ColorAsset {
+  internal fileprivate(set) var name: String
+
+  @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
+  internal var color: AssetColorTypeAlias {
+    return AssetColorTypeAlias(asset: self)
+  }
+}
+
+internal extension AssetColorTypeAlias {
+  @available(iOS 11.0, tvOS 11.0, watchOS 4.0, OSX 10.13, *)
+  convenience init!(asset: ColorAsset) {
+    let bundle = Bundle(for: BundleToken.self)
+    #if os(iOS) || os(tvOS)
+      self.init(named: asset.name, in: bundle, compatibleWith: nil)
+    #elseif os(OSX)
+      self.init(named: NSColor.Name(asset.name), bundle: bundle)
+    #elseif os(watchOS)
+      self.init(named: asset.name)
+    #endif
+  }
+}
+
+internal struct DataAsset {
+  internal fileprivate(set) var name: String
+
+  #if os(iOS) || os(tvOS) || os(OSX)
+    @available(iOS 9.0, tvOS 9.0, OSX 10.11, *)
+    internal var data: NSDataAsset {
+      return NSDataAsset(asset: self)
+    }
+  #endif
+}
+
+#if os(iOS) || os(tvOS) || os(OSX)
+  @available(iOS 9.0, tvOS 9.0, OSX 10.11, *)
+  internal extension NSDataAsset {
+    convenience init!(asset: DataAsset) {
+      let bundle = Bundle(for: BundleToken.self)
+      #if os(iOS) || os(tvOS)
+        self.init(name: asset.name, bundle: bundle)
+      #elseif os(OSX)
+        self.init(name: NSDataAsset.Name(asset.name), bundle: bundle)
+      #endif
+    }
+  }
+#endif
+
+internal struct ImageAsset {
+  internal fileprivate(set) var name: String
+
+  internal var image: AssetImageTypeAlias {
+    let bundle = Bundle(for: BundleToken.self)
+    #if os(iOS) || os(tvOS)
+      let image = AssetImageTypeAlias(named: name, in: bundle, compatibleWith: nil)
+    #elseif os(OSX)
+      let image = bundle.image(forResource: NSImage.Name(name))
+    #elseif os(watchOS)
+      let image = AssetImageTypeAlias(named: name)
+    #endif
+    guard let result = image else { fatalError("Unable to load image named \(name).") }
+    return result
+  }
+}
+
+internal extension AssetImageTypeAlias {
+  @available(iOS 1.0, tvOS 1.0, watchOS 1.0, *)
+  @available(OSX, deprecated,
+             message: "This initializer is unsafe on macOS, please use the ImageAsset.image property")
+  convenience init!(asset: ImageAsset) {
+    #if os(iOS) || os(tvOS)
+      let bundle = Bundle(for: BundleToken.self)
+      self.init(named: asset.name, in: bundle, compatibleWith: nil)
+    #elseif os(OSX)
+      self.init(named: NSImage.Name(asset.name))
+    #elseif os(watchOS)
+      self.init(named: asset.name)
+    #endif
+  }
+}
+
+private final class BundleToken {}

gigi/Base.lproj/LaunchScreen.storyboard

@@ -0,0 +1,83 @@
+// swiftlint:disable all
+// Generated using SwiftGen — https://github.com/SwiftGen/SwiftGen
+
+// swiftlint:disable sorted_imports
+import Foundation
+import UIKit
+
+// swiftlint:disable superfluous_disable_command
+// swiftlint:disable file_length
+
+// MARK: - Storyboard Scenes
+
+// swiftlint:disable explicit_type_interface identifier_name line_length type_body_length type_name
+internal enum StoryboardScene {
+  internal enum Host: StoryboardType {
+    internal static let storyboardName = "Host"
+  }
+
+  internal enum LaunchScreen: StoryboardType {
+    internal static let storyboardName = "LaunchScreen"
+
+    internal static let initialScene = InitialSceneType<UIKit.UIViewController>(storyboard: LaunchScreen.self)
+  }
+
+  internal enum Map: StoryboardType {
+    internal static let storyboardName = "Map"
+  }
+
+  internal enum Visitor: StoryboardType {
+    internal static let storyboardName = "Visitor"
+
+    internal static let initialScene = InitialSceneType<UIKit.UINavigationController>(storyboard: Visitor.self)
+
+    internal static let visitorFinishViewController = SceneType<VisitorFinishViewController>(storyboard: Visitor.self, identifier: "VisitorFinishViewController")
+
+    internal static let visitorMainViewController = SceneType<VisitorMainViewController>(storyboard: Visitor.self, identifier: "VisitorMainViewController")
+
+    internal static let visitorNameViewController = SceneType<VisitorNameViewController>(storyboard: Visitor.self, identifier: "VisitorNameViewController")
+
+    internal static let visitorStationViewController = SceneType<VisitorStationViewController>(storyboard: Visitor.self, identifier: "VisitorStationViewController")
+  }
+}
+
+// swiftlint:enable explicit_type_interface identifier_name line_length type_body_length type_name
+
+// MARK: - Implementation Details
+
+internal protocol StoryboardType {
+  static var storyboardName: String { get }
+}
+
+internal extension StoryboardType {
+  static var storyboard: UIStoryboard {
+    let name = storyboardName
+    return UIStoryboard(name: name, bundle: Bundle(for: BundleToken.self))
+  }
+}
+
+internal struct SceneType<T: UIViewController> {
+  internal let storyboard: StoryboardType.Type
+  internal let identifier: String
+
+  internal func instantiate() -> T {
+    let identifier = self.identifier
+    guard let controller = storyboard.storyboard.instantiateViewController(withIdentifier: identifier) as? T else {
+      fatalError("ViewController '\(identifier)' is not of the expected class \(T.self).")
+    }
+    return controller
+  }
+}
+
+internal struct InitialSceneType<T: UIViewController> {
+  internal let storyboard: StoryboardType.Type
+
+  internal func instantiate() -> T {
+    guard let controller = storyboard.storyboard.instantiateInitialViewController() as? T else {
+      fatalError("ViewController is not of the expected class \(T.self).")
+    }
+    return controller
+  }
+}
+
+private final class BundleToken {}

gigi/Base.lproj/Main.storyboard

@@ -6,17 +6,24 @@
 //  Copyright © 2019 Ieungieung. All rights reserved.
 //
 
-import Combine
 import UIKit
 
+import RxSwift
+import Then
+
 @UIApplicationMain
 final class AppDelegate: UIResponder, UIApplicationDelegate {
   var window: UIWindow?
 
-  private var cancellables = Set<AnyCancellable>()
+  private var disposeBag = DisposeBag()
 
   func application(_ application: UIApplication,
                    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    UINavigationBar.appearance().do {
+      $0.setBackgroundImage(.init(), for: .default)
+      $0.shadowImage = .init()
+      $0.isTranslucent = true
+    }
     return true
   }
 }
@@ -27,34 +34,34 @@ private extension AppDelegate {
 
     service.requestAuthorization()
 
-    service.authorizationStatusPublisher
+    service.authorizationStatusObservable
       .filter { $0 == .authorizedWhenInUse || $0 == .authorizedAlways }
-      .sink(receiveValue: { _ in
+      .subscribe(onNext: { _ in
         Log.debug("위치 정보 권한 허용됨")
         service.startUpdatingLocation()
       })
-      .store(in: &cancellables)
+      .disposed(by: disposeBag)
 
-    service.authorizationStatusPublisher
+    service.authorizationStatusObservable
       .filter { !($0 == .authorizedWhenInUse || $0 == .authorizedAlways) }
-      .sink(receiveValue: { _ in
+      .subscribe(onNext: { _ in
         Log.error("위치 정보 권한 허용되지 않음")
       })
-      .store(in: &cancellables)
+      .disposed(by: disposeBag)
 
-    service.coordinateResultPublisher
+    service.coordinateResultObservable
       .compactMap { $0.success }
-      .sink(receiveValue: { coordinate in
+      .subscribe(onNext: { coordinate in
         Log.debug("현재 위치 갱신됨 : \(coordinate)")
         service.stopUpdatingLocation()
       })
-      .store(in: &cancellables)
+      .disposed(by: disposeBag)
 
-    service.coordinateResultPublisher
+    service.coordinateResultObservable
       .compactMap { $0.failure }
-      .sink(receiveValue: { error in
+      .subscribe(onNext: { error in
         Log.error("위치 갱신 에러 : \(error.localizedDescription)")
       })
-      .store(in: &cancellables)
+      .disposed(by: disposeBag)
   }
 }