Scarriffle/Calendarr-IOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Liquid Glass month title updates via @Observable store (visibleMonth)

Browse Source 
The system NavigationStack toolbar title would not refresh on a plain @State
change (title kept disappearing on iPhone). Moved visibleMonth into the
@Observable CalendarStore so the toolbar's read is tracked with @Observable's
fine-grained observation and refreshes on month change. Reverted the @State/.id
workaround. Real system glass bar retained.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Scarriffle
2026-06-01 19:06:53 +02:00
parent 51218b9aa3
commit 451d3d4d6b
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Calendarr iOS/Views/Calendar/CalendarHostView.swift
View File

@@ -27,21 +27,16 @@ struct CalendarHostView: View {
@State private var store = CalendarStore()
@State private var editorContext: CalEditorContext? = nil
@State private var selectedEvent: CalEvent? = nil
@State private var visibleMonth: Date = .now
@State private var showFilter = false
@State private var didApplyDefaultView = false
@State private var groups: [CalGroup] = []
// Drives the Liquid-Glass navigation-bar title. Kept in @State and updated
// via onChange so the system toolbar reliably refreshes on month change
// (reading the computed title directly in the toolbar did not update).
@State private var navTitle = ""
private var titleString: String {
if store.viewType == .month {
let f = DateFormatter()
f.locale = L10n.locale(appLang)
f.dateFormat = "LLLL yyyy"
return f.string(from: visibleMonth).capitalized(with: L10n.locale(appLang))
return f.string(from: store.visibleMonth).capitalized(with: L10n.locale(appLang))
}
return store.titleForCurrentView(language: appLang)
}
@@ -89,7 +84,7 @@ struct CalendarHostView: View {
.onChange(of: store.currentDate) { _, _ in Task { await onNavigate() } }
.onChange(of: store.viewType) { _, _ in Task { await onNavigate() } }
.onChange(of: cacheMonths) { _, _ in Task { await recache() } }
.onChange(of: visibleMonth) { _, new in Task { await ensureLoaded(around: new) } }
.onChange(of: store.visibleMonth) { _, new in Task { await ensureLoaded(around: new) } }
.onChange(of: scenePhase) { _, phase in if phase == .active { Task { await SettingsSync.pull(api: api) } } }
.onReceive(NotificationCenter.default.publisher(for: .banishedCalendarsChanged)) { _ in
store.syncBanishedFromDefaults()
@@ -130,11 +125,12 @@ struct CalendarHostView: View {
}
}
ToolbarItem(placement: .principal) {
Text(navTitle)
// Reads store.visibleMonth (@Observable) so the system
// toolbar refreshes on month change.
Text(titleString)
.font(.headline)
.lineLimit(1)
.minimumScaleFactor(0.7)
.id(navTitle) // force re-creation so the bar refreshes
}
ToolbarItem(placement: .navigationBarTrailing) {
HStack(spacing: 8) {
@@ -150,12 +146,10 @@ struct CalendarHostView: View {
.overlay(alignment: .bottomTrailing) { glassFAB }
.modifier(calendarSheets)
.task { await startup() }
.task { navTitle = titleString }
.onChange(of: titleString) { _, new in navTitle = new }
.onChange(of: store.currentDate) { _, _ in Task { await onNavigate() } }
.onChange(of: store.viewType) { _, _ in Task { await onNavigate() } }
.onChange(of: cacheMonths) { _, _ in Task { await recache() } }
.onChange(of: visibleMonth) { _, new in Task { await ensureLoaded(around: new) } }
.onChange(of: store.visibleMonth) { _, new in Task { await ensureLoaded(around: new) } }
.onChange(of: scenePhase) { _, phase in if phase == .active { Task { await SettingsSync.pull(api: api) } } }
.onReceive(NotificationCenter.default.publisher(for: .banishedCalendarsChanged)) { _ in
store.syncBanishedFromDefaults()
@@ -332,8 +326,7 @@ struct CalendarHostView: View {
onShowDay: { day in
store.currentDate = day
store.viewType = .day
},
visibleMonth: $visibleMonth)
})
case .week:
WeekView(store: store,
onEventTap: { selectedEvent = $0 },