Todos cleanup (#90)

* Remove font todo * Resolve Timer.Size concerns - Timer.Size is used as an accessibility id for timer buttons, and to map timer length settings to the appropriate timer models * Tag core data testing todo with #89 * Tag snapshot test todo with #85 * Decide rest setting defaults
isiahmanns · May 24, 2023 · 4427c9b · 4427c9b
1 parent d3874c0
commit 4427c9b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 26 deletions.
diff --git a/Hourglass/Hourglass/Data Models/TimerModel.swift b/Hourglass/Hourglass/Data Models/TimerModel.swift
@@ -37,7 +37,6 @@ extension Timer {
         }
     }
 
-    // TODO: - May not be needed
     enum Size {
         case small
         case medium

diff --git a/Hourglass/Hourglass/Managers/DataManager.swift b/Hourglass/Hourglass/Managers/DataManager.swift
@@ -19,24 +19,12 @@ class DataManager: DataManaging {
                              store: CoreDataStore,
                              timerEventProvider: TimerEventProviding) {
         let timerModels = [
-            Timer.Model(length: settingsManager.getTimerLength(for: .timerFocusSmall),
-                        category: .focus,
-                        size: .small),
-            Timer.Model(length: settingsManager.getTimerLength(for: .timerFocusMedium),
-                        category: .focus,
-                        size: .medium),
-            Timer.Model(length: settingsManager.getTimerLength(for: .timerFocusLarge),
-                        category: .focus,
-                        size: .large),
-            Timer.Model(length: settingsManager.getTimerLength(for: .timerRestSmall),
-                        category: .rest,
-                        size: .small),
-            Timer.Model(length: settingsManager.getTimerLength(for: .timerRestMedium),
-                        category: .rest,
-                        size: .medium),
-            Timer.Model(length: settingsManager.getTimerLength(for: .timerRestLarge),
-                        category: .rest,
-                        size: .large)
+            Timer.Model(length: settingsManager.getTimerLength(for: .timerFocusSmall), category: .focus, size: .small),
+            Timer.Model(length: settingsManager.getTimerLength(for: .timerFocusMedium), category: .focus, size: .medium),
+            Timer.Model(length: settingsManager.getTimerLength(for: .timerFocusLarge), category: .focus, size: .large),
+            Timer.Model(length: settingsManager.getTimerLength(for: .timerRestSmall), category: .rest, size: .small),
+            Timer.Model(length: settingsManager.getTimerLength(for: .timerRestMedium), category: .rest, size: .medium),
+            Timer.Model(length: settingsManager.getTimerLength(for: .timerRestLarge), category: .rest, size: .large)
         ]
 
         self.init(timerModels: timerModels,

diff --git a/Hourglass/Hourglass/Managers/TimerModelStateManager.swift b/Hourglass/Hourglass/Managers/TimerModelStateManager.swift
@@ -135,7 +135,6 @@ class TimerModelStateManager {
     }
 
     private func configureSettingsObservations() {
-        // TODO: - Sort by length and use array indices, to match UI logic
         let focusTimers = timerModels.filterByCategory(.focus)
         let restTimers = timerModels.filterByCategory(.rest)
 

diff --git a/Hourglass/Hourglass/Utilities/Constants.swift b/Hourglass/Hourglass/Utilities/Constants.swift
@@ -19,8 +19,7 @@ enum Constants {
     static let timerRestLarge = 20
 
     // Timer threshold defaults
-    // TODO: - Decide these values!
-    static let restWarningThreshold: Int = 15
+    static let restWarningThreshold: Int = 30
     static let enforceRestThreshold: Int = -1
     static let getBackToWorkIsEnabled: Bool = false
 

diff --git a/Hourglass/Hourglass/Views/AboutView.swift b/Hourglass/Hourglass/Views/AboutView.swift
@@ -10,7 +10,7 @@ struct AboutView: View {
             VStack(alignment: .leading, spacing: 20) {
                 VStack(alignment: .leading, spacing: 0) {
                     Text("Hourglass")
-                        .font(.poppins) // TODO: - Rename API with sizes
+                        .font(.poppins)
                     Text("Version 1.0")
                 }
 

diff --git a/Hourglass/Hourglass/Views/StatisticsView.swift b/Hourglass/Hourglass/Views/StatisticsView.swift
@@ -12,7 +12,7 @@ struct StatisticsView: View {
 
     var body: some View {
         let timeChunks: [TimeBlock.Chunk] = timeBlocks.flatMap(\.chunks)
-        // TODO: - Write snapshot tests using test data sets
+        // TODO: - Write snapshot tests using test data sets (#89)
         //let timeChunks = [TimeBlock.Chunk]()
         //let timeChunks = TestData.timeChunks
         //let timeChunks = Array(TestData.timeChunks.prefix(25))
@@ -307,7 +307,6 @@ private extension TimeBlock {
         Calendar.current.dateComponents([.year, .month, .day, .hour, .minute, .second], from: end!)
     }
 
-    // TODO: - Test this with Core Data
     var doesIncludeNextDay: Bool {
         startDate.day! < endDate.day!
     }

diff --git a/Hourglass/HourglassTests/ViewModelTests.swift b/Hourglass/HourglassTests/ViewModelTests.swift
@@ -1,7 +1,7 @@
 import XCTest
 @testable import Hourglass
 
-// TODO: - Snapshot test is a better solution to create a state for the button and verify its appearance pixel for pixel.
+// TODO: - Snapshot tests to validate timer button state pixel for pixel. (#85)
 
 final class ViewModelTests: XCTestCase {