쥬스메이커 [STEP 3] 제이티, Ari

JuiceMaker/JuiceMaker/Controller/FruitStoreViewController.swift

@@ -7,13 +7,111 @@
 
 import UIKit
 
+// MARK: - Properties and Lifecycle, Transition
 class FruitStoreViewController: UIViewController {
-
+ @IBOutlet weak var strawberryStockLabel: UILabel!
+ @IBOutlet weak var bananaStockLabel: UILabel!
+ @IBOutlet weak var pineappleStockLabel: UILabel!
+ @IBOutlet weak var kiwiStockLabel: UILabel!
+ @IBOutlet weak var mangoStockLabel: UILabel!
+
+ @IBOutlet weak var strawberryStockStepper: UIStepper!
+ @IBOutlet weak var bananaStockStepper: UIStepper!
+ @IBOutlet weak var pineappleStockStepper: UIStepper!
+ @IBOutlet weak var kiwiStockStepper: UIStepper!
+ @IBOutlet weak var mangoStockStepper: UIStepper!
+
  override func viewDidLoad() {
  super.viewDidLoad()
+ setUpFruitStepperValues()
  }
 
  @IBAction func cancelButtonTapped(_ sender: UIButton) {
  self.dismiss(animated: true, completion: nil)
  }
 }
+
+// MARK: - Label and Stepper Values Setting
+extension FruitStoreViewController {
+ @IBAction func stepperTapped(_ sender: UIStepper) {
+ switch sender {
+ case strawberryStockStepper:
+ strawberryStockLabel.text = fruitLabelText(value: sender.value)
+ changeFruitStock(fruit: .strawberry, value: sender.value)
+ case bananaStockStepper:
+ bananaStockLabel.text = fruitLabelText(value: sender.value)
+ changeFruitStock(fruit: .banana, value: sender.value)
+ case pineappleStockStepper:
+ pineappleStockLabel.text = fruitLabelText(value: sender.value)
+ changeFruitStock(fruit: .pineapple, value: sender.value)
+ case kiwiStockStepper:
+ kiwiStockLabel.text = fruitLabelText(value: sender.value)
+ changeFruitStock(fruit: .kiwi, value: sender.value)
+ case mangoStockStepper:
+ mangoStockLabel.text = fruitLabelText(value: sender.value)
+ changeFruitStock(fruit: .mango, value: sender.value)
+ default:
+ showNotificationAlert(message: Message.unknownError.description)
+ }
+ }
+
+ func fruitLabelText(value: Double) -> String {
+ return String(format: "%.0f", value)
+ }
+
+ func setUpFruitStepperValues() {
+ updateCurrentStockStepperValue(fruit: .strawberry, stepper: strawberryStockStepper)
+ updateCurrentStockStepperValue(fruit: .banana, stepper: bananaStockStepper)
+ updateCurrentStockStepperValue(fruit: .pineapple, stepper: pineappleStockStepper)
+ updateCurrentStockStepperValue(fruit: .kiwi, stepper: kiwiStockStepper)
+ updateCurrentStockStepperValue(fruit: .mango, stepper: mangoStockStepper)
+ }
+
+ func updateCurrentStockStepperValue(fruit: Fruit, stepper: UIStepper) {
+ do {
+ let stock = try FruitStore.shared.stock(fruit: fruit)
+ stepper.value = Double(stock)
+ } catch {
+ showNotificationAlert(message: Message.unknownError.description)
+ }
+ }
+}
+
+// MARK: Stepper Operation
+extension FruitStoreViewController {
+ func changeFruitStock(fruit: Fruit, value: Double) {
+ let oldStockValue: Int
+ let newStockValue = Int(value)
+ do {
+ oldStockValue = try FruitStore.shared.stock(fruit: fruit)
+ chooseCalculator(fruit: fruit, oldStockValue: oldStockValue, newStockValue: newStockValue)
+ } catch {
+ showNotificationAlert(message: Message.unknownError.description)
+ }
+ }
+
+ func chooseCalculator(fruit: Fruit, oldStockValue: Int, newStockValue: Int) {
+ if oldStockValue < newStockValue {
+ let count = newStockValue - oldStockValue
+ calculateFruitStock(fruit: fruit, count: count, calculate: FruitStore.shared.addFruitStock)
+ } else {
+ let count = oldStockValue - newStockValue
+ calculateFruitStock(fruit: fruit, count: count, calculate: FruitStore.shared.subtractFruitStock)
+ }
+ }
+
+ func calculateFruitStock(fruit: Fruit, count: Int, calculate: (Fruit, Int) throws -> Void ) {
+ do {
+ try calculate(fruit, count)
+ } catch {
+ showNotificationAlert(message: Message.unknownError.description)
+ }
+ }
+
+ func showNotificationAlert(message: String, title: String = Text.ok.title) {
+ let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
+ let cancel = UIAlertAction(title: title, style: .cancel, handler: nil)
+ alert.addAction(cancel)
+ present(alert, animated: true, completion: nil)
+ }
+}

JuiceMaker/JuiceMaker/Controller/JuiceMakerViewController.swift

@@ -6,8 +6,8 @@
 
 import UIKit
 
+// MARK: - Properties and Lifecycle
 class JuiceMakerViewController: UIViewController {
-
  private let juiceMaker = JuiceMaker()
 
  @IBOutlet weak var strawberryStockLabel: UILabel!
@@ -27,10 +27,69 @@ class JuiceMakerViewController: UIViewController {
  override func viewDidLoad() {
  super.viewDidLoad()
  updateFruitLabels()
-
+ setUpbuttonLabelFontAttributes()
+
  NotificationCenter.default.addObserver(self, selector: #selector(fruitLabelChanged(notification:)), name: .changedFruitStockNotification, object: nil)
  }
+}
+
+// MARK: - Setup Label and Button
+extension JuiceMakerViewController {
+ func setUpbuttonLabelFontAttributes() {
+ orderStrawberryBananaJuiceButton.titleLabel?.adjustsFontForContentSizeCategory = true
+ orderMangoKiwiJuiceButton.titleLabel?.adjustsFontForContentSizeCategory = true
+ orderStrawberryJuiceButton.titleLabel?.adjustsFontForContentSizeCategory = true
+ orderBananaJuiceButton.titleLabel?.adjustsFontForContentSizeCategory = true
+ orderPineappleJuiceButton.titleLabel?.adjustsFontForContentSizeCategory = true
+ orderKiwiJuiceButton.titleLabel?.adjustsFontForContentSizeCategory = true
+ orderMangoJuiceButton.titleLabel?.adjustsFontForContentSizeCategory = true
+
+ orderStrawberryBananaJuiceButton.titleLabel?.adjustsFontSizeToFitWidth = true
+ orderMangoKiwiJuiceButton.titleLabel?.adjustsFontSizeToFitWidth = true
+ orderStrawberryJuiceButton.titleLabel?.adjustsFontSizeToFitWidth = true
+ orderBananaJuiceButton.titleLabel?.adjustsFontSizeToFitWidth = true
+ orderPineappleJuiceButton.titleLabel?.adjustsFontSizeToFitWidth = true
+ orderKiwiJuiceButton.titleLabel?.adjustsFontSizeToFitWidth = true
+ orderMangoJuiceButton.titleLabel?.adjustsFontSizeToFitWidth = true
+ }
+
+ func updateFruitLabels() {
+ currentStockLabelUpdate(fruit: .strawberry, label: strawberryStockLabel)
+ currentStockLabelUpdate(fruit: .banana, label: bananaStockLabel)
+ currentStockLabelUpdate(fruit: .pineapple, label: pineappleStockLabel)
+ currentStockLabelUpdate(fruit: .kiwi, label: kiwiStockLabel)
+ currentStockLabelUpdate(fruit: .mango, label: mangoStockLabel)
+ }
+
+ func currentStockLabelUpdate(fruit: Fruit, label: UILabel) {
+ do {
+ let stock = try FruitStore.shared.stock(fruit: fruit)
+ label.text = stock.description
+ } catch let error as RequestError {
+ showNotificationAlert(message: error.errorDescription)
+ } catch {
+ showNotificationAlert(message: Message.unknownError.description)
+ }
+ }
 
+ func fruitlabel(of fruit: Fruit) -> UILabel {
+ switch fruit {
+ case .strawberry:
+ return strawberryStockLabel
+ case .banana:
+ return bananaStockLabel
+ case .pineapple:
+ return pineappleStockLabel
+ case .kiwi:
+ return kiwiStockLabel
+ case .mango:
+ return mangoStockLabel
+ }
+ }
+}
+
+// MARK: - Order Juice
+extension JuiceMakerViewController {
  @IBAction func orderJuiceButtonTapped(_ sender: UIButton) {
  let juice: Juice
 
@@ -70,48 +129,6 @@ class JuiceMakerViewController: UIViewController {
  }
  }
 
- @objc func fruitLabelChanged(notification: Notification) {
- guard let fruit = notification.object as? Fruit else {
- showNotificationAlert(message: Message.unknownError.description)
- return
- }
- currentStockLabelUpdate(fruit: fruit, label: fruitlabel(of: fruit))
- }
-
- func updateFruitLabels() {
- currentStockLabelUpdate(fruit: .strawberry, label: strawberryStockLabel)
- currentStockLabelUpdate(fruit: .banana, label: bananaStockLabel)
- currentStockLabelUpdate(fruit: .pineapple, label: pineappleStockLabel)
- currentStockLabelUpdate(fruit: .kiwi, label: kiwiStockLabel)
- currentStockLabelUpdate(fruit: .mango, label: mangoStockLabel)
- }
-
- func currentStockLabelUpdate(fruit: Fruit, label: UILabel) {
- do {
- let stock = try FruitStore.shared.stock(fruit: fruit)
- label.text = stock.description
- } catch let error as RequestError {
- showNotificationAlert(message: error.errorDescription)
- } catch {
- showNotificationAlert(message: Message.unknownError.description)
- }
- }
-
- func fruitlabel(of fruit: Fruit) -> UILabel {
- switch fruit {
- case .strawberry:
- return strawberryStockLabel
- case .banana:
- return bananaStockLabel
- case .pineapple:
- return pineappleStockLabel
- case .kiwi:
- return kiwiStockLabel
- case .mango:
- return mangoStockLabel
- }
- }
-
  func showNotificationAlert(message: String, title: String = Text.ok.title) {
  let alert = UIAlertController(title: nil, message: message, preferredStyle: .alert)
  let cancel = UIAlertAction(title: title, style: .cancel, handler: nil)
@@ -127,10 +144,40 @@ class JuiceMakerViewController: UIViewController {
  alert.addAction(okAction)
  present(alert, animated: true, completion: nil)
  }
-
+}
+
+// MARK: - Transition
+extension JuiceMakerViewController {
  private func presentFruitStoreViewController(_ action: UIAlertAction) {
- guard let viewController = self.storyboard?.instantiateViewController(withIdentifier: "FruitStoreViewController") else { return }
+ guard let viewController = self.storyboard?.instantiateViewController(withIdentifier: "FruitStoreViewController") as? UINavigationController else { return }
  self.present(viewController, animated: true, completion: nil)
+ guard let nextViewController = viewController.topViewController as? FruitStoreViewController else { return }
+ setupNextViewLabel(of: nextViewController)
+ }
+
+ override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+ guard let navigationController = segue.destination as? UINavigationController else { return }
+ guard let nextViewController = navigationController.topViewController as? FruitStoreViewController else { return }
+ setupNextViewLabel(of: nextViewController)
+ }
+
+ func setupNextViewLabel(of nextViewController: FruitStoreViewController) {
+ nextViewController.loadViewIfNeeded()
+ nextViewController.strawberryStockLabel.text = strawberryStockLabel.text
+ nextViewController.bananaStockLabel.text = bananaStockLabel.text
+ nextViewController.pineappleStockLabel.text = pineappleStockLabel.text
+ nextViewController.kiwiStockLabel.text = kiwiStockLabel.text
+ nextViewController.mangoStockLabel.text = mangoStockLabel.text
  }
 }
 
+// MARK: - Notification
+extension JuiceMakerViewController {
+ @objc func fruitLabelChanged(notification: Notification) {
+ guard let fruit = notification.object as? Fruit else {
+ showNotificationAlert(message: Message.unknownError.description)
+ return
+ }
+ currentStockLabelUpdate(fruit: fruit, label: fruitlabel(of: fruit))
+ }
+}

JuiceMaker/JuiceMaker/Model/FruitStore.swift

@@ -52,10 +52,10 @@ class FruitStore {
  guard let oldFruitCount = fruitBasket[fruit] else {
  throw RequestError.fruitNotFound
  }
- guard count <= oldFruitCount else {
+ let newFruitCount = calculator(oldFruitCount, count)
+ guard newFruitCount >= 0 else {
  throw RequestError.fruitStockOut
  }
- let newFruitCount = calculator(oldFruitCount, count)
  fruitBasket[fruit] = newFruitCount
 
  NotificationCenter.default.post(name: .changedFruitStockNotification, object: fruit)

JuiceMaker/JuiceMaker/Model/Text.swift

@@ -12,21 +12,11 @@ enum Text {
  case ok
 
  var title: String {
- return localizedTitle(key: self.key)
- }
-
- private var key: String {
  switch self {
  case .cancel:
- return "Cancel"
+ return "취소"
  case .ok:
- return "OK"
+ return "확인"
  }
  }
-
- private func localizedTitle(key: String) -> String {
- let bundle = Bundle.init(for: UIButton.self)
- let title = bundle.localizedString(forKey: key, value: nil, table: nil)
- return title
- }
 }