Skip to content

Commit c50eabd

Browse files
committed
Formatter/localization updates
1 parent 5baebff commit c50eabd

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

Loop/View Models/FavoriteFoodsViewModel.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
//
88

99
import SwiftUI
10+
import HealthKit
1011
import LoopKit
1112
import Combine
1213

@@ -18,6 +19,15 @@ final class FavoriteFoodsViewModel: ObservableObject {
1819
@Published var isEditViewActive = false
1920
@Published var isAddViewActive = false
2021

22+
var preferredCarbUnit = HKUnit.gram()
23+
lazy var carbFormatter = QuantityFormatter(for: preferredCarbUnit)
24+
lazy var absorptionTimeFormatter: DateComponentsFormatter = {
25+
let formatter = DateComponentsFormatter()
26+
formatter.allowedUnits = [.hour, .minute]
27+
formatter.unitsStyle = .abbreviated
28+
return formatter
29+
}()
30+
2131
private lazy var cancellables = Set<AnyCancellable>()
2232

2333
init() {

Loop/Views/FavoriteFoodsView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct FavoriteFoodsView: View {
3030
else {
3131
Section(header: listHeader) {
3232
ForEach(viewModel.favoriteFoods) { food in
33-
FavoriteFoodListRow(food: food, foodToConfirmDeleteId: $foodToConfirmDeleteId, onFoodTap: onFoodTap(_:), onFoodDelete: viewModel.onFoodDelete(_:))
33+
FavoriteFoodListRow(food: food, foodToConfirmDeleteId: $foodToConfirmDeleteId, onFoodTap: onFoodTap(_:), onFoodDelete: viewModel.onFoodDelete(_:), carbFormatter: viewModel.carbFormatter, absorptionTimeFormatter: viewModel.absorptionTimeFormatter, preferredCarbUnit: viewModel.preferredCarbUnit)
3434
.environment(\.editMode, self.$editMode)
3535
.listRowInsets(EdgeInsets())
3636
}
@@ -52,7 +52,7 @@ struct FavoriteFoodsView: View {
5252
EmptyView()
5353
}
5454

55-
NavigationLink(destination: FavoriteFoodDetailView(food: viewModel.selectedFood, onFoodDelete: viewModel.onFoodDelete(_:)), isActive: $viewModel.isDetailViewActive) {
55+
NavigationLink(destination: FavoriteFoodDetailView(food: viewModel.selectedFood, onFoodDelete: viewModel.onFoodDelete(_:), carbFormatter: viewModel.carbFormatter, absorptionTimeFormatter: viewModel.absorptionTimeFormatter, preferredCarbUnit: viewModel.preferredCarbUnit), isActive: $viewModel.isDetailViewActive) {
5656
EmptyView()
5757
}
5858
}

0 commit comments

Comments
 (0)