Skip to content

Commit

Permalink
Per PR review, cleanup where Food is located
Browse files Browse the repository at this point in the history
  • Loading branch information
lokae0 committed Feb 25, 2019
1 parent c0da432 commit 7854df4
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,3 @@ extension DetailNavigationModelFactoryProtocol {
}

}

class DetailNavigationModelFactory: DetailNavigationModelFactoryProtocol { }
4 changes: 0 additions & 4 deletions Application/Source/Detail/View/DetailViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,4 @@ extension DetailViewControllerFactoryProtocol {
return DetailViewController(viewModel: viewModel, themeProvider: themeProvider)
}

func makeFoodInfoViewController(viewModel: FoodInfoViewModel) -> FoodInfoViewController {
return FoodInfoViewController(viewModel: viewModel, themeProvider: themeProvider)
}

}
5 changes: 0 additions & 5 deletions Application/Source/Detail/View/DetailViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,6 @@ protocol DetailViewModelFactoryProtocol: SelectionViewModelFactoryProtocol, Food

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(foods: foods, factory: self)
}
Expand Down
2 changes: 0 additions & 2 deletions Application/Source/Home/Navigation/HomeNavigationModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,3 @@ extension HomeNavigationModelFactoryProtocol {
}

}

class HomeNavigationModelFactory: HomeNavigationModelFactoryProtocol { }
3 changes: 3 additions & 0 deletions Application/Source/Root/RootTabBarViewModel.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import RxSwift
import RxCocoa
import RxExtensions
import Presentations
import Core

Expand Down Expand Up @@ -39,6 +40,8 @@ class RootTabBarModelFactory: RootTabBarModelFactoryProtocol {

let themeProvider: ThemeProvider

let foods = Property<[Food]>([.beans, .greens, .potatoes, .tomatoes])

init(themeProvider: ThemeProvider) {
self.themeProvider = themeProvider
}
Expand Down

0 comments on commit 7854df4

Please sign in to comment.