feat: add support for multiple Google Calendar accounts

MeetingBar/Core/Models/GoogleAccount.swift

@@ -0,0 +1,20 @@
+//
+//  GoogleAccount.swift
+//  MeetingBar
+//
+//  Created for multi-account Google Calendar support.
+//  Copyright © 2026 Andrii Leitsius. All rights reserved.
+//
+
+import Defaults
+import Foundation
+
+public struct GoogleAccount: Identifiable, Codable, Hashable, Sendable, Defaults.Serializable {
+    public let id: String
+    public let email: String
+
+    public init(id: String, email: String) {
+        self.id = id
+        self.email = email
+    }
+}

MeetingBar/Extensions/DefaultsKeys.swift

@@ -19,6 +19,8 @@ extension Defaults.Keys {
     static let selectedCalendarIDs = Key<[String]>("selectedCalendarIDs", default: [])
     static let eventStoreProvider = Key<EventStoreProvider>("eventStoreProvider", default: .macOSEventKit)
 
+    static let googleAccounts = Key<[GoogleAccount]>("googleAccounts", default: [])
+
     static let onboardingCompleted = Key<Bool>("onboardingCompleted", default: false)
 
     static let showEventsForPeriod = Key<ShowEventsForPeriod>("showEventsForPeriod", default: .today)

MeetingBar/Resources /Localization /en.lproj/Localizable.strings

@@ -336,3 +336,29 @@
 
 "link_url_cant_open_title" = "Oops! Unable to open the link in %@";
 "link_url_cant_open_message" = "Ensure you have %@ installed, or open such links in a web browser from the preferences instead.";
+
+// MARK: - Multi-account Google Calendar
+
+"preferences_calendars_google_accounts_title" = "Google Accounts";
+"preferences_calendars_no_accounts_connected" = "No accounts connected. Add a Google account to get started.";
+"preferences_calendars_no_calendars_available" = "No calendars available. Try refreshing or check account access.";
+"preferences_calendars_refresh" = "Refresh";
+"preferences_calendars_no_google_accounts_connected" = "No Google accounts connected";
+"preferences_calendars_account_connected" = "Connected";
+"preferences_calendars_remove_account_help" = "Remove %@";
+"preferences_calendars_remove_account_label" = "Remove Google account %@";
+"preferences_calendars_add_google_account" = "Add Google Account";
+"preferences_calendars_remove_account_dialog_title" = "Remove Account";
+"preferences_calendars_remove_account_action" = "Remove %@";
+"preferences_calendars_cancel" = "Cancel";
+"preferences_calendars_remove_account_message" = "This will remove %@ and all its calendars from MeetingBar. You can add it back later.";
+"preferences_calendars_add_google_account_sheet_title" = "Add Google Account";
+"preferences_calendars_add_google_account_sheet_description" = "You'll be redirected to Google to sign in and grant calendar access.";
+"preferences_calendars_waiting_for_authentication" = "Waiting for authentication...";
+"preferences_calendars_sign_in_with_google" = "Sign in with Google";
+
+// MARK: - Google Account Notifications
+
+"notifications_google_account_connected_title" = "Google Account connected";
+"notifications_google_account_connected_body" = "%@ is connected";
+"notifications_google_account_refreshed_body" = "%@ calendars refreshed";

MeetingBar/UI/Views/Preferences/CalendarsTab.swift

@@ -8,7 +8,6 @@
 
 import EventKit
 import SwiftUI
-
 import Defaults
 
 struct CalendarsTab: View {
@@ -20,13 +19,29 @@ struct CalendarsTab: View {
                 ProviderPicker(eventManager: eventManager)
             }
             .padding(.bottom, 5)
-            Label("preferences_calendars_select_calendars_title".loco(), systemImage: "calendar").padding(5)
+
+            if Defaults[.eventStoreProvider] == .googleCalendar {
+                GroupBox(label: Label("preferences_calendars_google_accounts_title", systemImage: "person.3")) {
+                    GoogleAccountsSection(eventManager: eventManager)
+                }
+                .padding(.bottom, 5)
+            }
+
+            Label("preferences_calendars_select_calendars_title", systemImage: "calendar").padding(5)
             List {
                 if eventManager.calendars.isEmpty {
                     if Defaults[.eventStoreProvider] == .macOSEventKit {
                         AccessDeniedBanner()
+                    } else if Defaults[.googleAccounts].isEmpty {
+                        Text("preferences_calendars_no_accounts_connected")
+                            .foregroundColor(.secondary)
+                            .padding()
+                    } else {
+                        Text("preferences_calendars_no_calendars_available")
+                            .foregroundColor(.secondary)
+                            .padding()
                     }
-                    Button("Refresh") {
+                    Button("preferences_calendars_refresh") {
                         Task { try await eventManager.refreshSources() }
                     }
 
@@ -39,10 +54,146 @@ struct CalendarsTab: View {
     }
 }
 
+struct GoogleAccountsSection: View {
+    @ObservedObject var eventManager: EventManager
+    @Default(.googleAccounts) private var accounts
+    @State private var showingAddAccount = false
+    @State private var accountToRemove: GoogleAccount?
+    @State private var showingRemoveConfirmation = false
+
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            if accounts.isEmpty {
+                Text("preferences_calendars_no_google_accounts_connected")
+                    .foregroundColor(.secondary)
+                    .font(.caption)
+            }
+
+            ForEach(accounts) { account in
+                HStack {
+                    Image(systemName: "person.circle.fill")
+                        .foregroundColor(.blue)
+                    VStack(alignment: .leading) {
+                        Text(account.email)
+                            .font(.system(size: 13))
+                        Text("preferences_calendars_account_connected")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                    }
+                    Spacer()
+                    Button(action: {
+                        accountToRemove = account
+                        showingRemoveConfirmation = true
+                    }) {
+                        Image(systemName: "xmark.circle.fill")
+                            .foregroundColor(.red)
+                    }
+                    .buttonStyle(.plain)
+                    .help("preferences_calendars_remove_account_help")
+                    .accessibilityLabel("preferences_calendars_remove_account_label")
+                }
+                .padding(.vertical, 2)
+            }
+
+            Divider()
+
+            Button(action: {
+                showingAddAccount = true
+            }) {
+                Label("preferences_calendars_add_google_account", systemImage: "plus.circle.fill")
+            }
+            .sheet(isPresented: $showingAddAccount) {
+                AddAccountSheet(onAccountAdded: {
+                    Task {
+                        try? await eventManager.refreshSources()
+                    }
+                })
+            }
+        }
+        .padding(5)
+        .confirmationDialog(
+            "preferences_calendars_remove_account_dialog_title",
+            isPresented: $showingRemoveConfirmation,
+            titleVisibility: .visible,
+            presenting: accountToRemove
+        ) { account in
+            Button("preferences_calendars_remove_account_action".loco(account.email), role: .destructive) {
+                Task {
+                    await GCEventStore.shared.removeAccount(account)
+                    try? await eventManager.refreshSources()
+                }
+            }
+            Button("preferences_calendars_cancel", role: .cancel) {}
+        } message: { account in
+            Text("preferences_calendars_remove_account_message".loco(account.email))
+        }
+    }
+}
+
+struct AddAccountSheet: View {
+    @Environment(\.presentationMode) var presentationMode
+    @State private var errorMessage: String?
+    @State private var isAdding = false
+    var onAccountAdded: () async -> Void
+
+    var body: some View {
+        VStack(spacing: 16) {
+            Text("preferences_calendars_add_google_account_sheet_title")
+                .font(.headline)
+
+            Text("preferences_calendars_add_google_account_sheet_description")
+                .font(.caption)
+                .foregroundColor(.secondary)
+                .multilineTextAlignment(.center)
+
+            if let error = errorMessage {
+                Text(error)
+                    .foregroundColor(.red)
+                    .font(.caption)
+            }
+
+            if isAdding {
+                ProgressView("preferences_calendars_waiting_for_authentication")
+                    .frame(maxWidth: .infinity, alignment: .center)
+            }
+
+            HStack(spacing: 12) {
+                Button("preferences_calendars_cancel") {
+                    presentationMode.wrappedValue.dismiss()
+                }
+                .keyboardShortcut(.escape, modifiers: [])
+
+                Button(action: {
+                    Task {
+                        isAdding = true
+                        do {
+                            _ = try await GCEventStore.shared.addAccount()
+                            await onAccountAdded()
+                            presentationMode.wrappedValue.dismiss()
+                        } catch {
+                            errorMessage = error.localizedDescription
+                            isAdding = false
+                        }
+                    }
+                }) {
+                    if isAdding {
+                        ProgressView()
+                    } else {
+                        Text("preferences_calendars_sign_in_with_google")
+                    }
+                }
+                .buttonStyle(.borderedProminent)
+                .disabled(isAdding)
+            }
+        }
+        .padding()
+        .frame(width: 320, height: 180)
+    }
+}
+
 struct CalendarSectionsView: View {
     let calendars: [MBCalendar]
 
-    // 1. Compute once, with explicit types
     private var grouped: [String: [MBCalendar]] {
         Dictionary(grouping: calendars, by: \.source)
     }
@@ -69,32 +220,24 @@ struct ProviderPicker: View {
     var body: some View {
         HStack {
             Picker("", selection: $picker) {
-                Text("access_screen_provider_macos_title".loco()).tag(EventStoreProvider.macOSEventKit)
+                Text("access_screen_provider_macos_title").tag(EventStoreProvider.macOSEventKit)
                 Text("Google Calendar API").tag(EventStoreProvider.googleCalendar)
             }
             .onChange(of: picker) { provider in
                 Task { await eventManager.changeEventStoreProvider(provider) }
             }
-
-            if Defaults[.eventStoreProvider] == .googleCalendar {
-                Button("preferences_calendars_provider_gcalendar_change_account".loco()) {
-                    Task {
-                        await eventManager.changeEventStoreProvider(.googleCalendar, withSignOut: true)
-                    }
-                }
-            }
         }
     }
 }
 
 struct AccessDeniedBanner: View {
     var body: some View {
         VStack(alignment: .leading, spacing: 4) {
-            Text("access_screen_access_screen_access_denied_go_to_title".loco())
-            Button("access_screen_access_denied_system_preferences_button".loco()) {
+            Text("access_screen_access_screen_access_denied_go_to_title")
+            Button("access_screen_access_denied_system_preferences_button") {
                 NSWorkspace.shared.open(Links.calendarPreferences)
             }
-            Text("access_screen_access_denied_relaunch_title".loco())
+            Text("access_screen_access_denied_relaunch_title")
         }
         .padding(.top, 8)
     }
@@ -111,8 +254,7 @@ struct CalendarRow: View {
 
     var body: some View {
         Toggle(isOn: $isSelected) {
-            HStack {
-                Text("")
+            HStack(spacing: 6) {
                 Circle().fill(Color(calendar.color)).frame(width: 10, height: 10)
                 Text(calendar.title)
             }
@@ -126,15 +268,14 @@ struct CalendarRow: View {
             } else {
                 Defaults[.selectedCalendarIDs].removeAll { $0 == calendar.id }
             }
-            Defaults[.selectedCalendarIDs] = Array(Set(Defaults[.selectedCalendarIDs])) // Deduplication
+            Defaults[.selectedCalendarIDs] = Array(Set(Defaults[.selectedCalendarIDs]))
         }
     }
 }
 
 #Preview {
     List {
         CalendarSectionsView(calendars: [MBCalendar(title: "Calendar #1", id: "1", source: "Source #1", email: nil, color: .brown)])
-
         CalendarSectionsView(calendars: [MBCalendar(title: "Calendar #2", id: "2", source: "Source #2", email: nil, color: .blue)])
     }.listStyle(.sidebar)
         .frame(width: 300, height: 200)

MeetingBar/Utilities/Helpers.swift

@@ -268,3 +268,12 @@ extension NSImage {
         return copy
     }
 }
+
+extension DateFormatter {
+    static let yyyyMMdd: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd"
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        return formatter
+    }()
+}