Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A few more Reminders animation fixes #24

Merged
merged 1 commit into from
Feb 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions Examples/Reminders/RemindersListDetail.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
)
Expand All @@ -68,7 +67,7 @@ struct RemindersListDetailView: View {
try await updateQuery()
}
}
.navigationTitle(Text(remindersList.name))
.navigationTitle(remindersList.name)
.navigationBarTitleDisplayMode(.large)
.sheet(isPresented: $isNewReminderSheetPresented) {
NavigationStack {
Expand Down
8 changes: 4 additions & 4 deletions Examples/Reminders/SearchReminders.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down