Merge branch 'dev' into cameron/LOOP-4884-pulsing-loop-status

Author: Camji55

Loop/Managers/Store Protocols/CarbStoreProtocol.swift

@@ -11,7 +11,7 @@ import HealthKit
 
 protocol CarbStoreProtocol: AnyObject {
 
-    func getCarbEntries(start: Date?, end: Date?) async throws -> [StoredCarbEntry]
+    func getCarbEntries(start: Date?, end: Date?, dateAscending: Bool, with favoriteFoodID: String?) async throws -> [StoredCarbEntry]
 
     func replaceCarbEntry(_ oldEntry: StoredCarbEntry, withEntry newEntry: NewCarbEntry) async throws -> StoredCarbEntry
 
@@ -21,4 +21,10 @@ protocol CarbStoreProtocol: AnyObject {
 
 }
 
+extension CarbStoreProtocol {
+    func getCarbEntries(start: Date?, end: Date?) async throws -> [StoredCarbEntry] {
+        try await getCarbEntries(start: start, end: end, dateAscending: true, with: nil)
+    }
+}
+
 extension CarbStore: CarbStoreProtocol { }

Loop/View Models/CarbEntryViewModel.swift

@@ -87,6 +87,10 @@ final class CarbEntryViewModel: ObservableObject {
 
     @Published var favoriteFoods = UserDefaults.standard.favoriteFoods
     @Published var selectedFavoriteFoodIndex = -1
+    var selectedFavoriteFood: StoredFavoriteFood? {
+        let foodExistsForIndex = 0..<favoriteFoods.count ~= selectedFavoriteFoodIndex
+        return foodExistsForIndex ? favoriteFoods[selectedFavoriteFoodIndex] : nil
+    }
 
     weak var delegate: CarbEntryViewModelDelegate?
     weak var analyticsServicesManager: AnalyticsServicesManager?
@@ -121,6 +125,10 @@ final class CarbEntryViewModel: ObservableObject {
         self.usesCustomFoodType = true
         self.shouldBeginEditingQuantity = false
 
+        if let favoriteFoodIndex = favoriteFoods.firstIndex(where: { $0.id == originalCarbEntry.favoriteFoodID }) {
+            self.selectedFavoriteFoodIndex = favoriteFoodIndex
+        }
+        
         observeLoopUpdates()
     }
 
@@ -133,12 +141,15 @@ final class CarbEntryViewModel: ObservableObject {
                 return nil  // No changes were made
             }
 
+            let favoriteFoodID = selectedFavoriteFoodIndex == -1 ? nil : favoriteFoods[selectedFavoriteFoodIndex].id
+            
             return NewCarbEntry(
                 date: date,
                 quantity: HKQuantity(unit: preferredCarbUnit, doubleValue: quantity),
                 startDate: time,
                 foodType: usesCustomFoodType ? foodType : selectedDefaultAbsorptionTimeEmoji,
-                absorptionTime: absorptionTime
+                absorptionTime: absorptionTime,
+                favoriteFoodID: favoriteFoodID
             )
         }
         else {

Loop/Views/BolusEntryView.swift

@@ -468,15 +468,3 @@ struct LabeledQuantity: View {
         return Text(string)
     }
 }
-
-struct LabelBackground: ViewModifier {
-    func body(content: Content) -> some View {
-        content
-            .padding(.horizontal, 8)
-            .padding(.vertical, 4)
-            .background(
-                RoundedRectangle(cornerRadius: 5, style: .continuous)
-                    .fill(Color(.systemGray6))
-            )
-    }
-}

Loop/Views/CarbEntryView.swift

@@ -110,7 +110,8 @@ struct CarbEntryView: View, HorizontalSizeClassOverride {
 
             CardSectionDivider()
 
-            FoodTypeRow(foodType: $viewModel.foodType, absorptionTime: $viewModel.absorptionTime, selectedDefaultAbsorptionTimeEmoji: $viewModel.selectedDefaultAbsorptionTimeEmoji, usesCustomFoodType: $viewModel.usesCustomFoodType, absorptionTimeWasEdited: $viewModel.absorptionTimeWasEdited, isFocused: foodTypeFocused, defaultAbsorptionTimes: viewModel.defaultAbsorptionTimes)
+            let selectedFavoriteFoodBinding = Binding(get: { viewModel.selectedFavoriteFood }, set: { _ in })
+            FoodTypeRow(selectedFavoriteFood: selectedFavoriteFoodBinding, foodType: $viewModel.foodType, absorptionTime: $viewModel.absorptionTime, selectedDefaultAbsorptionTimeEmoji: $viewModel.selectedDefaultAbsorptionTimeEmoji, usesCustomFoodType: $viewModel.usesCustomFoodType, absorptionTimeWasEdited: $viewModel.absorptionTimeWasEdited, isFocused: foodTypeFocused, defaultAbsorptionTimes: viewModel.defaultAbsorptionTimes)
 
             CardSectionDivider()
 

LoopTests/Mock Stores/MockCarbStore.swift

@@ -16,7 +16,7 @@ class MockCarbStore: CarbStoreProtocol {
 
     var carbHistory: [StoredCarbEntry] = []
 
-    func getCarbEntries(start: Date?, end: Date?) async throws -> [StoredCarbEntry] {
+    func getCarbEntries(start: Date?, end: Date?, dateAscending: Bool, with favoriteFoodID: String?) async throws -> [StoredCarbEntry] {
         return carbHistory.filterDateRange(start, end)
     }