Bugfixes (#47)

Author: antazoey

.gitignore

@@ -6,7 +6,7 @@
 **/xcuserdata/
 
 # Test results files
-*result.yml
+result.xml
 
 # Files
 *.cer

CHANGELOG.md

@@ -14,6 +14,16 @@ Added
     number of days and then stop taking the pill for a certain number of days.  You can set the "Days on" and 
     "Days off" properties accordingly to any numbers 1 - 25.
 
+Fixed
+
+- Issue where you could not take a newly added pill.
+- Issue that causes the app to crash in situations when creating a new pill or site, then backgrounding the app, then 
+    foregrounding again.
+- Issue where an arrow component in the Site Schedule View would not hide during editing mode.
+- Bug where if you create a site when you don't have any sites in the Site Schedule View, it would not load some 
+    of the components in the cell.
+- Bug preventing reordering sites.
+
 ## 3.2.3
 
 Fixed

Sources/PDKit/PDTO.swift

@@ -134,8 +134,8 @@ public struct SiteCellProperties {
     }
     public var row: Index
     public var site: Bodily?
-    public var totalSiteCount: Int = 0
-    public var nextSiteIndex: Int = 0
+    public var totalSiteCount = 0
+    public var nextSiteIndex = 0
 }
 
 public struct BarItemInitializationProperties {

Sources/PDKit/Pills/PillAttributes.swift

@@ -50,7 +50,8 @@ public class PillAttributes {
         _expirationInterval = PillExpirationInterval(nil, xDays: nil)
     }
 
-    /// Returns true if these attributes contain any non-nil attributes. Optionally pass in exceptions and it will also make sure
+    /// Returns true if these attributes contain any non-nil attributes.
+    /// Optionally pass in exceptions and it will also make sure
     /// the attribute is not equal to the property in the exceptions.
     public func anyAttributeExists(exclusions: PillAttributes? = nil) -> Bool {
         let exclusions = exclusions != nil ? exclusions! : PillAttributes()

Sources/PDKit/Pills/PillExpirationInterval.swift

@@ -24,7 +24,8 @@ public class PillExpirationInterval {
     }
 
     /// The normal initializer that would exist if we did not have to include migrations.
-    /// It will take a `xDays` value and convert it to the days integer values. Call `.xDays` to form the new value for storing.
+    /// It will take a `xDays` value and convert it to the days integer values.
+    /// Call `.xDays`to form the new value for storing.
     public init(_ value: PillExpirationIntervalSetting?, xDays: String?) {
         self._value = value
         if let xDaysValue = xDays, let val = value, _xDaysIntervals.contains(val) {

Sources/PDKit/Pills/PillExpirationIntervalXDays.swift

@@ -63,6 +63,14 @@ public class PillExpirationIntervalXDays {
                 // setting to nil is allowed
                 _one = newValue
             }
+
+            // Set position to 1 if we are lowering the limit
+            guard let isOn = isOn, isOn else { return }
+            guard let one = _one else { return }
+            guard let pos = position else { return }
+            if one < pos {
+                position = one
+            }
         }
     }
 
@@ -77,6 +85,14 @@ public class PillExpirationIntervalXDays {
                 // setting to nil is allowed
                 _two = newValue
             }
+
+            // Set position to 1 if we are lowering the limit
+            guard let isOn = isOn, !isOn else { return }
+            guard let two = _two else { return }
+            guard let pos = position else { return }
+            if two < pos {
+                position = two
+            }
         }
     }
 

Sources/PDKit/Protocols/UI/Pills/PillCellProtocol.swift

@@ -8,6 +8,5 @@ import Foundation
 
 public protocol PillCellProtocol {
     @discardableResult func configure(_ params: PillCellConfigurationParameters) -> PillCellProtocol
-    @discardableResult func stamp() -> PillCellProtocol
     func loadBackground()
 }

Sources/PDKit/Protocols/UI/Pills/PillDetailViewModelProtocol.swift

@@ -12,7 +12,7 @@ public protocol PillDetailViewModelProtocol {
     var index: Index { get }
 
     /// The view model's `Pill`.
-    var pill: Swallowable { get }
+    var pill: Swallowable? { get }
 
     /// The user selections from the UI.
     var selections: PillAttributes { get }
@@ -113,7 +113,8 @@ public protocol PillDetailViewModelProtocol {
     /// Select a days value for either `daysOne`, `daysTwo`, or the `position`, depending on the given days number.
     func selectFromDaysPicker(_ row: Index, daysNumber: Int?)
 
-    /// Returns either the days options or the positions options, based on the picker number. [1,2] -> days, 0 -> positions.
+    /// Returns either the days options or the positions options,
+    /// based on the picker number. [1,2] -> days, 0 -> positions.
     func getOptionsForSelectedPicker(_ pickerNumber: Int) -> [String]
 
     /// Enable or disable the provided pickers, based on `pill` data.

Sources/PDKit/Protocols/UI/Sites/SiteCellViewModelProtocol.swift

@@ -9,5 +9,7 @@ import Foundation
 public protocol SiteCellViewModelProtocol {
     var siteNameText: String { get }
     var orderText: String { get }
-    func getVisibilityBools(cellIsInEditMode: Bool) -> (showNext: Bool, showOrder: Bool)
+    func getVisibilityBools(
+        cellIsInEditMode: Bool) -> (hideNext: Bool, hideOrder: Bool, hideArrow: Bool
+    )
 }

Sources/PDKit/Protocols/UI/Sites/SiteDetailViewModelProtocol.swift

@@ -9,8 +9,7 @@ import Foundation
 public protocol SiteDetailViewModelProtocol {
     var selections: SiteSelectionState { get set }
     var imagePickerDelegate: SiteImagePicker? { get }
-    var siteDetailViewControllerTitle: String { get }
-    var siteName: SiteName { get }
+    var siteName: SiteName? { get }
     var sitesCount: Int { get }
     var siteNameOptions: [SiteName] { get }
     var siteNamePickerStartIndex: Index { get }

Sources/PDKit/Protocols/UI/Sites/SitesTableProtocol.swift

@@ -14,7 +14,6 @@ public protocol SitesTableProtocol {
     func reloadCells()
     subscript(index: Index) -> SiteCellProtocol { get }
     func toggleEdit(isEditing: Bool)
-    func turnOffEditingMode()
     func deleteCell(indexPath: IndexPath)
     func reloadData()
 }

Sources/PDMock/Mocks/MockApp/Pills/MockPillCell.swift

@@ -15,12 +15,6 @@ public class MockPillCell: PillCellProtocol {
         return self
     }
 
-    public var stampCallCount = 0
-    public func stamp() -> PillCellProtocol {
-        stampCallCount += 1
-        return self
-    }
-
     public var loadBackgroundCallCount = 0
     public func loadBackground() {
         loadBackgroundCallCount += 1

Sources/PDMock/Mocks/MockApp/Sites/MockSitesTable.swift

@@ -39,11 +39,6 @@ public class MockSitesTable: SitesTableProtocol {
         toggleEditCallArgs.append(isEditing)
     }
 
-    public var turnOffEditingModeCallCount = 0
-    public func turnOffEditingMode() {
-        turnOffEditingModeCallCount += 1
-    }
-
     public var deleteCellCallArgs: [IndexPath] = []
     public func deleteCell(indexPath: IndexPath) {
         deleteCellCallArgs.append(indexPath)

Sources/PatchData/Objects/Pill.swift

@@ -116,11 +116,27 @@ public class Pill: Swallowable {
 
     public func set(attributes: PillAttributes) {
         pillData.attributes.update(attributes)
+
+        // Prevent pills with 0 set times
+        if timesaday == 0 {
+            let timeString = DefaultPillAttributes.time
+            let defaultTime = DateFactory.createTimesFromCommaSeparatedString(timeString, now: _now)
+            self.appendTime(defaultTime[0])
+        }
+
+        let interval = attributes.expirationInterval
+        let wasGivenPosition = interval.xDaysPosition != nil || interval.xDaysIsOn != nil
+        if wasGivenPosition && lastTaken == nil {
+            // Set to arbitrary date in the past so it appears the schedule is in-progress.
+            lastTaken = DateFactory.createDate(byAddingHours: -24, to: now)
+        }
     }
 
     public func swallow() {
         guard timesTakenToday < timesaday || lastTaken == nil else { return }
-        if lastTaken == nil && expirationInterval.value == .XDaysOnXDaysOff {
+        if lastTaken == nil
+            && expirationInterval.value == .XDaysOnXDaysOff
+            && pillData.attributes.expirationInterval.xDaysIsOn == nil {
             pillData.attributes.expirationInterval.startPositioning()
         }
         let currentTimesTaken = pillData.attributes.timesTakenToday ?? 0
@@ -232,30 +248,30 @@ public class Pill: Swallowable {
 
     private var dueDateForXDaysOnXDaysOff: Date? {
         /*
-         X X X X X O O O O O O O O O X X X X X O O O O O O O O O
-         _ _ _ _ _ _ P _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
+        X X X X X O O O O O O O O O X X X X X O O O O O O O O O
+        _ _ _ _ _ _ P _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
 
-         # Constants
+        # Constants
 
-         On = X, Off = O
-         Span = len(O[]) = 9
+        On = X, Off = O
+        Span = len(O[]) = 9
 
-         # Variables
+        # Variables
 
-         Pos = P = 2     // Change position to calculate next due date
+        Pos = P = 2     // Change position to calculate next due date
 
-         # Evaluation
+        # Evaluation
 
-         Next = SPAN + 1         // The next start of "on" from "off" position 1
-         Next = 10               // Eval
-         Diff = Next - Pos       // The amount we are away from Next
-         Diff = 10 - 2           // Eval
-         Diff = 8                // Eval
+        Next = SPAN + 1         // The next start of "on" from "off" position 1
+        Next = 10               // Eval
+        Diff = Next - Pos       // The amount we are away from Next
+        Diff = 10 - 2           // Eval
+        Diff = 8                // Eval
 
-         # Conclusion
+        # Conclusion
 
-         We are 8 days away from the next due date.
-         */
+        We are 8 days away from the next due date.
+        */
         guard let isOn = expirationInterval.xDaysIsOn else { return nil }
         guard let pos = expirationInterval.xDaysPosition else { return nil }
         guard let onSpan = expirationInterval.daysOne else { return nil }

Sources/PatchData/Schedules/PillSchedule.swift

@@ -135,6 +135,7 @@ public class PillSchedule: NSObject, PillScheduling {
         shareData()
     }
 
+    /// Awaken the properties that are relevant to the current date and time.
     private func awaken() {
         for pill in all {
             pill.awaken()

Sources/PatchData/Schedules/SiteSchedule.swift

@@ -32,7 +32,10 @@ public class SiteSchedule: NSObject, SiteScheduling {
 
     public var count: Int { all.count }
 
-    public var all: [Bodily] { context }
+    public var all: [Bodily] {
+        sort()
+        return context
+    }
 
     public var suggested: Bodily? {
         guard count > 0 else { return nil }
@@ -86,7 +89,7 @@ public class SiteSchedule: NSObject, SiteScheduling {
             site.order = count
             context.append(site)
             onSuccess?()
-            save() // Save name and order
+            save()
             return site
         }
         return nil

Sources/PatchDay/Hormones/Details/HormoneDetailViewModel.swift

@@ -95,7 +95,7 @@ class HormoneDetailViewModel: CodeBehindDependencies<HormoneDetailViewModel>, Ho
         guard let site = getSite() else { return 0 }
         let order = site.order
         let end = siteCount
-        if order >= 1 && order <= end {
+        if order >= 0 && order < end {
             selections.site = site
             return order
         }

Sources/PatchDay/Pills/Cell/PillCell.swift

@@ -35,12 +35,6 @@ class PillCell: TableCell, PillCellProtocol {
         return self
     }
 
-    /// Set the "last taken" label to the current date as a string.
-    @discardableResult func stamp() -> PillCellProtocol {
-        lastTakenLabel?.text = PDDateFormatter.formatDate(Date())
-        return self
-    }
-
     func loadBackground() {
         backgroundColor = UIColor.systemBackground
         let backgroundView = UIView()

Sources/PatchDay/Pills/Details/PillDetailViewController.swift

@@ -291,6 +291,15 @@ class PillDetailViewController: UIViewController, UIPickerViewDelegate, UIPicker
     }
 
     private func reflectPillAttributes() {
+        guard viewModel.pill != nil else {
+            // Remove outdated observer
+            NotificationCenter.default.removeObserver(
+                self,
+                name: UIApplication.willEnterForegroundNotification,
+                object: nil
+            )
+            return
+        }
         loadName()
         loadTimes()
         loadNotify()