Update Food List UI

vykut · Dec 8, 2023 · 8c282f8 · 8c282f8
1 parent 66a24b9
commit 8c282f8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/FoodSpec/Clients/SpotlightClient.swift b/FoodSpec/Clients/SpotlightClient.swift
@@ -26,12 +26,7 @@ extension SpotlightClient: DependencyKey {
                 let attributeSet = CSSearchableItemAttributeSet(contentType: .content)
                 attributeSet.displayName = food.name.capitalized
                 attributeSet.title = "\(food.name.capitalized) nutritional values"
-                attributeSet.contentDescription = """
-E: \(food.energy.formatted(width: .narrow)) | \
-P: \(food.protein.formatted(width: .narrow)) | \
-C: \(food.carbohydrates.formatted(width: .narrow)) | \
-F: \(food.fatTotal.formatted(width: .narrow))
-"""
+                attributeSet.contentDescription = food.nutritionalSummary
                 let searchableItem = CSSearchableItem(
                     uniqueIdentifier: food.name,
                     domainIdentifier: "foods",

diff --git a/FoodSpec/Food List/FoodList.swift b/FoodSpec/Food List/FoodList.swift
@@ -83,6 +83,9 @@ struct FoodList: View {
             .onDelete(perform: deleteItems)
         } header: {
             Text("Recent Searches")
+        } footer: {
+            Text("Values per \(Quantity(grams: 100).formatted(width: .wide))")
+                .font(.footnote)
         }
     }
 
@@ -134,6 +137,13 @@ struct FoodList: View {
             initialState: FoodListReducer.State(),
             reducer: {
                 FoodListReducer()
+                    .transformDependency(\.databaseClient) {
+                        $0.observeFoods = { _, _ in
+                            .init {
+                                $0.yield([.preview, .preview, .preview])
+                            }
+                        }
+                    }
                     ._printChanges()
             }
         )

diff --git a/FoodSpec/Food List/FoodListRow.swift b/FoodSpec/Food List/FoodListRow.swift
@@ -14,12 +14,7 @@ struct FoodListRow: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 8) {
             Text(food.name.capitalized)
-            HStack {
-                Text(food.energy.formatted(width: .narrow))
-                Text("P: \(food.protein.formatted(width: .narrow))")
-                Text("C: \(food.carbohydrates.formatted(width: .narrow))")
-                Text("F: \(food.fatTotal.formatted(width: .narrow))")
-            }
+            Text(food.nutritionalSummary)
             .font(.footnote)
             .foregroundStyle(.secondary)
         }

diff --git a/FoodSpec/Model/Food/Food.swift b/FoodSpec/Model/Food/Food.swift
@@ -21,6 +21,15 @@ struct Food: Codable, Hashable {
     var carbohydrates: Quantity
     var fiber: Quantity
     var sugar: Quantity
+
+    var nutritionalSummary: String {
+        """
+\(energy.formatted(width: .narrow)) | \
+P: \(protein.formatted(width: .narrow)) | \
+C: \(carbohydrates.formatted(width: .narrow)) | \
+F: \(fatTotal.formatted(width: .narrow))
+"""
+    }
 }
 
 extension Food: FetchableRecord, MutablePersistableRecord {