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

iOS: localization fixes, per-calendar reminders, widget polish

Browse Source 
C1 — Localization: route the remaining hardcoded German strings through
L10n (LoginView, ServerSetupView, SettingsView email, EventDetailSheet) so
"System Default" + English device language shows fully English text.

C2 — Per-calendar reminders: parse the new reminders_enabled flag on every
calendar type; CalendarStore persists a reminderDisabledKeys set and passes
it to NotificationScheduler, which skips events of muted calendars (default
and per-event reminders). Filter sheet gains a per-calendar reminder toggle
(leading swipe + bell.slash indicator), reconciled from the server and
synced back via PUT.

C3 — Widgets:
- Shared WidgetTime.range helper; Today / Today & Tomorrow / Three Days /
  Up Next now show start–end instead of only the start time.
- This Week: show up to 6 events per day (was 3) to use the height.
- Two Weeks: mini event-title pills instead of bare dots.
- Two Months: weeks expand to fill the column (no more empty lower third).
- Day & Events: smaller header/strip/rows so content stops clipping.
- Next 5 days → Next 7 days (range + labels), higher row cap.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Scarriffle
2026-06-09 20:14:39 +02:00
parent 13d80981c6
commit c0edca338e
20 changed files with 256 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Calendarr iOS/Models/AppSettings.swift
View File

@@ -92,10 +92,12 @@ struct CalDAVCalendar: Codable, Identifiable {
var color: String?
var enabled: Bool
var sidebarHidden: Bool
var remindersEnabled: Bool?
enum CodingKeys: String, CodingKey {
case id, name, color, enabled
case sidebarHidden = "sidebar_hidden"
case remindersEnabled = "reminders_enabled"
}
}
@@ -108,10 +110,12 @@ struct LocalCalendar: Codable, Identifiable {
var sharedBy: String? = nil
var permission: String? = nil
var group: Bool = false
var remindersEnabled: Bool = true
enum CodingKeys: String, CodingKey {
case id, name, color, enabled, owned, permission, group
case sharedBy = "shared_by"
case remindersEnabled = "reminders_enabled"
}
init(from decoder: Decoder) throws {
@@ -124,6 +128,7 @@ struct LocalCalendar: Codable, Identifiable {
sharedBy = try c.decodeIfPresent(String.self, forKey: .sharedBy)
permission = try c.decodeIfPresent(String.self, forKey: .permission)
group = try c.decodeIfPresent(Bool.self, forKey: .group) ?? false
remindersEnabled = try c.decodeIfPresent(Bool.self, forKey: .remindersEnabled) ?? true
}
}
@@ -135,11 +140,13 @@ struct ICalSubscription: Codable, Identifiable {
var enabled: Bool
var refreshMinutes: Int
var lastFetched: String?
var remindersEnabled: Bool?
enum CodingKeys: String, CodingKey {
case id, name, url, color, enabled
case refreshMinutes = "refresh_minutes"
case lastFetched = "last_fetched"
case remindersEnabled = "reminders_enabled"
}
}
@@ -155,10 +162,12 @@ struct GoogleCalendar: Codable, Identifiable {
var color: String?
var enabled: Bool
var sidebarHidden: Bool
var remindersEnabled: Bool?
enum CodingKeys: String, CodingKey {
case id, name, color, enabled
case sidebarHidden = "sidebar_hidden"
case remindersEnabled = "reminders_enabled"
}
}
@@ -182,11 +191,13 @@ struct HACalendar: Codable, Identifiable {
var color: String?
var enabled: Bool
var sidebarHidden: Bool
var remindersEnabled: Bool = true
enum CodingKeys: String, CodingKey {
case id, name, color, enabled
case entityId = "entity_id"
case sidebarHidden = "sidebar_hidden"
case remindersEnabled = "reminders_enabled"
}
init(from decoder: Decoder) throws {
@@ -197,6 +208,7 @@ struct HACalendar: Codable, Identifiable {
color = try c.decodeIfPresent(String.self, forKey: .color)
enabled = try c.decodeIfPresent(Bool.self, forKey: .enabled) ?? true
sidebarHidden = try c.decodeIfPresent(Bool.self, forKey: .sidebarHidden) ?? false
remindersEnabled = try c.decodeIfPresent(Bool.self, forKey: .remindersEnabled) ?? true
}
}

45
Calendarr iOS/Models/CalendarStore.swift
View File

@@ -74,6 +74,11 @@ class CalendarStore {
/// show/hide list. Re-activation happens in AccountsView.
var banishedCalendarKeys: Set<String> = CalendarStore.loadBanishedKeys()
/// Set of `"source:calendarId"` keys whose events must NOT generate reminder
/// notifications (mirrors the server `reminders_enabled=false` flag). Persisted
/// in UserDefaults; reconciled from the server in the filter sheet.
var reminderDisabledKeys: Set<String> = CalendarStore.loadReminderDisabledKeys()
/// Group-overlay visibility: which members' calendars (`gm:<userId>`) and the
/// group calendar (`gc`) are hidden in the combined view — like hiding
/// individual people in Outlook. In-memory; resets when leaving/switching a
@@ -213,6 +218,42 @@ class CalendarStore {
publishWidgetSnapshot()
}
// MARK: – Reminder-disabled-calendar persistence
private static let reminderDisabledKeysDefaultsKey = "reminderDisabledCalendarKeys"
static func loadReminderDisabledKeys() -> Set<String> {
guard let raw = UserDefaults.standard.string(forKey: reminderDisabledKeysDefaultsKey),
let data = raw.data(using: .utf8),
let arr = try? JSONDecoder().decode([String].self, from: data)
else { return [] }
return Set(arr)
}
static func saveReminderDisabledKeys(_ keys: Set<String>) {
if let data = try? JSONEncoder().encode(Array(keys)),
let s = String(data: data, encoding: .utf8) {
UserDefaults.standard.set(s, forKey: reminderDisabledKeysDefaultsKey)
}
}
/// Toggle whether a single calendar's events generate reminders, then
/// reschedule notifications from the cache.
func setReminderDisabled(_ key: String, disabled: Bool) {
if disabled { reminderDisabledKeys.insert(key) } else { reminderDisabledKeys.remove(key) }
Self.saveReminderDisabledKeys(reminderDisabledKeys)
rescheduleNotifications()
}
/// Replace the whole set (used when reconciling with the server's
/// `reminders_enabled` flags in the filter sheet).
func setReminderDisabledKeys(_ keys: Set<String>) {
guard keys != reminderDisabledKeys else { return }
reminderDisabledKeys = keys
Self.saveReminderDisabledKeys(keys)
rescheduleNotifications()
}
/// Split a `"source:calendarId"` key back into its parts.
static func parseCalendarKey(_ key: String) -> (source: String, id: Int)? {
guard let colon = key.firstIndex(of: ":") else { return nil }
@@ -265,14 +306,14 @@ class CalendarStore {
&& !banishedCalendarKeys.contains(key)
}
// Personal events drive local reminder notifications.
NotificationScheduler.reschedule(events: allCachedEvents)
NotificationScheduler.reschedule(events: allCachedEvents, disabledCalendarKeys: reminderDisabledKeys)
}
/// Recompute scheduled reminder notifications from the personal cache
/// (skipped while a group overlay is active).
func rescheduleNotifications() {
guard activeGroup == nil else { return }
NotificationScheduler.reschedule(events: allCachedEvents)
NotificationScheduler.reschedule(events: allCachedEvents, disabledCalendarKeys: reminderDisabledKeys)
}
/// Optimistically drop a just-deleted event from the cache so it disappears

52
Calendarr iOS/Models/Localization.swift
View File

@@ -259,6 +259,30 @@ private let strings: [String: [String: String]] = [
"event.save": "Sichern",
"event.add": "Hinzufügen",
// Event detail
"detail.title": "Termin",
"detail.source": "Quelle",
"detail.created_by": "Erstellt von",
"detail.delete": "Termin löschen",
"detail.edit": "Bearbeiten",
"detail.delete_confirm_title": "Termin löschen?",
"detail.delete_msg_suffix": "wird dauerhaft gelöscht.",
"common.delete": "Löschen",
// Login / server setup
"login.username": "Benutzername",
"login.password": "Passwort",
"login.totp": "2FA-Code",
"login.totp_placeholder": "6-stelliger Code",
"login.remember": "Angemeldet bleiben",
"login.signin": "Anmelden",
"login.choose_server": "Anderen Server wählen",
"server.connect_title": "Server verbinden",
"server.url": "Server-URL",
"server.connect": "Verbinden",
"server.unreachable": "Server nicht erreichbar. URL prüfen.",
"settings.email": "E-Mail",
// Accounts
"accounts.title": "Konten",
"accounts.loading": "Lade Konten…",
@@ -292,6 +316,8 @@ private let strings: [String: [String: String]] = [
"filter.hide_all": "Alle ausblenden",
"filter.button": "Kalender ein-/ausblenden",
"filter.banish": "Dauerhaft ausblenden",
"filter.reminders_on": "Benachrichtigungen an",
"filter.reminders_off": "Benachrichtigungen aus",
"filter.banished_footer": "Dauerhaft ausgeblendete Kalender erscheinen unter »Konten & Kalender« und können dort wieder eingeblendet werden.",
"accounts.banished_header": "Ausgeblendete Kalender",
"accounts.banished_unhide": "Wieder einblenden",
@@ -561,6 +587,30 @@ private let strings: [String: [String: String]] = [
"event.save": "Save",
"event.add": "Add",
// Event detail
"detail.title": "Event",
"detail.source": "Source",
"detail.created_by": "Created by",
"detail.delete": "Delete event",
"detail.edit": "Edit",
"detail.delete_confirm_title": "Delete event?",
"detail.delete_msg_suffix": "will be permanently deleted.",
"common.delete": "Delete",
// Login / server setup
"login.username": "Username",
"login.password": "Password",
"login.totp": "2FA code",
"login.totp_placeholder": "6-digit code",
"login.remember": "Stay signed in",
"login.signin": "Sign in",
"login.choose_server": "Choose another server",
"server.connect_title": "Connect server",
"server.url": "Server URL",
"server.connect": "Connect",
"server.unreachable": "Server unreachable. Check the URL.",
"settings.email": "Email",
// Accounts
"accounts.title": "Accounts",
"accounts.loading": "Loading accounts…",
@@ -594,6 +644,8 @@ private let strings: [String: [String: String]] = [
"filter.hide_all": "Hide all",
"filter.button": "Show/hide calendars",
"filter.banish": "Hide permanently",
"filter.reminders_on": "Reminders on",
"filter.reminders_off": "Reminders off",
"filter.banished_footer": "Permanently hidden calendars appear under “Accounts & Calendars”, where you can show them again.",
"accounts.banished_header": "Hidden calendars",
"accounts.banished_unhide": "Show again",