From 4399d41e74a5bdd7430bd264aee63a7a4d00b552 Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Tue, 25 Feb 2025 09:54:04 -0800 Subject: [PATCH] A few more Reminders animation fixes --- Examples/Reminders/RemindersListDetail.swift | 11 +++++------ Examples/Reminders/SearchReminders.swift | 8 ++++---- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Examples/Reminders/RemindersListDetail.swift b/Examples/Reminders/RemindersListDetail.swift index 4266a47..0f7a9e9 100644 --- a/Examples/Reminders/RemindersListDetail.swift +++ b/Examples/Reminders/RemindersListDetail.swift @@ -3,7 +3,7 @@ import SharingGRDB import SwiftUI struct RemindersListDetailView: View { - @State.SharedReader private var remindersState: [Reminders.Record] + @SharedReader private var remindersState: [Reminders.Record] @AppStorage private var ordering: Ordering @AppStorage private var showCompleted: Bool private let remindersList: RemindersList @@ -32,16 +32,15 @@ struct RemindersListDetailView: View { init?(remindersList: RemindersList) { self.remindersList = remindersList - _remindersState = State.SharedReader(value: []) if let listID = remindersList.id { _ordering = AppStorage(wrappedValue: .dueDate, "ordering_list_\(listID)") _showCompleted = AppStorage(wrappedValue: false, "show_completed_list_\(listID)") - _remindersState = State.SharedReader( + _remindersState = SharedReader( .fetch( Reminders( listID: listID, - ordering: ordering, - showCompleted: showCompleted + ordering: _ordering.wrappedValue, + showCompleted: _showCompleted.wrappedValue ), animation: .default ) @@ -68,7 +67,7 @@ struct RemindersListDetailView: View { try await updateQuery() } } - .navigationTitle(Text(remindersList.name)) + .navigationTitle(remindersList.name) .navigationBarTitleDisplayMode(.large) .sheet(isPresented: $isNewReminderSheetPresented) { NavigationStack { diff --git a/Examples/Reminders/SearchReminders.swift b/Examples/Reminders/SearchReminders.swift index 6d75185..2dbff4d 100644 --- a/Examples/Reminders/SearchReminders.swift +++ b/Examples/Reminders/SearchReminders.swift @@ -3,7 +3,7 @@ import SharingGRDB import SwiftUI struct SearchRemindersView: View { - @State.SharedReader(value: SearchReminders.Value()) var searchReminders + @SharedReader var searchReminders: SearchReminders.Value let searchText: String @State var showCompletedInSearchResults = false @@ -12,11 +12,11 @@ struct SearchRemindersView: View { init(searchText: String) { self.searchText = searchText - $searchReminders = SharedReader( - wrappedValue: searchReminders, + _searchReminders = SharedReader( + wrappedValue: SearchReminders.Value(), .fetch( SearchReminders( - showCompletedInSearchResults: showCompletedInSearchResults, + showCompletedInSearchResults: _showCompletedInSearchResults.wrappedValue, searchText: searchText ), animation: .default