Adding SwiftUI Ingredient List #21
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // | ||
| // CSConversionVCExt.swift | ||
| // cake | ||
| // | ||
| // Created by Alex King on 3/28/20. | ||
| // Copyright © 2020 Olga Galchenko. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| extension CSConversionVC { | ||
| @objc | ||
| func showIngredientList() { | ||
| let ingredientListViewController = IngredientListViewController() | ||
| present(ingredientListViewController, animated: true, completion: nil) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| // | ||
| // CSIngredientsExt.swift | ||
| // cake | ||
| // | ||
| // Created by Alex King on 3/29/20. | ||
| // Copyright © 2020 Olga Galchenko. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| extension CSIngredient: Identifiable { | ||
| public var id: String { name } | ||
| } | ||
|
|
||
| extension CSIngredientGroup: Identifiable { | ||
| public var id: String { name } | ||
| } | ||
|
|
||
| extension CSIngredientGroup { | ||
| var ingredients: [CSIngredient] { | ||
| (0 ..< countOfIngredients()).map { ingredient(at: $0) } | ||
| } | ||
| } | ||
|
|
||
| extension CSIngredients { | ||
| var ingredientList: [CSIngredientGroup] { | ||
|
Collaborator
There was a problem hiding this comment. Minor: I would name it |
||
| let groups: [CSIngredientGroup] = (0 ..< countOfIngredientGroups()).map { ingredientGroup(at: $0) } | ||
| return groups | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| // | ||
| // IngredientListViewController.swift | ||
| // cake | ||
| // | ||
| // Created by Alex King on 3/28/20. | ||
| // Copyright © 2020 Olga Galchenko. All rights reserved. | ||
| // | ||
|
|
||
| import Foundation | ||
| import SwiftUI | ||
|
|
||
| class IngredientListViewController: UIHostingController<IngredientListView> { | ||
| init() { | ||
| super.init(rootView: IngredientListView()) | ||
| } | ||
|
|
||
| @objc | ||
| dynamic required init?(coder _: NSCoder) { | ||
| assertionFailure("init(coder:) has not been implemented") | ||
| return nil | ||
| } | ||
|
|
||
| override func viewDidLoad() { | ||
| super.viewDidLoad() | ||
| CSIngredients.sharedInstance()?.refreshRecents() | ||
|
Collaborator
There was a problem hiding this comment. Hmmm, why is the CSIngredients optional? When might it be missing? Might it make sense to just throw when it's not available inside the
Collaborator
There was a problem hiding this comment. or is the optional just the artifact of Objective C interop?
Collaborator
There was a problem hiding this comment. Also, shouldn't this go into viewWillAppear or something like that, i.e. wouldn't we want to refresh recents every time this view is shown. |
||
| } | ||
| } | ||
|
|
||
| struct IngredientListView: View { | ||
| @State private var searchText: String = "" | ||
|
|
||
| var body: some View { | ||
| NavigationView { | ||
| List { | ||
| SearchBar(text: $searchText) | ||
| ForEach(CSIngredients.sharedInstance()!.ingredientList) { group in | ||
| Section(header: Text(group.name)) { | ||
| ForEach(group.ingredients) { ingredient in | ||
| IngredientListCell(ingredientName: ingredient.name) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| .listStyle(GroupedListStyle()) | ||
| .navigationBarTitle("Ingredients") | ||
| .navigationBarItems(leading: | ||
| Button(action: { | ||
| print("Pressed") | ||
|
Collaborator
There was a problem hiding this comment. Need to fill in the action here. |
||
| }, label: { | ||
|
Collaborator
There was a problem hiding this comment. I hope all this indentation looks better in XCode than it does here. |
||
| Image(systemName: "xmark") | ||
| .foregroundColor(SwiftUI.Color(Color.redLineColor)) | ||
| .font(Font.system(size: 20, weight: .medium, design: .default)) | ||
|
Collaborator
There was a problem hiding this comment. Wait, why is there font in here at all? This is the closing |
||
| }), | ||
| trailing: | ||
| NavigationLink(destination: EditIngredientViewControllerRepresentable(), | ||
| label: { Image(systemName: "plus") | ||
| .foregroundColor(SwiftUI.Color(Color.redLineColor)) | ||
| .font(Font.system(size: 20, weight: .medium, design: .default)) | ||
|
Collaborator
There was a problem hiding this comment. Same here. Why do we need a font here at all? |
||
| })) | ||
|
Collaborator
There was a problem hiding this comment. Aren't we missing the "Reset to Defaults" button here somewhere? |
||
| } | ||
| } | ||
| } | ||
|
|
||
| struct IngredientListCell: View { | ||
| private let ingredientName: String | ||
|
|
||
| init(ingredientName: String = "Sugar") { | ||
| self.ingredientName = ingredientName | ||
| } | ||
|
|
||
| var body: some View { | ||
| ZStack { | ||
| NavigationLink(destination: EditIngredientViewControllerRepresentable()) { | ||
| EmptyView() | ||
| }.buttonStyle(PlainButtonStyle()) | ||
| HStack { | ||
| Text(ingredientName) | ||
| Spacer() | ||
| Button(action: { | ||
| print("Edit Tapped") | ||
|
Collaborator
There was a problem hiding this comment. Need to fill in action here. |
||
| }, label: { | ||
| Image(systemName: "pencil.circle") | ||
| .foregroundColor(SwiftUI.Color(Color.redLineColor)) | ||
| .font(Font.system(size: 22, weight: .regular, design: .default)) | ||
|
Collaborator
There was a problem hiding this comment. Same question regarding font. |
||
| }).buttonStyle(BorderlessButtonStyle()) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private struct SearchBar: UIViewRepresentable { | ||
| @Binding var text: String | ||
|
|
||
| class Coordinator: NSObject, UISearchBarDelegate { | ||
| @Binding var text: String | ||
|
|
||
| init(text: Binding<String>) { | ||
| _text = text | ||
| } | ||
|
|
||
| func searchBar(_: UISearchBar, textDidChange searchText: String) { | ||
| text = searchText | ||
| } | ||
| } | ||
|
|
||
| func makeCoordinator() -> SearchBar.Coordinator { | ||
| Coordinator(text: $text) | ||
| } | ||
|
|
||
| func makeUIView(context: UIViewRepresentableContext<SearchBar>) -> UISearchBar { | ||
| let searchBar = UISearchBar(frame: .zero) | ||
| searchBar.placeholder = "Search" | ||
| searchBar.delegate = context.coordinator | ||
| searchBar.searchBarStyle = .minimal | ||
| return searchBar | ||
| } | ||
|
|
||
| func updateUIView(_ uiView: UISearchBar, context _: UIViewRepresentableContext<SearchBar>) { | ||
| uiView.text = text | ||
| } | ||
| } | ||
|
|
||
| struct IngredientListViewController_Previews: PreviewProvider { | ||
| static var previews: some View { | ||
| IngredientListView() | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Clean up the comments.