bugfix: date selector stops working in b90

aapis · Apr 26, 2023 · c639e53 · c639e53
1 parent 6204074
commit c639e53
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/DLPrototype.xcodeproj/project.pbxproj b/DLPrototype.xcodeproj/project.pbxproj
@@ -1082,7 +1082,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 90;
+				CURRENT_PROJECT_VERSION = 91;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"DLPrototype/Preview Content\"";
 				DEVELOPMENT_TEAM = 6DT7L2N5X6;
@@ -1113,7 +1113,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 90;
+				CURRENT_PROJECT_VERSION = 91;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"DLPrototype/Preview Content\"";
 				DEVELOPMENT_TEAM = 6DT7L2N5X6;

diff --git a/DLPrototype/Views/Shared/Fancy/FancyButton.swift b/DLPrototype/Views/Shared/Fancy/FancyButton.swift
@@ -18,7 +18,7 @@ struct FancyButton: View {
     public var showLabel: Bool? = true
     public var showIcon: Bool? = true
     public var fgColour: Color?
-    public var size: ButtonSize = .large
+    public var size: ButtonSize = .medium
 
     @State private var padding: CGFloat = 10
 

diff --git a/DLPrototype/Views/Today/LogTable/LogTable.swift b/DLPrototype/Views/Today/LogTable/LogTable.swift
@@ -12,7 +12,7 @@ import SwiftUI
 struct LogTable: View, Identifiable {
     public var id = UUID()
     @Binding public var job: String
-    public var date: Date
+    public var defaultSelectedDate: Date?
 
     @State private var records: [LogRecord] = []
     @State private var recordsAsString: String = ""
@@ -251,7 +251,10 @@ struct LogTable: View, Identifiable {
     }
 
     private func loadRecordsBySelectedDate() -> Void {
-        selectedDate = date
+        if defaultSelectedDate != nil {
+            selectedDate = defaultSelectedDate!
+        }
+
         records = LogRecords(moc: moc).forDate(selectedDate)
 
         // TODO: move this func to LogRecords model
@@ -325,7 +328,7 @@ struct LogTablePreview: PreviewProvider {
     @State static public var d: Date = Date()
 
     static var previews: some View {
-        LogTable(job: $sj, date: d)
+        LogTable(job: $sj, defaultSelectedDate: d)
             .environment(\.managedObjectContext, PersistenceController.preview.container.viewContext)
             .frame(width: 700)
     }

diff --git a/DLPrototype/Views/Today/Today.swift b/DLPrototype/Views/Today/Today.swift
@@ -10,7 +10,7 @@ import SwiftUI
 import Combine
 
 struct Today: View {
-    public var defaultSelectedDate: Date? = Date()
+    public var defaultSelectedDate: Date?
 
     @State private var text: String = ""
     @State private var jobId: String = ""
@@ -82,7 +82,7 @@ struct Today: View {
 
     // MARK: Table view
     var table: some View {
-        LogTable(job: $jobId, date: defaultSelectedDate!)
+        LogTable(job: $jobId, defaultSelectedDate: defaultSelectedDate)
             .id(updater.ids["today.table"])
             .environmentObject(updater)
     }