Merge pull request #37 from aapis/feature/ux-updates

Small UX updates

Author: aapis

KlockWork-iOS/KlockWork-iOS.xcodeproj/project.pbxproj

@@ -817,7 +817,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "KlockWork-iOS/KlockWork_iOS.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"KlockWork-iOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 6DT7L2N5X6;
@@ -859,7 +859,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "KlockWork-iOS/KlockWork_iOS.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 15;
+				CURRENT_PROJECT_VERSION = 16;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"KlockWork-iOS/Preview Content\"";
 				DEVELOPMENT_TEAM = 6DT7L2N5X6;

KlockWork-iOS/KlockWork-iOS/Entities/Filter/RecordFilter.swift

@@ -71,7 +71,7 @@ extension RecordFilter {
         if self.records.count > 0 {
             let sortedRecords = Array(self.records)
                 .sliced(by: [.year, .month, .day], for: \.timestamp!)
-                .sorted(by: {$0.key < $1.key})
+                .sorted(by: {$0.key > $1.key})
             let grouped = Dictionary(grouping: sortedRecords, by: {$0.key})
 
             for group in grouped {

KlockWork-iOS/KlockWork-iOS/SharedViews/Tabs.swift

@@ -537,9 +537,11 @@ extension Tabs.Content {
                                         Rectangle()
                                             .foregroundStyle(Color.fromStored(self.entity.project?.colour ?? Theme.rowColourAsDouble))
                                             .frame(width: 15)
-                                        Rectangle()
-                                            .foregroundStyle(Color.fromStored(self.entity.colour ?? Theme.rowColourAsDouble))
-                                            .frame(width: 15)
+                                        if self.records.isEmpty {
+                                            Rectangle()
+                                                .foregroundStyle(Color.fromStored(self.entity.colour ?? Theme.rowColourAsDouble))
+                                                .frame(width: 15)
+                                        }
 
                                         HStack(spacing: 0) {
                                             if self.records.isEmpty {
@@ -994,6 +996,7 @@ extension Tabs.Content {
         }
 
         struct SingleTaskChecklistItem: View {
+            @EnvironmentObject private var state: AppState
             public let task: LogTask
             @State private var isCompleted: Bool = false
             @State private var isCancelled: Bool = false
@@ -1038,12 +1041,18 @@ extension Tabs.Content {
             private func actionOnSave() -> Void {
                 if self.isCompleted {
                     self.task.completedDate = Date()
+
+                    // Create a record indicating when the task was completed
+                    CoreDataTasks(moc: self.state.moc).complete(self.task)
                 } else {
                     self.task.completedDate = nil
                 }
 
                 if self.isCancelled {
                     self.task.cancelledDate = Date()
+
+                    // Create a record indicating when the task was cancelled
+                    CoreDataTasks(moc: self.state.moc).cancel(self.task)
                 } else {
                     self.task.cancelledDate = nil
                 }