Add Basic Food Table View

Application/Source/Detail/Navigation/DetailNavigationController.swift

@@ -44,4 +44,13 @@ extension DetailNavigationController: SelectionPresenter {
 
 }
 
+extension DetailNavigationController: FoodInfoPresenter {
+
+    func foodInfoPresentation(of viewModel: FoodInfoViewModel) -> DismissablePresentation {
+        let viewController = factory.makeFoodInfoViewController(viewModel: viewModel)
+        return makePushPresentation(of: viewController)
+    }
+
+}
+
 protocol DetailNavigationControllerFactoryProtocol: DetailViewControllerFactoryProtocol, SingleViewNavigationControllerFactoryProtocol { }

Application/Source/Detail/View/DetailPresenter.swift

@@ -2,7 +2,7 @@ import RxSwift
 import Action
 import Presentations
 
-protocol DetailPresentingViewModel: class, PresentingViewModel {
+protocol DetailPresentingViewModel: AnyObject, PresentingViewModel {
     var detailPresenter: DetailPresenter? { get set }
     var presentDetail: Action<Bool, DetailViewModel> { get }
 }
@@ -30,6 +30,7 @@ extension DetailPresentingViewModel {
             let viewModel = factory.makeDetailViewModel()
 
             viewModel.selectionPresenter = presenter
+            viewModel.foodInfoPresenter = presenter
 
             setupViewModel?(viewModel)
 
@@ -41,6 +42,6 @@ extension DetailPresentingViewModel {
 
 }
 
-protocol DetailPresenter: SelectionPresenter {
+protocol DetailPresenter: SelectionPresenter, FoodInfoPresenter {
     func detailPresentation(of viewModel: DetailViewModel) -> DismissablePresentation
 }

Application/Source/Detail/View/DetailViewController.swift

@@ -50,7 +50,7 @@ class DetailViewController: UIViewController, ViewController {
             .disposed(by: disposeBag)
 
         detailView.button.rx.bind(to: viewModel.presentSelection, input: true)
-        detailView.foodInfoButton.rx.bind(to: viewModel.presentContents, input: ())
+        detailView.foodInfoButton.rx.bind(to: viewModel.presentFoodInfo, input: true)
 
         rx.isAppeared
             .bind(to: viewModel.isActive)
@@ -69,7 +69,7 @@ class DetailViewController: UIViewController, ViewController {
 
 }
 
-protocol DetailViewControllerFactoryProtocol: SelectionViewControllerFactoryProtocol {
+protocol DetailViewControllerFactoryProtocol: SelectionViewControllerFactoryProtocol, FoodInfoViewControllerFactoryProtocol {
     var themeProvider: ThemeProvider { get }
 
     func makeDetailViewController(viewModel: DetailViewModel) -> DetailViewController
@@ -81,4 +81,8 @@ extension DetailViewControllerFactoryProtocol {
         return DetailViewController(viewModel: viewModel, themeProvider: themeProvider)
     }
 
+    func makeFoodInfoViewController(viewModel: FoodInfoViewModel) -> FoodInfoViewController {
+        return FoodInfoViewController(viewModel: viewModel, themeProvider: themeProvider)
+    }
+
 }

Application/Source/Detail/View/DetailViewModel.swift

@@ -4,11 +4,12 @@ import RxExtensions
 import Presentations
 import Action
 
-class DetailViewModel: ViewModel, SelectionPresentingViewModel {
+class DetailViewModel: ViewModel, SelectionPresentingViewModel, FoodInfoPresentingViewModel {
 
     let isActive = BehaviorRelay(value: false)
 
     weak var selectionPresenter: SelectionPresenter?
+    weak var foodInfoPresenter: FoodInfoPresenter?
 
     let title = Property(L10n.Detail.title)
 
@@ -20,12 +21,9 @@ class DetailViewModel: ViewModel, SelectionPresentingViewModel {
     let foodListTitle = Property(L10n.Detail.FoodList.title)
     let foodInfoButtonTitle = Property(L10n.Detail.FoodButton.title)
 
-    let presentContents = CocoaAction { _ in
-        print("Content button pressed")
-        return .empty()
-    }
+    private(set) lazy var presentFoodInfo = makePresentFoodInfo(withFactory: factory)
 
-    let foods: BehaviorRelay<[Food]> = BehaviorRelay(value: [.beans, .greens, .potatoes, .tomatoes])
+    private let foods: Property<[Food]>
 
     private(set) lazy var foodListText: Property<String> = {
         let observable = foods.map { foods -> String in
@@ -37,7 +35,7 @@ class DetailViewModel: ViewModel, SelectionPresentingViewModel {
     }()
 
     private(set) lazy var presentSelection = makePresentSelection(
-        withFactory: selectionFactory,
+        withFactory: factory,
         defaultValue: { [weak self] in
             return self?.selectionResult.value
         },
@@ -50,24 +48,34 @@ class DetailViewModel: ViewModel, SelectionPresentingViewModel {
                 .disposed(by: self.disposeBag)
         })
 
-    init(selectionFactory: SelectionViewModelFactoryProtocol) {
-        self.selectionFactory = selectionFactory
+    typealias Factory = SelectionViewModelFactoryProtocol & FoodInfoViewModelFactoryProtocol
+
+    init(foods: Property<[Food]>, factory: Factory) {
+        self.foods = foods
+        self.factory = factory
     }
 
     private let selectionResultRelay = BehaviorRelay<String?>(value: nil)
-    private let selectionFactory: SelectionViewModelFactoryProtocol
+    private let factory: Factory
     private let disposeBag = DisposeBag()
 
 }
 
-protocol DetailViewModelFactoryProtocol: SelectionViewModelFactoryProtocol {
+protocol DetailViewModelFactoryProtocol: SelectionViewModelFactoryProtocol, FoodInfoViewModelFactoryProtocol {
+    var foods: Property<[Food]> { get }
+
     func makeDetailViewModel() -> DetailViewModel
 }
 
 extension DetailViewModelFactoryProtocol {
 
+    // This can be backed by a datastore. For now, use a computed property to represent persistent data
+    var foods: Property<[Food]> {
+        return Property([.beans, .greens, .potatoes, .tomatoes])
+    }
+
     func makeDetailViewModel() -> DetailViewModel {
-        return DetailViewModel(selectionFactory: self)
+        return DetailViewModel(foods: foods, factory: self)
     }
 
 }

Application/Source/Food Info/FoodInfoViewController.swift

@@ -0,0 +1,61 @@
+import UIKit
+import Presentations
+import RxSwift
+import Action
+import Core
+
+class FoodInfoViewController: UITableViewController, ViewController {
+
+    let viewModel: FoodInfoViewModel
+
+    let themeProvider: ThemeProvider
+
+    required init(viewModel: FoodInfoViewModel, themeProvider: ThemeProvider) {
+        self.viewModel = viewModel
+        self.themeProvider = themeProvider
+
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        let cellIdentifier = "FoodCell"
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: cellIdentifier)
+
+        viewModel.foods
+            .bind(to: tableView.rx.items(cellIdentifier: cellIdentifier)) { _, food, cell in
+                cell.textLabel?.text = food.name
+            }
+            .disposed(by: disposeBag)
+
+        rx.isAppeared
+            .bind(to: viewModel.isActive)
+            .disposed(by: disposeBag)
+
+        themeProvider.bindToStyleable(self) { FoodInfoViewControllerStyle(theme: $0) }
+    }
+
+    @available(*, unavailable)
+    override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) { fatalError("\(#function) not implemented.") }
+
+    @available(*, unavailable)
+    required init?(coder aDecoder: NSCoder) { fatalError("\(#function) not implemented.") }
+
+    private let disposeBag = DisposeBag()
+
+}
+
+protocol FoodInfoViewControllerFactoryProtocol {
+    var themeProvider: ThemeProvider { get }
+
+    func makeFoodInfoViewController(viewModel: FoodInfoViewModel) -> FoodInfoViewController
+}
+
+extension FoodInfoViewControllerFactoryProtocol {
+
+    func makeFoodInfoViewController(viewModel: FoodInfoViewModel) -> FoodInfoViewController {
+        return FoodInfoViewController(viewModel: viewModel, themeProvider: themeProvider)
+    }
+
+}

Application/Source/Food Info/FoodInfoViewControllerStyle.swift

@@ -0,0 +1,16 @@
+import Themer
+import UIKit
+import Core
+
+struct FoodInfoViewControllerStyle: Style {
+
+    let theme: Theme
+
+    init(theme: Theme) {
+        self.theme = theme
+    }
+
+    func apply(to styleable: FoodInfoViewController) {
+    }
+
+}

Application/Source/Food Info/FoodInfoViewModel.swift

@@ -0,0 +1,37 @@
+import RxSwift
+import RxCocoa
+import RxExtensions
+import Presentations
+import Action
+
+class FoodInfoViewModel: ViewModel {
+
+    let isActive = BehaviorRelay(value: false)
+    let foods: Property<[Food]>
+
+    init(with foods: Property<[Food]>) {
+        self.foods = foods
+        foods
+            .asObservable()
+            .logValue(.info, .application) { "FOODS: \($0)" }
+            .subscribe()
+            .disposed(by: disposeBag)
+    }
+
+    private let disposeBag = DisposeBag()
+
+}
+
+protocol FoodInfoViewModelFactoryProtocol {
+    var foods: Property<[Food]> { get }
+
+    func makeFoodInfoViewModel() -> FoodInfoViewModel
+}
+
+extension FoodInfoViewModelFactoryProtocol {
+
+    func makeFoodInfoViewModel() -> FoodInfoViewModel {
+        return FoodInfoViewModel(with: foods)
+    }
+
+}

Application/Source/Food Info/FoodInfoViewPresenter.swift

@@ -0,0 +1,45 @@
+import RxSwift
+import RxCocoa
+import Action
+import Presentations
+
+protocol FoodInfoPresentingViewModel: AnyObject, PresentingViewModel {
+    var foodInfoPresenter: FoodInfoPresenter? { get set }
+    var presentFoodInfo: Action<Bool, FoodInfoViewModel> { get }
+}
+
+extension FoodInfoPresentingViewModel {
+
+    /// Makes an action that is suitable to be set as the presentFoodInfo action.
+    ///
+    /// This action should be executed with a Bool indicating whether the presentation should be animated.
+    ///
+    /// - Parameter factory: A factory to be used to generate the presented view model.
+    /// - Parameter setupViewModel: This closure will be called with the presented view model when a present action
+    ///             is executed. Consumers can use this to observe changes to the presented view model if necessary.
+    func makePresentFoodInfo(
+        withFactory factory: FoodInfoViewModelFactoryProtocol,
+        setupViewModel: ((FoodInfoViewModel) -> Void)? = nil
+    ) -> Action<Bool, FoodInfoViewModel> {
+        return makePresentAction { [weak self] animated -> DismissablePresentationContext<FoodInfoViewModel>? in
+            guard
+                let self = self,
+                let presenter = self.foodInfoPresenter else {
+                    return nil
+            }
+
+            let viewModel = factory.makeFoodInfoViewModel()
+
+            setupViewModel?(viewModel)
+
+            let presentation = presenter.foodInfoPresentation(of: viewModel)
+
+            return DismissablePresentationContext(presentation: presentation, viewModel: viewModel, presentAnimated: animated)
+        }
+    }
+
+}
+
+protocol FoodInfoPresenter: AnyObject {
+    func foodInfoPresentation(of viewModel: FoodInfoViewModel) -> DismissablePresentation
+}

Application/Source/Home/Navigation/HomeNavigationController.swift

@@ -39,6 +39,15 @@ extension HomeNavigationController: DetailPresenter {
 
 }
 
+extension HomeNavigationController: FoodInfoPresenter {
+
+    func foodInfoPresentation(of viewModel: FoodInfoViewModel) -> DismissablePresentation {
+        let viewController = factory.makeFoodInfoViewController(viewModel: viewModel)
+        return makePushPresentation(of: viewController)
+    }
+
+}
+
 extension HomeNavigationController: SelectionPresenter {
 
     func selectionPresentation(of viewModel: SelectionViewModel) -> DismissablePresentation {

Application/Source/Home/View/HomeViewPresenter.swift

@@ -2,7 +2,7 @@ import RxSwift
 import Action
 import Presentations
 
-protocol HomePresentingViewModel: class, PresentingViewModel {
+protocol HomePresentingViewModel: AnyObject, PresentingViewModel {
     var homePresenter: HomePresenter? { get set }
     var presentHome: Action<Bool, HomeViewModel> { get }
 }

Application/Source/Selection/SelectionPresenter.swift

@@ -2,7 +2,7 @@ import RxSwift
 import Action
 import Presentations
 
-protocol SelectionPresentingViewModel: class, PresentingViewModel {
+protocol SelectionPresentingViewModel: AnyObject, PresentingViewModel {
     var selectionPresenter: SelectionPresenter? { get set }
     var presentSelection: Action<Bool, SelectionViewModel> { get }
 }
@@ -40,6 +40,6 @@ extension SelectionPresentingViewModel {
 
 }
 
-protocol SelectionPresenter: class {
+protocol SelectionPresenter: AnyObject {
     func selectionPresentation(of viewModel: SelectionViewModel) -> DismissablePresentation
 }

Application/Source/Settings/View/SettingsPresenter.swift

@@ -2,7 +2,7 @@ import RxSwift
 import Action
 import Presentations
 
-protocol SettingsPresentingViewModel: class, PresentingViewModel {
+protocol SettingsPresentingViewModel: AnyObject, PresentingViewModel {
     var settingsPresenter: SettingsPresenter? { get set }
     var presentSettings: Action<Bool, SettingsViewModel> { get }
 }
@@ -37,6 +37,6 @@ extension SettingsPresentingViewModel {
 
 }
 
-protocol SettingsPresenter: class {
+protocol SettingsPresenter: AnyObject {
     func settingsPresentation(of viewModel: SettingsViewModel) -> DismissablePresentation
 }

Application/Tests/DetailViewModelSpec.swift

@@ -3,16 +3,18 @@
 import Quick
 import Nimble
 import RxSwift
+import RxExtensions
 
 @testable import Application
 
 class DetailViewModelSpec: QuickSpec {
     override func spec() {
 
         var viewModel: DetailViewModel!
+        let foods = Property<[Food]>([.tomatoes, .potatoes])
 
         beforeEach {
-            viewModel = DetailViewModel(selectionFactory: StubSelectionViewModelFactory())
+            viewModel = DetailViewModel(foods: foods, factory: StubDetailViewModelFactory())
         }
 
         describe("DetailViewModel") {
@@ -81,7 +83,6 @@ class DetailViewModelSpec: QuickSpec {
 
             describe("foodListText") {
                 it("should return a String list from the array of Contents") {
-                    viewModel.foods.accept([.tomatoes, .potatoes])
                     let expected = L10n.Food.tomatoes + ", " + L10n.Food.potatoes
 
                     expect(viewModel.foodListText.value).to(equal(expected))