Enhance habit entries

Author: aint

Habits.xcodeproj/project.pbxproj

@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		BC025C5728DE3CDC00E55CF0 /* HistoryChartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC025C5628DE3CDC00E55CF0 /* HistoryChartView.swift */; };
 		BC50DD2128D3AC33000A632F /* HabitStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC50DD2028D3AC33000A632F /* HabitStore.swift */; };
+		BC50DD2528D5C83A000A632F /* Entry.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC50DD2428D5C83A000A632F /* Entry.swift */; };
 		BC5A3BCF28CDEEA100CAF319 /* Habit.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5A3BCE28CDEEA100CAF319 /* Habit.swift */; };
 		BC5A3BD628CDF44700CAF319 /* HabitsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5A3BD528CDF44700CAF319 /* HabitsView.swift */; };
 		BC5A3BD828CDF4B800CAF319 /* HabitSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC5A3BD728CDF4B800CAF319 /* HabitSummaryView.swift */; };
@@ -45,6 +46,7 @@
 /* Begin PBXFileReference section */
 		BC025C5628DE3CDC00E55CF0 /* HistoryChartView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HistoryChartView.swift; sourceTree = "<group>"; };
 		BC50DD2028D3AC33000A632F /* HabitStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HabitStore.swift; sourceTree = "<group>"; };
+		BC50DD2428D5C83A000A632F /* Entry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Entry.swift; sourceTree = "<group>"; };
 		BC5A3BCE28CDEEA100CAF319 /* Habit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Habit.swift; sourceTree = "<group>"; };
 		BC5A3BD428CDF32500CAF319 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
 		BC5A3BD528CDF44700CAF319 /* HabitsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HabitsView.swift; sourceTree = "<group>"; };
@@ -95,6 +97,7 @@
 			children = (
 				BC5A3BCE28CDEEA100CAF319 /* Habit.swift */,
 				BC50DD2028D3AC33000A632F /* HabitStore.swift */,
+				BC50DD2428D5C83A000A632F /* Entry.swift */,
 				BCC3857928DF1A9D00DB8E49 /* ChartEntry.swift */,
 				BCC3857B28DF215C00DB8E49 /* Utils.swift */,
 			);
@@ -302,6 +305,7 @@
 				BCC3857E28DF255E00DB8E49 /* ScoreChartView.swift in Sources */,
 				BC5A3BD828CDF4B800CAF319 /* HabitSummaryView.swift in Sources */,
 				BC025C5728DE3CDC00E55CF0 /* HistoryChartView.swift in Sources */,
+				BC50DD2528D5C83A000A632F /* Entry.swift in Sources */,
 				BC50DD2128D3AC33000A632F /* HabitStore.swift in Sources */,
 				BCD3692F28CCADD300B48135 /* HabitsApp.swift in Sources */,
 				BCC3857C28DF215C00DB8E49 /* Utils.swift in Sources */,

Habits/Models/Entry.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+struct Entry: Identifiable, Codable {
+    let id: UUID
+    var date: Date
+    var value: Float
+
+    init(id: UUID = UUID(), date: Date, value: Float) {
+        self.id = id
+        self.date = date
+        self.value = value
+    }
+
+}

Habits/Models/Habit.swift

@@ -5,7 +5,7 @@ struct Habit: Identifiable, Codable {
     let id: UUID
     var name: String = ""
     var color: CodableColor = CodableColor(color: .black)
-    var days: [Date : Bool] = [:]
+    var entries: [Date : Entry] = [:]
 
     init(id: UUID = UUID()) {
         self.id = id
@@ -21,6 +21,33 @@ struct Habit: Identifiable, Codable {
         name = habit.name
         color = habit.color
     }
+    
+    mutating func addEntry(date: Date) {
+        entries.updateValue(Entry(date: date.withoutTime, value: 1), forKey: date.withoutTime)
+    }
+    
+    mutating func deleteEntry(date: Date) {
+        entries.removeValue(forKey: date.withoutTime)
+    }
+    
+    func checkEntry(date: Date) -> Bool {
+        return entries.keys.contains(date.withoutTime)
+    }
+    
+    func entryCount(_ component: Calendar.Component?) -> Int {
+        if component == nil {
+            return entries.count
+        }
+
+        var count = 0
+        for date in entries.keys {
+            if date.get(component!) == Date.now.get(component!) {
+                count += 1
+            }
+        }
+
+        return count
+    }
 }
 
 extension Habit {

Habits/Models/Utils.swift

@@ -28,4 +28,8 @@ extension Date {
         return entries
     }
 
+    var withoutTime: Date {
+        return Calendar.current.startOfDay(for: self)
+    }
+
 }