impl

Author: antazoey

Sources/PDKit/Protocols/Schedules/PillScheduling.swift

@@ -19,6 +19,9 @@ public protocol PillScheduling: Schedule, Deleting {
     /// The due count.
     var totalDue: Int { get }
 
+    /// Force reloads data from storage.
+    func reloadContext()
+
     /// Insert a new pill into the schedule.
     @discardableResult
     func insertNew(onSuccess: (() -> Void)?) -> Swallowable?

Sources/PDMock/Mocks/MockSchedules/MockPillSchedule.swift

@@ -23,6 +23,11 @@ public class MockPillSchedule: PillScheduling {
 
     public var totalDue: Int = 0
 
+    public var reloadContextCallCount = 0
+    public func reloadContext() {
+        reloadContextCallCount += 1
+    }
+
     public var insertNewCallArgs: [(() -> Void)?] = []
     public var insertNewReturnValue: Swallowable?
     public func insertNew(onSuccess: (() -> Void)?) -> Swallowable? {

Sources/PatchData/Schedules/HormoneSchedule.swift

@@ -29,7 +29,7 @@ public class HormoneSchedule: NSObject, HormoneScheduling {
         self.store = store
         self.dataSharer = hormoneDataSharer
         self.settings = settings
-        self.context = HormoneSchedule.getHormoneList(from: store, settings: settings)
+        self.context = store.getStoredHormones(settings)
         super.init()
         resetIfEmpty()
         shareData()
@@ -57,7 +57,7 @@ public class HormoneSchedule: NSObject, HormoneScheduling {
     }
 
     public func reloadContext() {
-        self.context = HormoneSchedule.getHormoneList(from: store, settings: settings)
+        self.context = store.getStoredHormones(settings)
     }
 
     @discardableResult
@@ -222,10 +222,6 @@ public class HormoneSchedule: NSObject, HormoneScheduling {
         store.pushLocalChangesToManagedContext([hormone], doSave: true)
     }
 
-    private static func getHormoneList(from store: HormoneStoring, settings: UserDefaultsReading) -> [Hormonal] {
-        store.getStoredHormones(settings)
-    }
-
     private func pushFromDateAndSiteChange(_ hormone: Hormonal) {
         store.pushLocalChangesToManagedContext([hormone], doSave: true)
         shareData()

Sources/PatchData/Schedules/PillSchedule.swift

@@ -62,6 +62,10 @@ public class PillSchedule: NSObject, PillScheduling {
         }
     }
 
+    public func reloadContext() {
+        self.context = store.getStoredPills()
+    }
+
     // MARK: - Override base class
 
     @discardableResult

Sources/PatchDay/Pills/Alerts/PillCellActionAlert.swift

@@ -30,7 +30,7 @@ class PillCellActionAlert: PDAlert {
     private var takeAction: UIAlertAction? {
         !pill.isDone ? UIAlertAction(title: ActionStrings.Take, style: .default) {
             _ in self.handlers.takePill()
-            } : nil
+        } : nil
     }
 
     override func present() {

Sources/PatchDay/Pills/PillsViewModel.swift

@@ -75,7 +75,9 @@ class PillsViewModel: CodeBehindDependencies<PillsViewModel>, PillsViewModelProt
         at index: Index, viewController: UIViewController, takePillCompletion: @escaping () -> Void
     ) {
         guard let pill = sdk?.pills[index] else { return }
-        let goToDetails = { self.goToPillDetails(pillIndex: index, pillsViewController: viewController) }
+        let goToDetails = {
+            self.goToPillDetails(pillIndex: index, pillsViewController: viewController)
+        }
         let takePill = {
             self.takePill(at: index)
             takePillCompletion()

Sources/PatchDay/Tabs/TabReflector.swift

@@ -38,30 +38,31 @@ class TabReflector: TabReflective {
 
     func reflectHormones() {
         guard let sdk = sdk else { return }
-        guard let hormonesVC = hormonesViewController else { return }
+        guard let hormonesViewController = hormonesViewController else { return }
         sdk.hormones.reloadContext()
         let method = sdk.settings.deliveryMethod.value
         let icon = PDIcons[method]
         let expiredCount = sdk.hormones.totalExpired
         let title = PDTitleStrings.Hormones[method]
         let item = UITabBarItem(title: title, image: icon, selectedImage: icon)
         item.badgeValue = expiredCount > 0 ? "\(expiredCount)" : nil
-        hormonesVC.title = title
-        hormonesVC.tabBarItem = nil  // Set to nil first to force redraw
-        hormonesVC.tabBarItem = item
-        hormonesVC.awakeFromNib()
+        hormonesViewController.title = title
+        hormonesViewController.tabBarItem = nil  // Set to nil first to force redraw
+        hormonesViewController.tabBarItem = item
+        hormonesViewController.awakeFromNib()
     }
 
     func reflectPills() {
-        guard let pillsVC = pillsViewController else { return }
+        guard let pillsViewController = pillsViewController else { return }
         guard let sdk = sdk else { return }
-        guard let item = pillsVC.tabBarItem else { return }
+        guard let item = pillsViewController.tabBarItem else { return }
+        sdk.pills.reloadContext()
         let expiredCount = sdk.pills.totalDue
         item.badgeValue = expiredCount > 0 ? "\(expiredCount)" : nil
         let log = PDLog<TabReflector>()
         log.info("Settings pills tab to \(item.badgeValue ?? "nil")")
-        pillsVC.tabBarItem = item
-        pillsVC.awakeFromNib()
+        pillsViewController.tabBarItem = item
+        pillsViewController.awakeFromNib()
     }
 
     private func loadViewControllerTabTextAttributes() {

Tests/PatchDayTests/Tabs/TabReflectorTests.swift

@@ -60,6 +60,13 @@ class TabReflectorTests: XCTestCase {
         XCTAssertNil(hormonesViewController.tabBarItem.badgeValue)
     }
 
+    func testReflectPills_resetsContext() {
+        let tabs = createTabs()
+        tabs.reflectPills()
+        let actual = (sdk.pills as! MockPillSchedule).reloadContextCallCount
+        XCTAssertEqual(1, actual)
+    }
+
     func testReflectPills_whenZeroTotalDue_doesNotReflectBadgeValue() {
         let pills = sdk.pills as! MockPillSchedule
         pills.totalDue = 0