💲[Native Checkout] Shipping Picker - Navigation Workflow - 1/4

Kickstarter-iOS/Views/Cells/PledgeShippingLocationCell.swift

@@ -101,6 +101,13 @@ final class PledgeShippingLocationCell: UITableViewCell, ValueCell {
 
     self.amountLabel.rac.attributedText = self.viewModel.outputs.amountAttributedText
     self.shippingLocationButton.rac.title = self.viewModel.outputs.shippingLocationButtonTitle
+
+    self.viewModel.outputs.shippingLocationSelected
+      .observeForUI()
+      .observeValues { [weak self] shippingRule in
+        guard let self = self else { return }
+        self.delegate?.pledgeShippingCell(self, didSelectShippingRule: shippingRule)
+      }
   }
 
   // MARK: - Configuration
@@ -115,7 +122,9 @@ final class PledgeShippingLocationCell: UITableViewCell, ValueCell {
 
   // MARK: - Actions
 
-  @objc func shippingLocationButtonTapped(_: UIButton) {}
+  @objc func shippingLocationButtonTapped(_: UIButton) {
+    self.viewModel.inputs.shippingLocationButtonTapped()
+  }
 }
 
 // MARK: - Styles

Kickstarter-iOS/Views/Controllers/PledgeTableViewController.swift

@@ -3,6 +3,12 @@ import Library
 import Prelude
 import UIKit
 
+private enum Layout {
+  enum Sheet {
+    static let offset: CGFloat = 200
+  }
+}
+
 class PledgeTableViewController: UITableViewController {
   // MARK: - Properties
 
@@ -67,6 +73,14 @@ class PledgeTableViewController: UITableViewController {
         }
       }
 
+    self.viewModel.outputs.presentShippingRules
+      .observeForUI()
+      .observeValues { [weak self] project, shippingRules, selectedShippingRule in
+        self?.presentShippingRules(
+          project, shippingRules: shippingRules, selectedShippingRule: selectedShippingRule
+        )
+      }
+
     self.viewModel.outputs.configureShippingLocationCellWithData
       .observeForUI()
       .observeValues { [weak self] isLoading, project, selectedShippingRule in
@@ -82,12 +96,6 @@ class PledgeTableViewController: UITableViewController {
       }
   }
 
-  // MARK: - Actions
-
-  @objc func dismissKeyboard() {
-    self.tableView.endEditing(true)
-  }
-
   // MARK: - UITableViewDelegate
 
   override func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
@@ -118,10 +126,24 @@ class PledgeTableViewController: UITableViewController {
 
   // MARK: - Actions
 
+  @objc func dismissKeyboard() {
+    self.tableView.endEditing(true)
+  }
+
   private func presentHelpWebViewController(with helpType: HelpType) {
     let vc = HelpWebViewController.configuredWith(helpType: helpType)
-    let nav = UINavigationController(rootViewController: vc)
-    self.present(nav, animated: true, completion: nil)
+    let nc = UINavigationController(rootViewController: vc)
+    self.present(nc, animated: true)
+  }
+
+  private func presentShippingRules(
+    _: Project, shippingRules _: [ShippingRule], selectedShippingRule _: ShippingRule
+  ) {
+    let vc = UIViewController()
+    vc.view.backgroundColor = UIColor.cyan
+    let nc = UINavigationController(rootViewController: vc)
+    let sheetVC = SheetOverlayViewController(child: nc, offset: Layout.Sheet.offset)
+    self.present(sheetVC, animated: true)
   }
 }
 
@@ -131,9 +153,9 @@ extension PledgeTableViewController: PledgeDescriptionCellDelegate {
   }
 }
 
-extension PledgeTableViewController: PledgeSummaryCellDelegate {
-  internal func pledgeSummaryCell(_: PledgeSummaryCell, didOpen helpType: HelpType) {
-    self.presentHelpWebViewController(with: helpType)
+extension PledgeTableViewController: PledgeAmountCellDelegate {
+  func pledgeAmountCell(_: PledgeAmountCell, didUpdateAmount amount: Double) {
+    self.viewModel.inputs.pledgeAmountDidUpdate(to: amount)
   }
 }
 
@@ -143,9 +165,9 @@ extension PledgeTableViewController: PledgeShippingLocationCellDelegate {
   }
 }
 
-extension PledgeTableViewController: PledgeAmountCellDelegate {
-  func pledgeAmountCell(_: PledgeAmountCell, didUpdateAmount amount: Double) {
-    self.viewModel.inputs.pledgeAmountDidUpdate(to: amount)
+extension PledgeTableViewController: PledgeSummaryCellDelegate {
+  internal func pledgeSummaryCell(_: PledgeSummaryCell, didOpen helpType: HelpType) {
+    self.presentHelpWebViewController(with: helpType)
   }
 }
 

Library/ViewModels/PledgeShippingLocationCellViewModel.swift

@@ -6,11 +6,13 @@ import ReactiveSwift
 
 public protocol PledgeShippingLocationCellViewModelInputs {
   func configureWith(isLoading: Bool, project: Project, selectedShippingRule: ShippingRule?)
+  func shippingLocationButtonTapped()
 }
 
 public protocol PledgeShippingLocationCellViewModelOutputs {
   var amountAttributedText: Signal<NSAttributedString, Never> { get }
   var shippingLocationButtonTitle: Signal<String, Never> { get }
+  var shippingLocationSelected: Signal<ShippingRule, Never> { get }
 }
 
 public protocol PledgeShippingLocationCellViewModelType {
@@ -32,15 +34,25 @@ public final class PledgeShippingLocationCellViewModel: PledgeShippingLocationCe
 
     self.shippingLocationButtonTitle = projectAndSelectedShippingRule
       .map { _, selectedShippingRule in selectedShippingRule.location.localizedName }
+
+    self.shippingLocationSelected = projectAndSelectedShippingRule
+      .map(second)
+      .takeWhen(self.shippingLocationButtonTappedProperty.signal)
   }
 
   private let configDataProperty = MutableProperty<(Bool, Project, ShippingRule?)?>(nil)
   public func configureWith(isLoading: Bool, project: Project, selectedShippingRule: ShippingRule?) {
     self.configDataProperty.value = (isLoading, project, selectedShippingRule)
   }
 
+  private let shippingLocationButtonTappedProperty = MutableProperty(())
+  public func shippingLocationButtonTapped() {
+    self.shippingLocationButtonTappedProperty.value = ()
+  }
+
   public let amountAttributedText: Signal<NSAttributedString, Never>
   public let shippingLocationButtonTitle: Signal<String, Never>
+  public let shippingLocationSelected: Signal<ShippingRule, Never>
 
   public var inputs: PledgeShippingLocationCellViewModelInputs { return self }
   public var outputs: PledgeShippingLocationCellViewModelOutputs { return self }

Library/ViewModels/PledgeShippingLocationCellViewModelTests.swift

@@ -8,13 +8,15 @@ final class PledgeShippingLocationCellViewModelTests: TestCase {
   private let vm: PledgeShippingLocationCellViewModelType = PledgeShippingLocationCellViewModel()
 
   private let amountAttributedText = TestObserver<NSAttributedString, Never>()
-  private let shippingLocation = TestObserver<String, Never>()
+  private let shippingLocationButtonTitle = TestObserver<String, Never>()
+  private let shippingLocationSelected = TestObserver<ShippingRule, Never>()
 
   override func setUp() {
     super.setUp()
 
     self.vm.outputs.amountAttributedText.observe(self.amountAttributedText.observer)
-    self.vm.outputs.shippingLocationButtonTitle.observe(self.shippingLocation.observer)
+    self.vm.outputs.shippingLocationButtonTitle.observe(self.shippingLocationButtonTitle.observer)
+    self.vm.outputs.shippingLocationSelected.observe(self.shippingLocationSelected.observer)
   }
 
   func testAmountAttributedText() {
@@ -35,11 +37,22 @@ final class PledgeShippingLocationCellViewModelTests: TestCase {
     self.amountAttributedText.assertValues([expectedAttributedString])
   }
 
-  func testShippingLocation() {
+  func testShippingLocationButtonTitle() {
     self.vm.inputs.configureWith(isLoading: false, project: .template, selectedShippingRule: nil)
-    self.shippingLocation.assertDidNotEmitValue()
+    self.shippingLocationButtonTitle.assertDidNotEmitValue()
 
     self.vm.inputs.configureWith(isLoading: false, project: .template, selectedShippingRule: .template)
-    self.shippingLocation.assertValues(["Brooklyn, NY"])
+    self.shippingLocationButtonTitle.assertValues(["Brooklyn, NY"])
+  }
+
+  func testShippingLocationSelected() {
+    self.vm.inputs.shippingLocationButtonTapped()
+    self.shippingLocationSelected.assertDidNotEmitValue()
+
+    let shippingRule = ShippingRule.template
+
+    self.vm.inputs.configureWith(isLoading: false, project: .template, selectedShippingRule: shippingRule)
+    self.vm.inputs.shippingLocationButtonTapped()
+    self.shippingLocationSelected.assertValues([shippingRule])
   }
 }

Library/ViewModels/PledgeViewModel.swift

@@ -36,7 +36,7 @@ public protocol PledgeViewModelOutputs {
    recycled it will be reloaded with its most recent data.
    */
   var pledgeViewDataAndReload: Signal<(PledgeViewData, Bool), Never> { get }
-  var presentShippingRules: Signal<[ShippingRule], Never> { get }
+  var presentShippingRules: Signal<(Project, [ShippingRule], ShippingRule), Never> { get }
   var shippingRulesError: Signal<String, Never> { get }
 }
 
@@ -74,15 +74,20 @@ public class PledgeViewModel: PledgeViewModelType, PledgeViewModelInputs, Pledge
           .materialize()
       }
 
-    self.presentShippingRules = shippingRulesEvent.values()
-
-    let selectedShippingRule = Signal.merge(
+    let defaultShippingRule = Signal.merge(
       self.viewDidLoadProperty.signal.mapConst(nil),
-      self.presentShippingRules.map(defaultShippingRule(fromShippingRules:))
+      shippingRulesEvent.values().map(defaultShippingRule(fromShippingRules:))
+    )
+
+    self.presentShippingRules = Signal.combineLatest(
+      project,
+      shippingRulesEvent.values(),
+      defaultShippingRule.skipNil()
     )
+    .takeWhen(self.shippingRuleSignal.signal)
 
     let shippingAmount = Signal.merge(
-      selectedShippingRule.skipNil().map { $0.cost },
+      defaultShippingRule.skipNil().map { $0.cost },
       self.shippingRuleSignal.map { $0.cost },
       projectAndReward.mapConst(0)
     )
@@ -102,7 +107,7 @@ public class PledgeViewModel: PledgeViewModelType, PledgeViewModelInputs, Pledge
     let pledgeTotal = Signal.combineLatest(pledgeAmount, shippingAmount).map(+)
 
     let data = Signal
-      .combineLatest(project, reward, isLoggedIn, isShippingLoading, selectedShippingRule, pledgeTotal)
+      .combineLatest(project, reward, isLoggedIn, isShippingLoading, defaultShippingRule, pledgeTotal)
       .map(pledgeViewData(with:reward:isLoggedIn:isShippingLoading:selectedShippingRule:pledgeTotal:))
 
     self.pledgeViewDataAndReload = Signal.merge(
@@ -120,7 +125,7 @@ public class PledgeViewModel: PledgeViewModelType, PledgeViewModelInputs, Pledge
 
     let isShippingLoadingAndSelectedShippingRule = Signal.combineLatest(
       isShippingLoading,
-      selectedShippingRule
+      defaultShippingRule
     )
 
     self.configureShippingLocationCellWithData = updatedData
@@ -154,7 +159,7 @@ public class PledgeViewModel: PledgeViewModelType, PledgeViewModelInputs, Pledge
   public let configureShippingLocationCellWithData: Signal<(Bool, Project, ShippingRule?), Never>
   public let configureSummaryCellWithData: Signal<(Project, Double), Never>
   public let pledgeViewDataAndReload: Signal<(PledgeViewData, Bool), Never>
-  public let presentShippingRules: Signal<[ShippingRule], Never>
+  public let presentShippingRules: Signal<(Project, [ShippingRule], ShippingRule), Never>
   public let shippingRulesError: Signal<String, Never>
 
   public var inputs: PledgeViewModelInputs { return self }

Library/ViewModels/PledgeViewModelTests.swift

@@ -31,7 +31,10 @@ final class PledgeViewModelTests: TestCase {
   private let pledgeViewDataAndReloadSelectedShippingRule = TestObserver<ShippingRule?, Never>()
   private let pledgeViewDataAndReloadTotal = TestObserver<Double, Never>()
 
-  private let presentShippingRules = TestObserver<[ShippingRule], Never>()
+  private let presentShippingRulesProject = TestObserver<Project, Never>()
+  private let presentShippingRulesShippingRules = TestObserver<[ShippingRule], Never>()
+  private let presentShippingRulesSelectedShippingRule = TestObserver<ShippingRule, Never>()
+
   private let shippingRulesError = TestObserver<String, Never>()
 
   override func setUp() {
@@ -55,7 +58,10 @@ final class PledgeViewModelTests: TestCase {
     self.vm.outputs.pledgeViewDataAndReload.map(first).map { $0.3 }.map { $0.2 }.observe(self.pledgeViewDataAndReloadSelectedShippingRule.observer)
     self.vm.outputs.pledgeViewDataAndReload.map(first).map { $0.4 }.observe(self.pledgeViewDataAndReloadTotal.observer)
 
-    self.vm.outputs.presentShippingRules.observe(self.presentShippingRules.observer)
+    self.vm.outputs.presentShippingRules.map(first).observe(self.presentShippingRulesProject.observer)
+    self.vm.outputs.presentShippingRules.map(second).observe(self.presentShippingRulesShippingRules.observer)
+    self.vm.outputs.presentShippingRules.map(third).observe(self.presentShippingRulesSelectedShippingRule.observer)
+
     self.vm.outputs.shippingRulesError.observe(self.shippingRulesError.observer)
   }
 
@@ -405,26 +411,29 @@ final class PledgeViewModelTests: TestCase {
   }
 
   func testPresentShippingRules() {
-    let shippingRules = [.usa, .canada, .greatBritain, .australia]
-      .enumerated()
-      .map { idx, location in
-        .template
-          |> ShippingRule.lens.location .~ location
-          |> ShippingRule.lens.cost .~ Double(idx + 1 * 10)
-      }
+    let shippingRules: [ShippingRule] = [.template, .template, .template]
 
     withEnvironment(apiService: MockService(fetchShippingRulesResult: .success(shippingRules))) {
+      let project = Project.template
       let reward = Reward.template
         |> Reward.lens.shipping.enabled .~ true
 
       self.vm.inputs.viewDidLoad()
-      self.vm.inputs.configureWith(project: .template, reward: reward)
-
-      self.presentShippingRules.assertValues([[]])
+      self.vm.inputs.configureWith(project: project, reward: reward)
 
       self.scheduler.advance()
 
-      self.presentShippingRules.assertValues([[], shippingRules])
+      self.presentShippingRulesProject.assertDidNotEmitValue()
+      self.presentShippingRulesShippingRules.assertDidNotEmitValue()
+      self.presentShippingRulesSelectedShippingRule.assertDidNotEmitValue()
+
+      let shippingRule = shippingRules[0]
+
+      self.vm.inputs.shippingRuleDidUpdate(to: shippingRule)
+
+      self.presentShippingRulesProject.assertValues([project])
+      self.presentShippingRulesShippingRules.assertValues([shippingRules])
+      self.presentShippingRulesSelectedShippingRule.assertValues([shippingRule])
     }
   }