Remove unused amount label from PledgeShippingLocationViewController and shimmer view (#2641)

This is prep-work for fixing MBL-2832. Removing the amount label simplifies the view controller so we can decouple it from ShippingRule.

Author: amy-at-kickstarter

Kickstarter-iOS/Features/PledgeShippingLocation/PledgeShippingLocationViewController.swift

@@ -26,7 +26,6 @@ final class PledgeShippingLocationViewController: UIViewController {
   private let viewModel: PledgeShippingLocationViewModelType = PledgeShippingLocationViewModel()
 
   private lazy var adaptableStackView: UIStackView = { UIStackView(frame: .zero) }()
-  private lazy var amountLabel: UILabel = { UILabel(frame: .zero) }()
   private lazy var shippingLocationButton: UIButton = { UIButton(frame: .zero) }()
   private lazy var titleLabel: UILabel = { UILabel(frame: .zero) }()
   private lazy var rootStackView: UIStackView = { UIStackView(frame: .zero) }()
@@ -45,7 +44,7 @@ final class PledgeShippingLocationViewController: UIViewController {
     super.viewDidLoad()
 
     _ = self
-      |> \.accessibilityElements .~ [self.titleLabel, self.shippingLocationButton, self.amountLabel]
+      |> \.accessibilityElements .~ [self.titleLabel, self.shippingLocationButton]
 
     _ = (self.rootStackView, self.view)
       |> ksr_addSubviewToParent()
@@ -54,7 +53,7 @@ final class PledgeShippingLocationViewController: UIViewController {
     _ = ([self.titleLabel, self.adaptableStackView, self.shimmerLoadingView], self.rootStackView)
       |> ksr_addArrangedSubviewsToStackView()
 
-    _ = ([self.shippingLocationButton, self.spacer, self.amountLabel], self.adaptableStackView)
+    _ = ([self.shippingLocationButton, self.spacer], self.adaptableStackView)
       |> ksr_addArrangedSubviewsToStackView()
 
     self.shippingLocationButton.addTarget(
@@ -65,8 +64,6 @@ final class PledgeShippingLocationViewController: UIViewController {
 
     self.spacer.widthAnchor.constraint(greaterThanOrEqualToConstant: Styles.grid(3)).isActive = true
 
-    self.amountLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
-
     self.viewModel.inputs.viewDidLoad()
   }
 
@@ -83,11 +80,6 @@ final class PledgeShippingLocationViewController: UIViewController {
         self.traitCollection.preferredContentSizeCategory.isAccessibilityCategory
       )
 
-    _ = self.amountLabel
-      |> checkoutBackgroundStyle
-    _ = self.amountLabel
-      |> amountLabelStyle
-
     _ = self.shippingLocationButton
       |> countryButtonStyle
       |> checkoutWhiteBackgroundStyle
@@ -112,31 +104,21 @@ final class PledgeShippingLocationViewController: UIViewController {
     super.bindViewModel()
 
     self.adaptableStackView.rac.hidden = self.viewModel.outputs.adaptableStackViewIsHidden
-    self.amountLabel.rac.attributedText = self.viewModel.outputs.amountAttributedText
-    self.amountLabel.rac.hidden = self.viewModel.outputs.amountLabelIsHidden
     self.shimmerLoadingView.rac.hidden = self.viewModel.outputs.shimmerLoadingViewIsHidden
     self.shippingLocationButton.rac.title = self.viewModel.outputs.shippingLocationButtonTitle
 
-    self.viewModel.outputs.amountLabelIsHidden
-      .observeForUI()
-      .observeValues { [weak self] isHidden in
-        self?.shimmerLoadingView.amountPlaceholder.alpha = isHidden ? 0 : 1
-      }
-
     /**
      When any layout updates occur we need to notify the delegate. This is only necessary when
      this view is contained within a view that is not fully supported by Auto Layout,
      e.g. a `UITableView` header.
      */
     Signal.combineLatest(
       self.viewModel.outputs.adaptableStackViewIsHidden,
-      self.viewModel.outputs.amountAttributedText,
-      self.viewModel.outputs.amountLabelIsHidden,
       self.viewModel.outputs.shimmerLoadingViewIsHidden,
       self.viewModel.outputs.shippingLocationButtonTitle
     )
     .observeForUI()
-    .observeValues { [weak self] _, _, _, shimmerLoadingViewIsHidden, _ in
+    .observeValues { [weak self] _, shimmerLoadingViewIsHidden, _ in
       guard let self = self else { return }
       self.delegate?.pledgeShippingLocationViewControllerLayoutDidUpdate(self, shimmerLoadingViewIsHidden)
     }

Kickstarter-iOS/SharedViews/PledgeShippingLocationShimmerLoadingView.swift

@@ -6,7 +6,6 @@ import UIKit
 final class PledgeShippingLocationShimmerLoadingView: UIView {
   // MARK: - Properties
 
-  internal lazy var amountPlaceholder: UIView = { UIView(frame: .zero) }()
   private lazy var buttonPlaceholder: UIView = { UIView(frame: .zero) }()
   private lazy var rootStackView: UIStackView = { UIStackView(frame: .zero) }()
 
@@ -41,9 +40,6 @@ final class PledgeShippingLocationShimmerLoadingView: UIView {
 
     _ = self.buttonPlaceholder
       |> roundedStyle(cornerRadius: Styles.gridHalf(3))
-
-    _ = self.amountPlaceholder
-      |> roundedStyle(cornerRadius: Styles.gridHalf(3))
   }
 
   // MARK: - Subviews
@@ -53,16 +49,14 @@ final class PledgeShippingLocationShimmerLoadingView: UIView {
       |> ksr_addSubviewToParent()
       |> ksr_constrainViewToEdgesInParent()
 
-    _ = ([self.buttonPlaceholder, UIView(), self.amountPlaceholder], self.rootStackView)
+    _ = ([self.buttonPlaceholder, UIView()], self.rootStackView)
       |> ksr_addArrangedSubviewsToStackView()
   }
 
   private func setupConstraints() {
     NSLayoutConstraint.activate([
       self.buttonPlaceholder.heightAnchor.constraint(equalToConstant: Styles.grid(3)),
-      self.amountPlaceholder.heightAnchor.constraint(equalToConstant: Styles.grid(3)),
-      self.buttonPlaceholder.widthAnchor.constraint(equalTo: self.widthAnchor, multiplier: 0.4),
-      self.amountPlaceholder.widthAnchor.constraint(equalTo: self.widthAnchor, multiplier: 0.2)
+      self.buttonPlaceholder.widthAnchor.constraint(equalTo: self.widthAnchor, multiplier: 0.4)
     ])
   }
 }
@@ -71,6 +65,6 @@ final class PledgeShippingLocationShimmerLoadingView: UIView {
 
 extension PledgeShippingLocationShimmerLoadingView: ShimmerLoading {
   func shimmerViews() -> [UIView] {
-    return [self.amountPlaceholder, self.buttonPlaceholder]
+    return [self.buttonPlaceholder]
   }
 }

Library/ViewModels/PledgeShippingLocationViewModel.swift

@@ -4,12 +4,10 @@ import Prelude
 import ReactiveExtensions
 import ReactiveSwift
 
-public typealias PledgeShippingLocationViewData = (
-  project: Project,
-  reward: Reward,
-  showAmount: Bool,
-  selectedLocationId: Int?
-)
+public struct PledgeShippingLocationViewData {
+  let project: Project
+  let selectedLocationId: Int?
+}
 
 public protocol PledgeShippingLocationViewModelInputs {
   func configureWith(data: PledgeShippingLocationViewData)
@@ -21,8 +19,6 @@ public protocol PledgeShippingLocationViewModelInputs {
 
 public protocol PledgeShippingLocationViewModelOutputs {
   var adaptableStackViewIsHidden: Signal<Bool, Never> { get }
-  var amountAttributedText: Signal<NSAttributedString, Never> { get }
-  var amountLabelIsHidden: Signal<Bool, Never> { get }
   var dismissShippingRules: Signal<Void, Never> { get }
   var presentShippingRules: Signal<(Project, [ShippingRule], ShippingRule), Never> { get }
   var notifyDelegateOfSelectedShippingRule: Signal<ShippingRule, Never> { get }
@@ -47,17 +43,15 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
     .map(first)
 
     let project = configData
-      .map { $0.0 }
-    let reward = configData
-      .map { $0.1 }
+      .map { $0.project }
     let selectedLocationId = configData
-      .map { $0.3 }
+      .map { $0.selectedLocationId }
 
-    let shippingShouldBeginLoading = reward
+    let shippingShouldBeginLoading = project
       .mapConst(true)
 
-    let shippingRulesEvent = Signal.zip(project, reward)
-      .switchMap { project, _ -> SignalProducer<Signal<[ShippingRule], ErrorEnvelope>.Event, Never> in
+    let shippingRulesEvent = project
+      .switchMap { project -> SignalProducer<Signal<[ShippingRule], ErrorEnvelope>.Event, Never> in
         getShippingRulesForAllRewards(in: project)
       }
 
@@ -92,22 +86,13 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
       self.shippingRuleUpdatedSignal
     )
 
-    let shippingAmount = Signal.merge(
-      self.notifyDelegateOfSelectedShippingRule.map { $0.cost },
-      configData.mapConst(0)
-    )
-
     self.presentShippingRules = Signal.combineLatest(
       project,
       shippingRulesEvent.values(),
       self.notifyDelegateOfSelectedShippingRule
     )
     .takeWhen(self.shippingLocationButtonTappedSignal)
 
-    self.amountAttributedText = Signal.combineLatest(project, shippingAmount)
-      .map { project, shippingAmount in shippingValue(of: project, with: shippingAmount) }
-      .skipNil()
-
     self.shippingLocationButtonTitle = self.notifyDelegateOfSelectedShippingRule
       .map { $0.location.localizedName }
 
@@ -117,8 +102,6 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
         .ignoreValues()
         .ksr_debounce(.milliseconds(300), on: AppEnvironment.current.scheduler)
     )
-
-    self.amountLabelIsHidden = configData.map { $0.2 }.negate()
   }
 
   private let configDataProperty = MutableProperty<PledgeShippingLocationViewData?>(nil)
@@ -148,8 +131,6 @@ public final class PledgeShippingLocationViewModel: PledgeShippingLocationViewMo
   }
 
   public let adaptableStackViewIsHidden: Signal<Bool, Never>
-  public let amountAttributedText: Signal<NSAttributedString, Never>
-  public let amountLabelIsHidden: Signal<Bool, Never>
   public let dismissShippingRules: Signal<Void, Never>
   public let presentShippingRules: Signal<(Project, [ShippingRule], ShippingRule), Never>
   public let notifyDelegateOfSelectedShippingRule: Signal<ShippingRule, Never>