Initial plan

* Double app entry.

* New icon for sys tray

.editorconfig

@@ -8,6 +8,9 @@ dotnet_style_operator_placement_when_wrapping = beginning_of_line
 tab_width = 4
 indent_size = 4
 end_of_line = crlf
+[XamlTypeInfo.g.cs]
+dotnet_diagnostic.CS0612.severity = none
+dotnet_diagnostic.CS0618.severity = none
 dotnet_style_coalesce_expression = true:suggestion
 dotnet_style_null_propagation = true:suggestion
 dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion

.github/copilot-instructions.md

@@ -0,0 +1,190 @@
+# Copilot Instructions for Wino-Mail Project
+
+## Project Overview
+
+Wino Mail is a native Windows mail client targeting Windows 10 1809+ and Windows 11. The project is **transitioning from UWP to WinUI 3** - always work with WinUI projects (Wino.Mail.WinUI, Wino.Core.WinUI), never edit the old Wino.Mail UWP project.
+
+### Key Technologies
+- **WinUI 3** for UI (previously UWP/WinUI 2)
+- **MVVM Toolkit** (CommunityToolkit.Mvvm) for ViewModels with source generators
+- **Messenger** pattern (WeakReferenceMessenger.Default) for event pub-sub throughout the codebase
+- **SQLite** database stored in publisher cache folder (not local storage)
+- **WebView2** for mail rendering/composition with custom HTML/JavaScript editors
+- **MimeKit/MailKit** for IMAP/SMTP operations
+- **Microsoft Graph SDK** for Outlook synchronization
+- **Gmail API** for Gmail synchronization
+
+### Solution Structure
+```
+Wino.Core.Domain       → Entities, interfaces, translations, enums (shared contracts)
+Wino.Core              → Synchronization engine, authenticators, request processing
+Wino.Services          → Database, mail, folder, account services
+Wino.Mail.ViewModels   → Mail-specific ViewModels
+Wino.Core.ViewModels   → Shared ViewModels (settings, personalization)
+Wino.Mail.WinUI        → **Active WinUI 3 UI project** (use this)
+Wino.Mail              → **Deprecated UWP project** (DO NOT EDIT)
+```
+
+## Architecture Patterns
+
+### Mail Synchronization Flow
+1. **WinoRequestDelegator** → Validates and delegates user actions (mark read, delete, move)
+2. **WinoRequestProcessor** → Batches requests using RequestComparer, queues to synchronizers
+3. **Synchronizers** (OutlookSynchronizer, GmailSynchronizer, ImapSynchronizer) → Execute batched operations
+4. **ChangeProcessors** (OutlookChangeProcessor, etc.) → Apply changes to local database
+5. Database updates trigger **Messenger** events (MailAddedMessage, MailUpdatedMessage, etc.)
+
+### Queue-Based Sync (New Pattern - See QUEUE_SYNC_IMPLEMENTATION.md)
+- Initial sync now queues mail IDs first (MailItemQueue table), downloads metadata only (no MIME)
+- MIME content downloaded on-demand when user opens mail
+- Synchronizers override `QueueMailIdsForInitialSyncAsync()`, `DownloadMailsFromQueueAsync()`, `CreateMinimalMailCopyAsync()`
+- Check `MailItemFolder.IsInitialSyncCompleted` to determine sync state
+
+### Dependency Injection Setup
+Services registered in extension methods across projects:
+- `RegisterCoreServices()` in Wino.Core/CoreContainerSetup.cs
+- `RegisterSharedServices()` in Wino.Services/ServicesContainerSetup.cs
+- `RegisterCoreUWPServices()` in CoreUWPContainerSetup.cs
+- ViewModels registered in App.xaml.cs with AddTransient/AddSingleton
+
+### Messenger Pattern (Event Pub-Sub)
+- All ViewModels inherit from CoreBaseViewModel or MailBaseViewModel which implement IRecipient<T>
+- Register/unregister message handlers in `RegisterRecipients()` / `UnregisterRecipients()`
+- Send messages via `WeakReferenceMessenger.Default.Send(new MessageType(...))`
+- Common messages: MailAddedMessage, MailUpdatedMessage, NavigationRequested, ThemeChanged
+
+## ViewModels Development Guidelines
+
+### Observable Properties - Critical Pattern
+- **ALWAYS** use `public partial` observable properties with MVVM Toolkit source generators
+- **NEVER** use private fields with `[ObservableProperty]` attribute
+- **Correct:**
+  ```csharp
+  [ObservableProperty]
+  public partial string SearchQuery { get; set; } = string.Empty;
+  ```
+- **Incorrect:**
+  ```csharp
+  [ObservableProperty]
+  private string searchQuery = string.Empty;  // WRONG - will not work
+  ```
+
+### ViewModels Structure
+- Inherit from MailBaseViewModel (for mail features) or CoreBaseViewModel (for shared features)
+- Use `[RelayCommand]` for command methods - source generator creates Command properties
+- Implement IRecipient<TMessage> for message handlers
+- Use `IMailDialogService` for Mail-related dialogs, `IDialogServiceBase` for core dialogs
+- Call `RegisterRecipients()` in constructor/OnNavigatedTo, `UnregisterRecipients()` in OnNavigatedFrom
+
+## Localization System
+
+### Translation Workflow (Custom T4-based System)
+1. Add English strings ONLY to `Wino.Core.Domain/Translations/en_US/resources.json`
+2. Build the project - source generators automatically create Translator properties
+3. Use `Translator.{PropertyName}` in ViewModels, XAML (with x:Bind, OneTime mode)
+4. **NEVER** edit other language files - Crowdin manages translations automatically
+5. **NEVER** hardcode user-facing strings
+
+### Usage Examples
+```csharp
+// ViewModel
+_dialogService.InfoBarMessage(Translator.Info_MissingFolderTitle, message);
+
+// XAML
+<TextBlock Text="{x:Bind Translator.Settings_Title, Mode=OneTime}" />
+```
+
+## UI Data Binding and Converters
+
+### WinUI 3 Automatic Conversions
+- **NEVER** create IValueConverter classes or add them to Converters.xaml
+- **NEVER** use BoolToVisibilityConverter - WinUI 3 SDK automatically converts bool to Visibility
+- Direct binding: `Visibility="{x:Bind IsVisible, Mode=OneWay}"`
+
+### XamlHelpers for Complex Conversions
+- **ALWAYS** use XamlHelpers static methods instead of converters
+- Add xmlns: `xmlns:helpers="using:Wino.Helpers"`
+- Usage: `{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(PropertyName), Mode=OneWay}`
+- Available methods: ReverseBoolToVisibilityConverter, CountToBooleanConverter, BoolToSelectionMode, Base64ToBitmapImage
+- Add new methods to XamlHelpers.cs when needed, don't create converters
+
+## WebView2 Mail Rendering
+
+### Architecture
+- **reader.html** (Wino.Mail.WinUI/JS/) for reading mails
+- **editor.html** for composing mails (uses Jodit editor, not Quill as originally planned)
+- WebView2 uses virtual host mapping: `https://wino.mail/reader.html`
+- JavaScript interop via `ExecuteScriptFunctionAsync()` to call functions like `RenderHTML()`
+- MIME content downloaded on-demand, not during sync
+
+### Key Patterns
+- Set environment variables for WebView2 before initialization (overlay scrollbars, cache)
+- Wait for DOMContentLoaded event before script execution
+- Handle theme changes by updating editor CSS dynamically
+- Cancel external navigation, open in browser via Launcher.LaunchUriAsync()
+
+## File Structure and Project Organization
+
+### Critical Rules
+- **NEVER** edit files in Wino.Mail (UWP) project - it's deprecated
+- **ALWAYS** work with Wino.Mail.WinUI for UI components
+- Place ViewModels in Wino.Mail.ViewModels (mail-specific) or Wino.Core.ViewModels (shared)
+- Create abstract base classes in Views/Abstract folders
+- Mail-specific dialog services go in Wino.Mail.WinUI/Services
+
+### Database and Storage
+- SQLite database in publisher cache folder (not app local storage)
+- EML files stored in app local storage, referenced by MailCopy.FileId
+- Paths resolved via MimeFileService.GetMimeMessagePath()
+- Database entities in Wino.Core.Domain/Entities
+
+## Error Handling and User Feedback
+
+### Exception Handling Patterns
+```csharp
+try {
+    await operation();
+} catch (UnavailableSpecialFolderException ex) {
+    _dialogService.InfoBarMessage(title, message, InfoBarMessageType.Warning, buttonText, action);
+} catch (NotImplementedException) {
+    _dialogService.ShowNotSupportedMessage();
+}
+```
+
+### Dialog Service Methods
+- `InfoBarMessage()` - simple notifications with optional action button
+- `ShowConfirmationDialogAsync()` - yes/no dialogs
+- `PickFilesAsync()` - file selection
+- Always check for null/empty results from dialog operations
+
+## Code Style and Best Practices
+
+- Use `var` where type is obvious from right side
+- String interpolation over string.Format for simple cases
+- Keep methods focused and single-responsibility
+- Add XML documentation for public APIs
+- Avoid introducing new NuGet packages - maximize use of existing libraries
+- Wrap async operations in try-catch blocks
+- Log errors via IWinoLogger but don't expose technical details to users
+
+## Development Workflow
+
+### Building and Running
+- Open WinoMail.slnx in Visual Studio 2022+
+- Target platforms: x86, x64, ARM64 (ARM32 being phased out)
+- Minimum: Windows 10 1809, Target: Windows 11 22H2
+- Set Wino.Mail.WinUI as startup project
+
+### Testing
+- Test suite in Wino.Core.Tests
+- Manual testing required for UI/WebView2 interactions
+- Test synchronization with real accounts when modifying synchronizers
+
+### Common Pitfalls
+- Forgetting to register ViewModels in App.xaml.cs RegisterViewModels()
+- Not calling RegisterRecipients() for message handlers
+- Using private fields with [ObservableProperty] (won't work - must be public partial)
+- Creating IValueConverter classes instead of using XamlHelpers
+- Editing UWP project files instead of WinUI equivalents
+- Hardcoding strings instead of using Translator
+- Forgetting to unregister Messenger recipients (memory leaks)

.github/workflows/pr-winui-build.yml

@@ -0,0 +1,115 @@
+name: PR WinUI Build
+
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+
+jobs:
+  build-winui:
+    name: Build project (${{ matrix.platform }})
+    if: github.event.pull_request.draft == false
+    runs-on: windows-latest
+    continue-on-error: ${{ contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.pull_request.author_association) }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - platform: x86
+            rid: win-x86
+          - platform: x64
+            rid: win-x64
+          - platform: ARM64
+            rid: win-arm64
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+
+      - name: Restore WinUI project dependencies
+        run: dotnet restore Wino.Mail.WinUI/Wino.Mail.WinUI.csproj --configfile nuget.config -p:Platform=${{ matrix.platform }} -p:RuntimeIdentifier=${{ matrix.rid }}
+
+      - name: Build WinUI project
+        run: dotnet build Wino.Mail.WinUI/Wino.Mail.WinUI.csproj --configuration Release --no-restore -p:Platform=${{ matrix.platform }} -p:RuntimeIdentifier=${{ matrix.rid }} -p:GenerateAppxPackageOnBuild=false -p:AppxPackageSigningEnabled=false
+
+  core-tests:
+    name: Run Core tests
+    if: github.event.pull_request.draft == false
+    runs-on: windows-latest
+    continue-on-error: ${{ contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.pull_request.author_association) }}
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 10.0.x
+
+      - name: Restore Core test projects
+        shell: pwsh
+        run: |
+          $coreTests = Get-ChildItem -Path . -Recurse -Filter "*Core*.Tests.csproj" | ForEach-Object { $_.FullName }
+          if (-not $coreTests) {
+            throw "No Core test projects were found."
+          }
+
+          foreach ($project in $coreTests) {
+            dotnet restore $project --configfile nuget.config
+          }
+
+      - name: Run Core test projects
+        shell: pwsh
+        run: |
+          New-Item -ItemType Directory -Path TestResults -Force | Out-Null
+          $coreTests = Get-ChildItem -Path . -Recurse -Filter "*Core*.Tests.csproj"
+          if (-not $coreTests) {
+            throw "No Core test projects were found."
+          }
+
+          foreach ($project in $coreTests) {
+            $name = $project.BaseName
+            dotnet test $project.FullName --configuration Release --no-restore --verbosity normal --logger "trx;LogFileName=$name.trx" --results-directory TestResults
+          }
+
+      - name: Upload Core test result artifacts
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: core-test-results
+          path: TestResults/*.trx
+          if-no-files-found: warn
+
+      - name: Publish Core test report
+        if: always()
+        uses: EnricoMi/publish-unit-test-result-action/windows@v2
+        with:
+          trx_files: TestResults/*.trx
+          check_name: Core test results
+
+  enforce-for-non-maintainers:
+    name: Enforce required checks (non-maintainers)
+    if: github.event.pull_request.draft == false && !contains(fromJSON('["OWNER","MEMBER","COLLABORATOR"]'), github.event.pull_request.author_association)
+    runs-on: ubuntu-latest
+    needs:
+      - build-winui
+      - core-tests
+
+    steps:
+      - name: Fail when build or tests fail for non-maintainers
+        if: needs.build-winui.result != 'success' || needs.core-tests.result != 'success'
+        run: |
+          echo "WinUI build and Core tests must pass for non-maintainer pull requests."
+          exit 1
+
+      - name: Confirm build and test success for non-maintainers
+        run: echo "WinUI build and Core tests passed."

.gitignore

@@ -399,3 +399,4 @@ Wino/obj/x86/Debug/XamlSaveStateFile.xml
 Wino/obj/x86/Debug/XamlSaveStateFile.xml
 *.cache
 .vs/Wino/v16/.suo
+/.claude/settings.local.json

CLAUDE.md

@@ -0,0 +1,132 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Project Overview
+
+Wino Mail is a native Windows mail client (Windows 10 1809+ / Windows 11) replacing the deprecated Windows Mail & Calendar. It's **transitioning from UWP to WinUI 3** - always work with WinUI projects (Wino.Mail.WinUI), never edit the deprecated Wino.Mail UWP project.
+
+## Build and Development Commands
+
+```bash
+# Open solution
+# WinoMail.slnx is the main solution file (VS 2022+)
+
+# Build from command line
+dotnet build WinoMail.slnx -c Debug
+
+# Run tests
+dotnet test Wino.Core.Tests/Wino.Core.Tests.csproj
+
+# Build specific platform
+dotnet build WinoMail.slnx -c Debug /p:Platform=x64
+```
+
+**Prerequisites:** Visual Studio 2022+ with ".NET desktop development" workload, .NET SDK 10+
+
+**Startup project:** Wino.Mail.WinUI
+
+**Platforms:** x86, x64, ARM64
+
+## Architecture
+
+### Solution Structure
+```
+Wino.Core.Domain       → Entities, interfaces, translations, enums (shared contracts)
+Wino.Core              → Synchronization engine, authenticators, request processing
+Wino.Services          → Database, mail, folder, account services
+Wino.Authentication    → OAuth2 authenticators (Outlook, Gmail)
+Wino.Mail.ViewModels   → Mail-specific ViewModels
+Wino.Core.ViewModels   → Shared ViewModels (settings, personalization)
+Wino.Messaging         → Pub-sub message definitions
+Wino.Mail.WinUI        → **Active WinUI 3 UI project** (use this)
+Wino.Mail              → **Deprecated UWP project** (DO NOT EDIT)
+```
+
+### Mail Synchronization Flow
+1. **WinoRequestDelegator** → Validates and delegates user actions (mark read, delete, move)
+2. **WinoRequestProcessor** → Batches requests using RequestComparer, queues to synchronizers
+3. **Synchronizers** (OutlookSynchronizer, GmailSynchronizer, ImapSynchronizer) → Execute batched operations
+4. **ChangeProcessors** → Apply changes to local SQLite database
+5. Database updates trigger **Messenger** events (MailAddedMessage, MailUpdatedMessage, etc.)
+
+### Synchronizer Types
+- **OutlookSynchronizer** - Microsoft Graph SDK for Office 365
+- **GmailSynchronizer** - Gmail API
+- **ImapSynchronizer** - MimeKit/MailKit for IMAP/SMTP
+
+### Queue-Based Sync Pattern
+- Initial sync queues mail IDs first (MailItemQueue table), downloads metadata only
+- MIME content downloaded on-demand when user opens mail
+- Check `MailItemFolder.IsInitialSyncCompleted` for sync state
+- See QUEUE_SYNC_IMPLEMENTATION.md for details
+
+### Dependency Injection
+- `RegisterCoreServices()` in Wino.Core/CoreContainerSetup.cs
+- `RegisterSharedServices()` in Wino.Services/ServicesContainerSetup.cs
+- ViewModels registered in App.xaml.cs
+
+## Key Patterns
+
+### MVVM with Source Generators
+**CORRECT - use public partial properties:**
+```csharp
+[ObservableProperty]
+public partial string SearchQuery { get; set; } = string.Empty;
+```
+
+**WRONG - will not work:**
+```csharp
+[ObservableProperty]
+private string searchQuery = string.Empty;
+```
+
+### Messenger Pattern
+- ViewModels inherit from CoreBaseViewModel or MailBaseViewModel
+- Register handlers in `RegisterRecipients()`, unregister in `UnregisterRecipients()`
+- Send via `WeakReferenceMessenger.Default.Send(new MessageType(...))`
+
+### Data Binding - No Converters
+- **NEVER** create IValueConverter classes
+- WinUI 3 auto-converts bool to Visibility: `Visibility="{x:Bind IsVisible, Mode=OneWay}"`
+- Use XamlHelpers for complex conversions: `{x:Bind helpers:XamlHelpers.ReverseBoolToVisibilityConverter(Prop)}`
+
+## Localization
+
+1. Add English strings ONLY to `Wino.Core.Domain/Translations/en_US/resources.json`
+2. Build project - source generators create Translator properties
+3. Use `Translator.{PropertyName}` in code/XAML
+4. **NEVER** edit other language files - Crowdin manages translations
+
+## Storage
+
+- **SQLite database** in publisher cache folder (shared with future Wino Calendar)
+- **EML files** in app local storage, referenced by `MailCopy.FileId`
+- Paths resolved via `MimeFileService.GetMimeMessagePath()`
+
+## WebView2 Mail Rendering
+
+- `reader.html` for reading mails, `editor.html` for composing (Jodit editor)
+- Virtual host mapping: `https://wino.mail/reader.html`
+- JavaScript interop via `ExecuteScriptFunctionAsync()`
+- MIME content downloaded on-demand, not during sync
+
+## Common Pitfalls
+
+- Forgetting to register ViewModels in App.xaml.cs `RegisterViewModels()`
+- Not calling `RegisterRecipients()` for message handlers
+- Using private fields with `[ObservableProperty]` instead of public partial
+- Creating IValueConverter classes instead of using XamlHelpers
+- Editing UWP project files instead of WinUI equivalents
+- Hardcoding strings instead of using Translator
+- Forgetting to unregister Messenger recipients (memory leaks)
+
+## Code Style
+
+- Avoid introducing new NuGet packages when possible
+- Use existing libraries (MimeKit, MailKit, Microsoft Graph, Gmail API)
+- Use `var` where type is obvious
+- String interpolation over string.Format
+- Wrap async operations in try-catch
+- Log errors via IWinoLogger
+- In ViewModels, update all UI-bound properties/collections via `ExecuteUIThread(...)` (especially after awaited calls and any use of `ConfigureAwait(false)`).

Directory.Packages.props

@@ -3,63 +3,75 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-        <PackageVersion Include="ColorHashSharp" Version="1.0.0" />
+    <PackageVersion Include="ColorHashSharp" Version="1.1.0" />
     <PackageVersion Include="CommunityToolkit.Common" Version="8.4.0" />
     <PackageVersion Include="CommunityToolkit.Diagnostics" Version="8.4.0" />
-        <PackageVersion Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
-        <PackageVersion Include="CommunityToolkit.Labs.Uwp.DependencyPropertyGenerator" Version="0.1.250206-build.2040" />
-        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Animations" Version="8.2.250129-preview2" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Behaviors" Version="8.2.250129-preview2" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Controls.Segmented" Version="8.2.250129-preview2" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Controls.SettingsControls" Version="8.2.250129-preview2" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Controls.Sizers" Version="8.2.250129-preview2" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Controls.TabbedCommandBar" Version="8.2.250129-preview2" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Controls.TokenizingTextBox" Version="8.2.250129-preview2" />
-        <PackageVersion Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250129-preview2" />
-        <PackageVersion Include="EmailValidation" Version="1.2.0" />
-        <PackageVersion Include="HtmlAgilityPack" Version="1.11.72" />
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.1-build.4" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Segmented" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.TabbedCommandBar" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Controls.TokenizingTextBox" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Extensions" Version="8.2.251219" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250926-build.2293" />
+    <PackageVersion Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
+    <PackageVersion Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" Version="0.1.250926-build.2293" />
+    <PackageVersion Include="EmailValidation" Version="1.3.0" />
+    <PackageVersion Include="gravatar-dotnet" Version="0.1.3" />
+    <PackageVersion Include="HtmlAgilityPack" Version="1.12.4" />
     <PackageVersion Include="Ical.Net" Version="4.3.1" />
     <PackageVersion Include="IsExternalInit" Version="1.0.3" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
-        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.2" />
-        <PackageVersion Include="Microsoft.Graph" Version="5.69.0" />
-        <PackageVersion Include="Microsoft.Identity.Client" Version="4.68.0" />
-        <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.68.0" />
-        <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.68.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Graph" Version="5.99.0" />
+    <PackageVersion Include="Microsoft.Graphics.Win2D" Version="1.3.2" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.79.2" />
+    <PackageVersion Include="Microsoft.Identity.Client.Broker" Version="4.79.2" />
+    <PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.79.2" />
     <PackageVersion Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.14" />
-        <PackageVersion Include="Microsoft.UI.Xaml" Version="2.8.7" />
-        <PackageVersion Include="Microsoft.Xaml.Behaviors.Uwp.Managed" Version="3.0.0" />
-        <PackageVersion Include="MimeKit" Version="4.10.0" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
+    <PackageVersion Include="MimeKit" Version="4.14.0" />
     <PackageVersion Include="morelinq" Version="4.4.0" />
     <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
     <PackageVersion Include="Nito.AsyncEx.Tasks" Version="5.1.2" />
-        <PackageVersion Include="NodaTime" Version="3.2.1" />
-        <PackageVersion Include="Serilog" Version="4.2.0" />
+    <PackageVersion Include="NodaTime" Version="3.2.3" />
+    <PackageVersion Include="Sentry.Serilog" Version="6.0.0" />
+    <PackageVersion Include="Serilog" Version="4.3.0" />
     <PackageVersion Include="Serilog.Exceptions" Version="8.4.0" />
     <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
-        <PackageVersion Include="Serilog.Sinks.File" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
     <PackageVersion Include="Serilog.Sinks.ApplicationInsights" Version="4.0.0" />
-        <PackageVersion Include="SkiaSharp" Version="3.116.1" />
-        <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-        <PackageVersion Include="SqlKata" Version="4.0.1" />
+    <PackageVersion Include="SkiaSharp" Version="3.119.1" />
+    <PackageVersion Include="SkiaSharp.Views.WinUI" Version="3.119.1" />
+    <PackageVersion Include="sqlite-net-pcl" Version="1.10.196-beta" />
+    <PackageVersion Include="System.Drawing.Common" Version="10.0.1" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
-        <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.2" />
-        <PackageVersion Include="System.Text.Json" Version="9.0.2" />
-        <PackageVersion Include="Win2D.uwp" Version="1.28.2" />
-        <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.1" />
+    <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />
+    <PackageVersion Include="H.NotifyIcon.WinUI" Version="2.4.1" />
     <PackageVersion Include="CommunityToolkit.WinUI.Notifications" Version="7.1.2" />
-        <PackageVersion Include="Google.Apis.Auth" Version="1.69.0" />
-        <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.69.0.3667" />
-        <PackageVersion Include="Google.Apis.Gmail.v1" Version="1.68.0.3427" />
-        <PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.68.0.3359" />
+    <PackageVersion Include="Google.Apis.Auth" Version="1.73.0" />
+    <PackageVersion Include="Google.Apis.Calendar.v3" Version="1.73.0.3993" />
+    <PackageVersion Include="Google.Apis.Gmail.v1" Version="1.73.0.3987" />
+    <PackageVersion Include="Google.Apis.PeopleService.v1" Version="1.72.0.3973" />
     <PackageVersion Include="HtmlKit" Version="1.2.0" />
-        <PackageVersion Include="MailKit" Version="4.10.0" />
-        <PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.5" />
-        <PackageVersion Include="System.Reactive" Version="6.0.1" />
-        <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.2" />
-        <PackageVersion Include="System.Text.Encodings.Web" Version="9.0.2" />
+    <PackageVersion Include="MailKit" Version="4.14.1" />
+    <PackageVersion Include="TimePeriodLibrary.NET" Version="2.1.6" />
+    <PackageVersion Include="System.Reactive" Version="6.1.0" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.1" />
+    <PackageVersion Include="System.Text.Encodings.Web" Version="10.0.1" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
+    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="2.0.250930001-experimental1" />
+    <PackageVersion Include="WinUIEx" Version="2.9.0" />
+    <!-- Testing packages -->
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="FluentAssertions" Version="7.0.0" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
   </ItemGroup>
 </Project>

Wino.Authentication/OutlookAuthenticator.cs

@@ -24,12 +24,14 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
     public override MailProviderType ProviderType => MailProviderType.Outlook;
 
     private readonly IPublicClientApplication _publicClientApplication;
+    private readonly INativeAppService _nativeAppService;
     private readonly IApplicationConfiguration _applicationConfiguration;
 
     public OutlookAuthenticator(INativeAppService nativeAppService,
                                 IApplicationConfiguration applicationConfiguration,
                                 IAuthenticatorConfig authenticatorConfig) : base(authenticatorConfig)
     {
+        _nativeAppService = nativeAppService;
         _applicationConfiguration = applicationConfiguration;
 
         var authenticationRedirectUri = nativeAppService.GetWebAuthenticationBrokerUri();
@@ -40,11 +42,25 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
             ListOperatingSystemAccounts = true,
         };
 
-        var outlookAppBuilder = PublicClientApplicationBuilder.Create(AuthenticatorConfig.OutlookAuthenticatorClientId)
-            .WithParentActivityOrWindow(nativeAppService.GetCoreWindowHwnd)
+        PublicClientApplicationBuilder outlookAppBuilder = null;
+
+        // Being created from an app notification.
+        // This is where we avoid all interactive shit for authentication.
+        if (nativeAppService.GetCoreWindowHwnd == null)
+        {
+            outlookAppBuilder = PublicClientApplicationBuilder.Create(AuthenticatorConfig.OutlookAuthenticatorClientId)
+                .WithDefaultRedirectUri()
                 .WithBroker(options)
+                .WithAuthority(Authority);
+        }
+        else
+        {
+            outlookAppBuilder = PublicClientApplicationBuilder.Create(AuthenticatorConfig.OutlookAuthenticatorClientId)
+                .WithBroker(options)
+                .WithParentActivityOrWindow(_nativeAppService.GetCoreWindowHwnd)
                 .WithDefaultRedirectUri()
                 .WithAuthority(Authority);
+        }
 
         _publicClientApplication = outlookAppBuilder.Build();
     }
@@ -67,7 +83,8 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
     {
         await EnsureTokenCacheAttachedAsync();
 
-        var storedAccount = (await _publicClientApplication.GetAccountsAsync()).FirstOrDefault(a => a.Username == account.Address);
+        var storedAccount = (await _publicClientApplication.GetAccountsAsync()).FirstOrDefault(
+            a => string.Equals(a.Username?.Trim(), account.Address?.Trim(), StringComparison.OrdinalIgnoreCase));
 
         if (storedAccount == null)
             return await GenerateTokenInformationAsync(account);
@@ -81,7 +98,8 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
         catch (MsalUiRequiredException)
         {
             // Somehow MSAL is not able to refresh the token silently.
-            // Force interactive login.
+            // Force interactive login which will include calendar scopes.
+            // The calling code should update account.IsCalendarAccessGranted = true after successful authentication.
 
             return await GenerateTokenInformationAsync(account);
         }
@@ -97,7 +115,13 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
         {
             await EnsureTokenCacheAttachedAsync();
 
-            var authResult = await _publicClientApplication
+            // Interactive authentication required but window doesn't exist.
+            // This can happen when being called from a notification background task and the token is expired.
+            // Force account attention;
+
+            if (_nativeAppService.GetCoreWindowHwnd == null) throw new AuthenticationAttentionException(account);
+
+            AuthenticationResult authResult = await _publicClientApplication
                 .AcquireTokenInteractive(Scope)
                 .ExecuteAsync();
 
@@ -107,7 +131,7 @@ public class OutlookAuthenticator : BaseAuthenticator, IOutlookAuthenticator
 
             if (account?.Address != null && !account.Address.Equals(authResult.Account.Username, StringComparison.OrdinalIgnoreCase))
             {
-                throw new AuthenticationException("Authenticated address does not match with your account address.");
+                throw new AuthenticationException("Authenticated address does not match with your account address. If you are signing with a Office365, it is not officially supported yet.");
             }
 
             return new TokenInformationEx(authResult.AccessToken, authResult.Account.Username);

Wino.Authentication/Wino.Authentication.csproj

@@ -1,11 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<RootNamespace>Wino.Authentication</RootNamespace>
 		<Platforms>x86;x64;arm64</Platforms>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Diagnostics" />
@@ -14,6 +17,7 @@
 		<PackageReference Include="Microsoft.Identity.Client" />
 		<PackageReference Include="Microsoft.Identity.Client.Broker" />
 		<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" />
+		<PackageReference Include="Sentry.Serilog" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj" />

Wino.BackgroundTasks/AppUpdatedTask.cs

@@ -1,34 +0,0 @@
-using Microsoft.Toolkit.Uwp.Notifications;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Background;
-
-namespace Wino.BackgroundTasks
-{
-    /// <summary>
-    /// Creates a toast notification to notify user when the Store update happens.
-    /// </summary>
-    public sealed class AppUpdatedTask : IBackgroundTask
-    {
-        public void Run(IBackgroundTaskInstance taskInstance)
-        {
-            var def = taskInstance.GetDeferral();
-
-            var builder = new ToastContentBuilder();
-            builder.SetToastScenario(ToastScenario.Default);
-
-            Package package = Package.Current;
-            PackageId packageId = package.Id;
-            PackageVersion version = packageId.Version;
-
-            var versionText = string.Format("{0}.{1}.{2}.{3}", version.Major, version.Minor, version.Build, version.Revision);
-
-            // TODO: Handle with Translator, but it's not initialized here yet.
-            builder.AddText("Wino Mail is updated!");
-            builder.AddText(string.Format("New version {0} is ready.", versionText));
-
-            builder.Show();
-
-            def.Complete();
-        }
-    }
-}

Wino.BackgroundTasks/Properties/AssemblyInfo.cs

@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Wino.BackgroundTasks")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Wino.BackgroundTasks")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]

Wino.BackgroundTasks/Wino.BackgroundTasks.csproj

@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{D9EF0F59-F5F2-4D6C-A5BA-84043D8F3E08}</ProjectGuid>
-    <OutputType>winmdobj</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Wino.BackgroundTasks</RootNamespace>
-    <AssemblyName>Wino.BackgroundTasks</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.22621.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <AllowCrossPlatformRetargeting>false</AllowCrossPlatformRetargeting>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
-    <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="AppUpdatedTask.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Identity.Client">
-      <Version>4.66.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.14</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
-      <Version>7.1.3</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Core.Domain\Wino.Core.Domain.csproj">
-      <Project>{CF3312E5-5DA0-4867-9945-49EA7598AF1F}</Project>
-      <Name>Wino.Core.Domain</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Wino.Core.UWP\Wino.Core.UWP.csproj">
-      <Project>{395f19ba-1e42-495c-9db5-1a6f537fccb8}</Project>
-      <Name>Wino.Core.UWP</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Wino.Core\Wino.Core.csproj">
-      <Project>{e6b1632a-8901-41e8-9ddf-6793c7698b0b}</Project>
-      <Name>Wino.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="WindowsDesktop, Version=10.0.22621.0">
-      <Name>Windows Desktop Extensions for the UWP</Name>
-    </SDKReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

Wino.Calendar.Packaging/Package.appxmanifest

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
-  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
-
-  <Identity
-    Name="58272BurakKSE.WinoCalendar"
-    Publisher="CN=51FBDAF3-E212-4149-89A2-A2636B3BC911"
-    Version="1.0.0.0" />
-
-  <Properties>
-    <DisplayName>Wino Calendar</DisplayName>
-    <PublisherDisplayName>Burak KÖSE</PublisherDisplayName>
-    <Logo>Images\StoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14393.0" MaxVersionTested="10.0.14393.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="Wino Calendar"
-        Description="Wino.Calendar.Packaging"
-        BackgroundColor="transparent"
-        Square150x150Logo="Images\Square150x150Logo.png"
-        Square44x44Logo="Images\Square44x44Logo.png">
-        <uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png" />
-        <uap:SplashScreen Image="Images\SplashScreen.png" />
-      </uap:VisualElements>
-
-		<Extensions>
-			<!-- Registration of full trust backend application. -->
-			<uap:Extension Category="windows.appService">
-				<uap:AppService Name="WinoInteropService" />
-			</uap:Extension>
-			
-			<!-- Protocol activation: Google OAuth -->
-			<uap:Extension Category="windows.protocol">
-				<uap:Protocol Name="google.pw.oauth2">
-					<uap:DisplayName>Wino Google Authentication Protocol</uap:DisplayName>
-				</uap:Protocol>
-			</uap:Extension>
-			
-			<!-- Protocol activation: Launch UWP app from Full Trust Process  -->
-			<uap:Extension Category="windows.protocol">
-				<uap:Protocol Name="wino.calendar.launch">
-					<uap:DisplayName>Wino Calendara Launcher Protocol</uap:DisplayName>
-				</uap:Protocol>
-			</uap:Extension>
-
-			<!-- Startup Task -->
-			<uap5:Extension
-				Category="windows.startupTask"
-				Executable="Wino.Server\Wino.Server.exe"
-				EntryPoint="Windows.FullTrustApplication">
-				<uap5:StartupTask
-					  TaskId="WinoServer"
-					  Enabled="false"
-					  DisplayName="Wino Mail" />
-			</uap5:Extension>
-
-			<desktop:Extension Category="windows.fullTrustProcess" Executable="Wino.Server\Wino.Server.exe">
-				<desktop:FullTrustProcess>
-					<desktop:ParameterGroup GroupId="WinoServer" Parameters="Calendar" />
-				</desktop:FullTrustProcess>
-			</desktop:Extension>
-		</Extensions>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <rescap:Capability Name="runFullTrust" />
-	<rescap:Capability Name="confirmAppClose" />
-  </Capabilities>
-</Package>

Wino.Calendar.Packaging/Wino.Calendar.Packaging.wapproj

@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x86">
-      <Configuration>Debug</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x86">
-      <Configuration>Release</Configuration>
-      <Platform>x86</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|AnyCPU">
-      <Configuration>Debug</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|AnyCPU">
-      <Configuration>Release</Configuration>
-      <Platform>AnyCPU</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup>
-    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
-  </PropertyGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
-  <PropertyGroup>
-    <ProjectGuid>7485b18c-f5ab-4abe-ba7f-05b6623c67c8</ProjectGuid>
-    <TargetPlatformVersion>10.0.22621.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <NoWarn>$(NoWarn);NU1702</NoWarn>
-    <EntryPointProjectUniqueName>..\Wino.Calendar\Wino.Calendar.csproj</EntryPointProjectUniqueName>
-    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
-  </PropertyGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Images\SplashScreen.scale-200.png" />
-    <Content Include="Images\LockScreenLogo.scale-200.png" />
-    <Content Include="Images\Square150x150Logo.scale-200.png" />
-    <Content Include="Images\Square44x44Logo.scale-200.png" />
-    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Images\StoreLogo.png" />
-    <Content Include="Images\Wide310x150Logo.scale-200.png" />
-    <None Include="Package.StoreAssociation.xml" />
-  </ItemGroup>
-  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" PrivateAssets="all" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Wino.Calendar\Wino.Calendar.csproj" />
-    <ProjectReference Include="..\Wino.Server\Wino.Server.csproj" />
-  </ItemGroup>
-</Project>

Wino.Calendar.ViewModels/AccountDetailsPageViewModel.cs

@@ -1,48 +0,0 @@
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Input;
-using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.ViewModels;
-using Wino.Mail.ViewModels.Data;
-using Wino.Messaging.UI;
-
-namespace Wino.Calendar.ViewModels
-{
-    public partial class AccountDetailsPageViewModel : CalendarBaseViewModel
-    {
-        private readonly IAccountService _accountService;
-
-        public AccountProviderDetailViewModel Account { get; private set; }
-        public ICalendarDialogService CalendarDialogService { get; }
-        public IAccountCalendarStateService AccountCalendarStateService { get; }
-
-        public AccountDetailsPageViewModel(ICalendarDialogService calendarDialogService, IAccountService accountService, IAccountCalendarStateService accountCalendarStateService)
-        {
-            CalendarDialogService = calendarDialogService;
-            _accountService = accountService;
-            AccountCalendarStateService = accountCalendarStateService;
-        }
-
-        [RelayCommand]
-        private async Task RenameAccount()
-        {
-            if (Account == null)
-                return;
-
-            var updatedAccount = await CalendarDialogService.ShowEditAccountDialogAsync(Account.Account);
-
-            if (updatedAccount != null)
-            {
-                await _accountService.UpdateAccountAsync(updatedAccount);
-
-                ReportUIChange(new AccountUpdatedMessage(updatedAccount));
-            }
-        }
-
-        public override void OnNavigatedTo(NavigationMode mode, object parameters)
-        {
-            base.OnNavigatedTo(mode, parameters);
-        }
-    }
-}

Wino.Calendar.ViewModels/AccountManagementViewModel.cs

@@ -1,147 +0,0 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Input;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Entities.Shared;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Authentication;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Server;
-
-namespace Wino.Calendar.ViewModels
-{
-    public partial class AccountManagementViewModel : AccountManagementPageViewModelBase
-    {
-        private readonly IProviderService _providerService;
-
-        public AccountManagementViewModel(ICalendarDialogService dialogService,
-                                          IWinoServerConnectionManager winoServerConnectionManager,
-                                          INavigationService navigationService,
-                                          IAccountService accountService,
-                                          IProviderService providerService,
-                                          IStoreManagementService storeManagementService,
-                                          IAuthenticationProvider authenticationProvider,
-                                          IPreferencesService preferencesService) : base(dialogService, winoServerConnectionManager, navigationService, accountService, providerService, storeManagementService, authenticationProvider, preferencesService)
-        {
-            CalendarDialogService = dialogService;
-            _providerService = providerService;
-        }
-
-        public ICalendarDialogService CalendarDialogService { get; }
-
-        public override async void OnNavigatedTo(NavigationMode mode, object parameters)
-        {
-            base.OnNavigatedTo(mode, parameters);
-
-            await InitializeAccountsAsync();
-        }
-
-        public override async Task InitializeAccountsAsync()
-        {
-            Accounts.Clear();
-
-            var accounts = await AccountService.GetAccountsAsync().ConfigureAwait(false);
-
-            await ExecuteUIThread(() =>
-            {
-                foreach (var account in accounts)
-                {
-                    var accountDetails = GetAccountProviderDetails(account);
-
-                    Accounts.Add(accountDetails);
-                }
-            });
-
-            await ManageStorePurchasesAsync().ConfigureAwait(false);
-        }
-
-        [RelayCommand]
-        private async Task AddNewAccountAsync()
-        {
-            if (IsAccountCreationBlocked)
-            {
-                var isPurchaseClicked = await DialogService.ShowConfirmationDialogAsync(Translator.DialogMessage_AccountLimitMessage, Translator.DialogMessage_AccountLimitTitle, Translator.Buttons_Purchase);
-
-                if (!isPurchaseClicked) return;
-
-                await PurchaseUnlimitedAccountAsync();
-
-                return;
-            }
-
-            var availableProviders = _providerService.GetAvailableProviders();
-
-            var accountCreationDialogResult = await DialogService.ShowAccountProviderSelectionDialogAsync(availableProviders);
-
-            if (accountCreationDialogResult == null) return;
-
-            var accountCreationCancellationTokenSource = new CancellationTokenSource();
-            var accountCreationDialog = CalendarDialogService.GetAccountCreationDialog(accountCreationDialogResult);
-
-            accountCreationDialog.ShowDialog(accountCreationCancellationTokenSource);
-            accountCreationDialog.State = AccountCreationDialogState.SigningIn;
-
-            // For OAuth authentications, we just generate token and assign it to the MailAccount.
-
-            var createdAccount = new MailAccount()
-            {
-                ProviderType = accountCreationDialogResult.ProviderType,
-                Name = accountCreationDialogResult.AccountName,
-                Id = Guid.NewGuid()
-            };
-
-            var tokenInformationResponse = await WinoServerConnectionManager
-                .GetResponseAsync<TokenInformationEx, AuthorizationRequested>(new AuthorizationRequested(accountCreationDialogResult.ProviderType,
-                                                                                                       createdAccount,
-                                                                                                       createdAccount.ProviderType == MailProviderType.Gmail), accountCreationCancellationTokenSource.Token);
-
-            if (accountCreationDialog.State == AccountCreationDialogState.Canceled)
-                throw new AccountSetupCanceledException();
-
-            tokenInformationResponse.ThrowIfFailed();
-
-            await AccountService.CreateAccountAsync(createdAccount, null);
-
-            // Sync profile information if supported.
-            if (createdAccount.IsProfileInfoSyncSupported)
-            {
-                // Start profile information synchronization.
-                // It's only available for Outlook and Gmail synchronizers.
-
-                var profileSyncOptions = new MailSynchronizationOptions()
-                {
-                    AccountId = createdAccount.Id,
-                    Type = MailSynchronizationType.UpdateProfile
-                };
-
-                var profileSynchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<MailSynchronizationResult, NewMailSynchronizationRequested>(new NewMailSynchronizationRequested(profileSyncOptions, SynchronizationSource.Client));
-
-                var profileSynchronizationResult = profileSynchronizationResponse.Data;
-
-                if (profileSynchronizationResult.CompletedState != SynchronizationCompletedState.Success)
-                    throw new Exception(Translator.Exception_FailedToSynchronizeProfileInformation);
-
-                createdAccount.SenderName = profileSynchronizationResult.ProfileInformation.SenderName;
-                createdAccount.Base64ProfilePictureData = profileSynchronizationResult.ProfileInformation.Base64ProfilePictureData;
-
-                await AccountService.UpdateProfileInformationAsync(createdAccount.Id, profileSynchronizationResult.ProfileInformation);
-            }
-
-            accountCreationDialog.State = AccountCreationDialogState.FetchingEvents;
-
-            // Start synchronizing events.
-            var synchronizationOptions = new CalendarSynchronizationOptions()
-            {
-                AccountId = createdAccount.Id,
-                Type = CalendarSynchronizationType.CalendarMetadata
-            };
-
-            var synchronizationResponse = await WinoServerConnectionManager.GetResponseAsync<CalendarSynchronizationResult, NewCalendarSynchronizationRequested>(new NewCalendarSynchronizationRequested(synchronizationOptions, SynchronizationSource.Client));
-        }
-    }
-}

Wino.Calendar.ViewModels/AppShellViewModel.cs

@@ -1,367 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Threading;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
-using CommunityToolkit.Mvvm.Messaging;
-using Serilog;
-using Wino.Calendar.ViewModels.Data;
-using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain.Collections;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Extensions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Calendar;
-using Wino.Core.Domain.Models.Navigation;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Client.Calendar;
-using Wino.Messaging.Client.Navigation;
-using Wino.Messaging.Server;
-
-namespace Wino.Calendar.ViewModels
-{
-    public partial class AppShellViewModel : CalendarBaseViewModel,
-        IRecipient<VisibleDateRangeChangedMessage>,
-        IRecipient<CalendarEnableStatusChangedMessage>,
-        IRecipient<NavigateManageAccountsRequested>,
-        IRecipient<CalendarDisplayTypeChangedMessage>,
-        IRecipient<DetailsPageStateChangedMessage>
-    {
-        public IPreferencesService PreferencesService { get; }
-        public IStatePersistanceService StatePersistenceService { get; }
-        public IAccountCalendarStateService AccountCalendarStateService { get; }
-        public INavigationService NavigationService { get; }
-        public IWinoServerConnectionManager ServerConnectionManager { get; }
-
-        [ObservableProperty]
-        private bool _isEventDetailsPageActive;
-
-        [ObservableProperty]
-        private int _selectedMenuItemIndex = -1;
-
-        [ObservableProperty]
-        private bool isCalendarEnabled;
-
-        /// <summary>
-        /// Gets or sets the active connection status of the Wino server.
-        /// </summary>
-        [ObservableProperty]
-        private WinoServerConnectionStatus activeConnectionStatus;
-
-        /// <summary>
-        /// Gets or sets the display date of the calendar.
-        /// </summary>
-        [ObservableProperty]
-        private DateTimeOffset _displayDate;
-
-        /// <summary>
-        /// Gets or sets the highlighted range in the CalendarView and displayed date range in FlipView.
-        /// </summary>
-        [ObservableProperty]
-        private DateRange highlightedDateRange;
-
-        [ObservableProperty]
-        private ObservableRangeCollection<string> dateNavigationHeaderItems = [];
-
-        [ObservableProperty]
-        private int _selectedDateNavigationHeaderIndex;
-
-        public bool IsVerticalCalendar => StatePersistenceService.CalendarDisplayType == CalendarDisplayType.Month;
-
-        // For updating account calendars asynchronously.
-        private SemaphoreSlim _accountCalendarUpdateSemaphoreSlim = new(1);
-
-        public AppShellViewModel(IPreferencesService preferencesService,
-                                 IStatePersistanceService statePersistanceService,
-                                 IAccountService accountService,
-                                 ICalendarService calendarService,
-                                 IAccountCalendarStateService accountCalendarStateService,
-                                 INavigationService navigationService,
-                                 IWinoServerConnectionManager serverConnectionManager)
-        {
-            _accountService = accountService;
-            _calendarService = calendarService;
-
-            AccountCalendarStateService = accountCalendarStateService;
-            AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
-            AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged += AccountCalendarStateCollectivelyChanged;
-
-            NavigationService = navigationService;
-            ServerConnectionManager = serverConnectionManager;
-            PreferencesService = preferencesService;
-
-            StatePersistenceService = statePersistanceService;
-            StatePersistenceService.StatePropertyChanged += PrefefencesChanged;
-        }
-
-        private void SelectedCalendarItemsChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
-        {
-            throw new NotImplementedException();
-        }
-
-        private void PrefefencesChanged(object sender, string e)
-        {
-            if (e == nameof(StatePersistenceService.CalendarDisplayType))
-            {
-                Messenger.Send(new CalendarDisplayTypeChangedMessage(StatePersistenceService.CalendarDisplayType));
-
-
-                // Change the calendar.
-                DateClicked(new CalendarViewDayClickedEventArgs(GetDisplayTypeSwitchDate()));
-            }
-        }
-
-        public override async void OnNavigatedTo(NavigationMode mode, object parameters)
-        {
-            base.OnNavigatedTo(mode, parameters);
-
-            UpdateDateNavigationHeaderItems();
-
-            await InitializeAccountCalendarsAsync();
-
-            TodayClicked();
-        }
-
-        private async void AccountCalendarStateCollectivelyChanged(object sender, GroupedAccountCalendarViewModel e)
-        {
-            // When using three-state checkbox, multiple accounts will be selected/unselected at the same time.
-            // Reporting all these changes one by one to the UI is not efficient and may cause problems in the future.
-
-            // Update all calendar states at once.
-            try
-            {
-                await _accountCalendarUpdateSemaphoreSlim.WaitAsync();
-
-                foreach (var calendar in e.AccountCalendars)
-                {
-                    await _calendarService.UpdateAccountCalendarAsync(calendar.AccountCalendar).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Error while waiting for account calendar update semaphore.");
-            }
-            finally
-            {
-                _accountCalendarUpdateSemaphoreSlim.Release();
-            }
-        }
-
-        private async void UpdateAccountCalendarRequested(object sender, AccountCalendarViewModel e)
-            => await _calendarService.UpdateAccountCalendarAsync(e.AccountCalendar).ConfigureAwait(false);
-
-        private async Task InitializeAccountCalendarsAsync()
-        {
-            await Dispatcher.ExecuteOnUIThread(() => AccountCalendarStateService.ClearGroupedAccountCalendar());
-
-            var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
-
-            foreach (var account in accounts)
-            {
-                var accountCalendars = await _calendarService.GetAccountCalendarsAsync(account.Id).ConfigureAwait(false);
-                var calendarViewModels = new List<AccountCalendarViewModel>();
-
-                foreach (var calendar in accountCalendars)
-                {
-                    var calendarViewModel = new AccountCalendarViewModel(account, calendar);
-
-                    calendarViewModels.Add(calendarViewModel);
-                }
-
-                var groupedAccountCalendarViewModel = new GroupedAccountCalendarViewModel(account, calendarViewModels);
-
-                await Dispatcher.ExecuteOnUIThread(() =>
-                {
-                    AccountCalendarStateService.AddGroupedAccountCalendar(groupedAccountCalendarViewModel);
-                });
-            }
-        }
-
-        private void ForceNavigateCalendarDate()
-        {
-            if (SelectedMenuItemIndex == -1)
-            {
-                var args = new CalendarPageNavigationArgs()
-                {
-                    NavigationDate = _navigationDate ?? DateTime.Now.Date
-                };
-
-                // Already on calendar. Just navigate.
-                NavigationService.Navigate(WinoPage.CalendarPage, args);
-
-                _navigationDate = null;
-            }
-            else
-            {
-                SelectedMenuItemIndex = -1;
-            }
-        }
-
-        partial void OnSelectedMenuItemIndexChanged(int oldValue, int newValue)
-        {
-            switch (newValue)
-            {
-                case -1:
-                    ForceNavigateCalendarDate();
-                    break;
-                case 0:
-                    NavigationService.Navigate(WinoPage.ManageAccountsPage);
-                    break;
-                case 1:
-                    NavigationService.Navigate(WinoPage.SettingsPage);
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        [RelayCommand]
-        private async Task Sync()
-        {
-            // Sync all calendars.
-            var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
-
-            foreach (var account in accounts)
-            {
-                var t = new NewCalendarSynchronizationRequested(new CalendarSynchronizationOptions()
-                {
-                    AccountId = account.Id,
-                    Type = CalendarSynchronizationType.CalendarMetadata
-                }, SynchronizationSource.Client);
-
-                Messenger.Send(t);
-            }
-        }
-
-        /// <summary>
-        /// When calendar type switches, we need to navigate to the most ideal date.
-        /// This method returns that date.
-        /// </summary>
-        private DateTime GetDisplayTypeSwitchDate()
-        {
-            var settings = PreferencesService.GetCurrentCalendarSettings();
-            switch (StatePersistenceService.CalendarDisplayType)
-            {
-                case CalendarDisplayType.Day:
-                    if (HighlightedDateRange.IsInRange(DateTime.Now)) return DateTime.Now.Date;
-
-                    return HighlightedDateRange.StartDate;
-                case CalendarDisplayType.Week:
-                    if (HighlightedDateRange == null || HighlightedDateRange.IsInRange(DateTime.Now))
-                    {
-                        return DateTime.Now.Date.GetWeekStartDateForDate(settings.FirstDayOfWeek);
-                    }
-
-                    return HighlightedDateRange.StartDate.GetWeekStartDateForDate(settings.FirstDayOfWeek);
-                case CalendarDisplayType.WorkWeek:
-                    break;
-                case CalendarDisplayType.Month:
-                    break;
-                case CalendarDisplayType.Year:
-                    break;
-                default:
-                    break;
-            }
-
-            return DateTime.Today.Date;
-        }
-
-        private DateTime? _navigationDate;
-        private readonly IAccountService _accountService;
-        private readonly ICalendarService _calendarService;
-
-        #region Commands
-
-        [RelayCommand]
-        private void TodayClicked()
-        {
-            _navigationDate = DateTime.Now.Date;
-
-            ForceNavigateCalendarDate();
-        }
-
-        [RelayCommand]
-        public void ManageAccounts() => NavigationService.Navigate(WinoPage.AccountManagementPage);
-
-        [RelayCommand]
-        private Task ReconnectServerAsync() => ServerConnectionManager.ConnectAsync();
-
-        [RelayCommand]
-        private void DateClicked(CalendarViewDayClickedEventArgs clickedDateArgs)
-        {
-            _navigationDate = clickedDateArgs.ClickedDate;
-
-            ForceNavigateCalendarDate();
-        }
-
-        #endregion
-
-        public void Receive(VisibleDateRangeChangedMessage message) => HighlightedDateRange = message.DateRange;
-
-        /// <summary>
-        /// Sets the header navigation items based on visible date range and calendar type.
-        /// </summary>
-        private void UpdateDateNavigationHeaderItems()
-        {
-            DateNavigationHeaderItems.Clear();
-
-            // TODO: From settings
-            var testInfo = new CultureInfo("en-US");
-
-            switch (StatePersistenceService.CalendarDisplayType)
-            {
-                case CalendarDisplayType.Day:
-                case CalendarDisplayType.Week:
-                case CalendarDisplayType.WorkWeek:
-                case CalendarDisplayType.Month:
-                    DateNavigationHeaderItems.ReplaceRange(testInfo.DateTimeFormat.MonthNames);
-                    break;
-                case CalendarDisplayType.Year:
-                    break;
-                default:
-                    break;
-            }
-
-            SetDateNavigationHeaderItems();
-        }
-
-        partial void OnHighlightedDateRangeChanged(DateRange value) => SetDateNavigationHeaderItems();
-
-        private void SetDateNavigationHeaderItems()
-        {
-            if (HighlightedDateRange == null) return;
-
-            if (DateNavigationHeaderItems.Count == 0)
-            {
-                UpdateDateNavigationHeaderItems();
-            }
-
-            // TODO: Year view
-            var monthIndex = HighlightedDateRange.GetMostVisibleMonthIndex();
-
-            SelectedDateNavigationHeaderIndex = Math.Max(monthIndex - 1, -1);
-        }
-
-        public async void Receive(CalendarEnableStatusChangedMessage message)
-            => await ExecuteUIThread(() => IsCalendarEnabled = message.IsEnabled);
-
-        public void Receive(NavigateManageAccountsRequested message) => SelectedMenuItemIndex = 1;
-
-        public void Receive(CalendarDisplayTypeChangedMessage message) => OnPropertyChanged(nameof(IsVerticalCalendar));
-
-        public async void Receive(DetailsPageStateChangedMessage message)
-        {
-            await ExecuteUIThread(() =>
-            {
-                IsEventDetailsPageActive = message.IsActivated;
-
-                // TODO: This is for Wino Mail. Generalize this later on.
-                StatePersistenceService.IsReaderNarrowed = message.IsActivated;
-                StatePersistenceService.IsReadingMail = message.IsActivated;
-            });
-        }
-    }
-}

Wino.Calendar.ViewModels/CalendarAccountSettingsPageViewModel.cs

@@ -0,0 +1,135 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Calendar;
+
+namespace Wino.Calendar.ViewModels;
+
+/// <summary>
+/// ViewModel for managing calendar account settings.
+/// </summary>
+public partial class CalendarAccountSettingsPageViewModel : CalendarBaseViewModel
+{
+    private readonly ICalendarService _calendarService;
+    private readonly IAccountService _accountService;
+    
+    [ObservableProperty]
+    public partial MailAccount Account { get; set; }
+
+    [ObservableProperty]
+    public partial AccountCalendar AccountCalendar { get; set; }
+
+    [ObservableProperty]
+    public partial string AccountColorHex { get; set; } = "#0078D4";
+
+    [ObservableProperty]
+    public partial bool IsSyncEnabled { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsPrimaryCalendar { get; set; }
+
+    public ObservableCollection<ShowAsOption> ShowAsOptions { get; } = new ObservableCollection<ShowAsOption>();
+
+    [ObservableProperty]
+    public partial ShowAsOption SelectedDefaultShowAsOption { get; set; }
+
+    public CalendarAccountSettingsPageViewModel(ICalendarService calendarService, IAccountService accountService)
+    {
+        _calendarService = calendarService;
+        _accountService = accountService;
+
+        // Initialize ShowAs options
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Free));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Tentative));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Busy));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.OutOfOffice));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.WorkingElsewhere));
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        if (parameters is AccountCalendar selectedCalendar)
+        {
+            Account = await _accountService.GetAccountAsync(selectedCalendar.AccountId);
+            AccountCalendar = await _calendarService.GetAccountCalendarAsync(selectedCalendar.Id) ?? selectedCalendar;
+        }
+        else if (parameters is Guid accountId)
+        {
+            Account = await _accountService.GetAccountAsync(accountId);
+            var calendars = await _calendarService.GetAccountCalendarsAsync(accountId);
+            AccountCalendar = calendars.FirstOrDefault(c => c.IsPrimary) ?? calendars.FirstOrDefault();
+        }
+        else
+        {
+            return;
+        }
+
+        if (Account == null || AccountCalendar == null)
+            return;
+
+        // Initialize properties from AccountCalendar
+        AccountColorHex = AccountCalendar.BackgroundColorHex ?? "#0078D4";
+        IsSyncEnabled = AccountCalendar.IsSynchronizationEnabled;
+        IsPrimaryCalendar = AccountCalendar.IsPrimary;
+        SelectedDefaultShowAsOption = ShowAsOptions.FirstOrDefault(o => o.ShowAs == AccountCalendar.DefaultShowAs) ?? ShowAsOptions[2];
+    }
+
+    partial void OnAccountColorHexChanged(string value)
+    {
+        if (AccountCalendar != null && !string.IsNullOrEmpty(value))
+        {
+            AccountCalendar.BackgroundColorHex = value;
+            SaveChangesAsync();
+        }
+    }
+
+    partial void OnIsSyncEnabledChanged(bool value)
+    {
+        if (AccountCalendar != null)
+        {
+            AccountCalendar.IsSynchronizationEnabled = value;
+            SaveChangesAsync();
+        }
+    }
+
+    partial void OnIsPrimaryCalendarChanged(bool value)
+    {
+        if (AccountCalendar != null)
+        {
+            AccountCalendar.IsPrimary = value;
+            SaveChangesAsync();
+        }
+    }
+
+    partial void OnSelectedDefaultShowAsOptionChanged(ShowAsOption value)
+    {
+        if (AccountCalendar != null && value != null)
+        {
+            AccountCalendar.DefaultShowAs = value.ShowAs;
+            SaveChangesAsync();
+        }
+    }
+
+    private async void SaveChangesAsync()
+    {
+        if (AccountCalendar == null)
+            return;
+
+        await _calendarService.UpdateAccountCalendarAsync(AccountCalendar);
+        
+        // Send message to update UI
+        Messenger.Send(new CalendarListUpdated(AccountCalendar));
+    }
+}

Wino.Calendar.ViewModels/CalendarAppShellViewModel.cs

@@ -0,0 +1,418 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Serilog;
+using Wino.Calendar.ViewModels.Data;
+using Wino.Calendar.ViewModels.Interfaces;
+using Wino.Core.Domain.Collections;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Domain.Extensions;
+using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
+using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Domain.Models.Synchronization;
+using Wino.Core.ViewModels;
+using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.Client.Navigation;
+using Wino.Messaging.Server;
+using Wino.Messaging.UI;
+
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarAppShellViewModel : CalendarBaseViewModel,
+    IRecipient<VisibleDateRangeChangedMessage>,
+    IRecipient<CalendarEnableStatusChangedMessage>,
+    IRecipient<NavigateManageAccountsRequested>,
+    IRecipient<CalendarDisplayTypeChangedMessage>,
+    IRecipient<AccountRemovedMessage>
+{
+    public IPreferencesService PreferencesService { get; }
+    public IStatePersistanceService StatePersistenceService { get; }
+    public IAccountCalendarStateService AccountCalendarStateService { get; }
+    public INavigationService NavigationService { get; }
+
+    [ObservableProperty]
+    private int _selectedMenuItemIndex = -1;
+
+    [ObservableProperty]
+    private bool isCalendarEnabled;
+
+
+
+    /// <summary>
+    /// Gets or sets the display date of the calendar.
+    /// </summary>
+    [ObservableProperty]
+    private DateTimeOffset _displayDate;
+
+    /// <summary>
+    /// Gets or sets the highlighted range in the CalendarView and displayed date range in FlipView.
+    /// </summary>
+    [ObservableProperty]
+    private DateRange highlightedDateRange;
+
+    [ObservableProperty]
+    private ObservableRangeCollection<string> dateNavigationHeaderItems = [];
+
+    [ObservableProperty]
+    private int _selectedDateNavigationHeaderIndex;
+
+    public bool IsVerticalCalendar => StatePersistenceService.CalendarDisplayType == CalendarDisplayType.Month;
+
+    // For updating account calendars asynchronously.
+    private SemaphoreSlim _accountCalendarUpdateSemaphoreSlim = new(1);
+
+    public CalendarAppShellViewModel(IPreferencesService preferencesService,
+                             IStatePersistanceService statePersistanceService,
+                             IAccountService accountService,
+                             ICalendarService calendarService,
+                             IAccountCalendarStateService accountCalendarStateService,
+                             INavigationService navigationService)
+    {
+        _accountService = accountService;
+        _calendarService = calendarService;
+
+        AccountCalendarStateService = accountCalendarStateService;
+        AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
+        AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged += AccountCalendarStateCollectivelyChanged;
+
+        NavigationService = navigationService;
+        PreferencesService = preferencesService;
+
+        StatePersistenceService = statePersistanceService;
+        StatePersistenceService.StatePropertyChanged += PrefefencesChanged;
+    }
+
+    protected override void OnDispatcherAssigned()
+    {
+        base.OnDispatcherAssigned();
+
+        AccountCalendarStateService.Dispatcher = Dispatcher;
+    }
+
+    private void PrefefencesChanged(object sender, string e)
+    {
+        if (e == nameof(StatePersistenceService.CalendarDisplayType))
+        {
+            Messenger.Send(new CalendarDisplayTypeChangedMessage(StatePersistenceService.CalendarDisplayType));
+
+            UpdateDateNavigationHeaderItems();
+
+            // Change the calendar.
+            DateClicked(new CalendarViewDayClickedEventArgs(GetDisplayTypeSwitchDate()));
+        }
+    }
+
+    public override async void OnNavigatedTo(NavigationMode mode, object parameters)
+    {
+        base.OnNavigatedTo(mode, parameters);
+
+        // Account list may have changed while this shell was inactive.
+        if (mode == NavigationMode.Back)
+        {
+            await InitializeAccountCalendarsAsync();
+            return;
+        }
+
+        UpdateDateNavigationHeaderItems();
+
+        await InitializeAccountCalendarsAsync();
+
+        TodayClicked();
+    }
+
+    private async void AccountCalendarStateCollectivelyChanged(object sender, GroupedAccountCalendarViewModel e)
+    {
+        // When using three-state checkbox, multiple accounts will be selected/unselected at the same time.
+        // Reporting all these changes one by one to the UI is not efficient and may cause problems in the future.
+
+        // Update all calendar states at once.
+        try
+        {
+            await _accountCalendarUpdateSemaphoreSlim.WaitAsync();
+
+            foreach (var calendar in e.AccountCalendars)
+            {
+                await _calendarService.UpdateAccountCalendarAsync(calendar.AccountCalendar).ConfigureAwait(false);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error while waiting for account calendar update semaphore.");
+        }
+        finally
+        {
+            _accountCalendarUpdateSemaphoreSlim.Release();
+        }
+    }
+
+    private async void UpdateAccountCalendarRequested(object sender, AccountCalendarViewModel e)
+        => await _calendarService.UpdateAccountCalendarAsync(e.AccountCalendar).ConfigureAwait(false);
+
+    private async Task InitializeAccountCalendarsAsync()
+    {
+        await Dispatcher.ExecuteOnUIThread(() => AccountCalendarStateService.ClearGroupedAccountCalendars());
+
+        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+
+        foreach (var account in accounts)
+        {
+            var accountCalendars = await _calendarService.GetAccountCalendarsAsync(account.Id).ConfigureAwait(false);
+            var calendarViewModels = new List<AccountCalendarViewModel>();
+
+            foreach (var calendar in accountCalendars)
+            {
+                var calendarViewModel = new AccountCalendarViewModel(account, calendar);
+
+                calendarViewModels.Add(calendarViewModel);
+            }
+
+            var groupedAccountCalendarViewModel = new GroupedAccountCalendarViewModel(account, calendarViewModels);
+
+            await Dispatcher.ExecuteOnUIThread(() =>
+            {
+                AccountCalendarStateService.AddGroupedAccountCalendar(groupedAccountCalendarViewModel);
+            });
+        }
+    }
+
+    private void ForceNavigateCalendarDate()
+    {
+        if (SelectedMenuItemIndex == -1)
+        {
+            var args = new CalendarPageNavigationArgs()
+            {
+                NavigationDate = _navigationDate ?? DateTime.Now.Date
+            };
+
+            // Already on calendar. Just navigate.
+            NavigationService.Navigate(WinoPage.CalendarPage, args);
+
+            _navigationDate = null;
+        }
+        else
+        {
+            SelectedMenuItemIndex = -1;
+        }
+    }
+
+    partial void OnSelectedMenuItemIndexChanged(int oldValue, int newValue)
+    {
+        switch (newValue)
+        {
+            case -1:
+                ForceNavigateCalendarDate();
+                break;
+            case 0:
+                NavigationService.Navigate(WinoPage.ManageAccountsPage);
+                break;
+            case 1:
+                NavigationService.Navigate(WinoPage.SettingsPage);
+                break;
+            default:
+                break;
+        }
+    }
+
+    [RelayCommand]
+    private async Task Sync()
+    {
+        // Sync all calendars.
+        var accounts = await _accountService.GetAccountsAsync().ConfigureAwait(false);
+
+        foreach (var account in accounts)
+        {
+            var t = new NewCalendarSynchronizationRequested(new CalendarSynchronizationOptions()
+            {
+                AccountId = account.Id,
+                Type = CalendarSynchronizationType.CalendarEvents
+            });
+
+            Messenger.Send(t);
+        }
+    }
+
+    /// <summary>
+    /// When calendar type switches, we need to navigate to the most ideal date.
+    /// This method returns that date.
+    /// </summary>
+    private DateTime GetDisplayTypeSwitchDate()
+    {
+        var settings = PreferencesService.GetCurrentCalendarSettings();
+        switch (StatePersistenceService.CalendarDisplayType)
+        {
+            case CalendarDisplayType.Day:
+                if (HighlightedDateRange.IsInRange(DateTime.Now)) return DateTime.Now.Date;
+
+                return HighlightedDateRange.StartDate;
+            case CalendarDisplayType.Week:
+                if (HighlightedDateRange == null || HighlightedDateRange.IsInRange(DateTime.Now))
+                {
+                    return DateTime.Now.Date.GetWeekStartDateForDate(settings.FirstDayOfWeek);
+                }
+
+                return HighlightedDateRange.StartDate.GetWeekStartDateForDate(settings.FirstDayOfWeek);
+            case CalendarDisplayType.WorkWeek:
+                break;
+            case CalendarDisplayType.Month:
+                break;
+            default:
+                break;
+        }
+
+        return DateTime.Today.Date;
+    }
+
+    private DateTime? _navigationDate;
+    private readonly IAccountService _accountService;
+    private readonly ICalendarService _calendarService;
+
+    #region Commands
+
+    [RelayCommand]
+    private void TodayClicked()
+    {
+        _navigationDate = DateTime.Now.Date;
+
+        ForceNavigateCalendarDate();
+    }
+
+    [RelayCommand]
+    public void ManageAccounts() => NavigationService.Navigate(WinoPage.AccountManagementPage);
+
+
+
+    [RelayCommand]
+    private void DateClicked(CalendarViewDayClickedEventArgs clickedDateArgs)
+    {
+        _navigationDate = clickedDateArgs.ClickedDate;
+
+        ForceNavigateCalendarDate();
+    }
+
+    #endregion
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        UnregisterRecipients();
+
+        Messenger.Register<VisibleDateRangeChangedMessage>(this);
+        Messenger.Register<CalendarEnableStatusChangedMessage>(this);
+        Messenger.Register<NavigateManageAccountsRequested>(this);
+        Messenger.Register<CalendarDisplayTypeChangedMessage>(this);
+        Messenger.Register<AccountRemovedMessage>(this);
+    }
+
+    protected override void UnregisterRecipients()
+    {
+        base.UnregisterRecipients();
+
+        Messenger.Unregister<VisibleDateRangeChangedMessage>(this);
+        Messenger.Unregister<CalendarEnableStatusChangedMessage>(this);
+        Messenger.Unregister<NavigateManageAccountsRequested>(this);
+        Messenger.Unregister<CalendarDisplayTypeChangedMessage>(this);
+        Messenger.Unregister<AccountRemovedMessage>(this);
+    }
+
+    public void Receive(VisibleDateRangeChangedMessage message) => HighlightedDateRange = message.DateRange;
+
+    /// <summary>
+    /// Sets the header navigation items based on visible date range and calendar type.
+    /// </summary>
+    private void UpdateDateNavigationHeaderItems()
+    {
+        var settings = PreferencesService.GetCurrentCalendarSettings();
+        var cultureInfo = settings.CultureInfo ?? CultureInfo.CurrentUICulture;
+
+        var visibleRange = HighlightedDateRange ?? new DateRange(DateTime.Today, DateTime.Today.AddDays(1));
+        var headerText = GetHeaderText(visibleRange, cultureInfo);
+
+        DateNavigationHeaderItems.ReplaceRange([headerText]);
+        SelectedDateNavigationHeaderIndex = DateNavigationHeaderItems.Count > 0 ? 0 : -1;
+    }
+
+    private string GetHeaderText(DateRange visibleRange, CultureInfo cultureInfo)
+    {
+        var startDate = visibleRange.StartDate.Date;
+        var endDate = visibleRange.EndDate.Date > startDate ? visibleRange.EndDate.Date.AddDays(-1) : startDate;
+
+        switch (StatePersistenceService.CalendarDisplayType)
+        {
+            case CalendarDisplayType.Day:
+                return startDate.ToString("MMMM d, dddd", cultureInfo);
+            case CalendarDisplayType.Week:
+            case CalendarDisplayType.WorkWeek:
+                if (startDate.Month == endDate.Month && startDate.Year == endDate.Year)
+                {
+                    return $"{startDate.ToString("MMMM d", cultureInfo)} - {endDate.ToString("%d", cultureInfo)}";
+                }
+
+                return $"{startDate.ToString("MMMM d", cultureInfo)} - {endDate.ToString("MMMM d", cultureInfo)}";
+            case CalendarDisplayType.Month:
+                return GetDominantMonthHeaderText(startDate, endDate, cultureInfo);
+            default:
+                return startDate.ToString("d", cultureInfo);
+        }
+    }
+
+    private static string GetDominantMonthHeaderText(DateTime startDate, DateTime endDate, CultureInfo cultureInfo)
+    {
+        if (endDate < startDate)
+        {
+            endDate = startDate;
+        }
+
+        var monthDayCounts = new Dictionary<(int Year, int Month), int>();
+
+        for (var day = startDate; day <= endDate; day = day.AddDays(1))
+        {
+            var key = (day.Year, day.Month);
+
+            if (monthDayCounts.TryGetValue(key, out var count))
+            {
+                monthDayCounts[key] = count + 1;
+            }
+            else
+            {
+                monthDayCounts[key] = 1;
+            }
+        }
+
+        var dominantKey = (Year: startDate.Year, Month: startDate.Month);
+        var dominantCount = -1;
+
+        foreach (var pair in monthDayCounts)
+        {
+            if (pair.Value > dominantCount)
+            {
+                dominantCount = pair.Value;
+                dominantKey = pair.Key;
+            }
+        }
+
+        return new DateTime(dominantKey.Year, dominantKey.Month, 1).ToString("Y", cultureInfo);
+    }
+
+    partial void OnHighlightedDateRangeChanged(DateRange value) => UpdateDateNavigationHeaderItems();
+
+    public async void Receive(CalendarEnableStatusChangedMessage message)
+        => await ExecuteUIThread(() => IsCalendarEnabled = message.IsEnabled);
+
+    public void Receive(NavigateManageAccountsRequested message) => SelectedMenuItemIndex = 1;
+
+    public void Receive(CalendarDisplayTypeChangedMessage message)
+    {
+        OnPropertyChanged(nameof(IsVerticalCalendar));
+        UpdateDateNavigationHeaderItems();
+    }
+
+    public async void Receive(AccountRemovedMessage message)
+        => await InitializeAccountCalendarsAsync();
+}

Wino.Calendar.ViewModels/CalendarPageViewModel.cs

@@ -8,6 +8,7 @@ using CommunityToolkit.Diagnostics;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Itenso.TimePeriod;
 using MoreLinq;
 using Serilog;
 using Wino.Calendar.ViewModels.Data;
@@ -22,17 +23,19 @@ using Wino.Core.Domain.Models.Calendar.CalendarTypeStrategies;
 using Wino.Core.Domain.Models.Navigation;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.UI;
 
-namespace Wino.Calendar.ViewModels
-{
-    public partial class CalendarPageViewModel : CalendarBaseViewModel,
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarPageViewModel : CalendarBaseViewModel,
     IRecipient<LoadCalendarMessage>,
     IRecipient<CalendarItemDeleted>,
     IRecipient<CalendarSettingsUpdatedMessage>,
     IRecipient<CalendarItemTappedMessage>,
     IRecipient<CalendarItemDoubleTappedMessage>,
-        IRecipient<CalendarItemRightTappedMessage>
-    {
+    IRecipient<CalendarItemRightTappedMessage>,
+    IRecipient<AccountRemovedMessage>
+{
     #region Quick Event Creation
 
     [ObservableProperty]
@@ -93,19 +96,15 @@ namespace Wino.Calendar.ViewModels
     #region Data Initialization
 
     [ObservableProperty]
-        private CalendarOrientation _calendarOrientation = CalendarOrientation.Horizontal;
-
+    public partial CalendarOrientation CalendarOrientation { get; set; } = CalendarOrientation.Horizontal;
     [ObservableProperty]
-        private DayRangeCollection _dayRanges = [];
-
+    public partial DayRangeCollection DayRanges { get; set; } = [];
     [ObservableProperty]
-        private int _selectedDateRangeIndex;
-
+    public partial int SelectedDateRangeIndex { get; set; }
     [ObservableProperty]
-        private DayRangeRenderModel _selectedDayRange;
-
+    public partial DayRangeRenderModel SelectedDayRange { get; set; }
     [ObservableProperty]
-        private bool _isCalendarEnabled = true;
+    public partial bool IsCalendarEnabled { get; set; } = true;
 
     #endregion
 
@@ -113,9 +112,14 @@ namespace Wino.Calendar.ViewModels
 
     public event EventHandler DetailsShowCalendarItemChanged;
 
+    public bool CanJoinOnline => DisplayDetailsCalendarItemViewModel != null &&
+                                        !string.IsNullOrEmpty(DisplayDetailsCalendarItemViewModel.CalendarItem.HtmlLink);
+
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(IsEventDetailsVisible))]
-        private CalendarItemViewModel _displayDetailsCalendarItemViewModel;
+    [NotifyCanExecuteChangedFor(nameof(JoinOnlineCommand))]
+    [NotifyPropertyChangedFor(nameof(CanJoinOnline))]
+    public partial CalendarItemViewModel DisplayDetailsCalendarItemViewModel { get; set; }
 
     public bool IsEventDetailsVisible => DisplayDetailsCalendarItemViewModel != null;
 
@@ -127,7 +131,9 @@ namespace Wino.Calendar.ViewModels
     private readonly ICalendarService _calendarService;
     private readonly INavigationService _navigationService;
     private readonly IKeyPressService _keyPressService;
+    private readonly INativeAppService _nativeAppService;
     private readonly IPreferencesService _preferencesService;
+    private readonly IWinoRequestDelegator _winoRequestDelegator;
 
     // Store latest rendered options.
     private CalendarDisplayType _currentDisplayType;
@@ -146,8 +152,10 @@ namespace Wino.Calendar.ViewModels
                                  ICalendarService calendarService,
                                  INavigationService navigationService,
                                  IKeyPressService keyPressService,
+                                 INativeAppService nativeAppService,
                                  IAccountCalendarStateService accountCalendarStateService,
-                                     IPreferencesService preferencesService)
+                                 IPreferencesService preferencesService,
+                                 IWinoRequestDelegator winoRequestDelegator)
     {
         StatePersistanceService = statePersistanceService;
         AccountCalendarStateService = accountCalendarStateService;
@@ -155,10 +163,34 @@ namespace Wino.Calendar.ViewModels
         _calendarService = calendarService;
         _navigationService = navigationService;
         _keyPressService = keyPressService;
+        _nativeAppService = nativeAppService;
         _preferencesService = preferencesService;
+        _winoRequestDelegator = winoRequestDelegator;
 
         AccountCalendarStateService.AccountCalendarSelectionStateChanged += UpdateAccountCalendarRequested;
         AccountCalendarStateService.CollectiveAccountGroupSelectionStateChanged += AccountCalendarStateCollectivelyChanged;
+
+        // We don't register on navigation here. This page is cached.
+        RegisterRecipients();
+    }
+
+    protected override void RegisterRecipients()
+    {
+        base.RegisterRecipients();
+
+        Messenger.Unregister<LoadCalendarMessage>(this);
+        Messenger.Unregister<CalendarSettingsUpdatedMessage>(this);
+        Messenger.Unregister<CalendarItemTappedMessage>(this);
+        Messenger.Unregister<CalendarItemDoubleTappedMessage>(this);
+        Messenger.Unregister<CalendarItemRightTappedMessage>(this);
+        Messenger.Unregister<AccountRemovedMessage>(this);
+
+        Messenger.Register<LoadCalendarMessage>(this);
+        Messenger.Register<CalendarSettingsUpdatedMessage>(this);
+        Messenger.Register<CalendarItemTappedMessage>(this);
+        Messenger.Register<CalendarItemDoubleTappedMessage>(this);
+        Messenger.Register<CalendarItemRightTappedMessage>(this);
+        Messenger.Register<AccountRemovedMessage>(this);
     }
 
     private void AccountCalendarStateCollectivelyChanged(object sender, GroupedAccountCalendarViewModel e)
@@ -179,6 +211,14 @@ namespace Wino.Calendar.ViewModels
         });
     }
 
+    [RelayCommand(CanExecute = nameof(CanJoinOnline))]
+    private async Task JoinOnlineAsync()
+    {
+        if (DisplayDetailsCalendarItemViewModel == null || string.IsNullOrEmpty(DisplayDetailsCalendarItemViewModel.CalendarItem.HtmlLink)) return;
+
+        await _nativeAppService.LaunchUriAsync(new Uri(DisplayDetailsCalendarItemViewModel.CalendarItem.HtmlLink));
+    }
+
     // TODO: Replace when calendar settings are updated.
     // Should be a field ideally.
     private BaseCalendarTypeDrawingStrategy GetDrawingStrategy(CalendarDisplayType displayType)
@@ -192,20 +232,12 @@ namespace Wino.Calendar.ViewModels
         };
     }
 
-        public override void OnNavigatedFrom(NavigationMode mode, object parameters)
-        {
-            // Do not call base method because that will unregister messenger recipient.
-            // This is a singleton view model and should not be unregistered.
-        }
-
     public override void OnNavigatedTo(NavigationMode mode, object parameters)
     {
-            base.OnNavigatedTo(mode, parameters);
+        RefreshSettings();
 
         if (mode == NavigationMode.Back) return;
 
-            RefreshSettings();
-
         // Automatically select the first primary calendar for quick event dialog.
         SelectedQuickEventAccountCalendar = AccountCalendarStateService.ActiveCalendars.FirstOrDefault(a => a.IsPrimary);
     }
@@ -235,24 +267,48 @@ namespace Wino.Calendar.ViewModels
     [RelayCommand(AllowConcurrentExecutions = false, CanExecute = nameof(CanSaveQuickEvent))]
     private async Task SaveQuickEventAsync()
     {
-            var durationSeconds = (QuickEventEndTime - QuickEventStartTime).TotalSeconds;
-
-            var testCalendarItem = new CalendarItem
+        try
         {
+            var startDate = IsAllDay ? SelectedQuickEventDate.Value.Date : QuickEventStartTime;
+            var endDate = IsAllDay ? SelectedQuickEventDate.Value.Date.AddDays(1) : QuickEventEndTime;
+            var durationSeconds = (endDate - startDate).TotalSeconds;
+
+            // Get the user's current timezone from the system
+            var currentTimeZone = TimeZoneInfo.Local.Id;
+
+            var calendarItem = new CalendarItem
+            {
+                Id = Guid.NewGuid(),
                 CalendarId = SelectedQuickEventAccountCalendar.Id,
-                StartDate = QuickEventStartTime,
+                StartDate = startDate,
                 DurationInSeconds = durationSeconds,
+                StartTimeZone = currentTimeZone,
+                EndTimeZone = currentTimeZone,
                 CreatedAt = DateTime.UtcNow,
                 Description = string.Empty,
-                Location = Location,
+                Location = Location ?? string.Empty,
                 Title = EventName,
-                Id = Guid.NewGuid()
+                ShowAs = SelectedQuickEventAccountCalendar.DefaultShowAs,
+                IsHidden = false,
+                AssignedCalendar = SelectedQuickEventAccountCalendar
             };
 
+            // Close dialog first
             IsQuickEventDialogOpen = false;
-            await _calendarService.CreateNewCalendarItemAsync(testCalendarItem, null);
 
-            // TODO: Create the request with the synchronizer.
+            // Save to local database first
+            // await _calendarService.CreateNewCalendarItemAsync(calendarItem, null);
+
+            // Queue the request via delegator
+            var preparationRequest = new CalendarOperationPreparationRequest(CalendarSynchronizerOperation.CreateEvent, calendarItem, null);
+            await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Error creating quick event");
+            // Re-open dialog if there was an error
+            IsQuickEventDialogOpen = true;
+        }
     }
 
     [RelayCommand]
@@ -590,31 +646,6 @@ namespace Wino.Calendar.ViewModels
         }
     }
 
-        protected override async void OnCalendarItemAdded(CalendarItem calendarItem)
-        {
-            base.OnCalendarItemAdded(calendarItem);
-
-            // Check if event falls into the current date range.
-
-
-            if (DayRanges.DisplayRange == null) return;
-
-            // Check whether this event falls into any of the loaded date ranges.
-            var allDaysForEvent = DayRanges.SelectMany(a => a.CalendarDays).Where(a => a.Period.OverlapsWith(calendarItem.Period));
-
-            foreach (var calendarDay in allDaysForEvent)
-            {
-                var calendarItemViewModel = new CalendarItemViewModel(calendarItem);
-
-                await ExecuteUIThread(() =>
-                {
-                    calendarDay.EventsCollection.AddCalendarItem(calendarItemViewModel);
-                });
-            }
-
-            FilterActiveCalendars(DayRanges);
-        }
-
     private async Task InitializeCalendarEventsForDayRangeAsync(DayRangeRenderModel dayRangeRenderModel)
     {
         // Clear all events first for all days.
@@ -628,14 +659,13 @@ namespace Wino.Calendar.ViewModels
 
         // Initialization is done for all calendars, regardless whether they are actively selected or not.
         // This is because the filtering is cached internally of the calendar items in CalendarEventCollection.
-            var allCalendars = AccountCalendarStateService.GroupedAccountCalendars.SelectMany(a => a.AccountCalendars);
 
-            foreach (var calendarViewModel in allCalendars)
+        foreach (var calendarViewModel in AccountCalendarStateService.AllCalendars)
         {
             // Check all the events for the given date range and calendar.
             // Then find the day representation for all the events returned, and add to the collection.
 
-                var events = await _calendarService.GetCalendarEventsAsync(calendarViewModel, dayRangeRenderModel).ConfigureAwait(false);
+            var events = await _calendarService.GetCalendarEventsAsync(calendarViewModel, dayRangeRenderModel.Period).ConfigureAwait(false);
 
             foreach (var @event in events)
             {
@@ -654,6 +684,34 @@ namespace Wino.Calendar.ViewModels
         }
     }
 
+    private async Task RefreshVisibleRangesAsync()
+    {
+        try
+        {
+            await _calendarLoadingSemaphore.WaitAsync().ConfigureAwait(false);
+
+            if (DayRanges == null || DayRanges.Count == 0)
+                return;
+
+            RefreshSettings();
+
+            foreach (var dayRange in DayRanges)
+            {
+                await InitializeCalendarEventsForDayRangeAsync(dayRange).ConfigureAwait(false);
+            }
+
+            FilterActiveCalendars(DayRanges);
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to refresh calendar ranges after navigation back.");
+        }
+        finally
+        {
+            _calendarLoadingSemaphore.Release();
+        }
+    }
+
     private async Task TryConsolidateItemsAsync()
     {
         // Check if trimming is necessary
@@ -711,7 +769,7 @@ namespace Wino.Calendar.ViewModels
         }
     }
 
-        partial void OnSelectedStartTimeStringChanged(string newValue)
+    partial void OnSelectedStartTimeStringChanged(string oldValue, string newValue)
     {
         var parsedTime = CurrentSettings.GetTimeSpan(newValue);
 
@@ -725,7 +783,7 @@ namespace Wino.Calendar.ViewModels
         }
     }
 
-        partial void OnSelectedEndTimeStringChanged(string newValue)
+    partial void OnSelectedEndTimeStringChanged(string oldValue, string newValue)
     {
         var parsedTime = CurrentSettings.GetTimeSpan(newValue);
 
@@ -796,15 +854,10 @@ namespace Wino.Calendar.ViewModels
 
     private IEnumerable<CalendarItemViewModel> GetCalendarItems(CalendarItemViewModel calendarItemViewModel, CalendarDayModel selectedDay)
     {
-            // All-day and multi-day events are selected collectively.
-            // Recurring events must be selected as a single instance.
-            // We need to find the day that the event is in, and then select the event.
+        // Multi-day events, all-day events, and recurring events are rendered across multiple days.
+        // We need to find all instances with the same ID across all visible date ranges.
 
-            if (!calendarItemViewModel.IsRecurringEvent)
-            {
-                return [calendarItemViewModel];
-            }
-            else
+        if (calendarItemViewModel.IsRecurringEvent || calendarItemViewModel.IsMultiDayEvent)
         {
             return DayRanges
                 .SelectMany(a => a.CalendarDays)
@@ -813,6 +866,11 @@ namespace Wino.Calendar.ViewModels
                 .Cast<CalendarItemViewModel>()
                 .Distinct();
         }
+        else
+        {
+            // Single-day, non-recurring events only appear once
+            return [calendarItemViewModel];
+        }
     }
 
     private void UnselectCalendarItem(CalendarItemViewModel calendarItemViewModel, CalendarDayModel calendarDay = null)
@@ -839,6 +897,71 @@ namespace Wino.Calendar.ViewModels
         }
     }
 
+    private void UpdateCalendarItemBusyState(Guid calendarItemId, bool isBusy)
+    {
+        var calendarItems = DayRanges
+            .SelectMany(a => a.CalendarDays)
+            .Select(b => b.EventsCollection.GetCalendarItem(calendarItemId))
+            .Where(c => c != null)
+            .OfType<CalendarItemViewModel>()
+            .Distinct();
+
+        foreach (var item in calendarItems)
+        {
+            item.IsBusy = isBusy;
+        }
+    }
+
+    private CalendarItemViewModel FindPendingBusyMatchByRemoteEventId(CalendarItem syncedItem)
+    {
+        if (syncedItem == null ||
+            string.IsNullOrWhiteSpace(syncedItem.RemoteEventId) ||
+            !TryExtractClientItemIdFromRemoteEventId(syncedItem.RemoteEventId, out var clientItemId))
+        {
+            return null;
+        }
+
+        return DayRanges
+            .SelectMany(a => a.CalendarDays)
+            .SelectMany(b => b.EventsCollection.RegularEvents.Concat(b.EventsCollection.AllDayEvents))
+            .OfType<CalendarItemViewModel>()
+            .FirstOrDefault(vm => vm.IsBusy &&
+                                  vm.Id == clientItemId &&
+                                  vm.AssignedCalendar?.Id == syncedItem.CalendarId);
+    }
+
+    private static bool TryExtractClientItemIdFromRemoteEventId(string remoteEventId, out Guid clientItemId)
+    {
+        clientItemId = Guid.Empty;
+
+        if (string.IsNullOrWhiteSpace(remoteEventId))
+            return false;
+
+        var uid = remoteEventId.Split(new[] { "::" }, StringSplitOptions.None)[0];
+        const string calDavPrefix = "caldav-";
+
+        if (!uid.StartsWith(calDavPrefix, StringComparison.OrdinalIgnoreCase))
+            return false;
+
+        var guidPart = uid[calDavPrefix.Length..];
+        return Guid.TryParseExact(guidPart, "N", out clientItemId) || Guid.TryParse(guidPart, out clientItemId);
+    }
+
+    private void RemoveCalendarItemEverywhere(Guid calendarItemId)
+    {
+        foreach (var dayRange in DayRanges)
+        {
+            foreach (var calendarDay in dayRange.CalendarDays)
+            {
+                var existingItem = calendarDay.EventsCollection.GetCalendarItem(calendarItemId);
+                if (existingItem != null)
+                {
+                    calendarDay.EventsCollection.RemoveCalendarItem(existingItem);
+                }
+            }
+        }
+    }
+
     public void Receive(CalendarItemTappedMessage message)
     {
         if (message.CalendarItemViewModel == null) return;
@@ -848,24 +971,245 @@ namespace Wino.Calendar.ViewModels
 
     public void Receive(CalendarItemDoubleTappedMessage message) => NavigateEvent(message.CalendarItemViewModel, CalendarEventTargetType.Single);
 
-        public void Receive(CalendarItemRightTappedMessage message)
-        {
+    public void Receive(CalendarItemRightTappedMessage message) { }
 
-        }
-
-        public async void Receive(CalendarItemDeleted message)
+    public async void Receive(AccountRemovedMessage message)
     {
-            // Each deleted recurrence will report for it's own.
+        var removedAccountId = message.Account.Id;
 
         await ExecuteUIThread(() =>
         {
-                var deletedItem = message.CalendarItem;
+            foreach (var dayRange in DayRanges)
+            {
+                foreach (var calendarDay in dayRange.CalendarDays)
+                {
+                    calendarDay.EventsCollection.RemoveCalendarItems(item => item.AssignedCalendar?.AccountId == removedAccountId);
+                }
+            }
 
-                // Event might be spreaded into multiple days.
-                // Remove from all.
+            if (DisplayDetailsCalendarItemViewModel?.AssignedCalendar?.AccountId == removedAccountId)
+            {
+                DisplayDetailsCalendarItemViewModel = null;
+            }
 
-                // var calendarItems = GetCalendarItems(deletedItem.Id);
+            SelectedQuickEventAccountCalendar = AccountCalendarStateService.ActiveCalendars.FirstOrDefault(a => a.IsPrimary);
+        });
+    }
+
+    protected override async void OnCalendarItemDeleted(CalendarItem calendarItem)
+    {
+        base.OnCalendarItemDeleted(calendarItem);
+
+        Debug.WriteLine($"Calendar item deleted: {calendarItem.Id}");
+
+        // Check if the deleted item (or its series master) is currently displayed in details view.
+        var isDeletedDetailsItem = DisplayDetailsCalendarItemViewModel?.Id == calendarItem.Id;
+        var isDeletedSeriesMasterOfDetailsItem = DisplayDetailsCalendarItemViewModel?.CalendarItem?.RecurringCalendarItemId == calendarItem.Id;
+
+        if (isDeletedDetailsItem || isDeletedSeriesMasterOfDetailsItem)
+        {
+            // Clear the details view since this item was deleted
+            DisplayDetailsCalendarItemViewModel = null;
+        }
+
+        // Remove the event and its occurrences from all visible date ranges.
+        await ExecuteUIThread(() =>
+        {
+            foreach (var dayRange in DayRanges)
+            {
+                foreach (var calendarDay in dayRange.CalendarDays)
+                {
+                    calendarDay.EventsCollection.RemoveCalendarItems(item =>
+                        item.Id == calendarItem.Id ||
+                        (item is CalendarItemViewModel vm && vm.CalendarItem.RecurringCalendarItemId == calendarItem.Id));
+                }
+            }
+        });
+    }
+
+    protected override async void OnCalendarItemUpdated(CalendarItem calendarItem, CalendarItemUpdateSource source)
+    {
+        base.OnCalendarItemUpdated(calendarItem, source);
+        Debug.WriteLine($"Calendar item updated: {calendarItem.Id}");
+
+        // Local-only calendar operations are persisted immediately without real network I/O.
+        // Ignore optimistic client updates to prevent applying the same mutation twice.
+        var isLocalCalendarUpdate = string.IsNullOrWhiteSpace(calendarItem.RemoteEventId) ||
+                                    calendarItem.RemoteEventId.StartsWith("local-", StringComparison.OrdinalIgnoreCase);
+        if (isLocalCalendarUpdate && source == CalendarItemUpdateSource.ClientUpdated)
+        {
+            return;
+        }
+
+        // Series master events should not be visible on the UI.
+        if (calendarItem.IsRecurringParent)
+        {
+            Debug.WriteLine($"Skipping series master event update: {calendarItem.Title}");
+            return;
+        }
+
+        if (DayRanges.DisplayRange == null) return;
+
+        // Find all days that currently have this item and days that should have it after update
+        var currentDaysWithItem = DayRanges
+            .SelectMany(a => a.CalendarDays)
+            .Where(day => day.EventsCollection.GetCalendarItem(calendarItem.Id) != null)
+            .ToList();
+
+        var targetDaysForItem = DayRanges
+            .SelectMany(a => a.CalendarDays)
+            .Where(a => a.Period.OverlapsWith(calendarItem.Period))
+            .ToList();
+
+        await ExecuteUIThread(() =>
+        {
+            if (source == CalendarItemUpdateSource.ClientUpdated)
+            {
+                UpdateCalendarItemBusyState(calendarItem.Id, true);
+            }
+            else if (source == CalendarItemUpdateSource.ClientReverted || source == CalendarItemUpdateSource.Server)
+            {
+                UpdateCalendarItemBusyState(calendarItem.Id, false);
+            }
+
+            // Update existing items in-place where the item should remain
+            foreach (var calendarDay in currentDaysWithItem)
+            {
+                if (targetDaysForItem.Contains(calendarDay))
+                {
+                    // Item should stay in this day - update in-place
+                    calendarDay.EventsCollection.UpdateCalendarItem(calendarItem);
+
+                    if (source == CalendarItemUpdateSource.Server)
+                    {
+                        var existingViewModel = calendarDay.EventsCollection.GetCalendarItem(calendarItem.Id) as CalendarItemViewModel;
+                        if (existingViewModel != null)
+                        {
+                            existingViewModel.IsBusy = false;
+                        }
+                    }
+                }
+                else
+                {
+                    // Item should no longer be in this day (time changed) - remove it
+                    var existingItem = calendarDay.EventsCollection.GetCalendarItem(calendarItem.Id);
+                    if (existingItem != null)
+                    {
+                        calendarDay.EventsCollection.RemoveCalendarItem(existingItem);
+                    }
+                }
+            }
+
+            // Add to new days where the item wasn't present before
+            foreach (var calendarDay in targetDaysForItem)
+            {
+                if (!currentDaysWithItem.Contains(calendarDay))
+                {
+                    var calendarItemViewModel = new CalendarItemViewModel(calendarItem);
+                    calendarDay.EventsCollection.AddCalendarItem(calendarItemViewModel);
+                }
+            }
+        });
+
+        FilterActiveCalendars(DayRanges);
+    }
+
+    protected override async void OnCalendarItemAdded(CalendarItem calendarItem)
+    {
+        base.OnCalendarItemAdded(calendarItem);
+        Debug.WriteLine($"Calendar item added: {calendarItem.Id}");
+
+        // Series master events should not be visible on the UI.
+        // Their instances are already expanded and synced individually.
+        // For revert scenarios, restore visible child instances from local storage.
+        if (calendarItem.IsRecurringParent)
+        {
+            Debug.WriteLine($"Skipping series master event: {calendarItem.Title}");
+            await RestoreVisibleRecurringSeriesInstancesAsync(calendarItem);
+            return;
+        }
+
+        // Check if event falls into the current date range.
+        if (DayRanges.DisplayRange == null) return;
+
+        // If this is server data, reconcile against optimistic client-side items first.
+        // This prevents duplicate rendering when a pending busy item is replaced by the synced one.
+        if (!string.IsNullOrEmpty(calendarItem.RemoteEventId))
+        {
+            var pendingMatch = FindPendingBusyMatchByRemoteEventId(calendarItem);
+
+            if (pendingMatch != null)
+            {
+                Debug.WriteLine($"Mapped pending busy item {pendingMatch.Id} with synced server event {calendarItem.Id}.");
+
+                await ExecuteUIThread(() =>
+                {
+                    RemoveCalendarItemEverywhere(pendingMatch.Id);
                 });
             }
         }
+
+        // Get all periods from the visible day ranges
+        // Note: Recurring event occurrences are now synced from server as individual instances
+        // No local expansion needed - just check if this item overlaps with visible periods
+        var allDaysForEvent = DayRanges
+            .SelectMany(a => a.CalendarDays)
+            .Where(a => a.Period.OverlapsWith(calendarItem.Period));
+
+        foreach (var calendarDay in allDaysForEvent)
+        {
+            var calendarItemViewModel = new CalendarItemViewModel(calendarItem)
+            {
+                IsBusy = string.IsNullOrEmpty(calendarItem.RemoteEventId)
+            };
+
+            await ExecuteUIThread(() =>
+            {
+                calendarDay.EventsCollection.AddCalendarItem(calendarItemViewModel);
+            });
+        }
+
+        FilterActiveCalendars(DayRanges);
+    }
+
+    private async Task RestoreVisibleRecurringSeriesInstancesAsync(CalendarItem recurringParent)
+    {
+        if (DayRanges.DisplayRange == null || recurringParent?.AssignedCalendar == null)
+            return;
+
+        var visibleRange = new TimeRange(DayRanges.DisplayRange.StartDate, DayRanges.DisplayRange.EndDate);
+        var visibleItems = await _calendarService.GetCalendarEventsAsync(recurringParent.AssignedCalendar, visibleRange).ConfigureAwait(false);
+
+        var recurringChildren = visibleItems
+            .Where(item => item.RecurringCalendarItemId == recurringParent.Id && !item.IsHidden && !item.IsRecurringParent)
+            .ToList();
+
+        if (!recurringChildren.Any())
+            return;
+
+        await ExecuteUIThread(() =>
+        {
+            foreach (var child in recurringChildren)
+            {
+                child.AssignedCalendar ??= recurringParent.AssignedCalendar;
+
+                var targetDays = DayRanges
+                    .SelectMany(a => a.CalendarDays)
+                    .Where(day => day.Period.OverlapsWith(child.Period));
+
+                foreach (var day in targetDays)
+                {
+                    if (day.EventsCollection.GetCalendarItem(child.Id) != null)
+                        continue;
+
+                    day.EventsCollection.AddCalendarItem(new CalendarItemViewModel(child)
+                    {
+                        IsBusy = string.IsNullOrEmpty(child.RemoteEventId)
+                    });
+                }
+            }
+        });
+
+        FilterActiveCalendars(DayRanges);
+    }
 }

Wino.Calendar.ViewModels/CalendarSettingsPageViewModel.cs

@@ -1,48 +1,68 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Globalization;
+using System.Linq;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Translations;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
+using Wino.Messaging.Client.Navigation;
 
-namespace Wino.Calendar.ViewModels
+namespace Wino.Calendar.ViewModels;
+
+public partial class CalendarSettingsPageViewModel : CalendarBaseViewModel
 {
-    public partial class CalendarSettingsPageViewModel : CalendarBaseViewModel
-    {
     [ObservableProperty]
-        private double _cellHourHeight;
+    public partial double CellHourHeight { get; set; }
 
     [ObservableProperty]
-        private int _selectedFirstDayOfWeekIndex;
+    public partial int SelectedFirstDayOfWeekIndex { get; set; }
 
     [ObservableProperty]
-        private bool _is24HourHeaders;
+    public partial bool Is24HourHeaders { get; set; }
 
     [ObservableProperty]
-        private TimeSpan _workingHourStart;
+    public partial TimeSpan WorkingHourStart { get; set; }
 
     [ObservableProperty]
-        private TimeSpan _workingHourEnd;
+    public partial TimeSpan WorkingHourEnd { get; set; }
 
     [ObservableProperty]
-        private List<string> _dayNames = [];
+    public partial List<string> DayNames { get; set; } = [];
 
     [ObservableProperty]
-        private int _workingDayStartIndex;
+    public partial int WorkingDayStartIndex { get; set; }
 
     [ObservableProperty]
-        private int _workingDayEndIndex;
+    public partial int WorkingDayEndIndex { get; set; }
+
+    [ObservableProperty]
+    public partial List<string> ReminderOptions { get; set; } = [];
+
+    [ObservableProperty]
+    public partial int SelectedDefaultReminderIndex { get; set; }
 
     public IPreferencesService PreferencesService { get; }
+    private readonly ICalendarService _calendarService;
+    private readonly IAccountService _accountService;
+
+    public ObservableCollection<MailAccount> Accounts { get; } = new ObservableCollection<MailAccount>();
 
     private readonly bool _isLoaded = false;
 
-        public CalendarSettingsPageViewModel(IPreferencesService preferencesService)
+    public CalendarSettingsPageViewModel(IPreferencesService preferencesService, ICalendarService calendarService, IAccountService accountService)
     {
         PreferencesService = preferencesService;
+        _calendarService = calendarService;
+        _accountService = accountService;
 
         var currentLanguageLanguageCode = WinoTranslationDictionary.GetLanguageFileNameRelativePath(preferencesService.CurrentLanguage);
 
@@ -51,21 +71,72 @@ namespace Wino.Calendar.ViewModels
         // Populate the day names list
         for (var i = 0; i < 7; i++)
         {
-                _dayNames.Add(cultureInfo.DateTimeFormat.DayNames[i]);
+            DayNames.Add(cultureInfo.DateTimeFormat.DayNames[i]);
         }
 
         var cultureFirstDayName = cultureInfo.DateTimeFormat.GetDayName(preferencesService.FirstDayOfWeek);
+        SelectedFirstDayOfWeekIndex = DayNames.IndexOf(cultureFirstDayName);
+        Is24HourHeaders = preferencesService.Prefer24HourTimeFormat;
+        WorkingHourStart = preferencesService.WorkingHourStart;
+        WorkingHourEnd = preferencesService.WorkingHourEnd;
+        CellHourHeight = preferencesService.HourHeight;
+        WorkingDayStartIndex = DayNames.IndexOf(cultureInfo.DateTimeFormat.GetDayName(preferencesService.WorkingDayStart));
+        WorkingDayEndIndex = DayNames.IndexOf(cultureInfo.DateTimeFormat.GetDayName(preferencesService.WorkingDayEnd));
 
-            _selectedFirstDayOfWeekIndex = _dayNames.IndexOf(cultureFirstDayName);
-            _is24HourHeaders = preferencesService.Prefer24HourTimeFormat;
-            _workingHourStart = preferencesService.WorkingHourStart;
-            _workingHourEnd = preferencesService.WorkingHourEnd;
-            _cellHourHeight = preferencesService.HourHeight;
+        // Initialize reminder options
+        var predefinedMinutes = _calendarService.GetPredefinedReminderMinutes();
+        ReminderOptions.Add("None");
+        foreach (var minutes in predefinedMinutes)
+        {
+            var displayText = minutes switch
+            {
+                >= 60 => $"{minutes / 60} Hour{(minutes / 60 > 1 ? "s" : "")}",
+                _ => $"{minutes} Minute{(minutes > 1 ? "s" : "")}"
+            };
+            ReminderOptions.Add(displayText);
+        }
 
-            _workingDayStartIndex = _dayNames.IndexOf(cultureInfo.DateTimeFormat.GetDayName(preferencesService.WorkingDayStart));
-            _workingDayEndIndex = _dayNames.IndexOf(cultureInfo.DateTimeFormat.GetDayName(preferencesService.WorkingDayEnd));
+        // Set selected index based on current default reminder setting
+        if (preferencesService.DefaultReminderDurationInSeconds == 0)
+        {
+            SelectedDefaultReminderIndex = 0; // None
+        }
+        else
+        {
+            var minutes = (int)(preferencesService.DefaultReminderDurationInSeconds / 60);
+            var index = Array.IndexOf(predefinedMinutes, minutes);
+            SelectedDefaultReminderIndex = index >= 0 ? index + 1 : 0;
+        }
 
         _isLoaded = true;
+
+        // Load accounts with calendar support
+        LoadAccountsAsync();
+    }
+
+    private async void LoadAccountsAsync()
+    {
+        var accounts = await _accountService.GetAccountsAsync();
+        
+        await Dispatcher.ExecuteOnUIThread(() =>
+        {
+            Accounts.Clear();
+            foreach (var account in accounts)
+            {
+                Accounts.Add(account);
+            }
+        });
+    }
+
+    [RelayCommand]
+    private void NavigateToAccountSettings(MailAccount account)
+    {
+        if (account == null) return;
+        
+        Messenger.Send(new BreadcrumbNavigationRequested(
+            string.Format(Translator.CalendarAccountSettings_Description, account.Name),
+            WinoPage.CalendarAccountSettingsPage,
+            account.Id));
     }
 
     partial void OnCellHourHeightChanged(double oldValue, double newValue) => SaveSettings();
@@ -75,6 +146,7 @@ namespace Wino.Calendar.ViewModels
     partial void OnWorkingHourEndChanged(TimeSpan value) => SaveSettings();
     partial void OnWorkingDayStartIndexChanged(int value) => SaveSettings();
     partial void OnWorkingDayEndIndexChanged(int value) => SaveSettings();
+    partial void OnSelectedDefaultReminderIndexChanged(int value) => SaveSettings();
 
     public void SaveSettings()
     {
@@ -121,7 +193,18 @@ namespace Wino.Calendar.ViewModels
         PreferencesService.WorkingHourEnd = WorkingHourEnd;
         PreferencesService.HourHeight = CellHourHeight;
 
+        // Save default reminder setting
+        if (SelectedDefaultReminderIndex == 0)
+        {
+            PreferencesService.DefaultReminderDurationInSeconds = 0; // None
+        }
+        else
+        {
+            var predefinedMinutes = _calendarService.GetPredefinedReminderMinutes();
+            var minutes = predefinedMinutes[SelectedDefaultReminderIndex - 1];
+            PreferencesService.DefaultReminderDurationInSeconds = minutes * 60;
+        }
+
         Messenger.Send(new CalendarSettingsUpdatedMessage());
     }
-    }
 }

Wino.Calendar.ViewModels/CalendarViewModelContainerSetup.cs

@@ -1,13 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Wino.Core;
-
-namespace Wino.Calendar.ViewModels
-{
-    public static class CalendarViewModelContainerSetup
-    {
-        public static void RegisterCalendarViewModelServices(this IServiceCollection services)
-        {
-            services.RegisterCoreServices();
-        }
-    }
-}

Wino.Calendar.ViewModels/Data/AccountCalendarViewModel.cs

@@ -2,12 +2,13 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Calendar.ViewModels.Data
+namespace Wino.Calendar.ViewModels.Data;
+
+public partial class AccountCalendarViewModel : ObservableObject, IAccountCalendar
 {
-    public partial class AccountCalendarViewModel : ObservableObject, IAccountCalendar
-    {
     public MailAccount Account { get; }
     public AccountCalendar AccountCalendar { get; }
 
@@ -54,6 +55,12 @@ namespace Wino.Calendar.ViewModels.Data
         set => SetProperty(AccountCalendar.IsPrimary, value, AccountCalendar, (u, i) => u.IsPrimary = i);
     }
 
+    public bool IsSynchronizationEnabled
+    {
+        get => AccountCalendar.IsSynchronizationEnabled;
+        set => SetProperty(AccountCalendar.IsSynchronizationEnabled, value, AccountCalendar, (u, i) => u.IsSynchronizationEnabled = i);
+    }
+
     public Guid AccountId
     {
         get => AccountCalendar.AccountId;
@@ -65,6 +72,12 @@ namespace Wino.Calendar.ViewModels.Data
         get => AccountCalendar.RemoteCalendarId;
         set => SetProperty(AccountCalendar.RemoteCalendarId, value, AccountCalendar, (u, r) => u.RemoteCalendarId = r);
     }
-        public Guid Id { get => ((IAccountCalendar)AccountCalendar).Id; set => ((IAccountCalendar)AccountCalendar).Id = value; }
+
+    public CalendarItemShowAs DefaultShowAs
+    {
+        get => AccountCalendar.DefaultShowAs;
+        set => SetProperty(AccountCalendar.DefaultShowAs, value, AccountCalendar, (u, s) => u.DefaultShowAs = s);
     }
+    public Guid Id { get => ((IAccountCalendar)AccountCalendar).Id; set => ((IAccountCalendar)AccountCalendar).Id = value; }
+    public MailAccount MailAccount { get => MailAccount; set => MailAccount = value; }
 }

Wino.Calendar.ViewModels/Data/CalendarAttachmentViewModel.cs

@@ -0,0 +1,71 @@
+using System;
+using System.IO;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Enums;
+using Wino.Core.Extensions;
+
+namespace Wino.Calendar.ViewModels.Data;
+
+public partial class CalendarAttachmentViewModel : ObservableObject
+{
+    public CalendarAttachment Attachment { get; }
+
+    public Guid Id => Attachment.Id;
+    public string FileName => Attachment.FileName;
+    public string ReadableSize { get; }
+    public MailAttachmentType AttachmentType { get; }
+    public bool IsDownloaded => Attachment.IsDownloaded;
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    public CalendarAttachmentViewModel(CalendarAttachment attachment)
+    {
+        Attachment = attachment;
+        ReadableSize = attachment.Size.GetBytesReadable();
+
+        var extension = Path.GetExtension(FileName);
+        AttachmentType = GetAttachmentType(extension);
+    }
+
+    private MailAttachmentType GetAttachmentType(string extension)
+    {
+        if (string.IsNullOrEmpty(extension))
+            return MailAttachmentType.None;
+
+        switch (extension.ToLower())
+        {
+            case ".exe":
+                return MailAttachmentType.Executable;
+            case ".rar":
+                return MailAttachmentType.RarArchive;
+            case ".zip":
+                return MailAttachmentType.Archive;
+            case ".ogg":
+            case ".mp3":
+            case ".wav":
+            case ".aac":
+            case ".alac":
+                return MailAttachmentType.Audio;
+            case ".mp4":
+            case ".wmv":
+            case ".avi":
+            case ".flv":
+                return MailAttachmentType.Video;
+            case ".pdf":
+                return MailAttachmentType.PDF;
+            case ".htm":
+            case ".html":
+                return MailAttachmentType.HTML;
+            case ".png":
+            case ".jpg":
+            case ".jpeg":
+            case ".gif":
+            case ".jiff":
+                return MailAttachmentType.Image;
+            default:
+                return MailAttachmentType.Other;
+        }
+    }
+}

Wino.Calendar.ViewModels/Data/CalendarItemViewModel.cs

@@ -2,13 +2,16 @@
 using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Itenso.TimePeriod;
+using Wino.Core.Domain;
 using Wino.Core.Domain.Entities.Calendar;
+using Wino.Core.Domain.Extensions;
 using Wino.Core.Domain.Interfaces;
+using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Calendar.ViewModels.Data
+namespace Wino.Calendar.ViewModels.Data;
+
+public partial class CalendarItemViewModel : ObservableObject, ICalendarItem, ICalendarItemViewModel
 {
-    public partial class CalendarItemViewModel : ObservableObject, ICalendarItem, ICalendarItemViewModel
-    {
     public CalendarItem CalendarItem { get; }
 
     public string Title => CalendarItem.Title;
@@ -17,13 +20,50 @@ namespace Wino.Calendar.ViewModels.Data
 
     public IAccountCalendar AssignedCalendar => CalendarItem.AssignedCalendar;
 
-        public DateTime StartDate { get => CalendarItem.StartDate; set => CalendarItem.StartDate = value; }
+    /// <summary>
+    /// Gets or sets the start date converted to user's local timezone for display.
+    /// The underlying CalendarItem stores dates according to their timezone.
+    /// </summary>
+    public DateTime StartDate
+    {
+        get
+        {
+            // Get start date in user's local timezone
+            return CalendarItem.LocalStartDate;
+        }
+        set
+        {
+            // When setting from UI (in local time), convert to event's timezone for storage.
+            CalendarItem.StartDate = value.ToTimeZoneFromLocal(CalendarItem.StartTimeZone);
+        }
+    }
 
-        public DateTime EndDate => CalendarItem.EndDate;
+    /// <summary>
+    /// Gets the end date converted to user's local timezone for display.
+    /// The underlying CalendarItem stores dates according to their timezone.
+    /// </summary>
+    public DateTime EndDate
+    {
+        get
+        {
+            // Get end date in user's local timezone
+            return CalendarItem.LocalEndDate;
+        }
+    }
 
     public double DurationInSeconds { get => CalendarItem.DurationInSeconds; set => CalendarItem.DurationInSeconds = value; }
 
-        public ITimePeriod Period => CalendarItem.Period;
+    /// <summary>
+    /// Gets the time period in local time.
+    /// </summary>
+    public ITimePeriod Period
+    {
+        get
+        {
+            // Return a period using local times for UI display
+            return new TimeRange(StartDate, EndDate);
+        }
+    }
 
     public bool IsAllDayEvent => CalendarItem.IsAllDayEvent;
     public bool IsMultiDayEvent => CalendarItem.IsMultiDayEvent;
@@ -32,7 +72,39 @@ namespace Wino.Calendar.ViewModels.Data
     public bool IsRecurringParent => CalendarItem.IsRecurringParent;
 
     [ObservableProperty]
-        private bool _isSelected;
+    public partial bool IsSelected { get; set; }
+
+    [ObservableProperty]
+    public partial bool IsBusy { get; set; }
+
+    /// <summary>
+    /// The period of the day where this item is currently being displayed.
+    /// Used for multi-day event title formatting.
+    /// </summary>
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(DisplayTitle))]
+    public partial ITimePeriod DisplayingPeriod { get; set; }
+
+    /// <summary>
+    /// Calendar settings for time formatting.
+    /// </summary>
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(DisplayTitle))]
+    public partial CalendarSettings CalendarSettings { get; set; }
+
+    /// <summary>
+    /// Gets the display title based on the current displaying period.
+    /// </summary>
+    public string DisplayTitle
+    {
+        get
+        {
+            if (DisplayingPeriod == null || CalendarSettings == null)
+                return Title;
+
+            return GetDisplayTitle(DisplayingPeriod, CalendarSettings);
+        }
+    }
 
     public ObservableCollection<CalendarEventAttendee> Attendees { get; } = new ObservableCollection<CalendarEventAttendee>();
 
@@ -41,6 +113,82 @@ namespace Wino.Calendar.ViewModels.Data
         CalendarItem = calendarItem;
     }
 
-        public override string ToString() => CalendarItem.Title;
+    /// <summary>
+    /// Updates the underlying CalendarItem with new data and raises property change notifications.
+    /// </summary>
+    /// <param name="calendarItem">The updated calendar item data.</param>
+    public void UpdateFrom(CalendarItem calendarItem)
+    {
+        if (calendarItem == null || calendarItem.Id != CalendarItem.Id)
+            return;
+
+        // Update all mutable properties
+        CalendarItem.Title = calendarItem.Title;
+        CalendarItem.Description = calendarItem.Description;
+        CalendarItem.Location = calendarItem.Location;
+        CalendarItem.StartDate = calendarItem.StartDate;
+        CalendarItem.StartTimeZone = calendarItem.StartTimeZone;
+        CalendarItem.EndTimeZone = calendarItem.EndTimeZone;
+        CalendarItem.DurationInSeconds = calendarItem.DurationInSeconds;
+        CalendarItem.Recurrence = calendarItem.Recurrence;
+        CalendarItem.RecurringCalendarItemId = calendarItem.RecurringCalendarItemId;
+        CalendarItem.OrganizerDisplayName = calendarItem.OrganizerDisplayName;
+        CalendarItem.OrganizerEmail = calendarItem.OrganizerEmail;
+        CalendarItem.IsLocked = calendarItem.IsLocked;
+        CalendarItem.IsHidden = calendarItem.IsHidden;
+        CalendarItem.CustomEventColorHex = calendarItem.CustomEventColorHex;
+        CalendarItem.HtmlLink = calendarItem.HtmlLink;
+        CalendarItem.Status = calendarItem.Status;
+        CalendarItem.Visibility = calendarItem.Visibility;
+        CalendarItem.ShowAs = calendarItem.ShowAs;
+        CalendarItem.UpdatedAt = calendarItem.UpdatedAt;
+        CalendarItem.AssignedCalendar = calendarItem.AssignedCalendar;
+
+        // Raise property changed for all bindable properties
+        OnPropertyChanged(nameof(Title));
+        OnPropertyChanged(nameof(StartDate));
+        OnPropertyChanged(nameof(EndDate));
+        OnPropertyChanged(nameof(DurationInSeconds));
+        OnPropertyChanged(nameof(Period));
+        OnPropertyChanged(nameof(IsAllDayEvent));
+        OnPropertyChanged(nameof(IsMultiDayEvent));
+        OnPropertyChanged(nameof(IsRecurringEvent));
+        OnPropertyChanged(nameof(IsRecurringChild));
+        OnPropertyChanged(nameof(IsRecurringParent));
+        OnPropertyChanged(nameof(AssignedCalendar));
+        OnPropertyChanged(nameof(DisplayTitle));
     }
+
+    /// <summary>
+    /// Gets the display title for this calendar item when rendered in a specific day.
+    /// </summary>
+    public string GetDisplayTitle(ITimePeriod displayingPeriod, CalendarSettings calendarSettings)
+    {
+        if (!IsMultiDayEvent)
+            return Title;
+
+        var periodRelation = Period.GetRelation(displayingPeriod);
+
+        if (periodRelation == PeriodRelation.StartInside || periodRelation == PeriodRelation.EnclosingStartTouching)
+        {
+            // Event starts within this day: "HH:mm -> Title"
+            return $"{calendarSettings.GetTimeString(StartDate.TimeOfDay)} -> {Title}";
+        }
+        else if (periodRelation == PeriodRelation.EndInside || periodRelation == PeriodRelation.EnclosingEndTouching)
+        {
+            // Event ends within this day: "Title <- HH:mm"
+            return $"{Title} <- {calendarSettings.GetTimeString(EndDate.TimeOfDay)}";
+        }
+        else if (periodRelation == PeriodRelation.Enclosing)
+        {
+            // Event spans the entire day
+            return $"{Translator.CalendarItemAllDay} {Title}";
+        }
+        else
+        {
+            return Title;
+        }
+    }
+
+    public override string ToString() => CalendarItem.Title;
 }

Wino.Calendar.ViewModels/Data/GroupedAccountCalendarViewModel.cs

@@ -6,10 +6,10 @@ using System.Linq;
 using CommunityToolkit.Mvvm.ComponentModel;
 using Wino.Core.Domain.Entities.Shared;
 
-namespace Wino.Calendar.ViewModels.Data
+namespace Wino.Calendar.ViewModels.Data;
+
+public partial class GroupedAccountCalendarViewModel : ObservableObject
 {
-    public partial class GroupedAccountCalendarViewModel : ObservableObject
-    {
     public event EventHandler CollectiveSelectionStateChanged;
     public event EventHandler<AccountCalendarViewModel> CalendarSelectionStateChanged;
 
@@ -69,10 +69,10 @@ namespace Wino.Calendar.ViewModels.Data
     }
 
     [ObservableProperty]
-        private bool _isExpanded = true;
+    public partial bool IsExpanded { get; set; } = true;
 
     [ObservableProperty]
-        private bool? isCheckedState = true;
+    public partial bool? IsCheckedState { get; set; } = true;
 
     private bool _isExternalPropChangeBlocked = false;
 
@@ -98,7 +98,7 @@ namespace Wino.Calendar.ViewModels.Data
         _isExternalPropChangeBlocked = false;
     }
 
-        partial void OnIsCheckedStateChanged(bool? newValue)
+    partial void OnIsCheckedStateChanged(bool? oldValue, bool? newValue)
     {
         if (_isExternalPropChangeBlocked) return;
 
@@ -142,5 +142,4 @@ namespace Wino.Calendar.ViewModels.Data
 
         CalendarSelectionStateChanged?.Invoke(this, accountCalendarViewModel);
     }
-    }
 }

Wino.Calendar.ViewModels/EventDetailsPageViewModel.cs

@@ -1,61 +1,230 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Diagnostics;
+using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using CommunityToolkit.Mvvm.Messaging;
+using Serilog;
 using Wino.Calendar.ViewModels.Data;
+using Wino.Core.Domain;
+using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Enums;
 using Wino.Core.Domain.Interfaces;
 using Wino.Core.Domain.Models.Calendar;
 using Wino.Core.Domain.Models.Navigation;
+using Wino.Core.Services;
 using Wino.Core.ViewModels;
 using Wino.Messaging.Client.Calendar;
 
-namespace Wino.Calendar.ViewModels
+namespace Wino.Calendar.ViewModels;
+
+public partial class EventDetailsPageViewModel : CalendarBaseViewModel
 {
-    public partial class EventDetailsPageViewModel : CalendarBaseViewModel
-    {
     private readonly ICalendarService _calendarService;
     private readonly INativeAppService _nativeAppService;
     private readonly IPreferencesService _preferencesService;
+    private readonly IMailDialogService _dialogService;
+    private readonly IWinoRequestDelegator _winoRequestDelegator;
+    private readonly INavigationService _navigationService;
+    private readonly IUnderlyingThemeService _underlyingThemeService;
 
     public CalendarSettings CurrentSettings { get; }
+    public INativeAppService NativeAppService => _nativeAppService;
+
+    [ObservableProperty]
+    public partial bool IsDarkWebviewRenderer { get; set; }
+
+    public ObservableCollection<CalendarAttachmentViewModel> Attachments { get; } = new ObservableCollection<CalendarAttachmentViewModel>();
+
+    /// <summary>
+    /// Returns true if the current event has attachments.
+    /// </summary>
+    public bool HasAttachments => Attachments.Count > 0;
 
     #region Details
 
     [ObservableProperty]
     [NotifyPropertyChangedFor(nameof(CanViewSeries))]
-        private CalendarItemViewModel _currentEvent;
+    [NotifyPropertyChangedFor(nameof(CanEditSeries))]
+    [NotifyPropertyChangedFor(nameof(IsCurrentUserOrganizer))]
+    [NotifyPropertyChangedFor(nameof(CurrentRsvpText))]
+    [NotifyPropertyChangedFor(nameof(CurrentRsvpStatus))]
+    public partial CalendarItemViewModel CurrentEvent { get; set; }
+
+    partial void OnCurrentEventChanged(CalendarItemViewModel value)
+    {
+        // Notify the view to re-render the description
+        Messenger.Send(new CalendarDescriptionRenderingRequested());
+    }
 
     [ObservableProperty]
-        private CalendarItemViewModel _seriesParent;
+    public partial CalendarItemViewModel SeriesParent { get; set; }
+    [ObservableProperty]
+    public partial List<Reminder> Reminders { get; set; }
 
+    public ObservableCollection<ReminderOption> ReminderOptions { get; } = new ObservableCollection<ReminderOption>();
+
+    /// <summary>
+    /// Returns true if the event is part of a recurring series (as a child occurrence).
+    /// Used to enable "View Series" functionality.
+    /// </summary>
     public bool CanViewSeries => CurrentEvent?.IsRecurringChild ?? false;
 
+    /// <summary>
+    /// Returns true if the "Edit Series" button should be visible.
+    /// Only visible for child occurrences of recurring events, not for master events or single events.
+    /// </summary>
+    public bool CanEditSeries => CurrentEvent?.IsRecurringChild ?? false;
+
+    /// <summary>
+    /// Returns true if the current user is the organizer of the event.
+    /// Used to determine if the user can invite attendees or modify the event.
+    /// </summary>
+    public bool IsCurrentUserOrganizer => CurrentEvent?.Attendees?.Any(a => a.IsOrganizer) ?? true;
+
     #endregion
 
-        public EventDetailsPageViewModel(ICalendarService calendarService, INativeAppService nativeAppService, IPreferencesService preferencesService)
+    #region Show As Options
+
+    public ObservableCollection<ShowAsOption> ShowAsOptions { get; } = new ObservableCollection<ShowAsOption>();
+
+    [ObservableProperty]
+    public partial ShowAsOption SelectedShowAsOption { get; set; }
+
+    #endregion
+
+    #region RSVP Panel
+
+    [ObservableProperty]
+    public partial bool IsRsvpPanelVisible { get; set; }
+
+    public bool IncludeRsvpMessage => !string.IsNullOrEmpty(RsvpMessage);
+
+    [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(IncludeRsvpMessage))]
+    public partial string RsvpMessage { get; set; } = string.Empty;
+
+    public ObservableCollection<RsvpStatusOption> RsvpStatusOptions { get; } = new ObservableCollection<RsvpStatusOption>();
+
+    public CalendarItemStatus CurrentRsvpStatus
+    {
+        get
+        {
+            return CurrentEvent?.CalendarItem?.Status ?? CalendarItemStatus.NotResponded;
+        }
+    }
+
+    public string CurrentRsvpText
+    {
+        get
+        {
+            if (CurrentEvent?.CalendarItem == null) return Translator.CalendarEventResponse_Accept;
+
+            return CurrentEvent.CalendarItem.Status switch
+            {
+                CalendarItemStatus.Accepted => Translator.CalendarEventResponse_AcceptedResponse,
+                CalendarItemStatus.Tentative => Translator.CalendarEventResponse_TentativeResponse,
+                CalendarItemStatus.Cancelled => Translator.CalendarEventResponse_DeclinedResponse,
+                CalendarItemStatus.NotResponded => Translator.CalendarEventResponse_NotResponded,
+                _ => Translator.CalendarEventResponse_NotResponded
+            };
+        }
+    }
+
+    #endregion
+
+    public EventDetailsPageViewModel(ICalendarService calendarService,
+                                     INativeAppService nativeAppService,
+                                     IPreferencesService preferencesService,
+                                     IMailDialogService dialogService,
+                                     IWinoRequestDelegator winoRequestDelegator,
+                                     INavigationService navigationService,
+                                     IUnderlyingThemeService underlyingThemeService)
     {
         _calendarService = calendarService;
         _nativeAppService = nativeAppService;
         _preferencesService = preferencesService;
+        _dialogService = dialogService;
+        _winoRequestDelegator = winoRequestDelegator;
+        _navigationService = navigationService;
+        _underlyingThemeService = underlyingThemeService;
 
         CurrentSettings = _preferencesService.GetCurrentCalendarSettings();
+        IsDarkWebviewRenderer = _underlyingThemeService.IsUnderlyingThemeDark();
+
+        // Initialize Show As options
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Free));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Tentative));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.Busy));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.OutOfOffice));
+        ShowAsOptions.Add(new ShowAsOption(CalendarItemShowAs.WorkingElsewhere));
+        SelectedShowAsOption = ShowAsOptions[2]; // Default to Busy
+
+        // Initialize RSVP status options
+        RsvpStatusOptions.Add(new RsvpStatusOption(CalendarItemStatus.Accepted));
+        RsvpStatusOptions.Add(new RsvpStatusOption(CalendarItemStatus.Tentative));
+        RsvpStatusOptions.Add(new RsvpStatusOption(CalendarItemStatus.Cancelled));
     }
 
     public override async void OnNavigatedTo(NavigationMode mode, object parameters)
     {
         base.OnNavigatedTo(mode, parameters);
 
-            Messenger.Send(new DetailsPageStateChangedMessage(true));
-
         if (parameters == null || parameters is not CalendarItemTarget args)
             return;
 
         await LoadCalendarItemTargetAsync(args);
     }
 
+    protected override async void OnCalendarItemUpdated(CalendarItem calendarItem, CalendarItemUpdateSource source)
+    {
+        base.OnCalendarItemUpdated(calendarItem, source);
+
+        // If the current event was updated, reload it
+        if (CurrentEvent?.CalendarItem?.Id == calendarItem.Id || CurrentEvent?.CalendarItem.RecurringCalendarItemId == calendarItem.Id)
+        {
+            // Reflect client-side optimistic changes immediately; fallback to DB for server updates.
+            if (source == CalendarItemUpdateSource.ClientUpdated || source == CalendarItemUpdateSource.ClientReverted)
+            {
+                var previousAttendees = CurrentEvent?.Attendees?.ToList() ?? [];
+                CurrentEvent = new CalendarItemViewModel(calendarItem)
+                {
+                    IsBusy = source == CalendarItemUpdateSource.ClientUpdated
+                };
+
+                foreach (var attendee in previousAttendees)
+                {
+                    CurrentEvent.Attendees.Add(attendee);
+                }
+
+                return;
+            }
+
+            // Refresh from DB when update comes from server sync.
+            var refreshedEvent = await _calendarService.GetCalendarItemAsync(calendarItem.Id);
+            if (refreshedEvent != null)
+            {
+                CurrentEvent = new CalendarItemViewModel(refreshedEvent);
+                await LoadAttendeesAsync(refreshedEvent.Id, refreshedEvent);
+            }
+        }
+    }
+
+    protected override void OnCalendarItemDeleted(CalendarItem calendarItem)
+    {
+        base.OnCalendarItemDeleted(calendarItem);
+
+        // If the current event was deleted, navigate back
+        if (CurrentEvent?.CalendarItem?.Id == calendarItem.Id || CurrentEvent?.CalendarItem.RecurringCalendarItemId == calendarItem.Id)
+        {
+            _navigationService.GoBack();
+        }
+    }
+
     private async Task LoadCalendarItemTargetAsync(CalendarItemTarget target)
     {
         try
@@ -67,12 +236,17 @@ namespace Wino.Calendar.ViewModels
 
             CurrentEvent = new CalendarItemViewModel(currentEventItem);
 
-                var attendees = await _calendarService.GetAttendeesAsync(currentEventItem.EventTrackingId);
+            await LoadAttendeesAsync(currentEventItem.Id, currentEventItem);
 
-                foreach (var item in attendees)
-                {
-                    CurrentEvent.Attendees.Add(item);
-                }
+            // Initialize SelectedShowAsOption based on current event's ShowAs
+            SelectedShowAsOption = ShowAsOptions.FirstOrDefault(o => o.ShowAs == currentEventItem.ShowAs) ?? ShowAsOptions[2];
+
+            // Load reminders for this calendar item
+            Reminders = await _calendarService.GetRemindersAsync(currentEventItem.Id);
+            InitializeReminderOptions();
+
+            // Load attachments
+            await LoadAttachmentsAsync(currentEventItem.Id);
         }
         catch (Exception ex)
         {
@@ -80,37 +254,498 @@ namespace Wino.Calendar.ViewModels
         }
     }
 
-        public override void OnNavigatedFrom(NavigationMode mode, object parameters)
+    private async Task LoadAttendeesAsync(Guid calendarItemId, CalendarItem calendarItem)
     {
-            base.OnNavigatedFrom(mode, parameters);
+        CurrentEvent.Attendees.Clear();
 
-            Messenger.Send(new DetailsPageStateChangedMessage(false));
+        var attendees = await _calendarService.GetAttendeesAsync(calendarItemId);
+
+        // Separate organizer from other attendees to ensure organizer is always first
+        var organizer = attendees.FirstOrDefault(a => a.IsOrganizer);
+        var nonOrganizerAttendees = attendees.Where(a => !a.IsOrganizer).ToList();
+
+        // If the organizer is in the list, add them first
+        if (organizer != null)
+        {
+            CurrentEvent.Attendees.Add(organizer);
         }
+        else if (!string.IsNullOrEmpty(calendarItem.OrganizerEmail))
+        {
+            // If the organizer is not in the attendees list, create and add them first
+            var organizerAttendee = new CalendarEventAttendee
+            {
+                Id = Guid.NewGuid(),
+                CalendarItemId = calendarItem.Id,
+                Name = calendarItem.OrganizerDisplayName ?? calendarItem.OrganizerEmail,
+                Email = calendarItem.OrganizerEmail,
+                IsOrganizer = true,
+                AttendenceStatus = AttendeeStatus.Accepted
+            };
+            CurrentEvent.Attendees.Add(organizerAttendee);
+        }
+
+        // Add all other attendees after the organizer
+        foreach (var item in nonOrganizerAttendees)
+        {
+            CurrentEvent.Attendees.Add(item);
+        }
+    }
+
+    private async Task LoadAttachmentsAsync(Guid calendarItemId)
+    {
+        Attachments.Clear();
+
+        try
+        {
+            var attachments = await _calendarService.GetAttachmentsAsync(calendarItemId);
+
+            foreach (var attachment in attachments)
+            {
+                Attachments.Add(new CalendarAttachmentViewModel(attachment));
+            }
+
+            OnPropertyChanged(nameof(HasAttachments));
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error loading attachments: {ex.Message}");
+        }
+    }
+
+    private void InitializeReminderOptions()
+    {
+        ReminderOptions.Clear();
+
+        // Add predefined options from service
+        var predefinedMinutes = _calendarService.GetPredefinedReminderMinutes();
+        var predefinedOptions = predefinedMinutes.Select(m => new ReminderOption(m)).ToList();
+
+        // Add custom reminders from synced data
+        if (Reminders != null)
+        {
+            foreach (var reminder in Reminders)
+            {
+                // Convert seconds to minutes
+                var minutesDiff = (int)(reminder.DurationInSeconds / 60);
+
+                // Check if this is a custom value not in predefined list
+                if (!predefinedMinutes.Contains(minutesDiff))
+                {
+                    predefinedOptions.Add(new ReminderOption(minutesDiff, isCustom: true));
+                }
+            }
+        }
+
+        // Sort by minutes descending and add to collection
+        foreach (var option in predefinedOptions.OrderByDescending(o => o.Minutes))
+        {
+            ReminderOptions.Add(option);
+        }
+
+        // Set selected state based on current reminders
+        if (Reminders != null)
+        {
+            foreach (var reminder in Reminders)
+            {
+                // Convert seconds to minutes
+                var minutesDiff = (int)(reminder.DurationInSeconds / 60);
+
+                var matchingOption = ReminderOptions.FirstOrDefault(o => o.Minutes == minutesDiff);
+                matchingOption?.IsSelected = true;
+            }
+        }
+    }
+
 
     [RelayCommand]
     private async Task SaveAsync()
     {
+        if (CurrentEvent == null) return;
 
+        try
+        {
+            // Capture original state BEFORE making any changes for potential revert
+            var originalItem = await _calendarService.GetCalendarItemAsync(CurrentEvent.CalendarItem.Id);
+            var originalAttendees = await _calendarService.GetAttendeesAsync(CurrentEvent.CalendarItem.Id);
+
+            // Get selected reminder options
+            var selectedOptions = ReminderOptions.Where(o => o.IsSelected).ToList();
+
+            // Create separate Reminder entities for each selected option
+            var newReminders = new List<Reminder>();
+
+            foreach (var option in selectedOptions)
+            {
+                var durationInSeconds = option.Minutes * 60; // Convert minutes to seconds
+
+                newReminders.Add(new Reminder
+                {
+                    Id = Guid.NewGuid(),
+                    CalendarItemId = CurrentEvent.Id,
+                    DurationInSeconds = durationInSeconds,
+                    ReminderType = CalendarItemReminderType.Popup
+                });
+            }
+
+            // Save reminders to database
+            await _calendarService.SaveRemindersAsync(CurrentEvent.CalendarItem.Id, newReminders);
+            Reminders = newReminders;
+
+            // Update ShowAs if changed
+            if (SelectedShowAsOption != null)
+            {
+                CurrentEvent.CalendarItem.ShowAs = SelectedShowAsOption.ShowAs;
+            }
+
+            // Update the calendar item and attendees in database
+            await _calendarService.UpdateCalendarItemAsync(CurrentEvent.CalendarItem, CurrentEvent.Attendees.ToList());
+
+            // Queue the update request to synchronizer with original state for revert capability
+            var preparationRequest = new CalendarOperationPreparationRequest(
+                CalendarSynchronizerOperation.UpdateEvent,
+                CurrentEvent.CalendarItem,
+                CurrentEvent.Attendees.ToList(),
+                ResponseMessage: null,
+                OriginalItem: originalItem,
+                OriginalAttendees: originalAttendees);
+
+            await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+
+            _navigationService.GoBack();
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error saving event: {ex.Message}");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentSaveFailedTitle,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
     }
 
     [RelayCommand]
     private async Task DeleteAsync()
     {
+        if (CurrentEvent == null) return;
 
+        // If the event is a master recurring event, ask for confirmation
+        if (CurrentEvent.IsRecurringParent)
+        {
+            var confirmed = await _dialogService.ShowConfirmationDialogAsync(
+                Translator.DialogMessage_DeleteRecurringSeriesMessage,
+                Translator.DialogMessage_DeleteRecurringSeriesTitle,
+                Translator.Buttons_Delete);
+
+            if (!confirmed) return;
+        }
+
+        try
+        {
+            var preparationRequest = new CalendarOperationPreparationRequest(
+                CalendarSynchronizerOperation.DeleteEvent,
+                CurrentEvent.CalendarItem,
+                null);
+
+            await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+
+            // Navigate back after successful deletion
+            _navigationService.GoBack();
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error deleting calendar event: {ex.Message}");
+        }
     }
 
     [RelayCommand]
-        private Task JoinOnline()
+    private Task JoinOnlineAsync()
     {
-            if (CurrentEvent == null || string.IsNullOrEmpty(CurrentEvent.CalendarItem.HtmlLink)) return Task.CompletedTask;
+        if (CurrentEvent == null || string.IsNullOrEmpty(CurrentEvent.CalendarItem.HtmlLink))
+            return Task.CompletedTask;
 
         return _nativeAppService.LaunchUriAsync(new Uri(CurrentEvent.CalendarItem.HtmlLink));
     }
 
     [RelayCommand]
-        private async Task Respond(CalendarItemStatus status)
+    private void ToggleRsvpPanel()
+    {
+        IsRsvpPanelVisible = !IsRsvpPanelVisible;
+
+        if (IsRsvpPanelVisible && CurrentEvent?.CalendarItem != null)
+        {
+            // Initialize selection based on current status
+            foreach (var item in RsvpStatusOptions)
+            {
+                item.IsSelected = CurrentEvent?.CalendarItem?.Status == item.Status;
+            }
+        }
+    }
+
+    [RelayCommand]
+    private void CloseRsvpPanel()
+    {
+        IsRsvpPanelVisible = false;
+        RsvpMessage = string.Empty;
+    }
+
+    [RelayCommand]
+    private async Task SendRsvpResponse(AttendeeStatus status)
     {
         if (CurrentEvent == null) return;
+
+        try
+        {
+            // Get the optional response message if user wants to include it
+            var responseMessage = IncludeRsvpMessage ? RsvpMessage : null;
+
+            // Map status to operation
+            CalendarSynchronizerOperation operation = status switch
+            {
+                AttendeeStatus.Accepted => CalendarSynchronizerOperation.AcceptEvent,
+                AttendeeStatus.Tentative => CalendarSynchronizerOperation.TentativeEvent,
+                AttendeeStatus.Declined => CalendarSynchronizerOperation.DeclineEvent,
+                _ => throw new InvalidOperationException($"Invalid RSVP status: {status}")
+            };
+
+            // Create preparation request with the optional message
+            var preparationRequest = new CalendarOperationPreparationRequest(
+                operation,
+                CurrentEvent.CalendarItem,
+                null,
+                responseMessage);
+
+            await _winoRequestDelegator.ExecuteAsync(preparationRequest);
+
+            // Reload attendees to get the updated status from the server
+            await LoadAttendeesAsync(CurrentEvent.CalendarItem.Id, CurrentEvent.CalendarItem);
+
+            OnPropertyChanged(nameof(CurrentRsvpText));
+            OnPropertyChanged(nameof(CurrentRsvpStatus));
+
+            CloseRsvpPanel();
         }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error sending RSVP response: {ex.Message}");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentSaveFailedTitle,
+                ex.Message,
+                InfoBarMessageType.Error);
+        }
+    }
+
+    [RelayCommand]
+    private async Task ViewSeriesAsync()
+    {
+        if (CurrentEvent == null || !CurrentEvent.IsRecurringChild) return;
+
+        try
+        {
+            // Get the master event from the recurring series
+            var masterEventId = CurrentEvent.CalendarItem.RecurringCalendarItemId.Value;
+            var masterEvent = await _calendarService.GetCalendarItemAsync(masterEventId);
+
+            if (masterEvent == null) return;
+
+            // Load the master event without navigation
+            var target = new CalendarItemTarget(masterEvent, CalendarEventTargetType.Series);
+            await LoadCalendarItemTargetAsync(target);
+        }
+        catch (Exception ex)
+        {
+            Debug.WriteLine($"Error loading series: {ex.Message}");
+        }
+    }
+
+    [RelayCommand]
+    private async Task OpenAttachmentAsync(CalendarAttachmentViewModel attachmentViewModel)
+    {
+        if (attachmentViewModel == null || CurrentEvent?.CalendarItem == null) return;
+
+        try
+        {
+            attachmentViewModel.IsBusy = true;
+
+            // If not downloaded, download it first
+            if (!attachmentViewModel.IsDownloaded)
+            {
+                await DownloadAttachmentAsync(attachmentViewModel);
+            }
+
+            // Launch the file
+            if (!string.IsNullOrEmpty(attachmentViewModel.Attachment.LocalFilePath) &&
+                File.Exists(attachmentViewModel.Attachment.LocalFilePath))
+            {
+                await _nativeAppService.LaunchFileAsync(attachmentViewModel.Attachment.LocalFilePath);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to open calendar attachment.");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentOpenFailedTitle,
+                Translator.Info_AttachmentOpenFailedMessage,
+                InfoBarMessageType.Error);
+        }
+        finally
+        {
+            attachmentViewModel.IsBusy = false;
+        }
+    }
+
+    [RelayCommand]
+    private async Task SaveAttachmentAsync(CalendarAttachmentViewModel attachmentViewModel)
+    {
+        if (attachmentViewModel == null) return;
+
+        try
+        {
+            attachmentViewModel.IsBusy = true;
+
+            var pickedPath = await _dialogService.PickWindowsFolderAsync();
+            if (string.IsNullOrEmpty(pickedPath)) return;
+
+            // Download if not already downloaded
+            if (!attachmentViewModel.IsDownloaded)
+            {
+                await DownloadAttachmentAsync(attachmentViewModel);
+            }
+
+            // Copy to selected location
+            if (!string.IsNullOrEmpty(attachmentViewModel.Attachment.LocalFilePath) &&
+                File.Exists(attachmentViewModel.Attachment.LocalFilePath))
+            {
+                var destinationPath = Path.Combine(pickedPath, attachmentViewModel.FileName);
+                File.Copy(attachmentViewModel.Attachment.LocalFilePath, destinationPath, overwrite: true);
+
+                _dialogService.InfoBarMessage(
+                    Translator.Info_AttachmentSaveSuccessTitle,
+                    Translator.Info_AttachmentSaveSuccessMessage,
+                    InfoBarMessageType.Success);
+            }
+        }
+        catch (Exception ex)
+        {
+            Log.Error(ex, "Failed to save calendar attachment.");
+            _dialogService.InfoBarMessage(
+                Translator.Info_AttachmentSaveFailedTitle,
+                Translator.Info_AttachmentSaveFailedMessage,
+                InfoBarMessageType.Error);
+        }
+        finally
+        {
+            attachmentViewModel.IsBusy = false;
+        }
+    }
+
+    private async Task DownloadAttachmentAsync(CalendarAttachmentViewModel attachmentViewModel)
+    {
+        if (CurrentEvent?.CalendarItem == null) return;
+
+        // Create attachments folder for this calendar item
+        var attachmentsFolder = Path.Combine(
+            _nativeAppService.GetCalendarAttachmentsFolderPath(),
+            CurrentEvent.CalendarItem.Id.ToString());
+
+        Directory.CreateDirectory(attachmentsFolder);
+
+        var localFilePath = Path.Combine(attachmentsFolder, attachmentViewModel.FileName);
+
+        // Download attachment using synchronizer
+        await SynchronizationManager.Instance.DownloadCalendarAttachmentAsync(
+            CurrentEvent.CalendarItem,
+            attachmentViewModel.Attachment,
+            localFilePath);
+
+        // Mark as downloaded
+        await _calendarService.MarkAttachmentDownloadedAsync(
+            attachmentViewModel.Id,
+            localFilePath);
+
+        // Update view model
+        attachmentViewModel.Attachment.IsDownloaded = true;
+        attachmentViewModel.Attachment.LocalFilePath = localFilePath;
+        OnPropertyChanged(nameof(attachmentViewModel.IsDownloaded));
+    }
+}
+
+public partial class ReminderOption : ObservableObject
+{
+    public int Minutes { get; }
+    public bool IsCustom { get; }
+
+    [ObservableProperty]
+    public partial bool IsSelected { get; set; }
+
+    public string DisplayText
+    {
+        get
+        {
+            if (Minutes >= 60)
+            {
+                var hours = Minutes / 60;
+                return hours == 1 ? "1 Hour" : $"{hours} Hours";
+            }
+            return Minutes == 1 ? "1 Minute" : $"{Minutes} Minutes";
+        }
+    }
+
+    public ReminderOption(int minutes, bool isCustom = false)
+    {
+        Minutes = minutes;
+        IsCustom = isCustom;
+    }
+}
+
+public partial class ShowAsOption : ObservableObject
+{
+    public CalendarItemShowAs ShowAs { get; }
+
+    public string DisplayText
+    {
+        get
+        {
+            return ShowAs switch
+            {
+                CalendarItemShowAs.Free => Translator.CalendarShowAs_Free,
+                CalendarItemShowAs.Tentative => Translator.CalendarShowAs_Tentative,
+                CalendarItemShowAs.Busy => Translator.CalendarShowAs_Busy,
+                CalendarItemShowAs.OutOfOffice => Translator.CalendarShowAs_OutOfOffice,
+                CalendarItemShowAs.WorkingElsewhere => Translator.CalendarShowAs_WorkingElsewhere,
+                _ => Translator.CalendarShowAs_Busy
+            };
+        }
+    }
+
+    public ShowAsOption(CalendarItemShowAs showAs)
+    {
+        ShowAs = showAs;
+    }
+}
+
+public partial class RsvpStatusOption : ObservableObject
+{
+    public CalendarItemStatus Status { get; }
+
+    public string StatusText
+    {
+        get
+        {
+            return Status switch
+            {
+                CalendarItemStatus.Accepted => Translator.CalendarEventResponse_Accept,
+                CalendarItemStatus.Tentative => Translator.CalendarEventResponse_Tentative,
+                CalendarItemStatus.Cancelled => Translator.CalendarEventResponse_Decline,
+                _ => Translator.CalendarEventResponse_Accept
+            };
+        }
+    }
+
+    [ObservableProperty]
+    public partial bool IsSelected { get; set; }
+
+    public RsvpStatusOption(CalendarItemStatus status)
+    {
+        Status = status;
     }
 }

Wino.Calendar.ViewModels/Interfaces/IAccountCalendarStateService.cs

@@ -2,14 +2,16 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
+using CommunityToolkit.Mvvm.Collections;
 using Wino.Calendar.ViewModels.Data;
 using Wino.Core.Domain.Entities.Shared;
+using Wino.Core.Domain.Interfaces;
 
-namespace Wino.Calendar.ViewModels.Interfaces
+namespace Wino.Calendar.ViewModels.Interfaces;
+
+public interface IAccountCalendarStateService : INotifyPropertyChanged
 {
-    public interface IAccountCalendarStateService : INotifyPropertyChanged
-    {
+    IDispatcher Dispatcher { get; set; }
     ReadOnlyObservableCollection<GroupedAccountCalendarViewModel> GroupedAccountCalendars { get; }
 
     event EventHandler<GroupedAccountCalendarViewModel> CollectiveAccountGroupSelectionStateChanged;
@@ -17,7 +19,7 @@ namespace Wino.Calendar.ViewModels.Interfaces
 
     public void AddGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar);
     public void RemoveGroupedAccountCalendar(GroupedAccountCalendarViewModel groupedAccountCalendar);
-        public void ClearGroupedAccountCalendar();
+    public void ClearGroupedAccountCalendars();
 
     public void AddAccountCalendar(AccountCalendarViewModel accountCalendar);
     public void RemoveAccountCalendar(AccountCalendarViewModel accountCalendar);
@@ -26,6 +28,6 @@ namespace Wino.Calendar.ViewModels.Interfaces
     /// Enumeration of currently selected calendars.
     /// </summary>
     IEnumerable<AccountCalendarViewModel> ActiveCalendars { get; }
-        IEnumerable<IGrouping<MailAccount, AccountCalendarViewModel>> GroupedAccountCalendarsEnumerable { get; }
-    }
+    IEnumerable<AccountCalendarViewModel> AllCalendars { get; }
+    ReadOnlyObservableGroupedCollection<MailAccount, AccountCalendarViewModel> GroupedCalendars { get; set; }
 }

Wino.Calendar.ViewModels/Messages/CalendarItemDoubleTappedMessage.cs

@@ -1,14 +1,13 @@
 using Wino.Calendar.ViewModels.Data;
 
-namespace Wino.Calendar.ViewModels.Messages
+namespace Wino.Calendar.ViewModels.Messages;
+
+public class CalendarItemDoubleTappedMessage
 {
-    public class CalendarItemDoubleTappedMessage
-    {
     public CalendarItemDoubleTappedMessage(CalendarItemViewModel calendarItemViewModel)
     {
         CalendarItemViewModel = calendarItemViewModel;
     }
 
     public CalendarItemViewModel CalendarItemViewModel { get; }
-    }
 }

Wino.Calendar.ViewModels/Messages/CalendarItemRightTappedMessage.cs

@@ -1,14 +1,13 @@
 using Wino.Calendar.ViewModels.Data;
 
-namespace Wino.Calendar.ViewModels.Messages
+namespace Wino.Calendar.ViewModels.Messages;
+
+public class CalendarItemRightTappedMessage
 {
-    public class CalendarItemRightTappedMessage
-    {
     public CalendarItemRightTappedMessage(CalendarItemViewModel calendarItemViewModel)
     {
         CalendarItemViewModel = calendarItemViewModel;
     }
 
     public CalendarItemViewModel CalendarItemViewModel { get; }
-    }
 }

Wino.Calendar.ViewModels/Messages/CalendarItemTappedMessage.cs

@@ -1,10 +1,10 @@
 using Wino.Calendar.ViewModels.Data;
 using Wino.Core.Domain.Models.Calendar;
 
-namespace Wino.Calendar.ViewModels.Messages
+namespace Wino.Calendar.ViewModels.Messages;
+
+public class CalendarItemTappedMessage
 {
-    public class CalendarItemTappedMessage
-    {
     public CalendarItemTappedMessage(CalendarItemViewModel calendarItemViewModel, CalendarDayModel clickedPeriod)
     {
         CalendarItemViewModel = calendarItemViewModel;
@@ -13,5 +13,4 @@ namespace Wino.Calendar.ViewModels.Messages
 
     public CalendarItemViewModel CalendarItemViewModel { get; }
     public CalendarDayModel ClickedPeriod { get; }
-    }
 }

Wino.Calendar.ViewModels/Wino.Calendar.ViewModels.csproj

@@ -1,15 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
-		<LangVersion>12</LangVersion>
-		<Platforms>AnyCPU;x64;x86</Platforms>
+		<TargetFramework>net10.0</TargetFramework>
+		<Platforms>x86;x64;arm64</Platforms>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
 		<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
 		<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
+		<IsTrimmable>true</IsTrimmable>
+		<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
+		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 	</PropertyGroup>
-
 	<ItemGroup>
-	  <PackageReference Include="TimePeriodLibrary.NET" Version="2.1.5" />
+	  <PackageReference Include="TimePeriodLibrary.NET" />
 	</ItemGroup>
 
 	<ItemGroup>

Wino.Calendar.sln

@@ -1,308 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.12.35424.110
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Core.Domain", "Wino.Core.Domain\Wino.Core.Domain.csproj", "{814400B6-5A05-4596-B451-3A116A147DC1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Core.UWP", "Wino.Core.UWP\Wino.Core.UWP.csproj", "{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Core.ViewModels", "Wino.Core.ViewModels\Wino.Core.ViewModels.csproj", "{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Messaging", "Wino.Messages\Wino.Messaging.csproj", "{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Server", "Wino.Server\Wino.Server.csproj", "{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Core", "Wino.Core\Wino.Core.csproj", "{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Calendar", "Wino.Calendar\Wino.Calendar.csproj", "{600F4979-DB7E-409D-B7DA-B60BE4C55C35}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.SourceGenerators", "Wino.SourceGenerators\Wino.SourceGenerators.csproj", "{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}"
-EndProject
-Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "Wino.Calendar.Packaging", "Wino.Calendar.Packaging\Wino.Calendar.Packaging.wapproj", "{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wino.Calendar.ViewModels", "Wino.Calendar.ViewModels\Wino.Calendar.ViewModels.csproj", "{CF850F8C-5042-4376-9CBA-C8F2BB554083}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Services", "Wino.Services\Wino.Services.csproj", "{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wino.Authentication", "Wino.Authentication\Wino.Authentication.csproj", "{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|ARM = Debug|ARM
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|ARM = Release|ARM
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM.Build.0 = Debug|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x64.ActiveCfg = Debug|x64
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x64.Build.0 = Debug|x64
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x86.ActiveCfg = Debug|x86
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Debug|x86.Build.0 = Debug|x86
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM.ActiveCfg = Release|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM.Build.0 = Release|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|ARM64.Build.0 = Release|Any CPU
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x64.ActiveCfg = Release|x64
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x64.Build.0 = Release|x64
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x86.ActiveCfg = Release|x86
-		{814400B6-5A05-4596-B451-3A116A147DC1}.Release|x86.Build.0 = Release|x86
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM.Build.0 = Debug|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x64.ActiveCfg = Debug|x64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x64.Build.0 = Debug|x64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x86.ActiveCfg = Debug|x86
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Debug|x86.Build.0 = Debug|x86
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM.ActiveCfg = Release|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM.Build.0 = Release|Any CPU
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM64.ActiveCfg = Release|ARM64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|ARM64.Build.0 = Release|ARM64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x64.ActiveCfg = Release|x64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x64.Build.0 = Release|x64
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x86.ActiveCfg = Release|x86
-		{395F19BA-1E42-495C-9DB5-1A6F537FCCB8}.Release|x86.Build.0 = Release|x86
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM.Build.0 = Debug|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x64.ActiveCfg = Debug|x64
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x64.Build.0 = Debug|x64
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x86.ActiveCfg = Debug|x86
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Debug|x86.Build.0 = Debug|x86
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM.ActiveCfg = Release|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM.Build.0 = Release|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|ARM64.Build.0 = Release|Any CPU
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x64.ActiveCfg = Release|x64
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x64.Build.0 = Release|x64
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x86.ActiveCfg = Release|x86
-		{510CD96C-B3FF-4EC9-A67B-845C842E6BEC}.Release|x86.Build.0 = Release|x86
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM.Build.0 = Debug|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x64.ActiveCfg = Debug|x64
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x64.Build.0 = Debug|x64
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x86.ActiveCfg = Debug|x86
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Debug|x86.Build.0 = Debug|x86
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM.ActiveCfg = Release|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM.Build.0 = Release|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|ARM64.Build.0 = Release|Any CPU
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x64.ActiveCfg = Release|x64
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x64.Build.0 = Release|x64
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x86.ActiveCfg = Release|x86
-		{AB588CFD-4B0C-4A1F-B711-1999E3D092D0}.Release|x86.Build.0 = Release|x86
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|Any CPU.Build.0 = Debug|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM.ActiveCfg = Debug|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM.Build.0 = Debug|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|ARM64.Build.0 = Debug|ARM64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x64.ActiveCfg = Debug|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x64.Build.0 = Debug|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x86.ActiveCfg = Debug|x86
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Debug|x86.Build.0 = Debug|x86
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|Any CPU.ActiveCfg = Release|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|Any CPU.Build.0 = Release|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM.ActiveCfg = Release|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM.Build.0 = Release|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM64.ActiveCfg = Release|ARM64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|ARM64.Build.0 = Release|ARM64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x64.ActiveCfg = Release|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x64.Build.0 = Release|x64
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x86.ActiveCfg = Release|x86
-		{92DA33FC-9252-40C5-BF71-67ACB0B56F2B}.Release|x86.Build.0 = Release|x86
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM.Build.0 = Debug|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x64.ActiveCfg = Debug|x64
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x64.Build.0 = Debug|x64
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x86.ActiveCfg = Debug|x86
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Debug|x86.Build.0 = Debug|x86
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM.Build.0 = Release|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|ARM64.Build.0 = Release|Any CPU
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x64.ActiveCfg = Release|x64
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x64.Build.0 = Release|x64
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x86.ActiveCfg = Release|x86
-		{87FFCBF4-DC17-4F09-90D6-102CF4C72BAF}.Release|x86.Build.0 = Release|x86
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|Any CPU.Build.0 = Debug|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|Any CPU.Deploy.0 = Debug|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM.ActiveCfg = Debug|ARM
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM.Build.0 = Debug|ARM
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM.Deploy.0 = Debug|ARM
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM64.Build.0 = Debug|ARM64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x64.ActiveCfg = Debug|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x64.Build.0 = Debug|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x64.Deploy.0 = Debug|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x86.ActiveCfg = Debug|x86
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x86.Build.0 = Debug|x86
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Debug|x86.Deploy.0 = Debug|x86
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|Any CPU.ActiveCfg = Release|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|Any CPU.Build.0 = Release|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|Any CPU.Deploy.0 = Release|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM.ActiveCfg = Release|ARM
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM.Build.0 = Release|ARM
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM.Deploy.0 = Release|ARM
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM64.ActiveCfg = Release|ARM64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM64.Build.0 = Release|ARM64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|ARM64.Deploy.0 = Release|ARM64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x64.ActiveCfg = Release|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x64.Build.0 = Release|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x64.Deploy.0 = Release|x64
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x86.ActiveCfg = Release|x86
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x86.Build.0 = Release|x86
-		{600F4979-DB7E-409D-B7DA-B60BE4C55C35}.Release|x86.Deploy.0 = Release|x86
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM.Build.0 = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x64.Build.0 = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Debug|x86.Build.0 = Debug|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM.Build.0 = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|ARM64.Build.0 = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x64.ActiveCfg = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x64.Build.0 = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x86.ActiveCfg = Release|Any CPU
-		{8A7EB697-D722-4E0F-B20E-9FC88373ADB5}.Release|x86.Build.0 = Release|Any CPU
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM.ActiveCfg = Debug|ARM
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM.Build.0 = Debug|ARM
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM.Deploy.0 = Debug|ARM
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM64.Build.0 = Debug|ARM64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x64.ActiveCfg = Debug|x64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x64.Build.0 = Debug|x64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x64.Deploy.0 = Debug|x64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x86.ActiveCfg = Debug|x86
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x86.Build.0 = Debug|x86
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Debug|x86.Deploy.0 = Debug|x86
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM.ActiveCfg = Release|ARM
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM.Build.0 = Release|ARM
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM.Deploy.0 = Release|ARM
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM64.ActiveCfg = Release|ARM64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM64.Build.0 = Release|ARM64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|ARM64.Deploy.0 = Release|ARM64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x64.ActiveCfg = Release|x64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x64.Build.0 = Release|x64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x64.Deploy.0 = Release|x64
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x86.ActiveCfg = Release|x86
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x86.Build.0 = Release|x86
-		{7485B18C-F5AB-4ABE-BA7F-05B6623C67C8}.Release|x86.Deploy.0 = Release|x86
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM.Build.0 = Debug|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x64.ActiveCfg = Debug|x64
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x64.Build.0 = Debug|x64
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x86.ActiveCfg = Debug|x86
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Debug|x86.Build.0 = Debug|x86
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM.ActiveCfg = Release|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM.Build.0 = Release|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|ARM64.Build.0 = Release|Any CPU
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x64.ActiveCfg = Release|x64
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x64.Build.0 = Release|x64
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x86.ActiveCfg = Release|x86
-		{CF850F8C-5042-4376-9CBA-C8F2BB554083}.Release|x86.Build.0 = Release|x86
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM.Build.0 = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x64.Build.0 = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Debug|x86.Build.0 = Debug|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM.ActiveCfg = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM.Build.0 = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|ARM64.Build.0 = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x64.ActiveCfg = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x64.Build.0 = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x86.ActiveCfg = Release|Any CPU
-		{BBA49030-7277-48CF-B2FE-3D01CB6B6C81}.Release|x86.Build.0 = Release|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM.Build.0 = Debug|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x64.ActiveCfg = Debug|x64
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x64.Build.0 = Debug|x64
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x86.ActiveCfg = Debug|x86
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Debug|x86.Build.0 = Debug|x86
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|Any CPU.Build.0 = Release|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM.ActiveCfg = Release|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM.Build.0 = Release|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|ARM64.Build.0 = Release|Any CPU
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x64.ActiveCfg = Release|x64
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x64.Build.0 = Release|x64
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x86.ActiveCfg = Release|x86
-		{16A979C2-F308-464F-9B2A-0AF8ED5EDB43}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Wino.Calendar/Activation/DefaultActivationHandler.cs

@@ -1,24 +0,0 @@
-using System.Threading.Tasks;
-using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media.Animation;
-using Wino.Activation;
-using Wino.Calendar.Views;
-
-namespace Wino.Calendar.Activation
-{
-    public class DefaultActivationHandler : ActivationHandler<IActivatedEventArgs>
-    {
-        protected override Task HandleInternalAsync(IActivatedEventArgs args)
-        {
-            (Window.Current.Content as Frame).Navigate(typeof(AppShell), null, new DrillInNavigationTransitionInfo());
-
-            return Task.CompletedTask;
-        }
-
-        // Only navigate if Frame content doesn't exist.
-        protected override bool CanHandleInternal(IActivatedEventArgs args)
-            => (Window.Current?.Content as Frame)?.Content == null;
-    }
-}

Wino.Calendar/App.xaml

@@ -1,31 +0,0 @@
-<core:WinoApplication
-    x:Class="Wino.Calendar.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="using:Microsoft.UI.Xaml.Controls"
-    xmlns:core="using:Wino.Core.UWP"
-    xmlns:coreStyles="using:Wino.Core.UWP.Styles"
-    xmlns:local="using:Wino.Calendar"
-    xmlns:styles="using:Wino.Calendar.Styles">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-
-                <core:CoreGeneric />
-
-                <styles:WinoCalendarResources />
-
-                <ResourceDictionary Source="Styles/CalendarThemeResources.xaml" />
-
-                <ResourceDictionary Source="Styles/WinoDayTimelineCanvas.xaml" />
-                <ResourceDictionary Source="Styles/WinoCalendarView.xaml" />
-                <ResourceDictionary Source="Styles/WinoCalendarTypeSelectorControl.xaml" />
-
-                <!--  Last item must always be the default theme.  -->
-                <ResourceDictionary Source="ms-appx:///Wino.Core.UWP/AppThemes/Mica.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Application.Resources>
-</core:WinoApplication>
-

Wino.Calendar/App.xaml.cs

@@ -1,164 +0,0 @@
-using System;
-using System.Collections.Generic;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Serilog;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.ApplicationModel.AppService;
-using Windows.ApplicationModel.Background;
-using Windows.UI.Core.Preview;
-using Wino.Activation;
-using Wino.Calendar.Activation;
-using Wino.Calendar.Services;
-using Wino.Calendar.ViewModels;
-using Wino.Calendar.ViewModels.Interfaces;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Enums;
-using Wino.Core.Domain.Exceptions;
-using Wino.Core.Domain.Interfaces;
-using Wino.Core.Domain.Models.Synchronization;
-using Wino.Core.UWP;
-using Wino.Core.ViewModels;
-using Wino.Messaging.Client.Connection;
-using Wino.Messaging.Server;
-using Wino.Services;
-
-namespace Wino.Calendar
-{
-    public sealed partial class App : WinoApplication, IRecipient<NewCalendarSynchronizationRequested>
-    {
-        public override string AppCenterKey => "dfdad6ab-95f9-44cc-9112-45ec6730c49e";
-
-        private BackgroundTaskDeferral connectionBackgroundTaskDeferral;
-        private BackgroundTaskDeferral toastActionBackgroundTaskDeferral;
-
-        public App()
-        {
-            InitializeComponent();
-
-            WeakReferenceMessenger.Default.Register(this);
-        }
-
-        public override IServiceProvider ConfigureServices()
-        {
-            var services = new ServiceCollection();
-
-            services.RegisterSharedServices();
-            services.RegisterCalendarViewModelServices();
-            services.RegisterCoreUWPServices();
-            services.RegisterCoreViewModels();
-
-            RegisterUWPServices(services);
-            RegisterViewModels(services);
-            RegisterActivationHandlers(services);
-
-            return services.BuildServiceProvider();
-        }
-
-        #region Dependency Injection
-
-        private void RegisterActivationHandlers(IServiceCollection services)
-        {
-            //services.AddTransient<ProtocolActivationHandler>();
-            //services.AddTransient<ToastNotificationActivationHandler>();
-            //services.AddTransient<FileActivationHandler>();
-        }
-
-        private void RegisterUWPServices(IServiceCollection services)
-        {
-            services.AddSingleton<INavigationService, NavigationService>();
-            services.AddSingleton<ICalendarDialogService, DialogService>();
-            services.AddTransient<ISettingsBuilderService, SettingsBuilderService>();
-            services.AddTransient<IProviderService, ProviderService>();
-            services.AddSingleton<IAuthenticatorConfig, CalendarAuthenticatorConfig>();
-            services.AddSingleton<IAccountCalendarStateService, AccountCalendarStateService>();
-        }
-
-        private void RegisterViewModels(IServiceCollection services)
-        {
-            services.AddSingleton(typeof(AppShellViewModel));
-            services.AddSingleton(typeof(CalendarPageViewModel));
-            services.AddTransient(typeof(CalendarSettingsPageViewModel));
-            services.AddTransient(typeof(AccountManagementViewModel));
-            services.AddTransient(typeof(PersonalizationPageViewModel));
-            services.AddTransient(typeof(AccountDetailsPageViewModel));
-            services.AddTransient(typeof(EventDetailsPageViewModel));
-        }
-
-        #endregion
-
-        protected override void OnApplicationCloseRequested(object sender, SystemNavigationCloseRequestedPreviewEventArgs e)
-        {
-            // TODO: Check server running.
-        }
-
-        protected override async void OnLaunched(LaunchActivatedEventArgs args)
-        {
-            LogActivation($"OnLaunched -> {args.GetType().Name}, Kind -> {args.Kind}, PreviousExecutionState -> {args.PreviousExecutionState}, IsPrelaunch -> {args.PrelaunchActivated}");
-
-            if (!args.PrelaunchActivated)
-            {
-                await ActivateWinoAsync(args);
-            }
-        }
-
-        protected override IEnumerable<ActivationHandler> GetActivationHandlers()
-        {
-            return null;
-        }
-
-        protected override ActivationHandler<IActivatedEventArgs> GetDefaultActivationHandler()
-            => new DefaultActivationHandler();
-
-        protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
-        {
-            base.OnBackgroundActivated(args);
-
-            if (args.TaskInstance.TriggerDetails is AppServiceTriggerDetails appServiceTriggerDetails)
-            {
-                LogActivation("OnBackgroundActivated -> AppServiceTriggerDetails received.");
-
-                // Only accept connections from callers in the same package
-                if (appServiceTriggerDetails.CallerPackageFamilyName == Package.Current.Id.FamilyName)
-                {
-                    // Connection established from the fulltrust process
-
-                    connectionBackgroundTaskDeferral = args.TaskInstance.GetDeferral();
-                    args.TaskInstance.Canceled += OnConnectionBackgroundTaskCanceled;
-
-                    AppServiceConnectionManager.Connection = appServiceTriggerDetails.AppServiceConnection;
-
-                    WeakReferenceMessenger.Default.Send(new WinoServerConnectionEstablished());
-                }
-            }
-        }
-
-        public void OnConnectionBackgroundTaskCanceled(IBackgroundTaskInstance sender, BackgroundTaskCancellationReason reason)
-        {
-            sender.Canceled -= OnConnectionBackgroundTaskCanceled;
-
-            Log.Information($"Server connection background task was canceled. Reason: {reason}");
-
-            connectionBackgroundTaskDeferral?.Complete();
-            connectionBackgroundTaskDeferral = null;
-
-            AppServiceConnectionManager.Connection = null;
-        }
-
-        public async void Receive(NewCalendarSynchronizationRequested message)
-        {
-            try
-            {
-                var synchronizationResultResponse = await AppServiceConnectionManager.GetResponseAsync<CalendarSynchronizationResult, NewCalendarSynchronizationRequested>(message);
-                synchronizationResultResponse.ThrowIfFailed();
-            }
-            catch (WinoServerException serverException)
-            {
-                var dialogService = Services.GetService<ICalendarDialogService>();
-
-                dialogService.InfoBarMessage(Translator.Info_SyncFailedTitle, serverException.Message, InfoBarMessageType.Error);
-            }
-        }
-    }
-}

Wino.Calendar/Args/TimelineCellSelectedArgs.cs

@@ -1,41 +0,0 @@
-using System;
-using Windows.Foundation;
-
-namespace Wino.Calendar.Args
-{
-    /// <summary>
-    /// When a new timeline cell is selected.
-    /// </summary>
-    public class TimelineCellSelectedArgs : EventArgs
-    {
-        public TimelineCellSelectedArgs(DateTime clickedDate, Point canvasPoint, Point positionerPoint, Size cellSize)
-        {
-            ClickedDate = clickedDate;
-            CanvasPoint = canvasPoint;
-            PositionerPoint = positionerPoint;
-            CellSize = cellSize;
-        }
-
-        /// <summary>
-        /// Clicked date and time information for the cell.
-        /// </summary>
-        public DateTime ClickedDate { get; set; }
-
-        /// <summary>
-        /// Position relative to the cell drawing part of the canvas.
-        /// Used to detect clicked cell from the position.
-        /// </summary>
-        public Point CanvasPoint { get; }
-
-        /// <summary>
-        /// Position relative to the main root positioner element of the drawing canvas.
-        /// Used to show the create event dialog teaching tip in correct position.
-        /// </summary>
-        public Point PositionerPoint { get; }
-
-        /// <summary>
-        /// Size of the cell.
-        /// </summary>
-        public Size CellSize { get; }
-    }
-}

Wino.Calendar/Args/TimelineCellUnselectedArgs.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace Wino.Calendar.Args
-{
-    /// <summary>
-    /// When selected timeline cell is unselected.
-    /// </summary>
-    public class TimelineCellUnselectedArgs : EventArgs { }
-}

Wino.Calendar/Controls/CalendarItemCommandBarFlyout.cs

@@ -1,31 +0,0 @@
-using Microsoft.UI.Xaml.Controls;
-using Windows.UI.Xaml;
-using Wino.Calendar.ViewModels.Data;
-
-namespace Wino.Calendar.Controls
-{
-    public class CalendarItemCommandBarFlyout : CommandBarFlyout
-    {
-        public static readonly DependencyProperty ItemProperty = DependencyProperty.Register(nameof(Item), typeof(CalendarItemViewModel), typeof(CalendarItemCommandBarFlyout), new PropertyMetadata(null, new PropertyChangedCallback(OnItemChanged)));
-
-        public CalendarItemViewModel Item
-        {
-            get { return (CalendarItemViewModel)GetValue(ItemProperty); }
-            set { SetValue(ItemProperty, value); }
-        }
-
-
-        private static void OnItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is CalendarItemCommandBarFlyout flyout)
-            {
-                flyout.UpdateMenuItems();
-            }
-        }
-
-        private void UpdateMenuItems()
-        {
-
-        }
-    }
-}

Wino.Calendar/Controls/CalendarItemControl.xaml.cs

@@ -1,198 +0,0 @@
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Itenso.TimePeriod;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using Wino.Calendar.ViewModels.Data;
-using Wino.Calendar.ViewModels.Messages;
-using Wino.Core.Domain;
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Calendar.Controls
-{
-    public sealed partial class CalendarItemControl : UserControl
-    {
-        // Single tap has a delay to report double taps properly.
-        private bool isSingleTap = false;
-
-        public static readonly DependencyProperty CalendarItemProperty = DependencyProperty.Register(nameof(CalendarItem), typeof(CalendarItemViewModel), typeof(CalendarItemControl), new PropertyMetadata(null, new PropertyChangedCallback(OnCalendarItemChanged)));
-        public static readonly DependencyProperty IsDraggingProperty = DependencyProperty.Register(nameof(IsDragging), typeof(bool), typeof(CalendarItemControl), new PropertyMetadata(false));
-        public static readonly DependencyProperty IsCustomEventAreaProperty = DependencyProperty.Register(nameof(IsCustomEventArea), typeof(bool), typeof(CalendarItemControl), new PropertyMetadata(false));
-        public static readonly DependencyProperty CalendarItemTitleProperty = DependencyProperty.Register(nameof(CalendarItemTitle), typeof(string), typeof(CalendarItemControl), new PropertyMetadata(string.Empty));
-        public static readonly DependencyProperty DisplayingDateProperty = DependencyProperty.Register(nameof(DisplayingDate), typeof(CalendarDayModel), typeof(CalendarItemControl), new PropertyMetadata(null, new PropertyChangedCallback(OnDisplayDateChanged)));
-
-        /// <summary>
-        /// Whether the control is displaying as regular event or all-multi day area in the day control.
-        /// </summary>
-        public bool IsCustomEventArea
-        {
-            get { return (bool)GetValue(IsCustomEventAreaProperty); }
-            set { SetValue(IsCustomEventAreaProperty, value); }
-        }
-
-        /// <summary>
-        /// Day that the calendar item is rendered at.
-        /// It's needed for title manipulation and some other adjustments later on.
-        /// </summary>
-        public CalendarDayModel DisplayingDate
-        {
-            get { return (CalendarDayModel)GetValue(DisplayingDateProperty); }
-            set { SetValue(DisplayingDateProperty, value); }
-        }
-
-        public string CalendarItemTitle
-        {
-            get { return (string)GetValue(CalendarItemTitleProperty); }
-            set { SetValue(CalendarItemTitleProperty, value); }
-        }
-
-        public CalendarItemViewModel CalendarItem
-        {
-            get { return (CalendarItemViewModel)GetValue(CalendarItemProperty); }
-            set { SetValue(CalendarItemProperty, value); }
-        }
-
-        public bool IsDragging
-        {
-            get { return (bool)GetValue(IsDraggingProperty); }
-            set { SetValue(IsDraggingProperty, value); }
-        }
-
-        public CalendarItemControl()
-        {
-            InitializeComponent();
-        }
-
-        private static void OnDisplayDateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is CalendarItemControl control)
-            {
-                control.UpdateControlVisuals();
-            }
-        }
-
-        private static void OnCalendarItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            if (d is CalendarItemControl control)
-            {
-                control.UpdateControlVisuals();
-            }
-        }
-
-        private void UpdateControlVisuals()
-        {
-            // Depending on the calendar item's duration and attributes, we might need to change the display title.
-            // 1. Multi-Day events should display the start date and end date.
-            // 2. Multi-Day events that occupy the whole day just shows 'all day'.
-            // 3. Other events should display the title.
-
-            if (CalendarItem == null) return;
-            if (DisplayingDate == null) return;
-
-            if (CalendarItem.IsMultiDayEvent)
-            {
-                // Multi day events are divided into 3 categories:
-                // 1. All day events
-                // 2. Events that started after the period.
-                // 3. Events that started before the period and finishes within the period.
-
-                var periodRelation = CalendarItem.Period.GetRelation(DisplayingDate.Period);
-
-                if (periodRelation == Itenso.TimePeriod.PeriodRelation.StartInside ||
-                    periodRelation == PeriodRelation.EnclosingStartTouching)
-                {
-                    // hour -> title
-                    CalendarItemTitle = $"{DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.StartDate.TimeOfDay)} -> {CalendarItem.Title}";
-                }
-                else if (
-                    periodRelation == PeriodRelation.EndInside ||
-                    periodRelation == PeriodRelation.EnclosingEndTouching)
-                {
-                    // title <- hour
-                    CalendarItemTitle = $"{CalendarItem.Title} <- {DisplayingDate.CalendarRenderOptions.CalendarSettings.GetTimeString(CalendarItem.EndDate.TimeOfDay)}";
-                }
-                else if (periodRelation == PeriodRelation.Enclosing)
-                {
-                    // This event goes all day and it's multi-day.
-                    // Item must be hidden in the calendar but displayed on the custom area at the top.
-
-                    CalendarItemTitle = $"{Translator.CalendarItemAllDay} {CalendarItem.Title}";
-                }
-                else
-                {
-                    // Not expected, but there it is.
-                    CalendarItemTitle = CalendarItem.Title;
-                }
-
-                // Debug.WriteLine($"{CalendarItem.Title} Period relation with {DisplayingDate.Period.ToString()}: {periodRelation}");
-            }
-            else
-            {
-                CalendarItemTitle = CalendarItem.Title;
-            }
-
-            UpdateVisualStates();
-        }
-
-        private void UpdateVisualStates()
-        {
-            if (CalendarItem == null) return;
-
-            if (CalendarItem.IsAllDayEvent)
-            {
-                VisualStateManager.GoToState(this, "AllDayEvent", true);
-            }
-            else if (CalendarItem.IsMultiDayEvent)
-            {
-                if (IsCustomEventArea)
-                {
-                    VisualStateManager.GoToState(this, "CustomAreaMultiDayEvent", true);
-                }
-                else
-                {
-                    // Hide it.
-                    VisualStateManager.GoToState(this, "MultiDayEvent", true);
-                }
-            }
-            else
-            {
-                VisualStateManager.GoToState(this, "RegularEvent", true);
-            }
-        }
-
-        private void ControlDragStarting(UIElement sender, DragStartingEventArgs args) => IsDragging = true;
-
-        private void ControlDropped(UIElement sender, DropCompletedEventArgs args) => IsDragging = false;
-
-        private async void ControlTapped(object sender, TappedRoutedEventArgs e)
-        {
-            if (CalendarItem == null) return;
-
-            isSingleTap = true;
-
-            await Task.Delay(100);
-
-            if (isSingleTap)
-            {
-                WeakReferenceMessenger.Default.Send(new CalendarItemTappedMessage(CalendarItem, DisplayingDate));
-            }
-        }
-
-        private void ControlDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
-        {
-            if (CalendarItem == null) return;
-
-            isSingleTap = false;
-
-            WeakReferenceMessenger.Default.Send(new CalendarItemDoubleTappedMessage(CalendarItem));
-        }
-
-        private void ControlRightTapped(object sender, RightTappedRoutedEventArgs e)
-        {
-            if (CalendarItem == null) return;
-
-            WeakReferenceMessenger.Default.Send(new CalendarItemRightTappedMessage(CalendarItem));
-        }
-    }
-}

Wino.Calendar/Controls/CustomCalendarFlipView.cs

@@ -1,43 +0,0 @@
-using Windows.UI.Xaml.Automation.Peers;
-using Windows.UI.Xaml.Controls;
-
-namespace Wino.Calendar.Controls
-{
-    /// <summary>
-    /// FlipView that hides the navigation buttons and exposes methods to navigate to the next and previous items with animations.
-    /// </summary>
-    public class CustomCalendarFlipView : FlipView
-    {
-        private const string PART_PreviousButton = "PreviousButtonHorizontal";
-        private const string PART_NextButton = "NextButtonHorizontal";
-
-        private Button PreviousButton;
-        private Button NextButton;
-
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            PreviousButton = GetTemplateChild(PART_PreviousButton) as Button;
-            NextButton = GetTemplateChild(PART_NextButton) as Button;
-
-            // Hide navigation buttons
-            PreviousButton.Opacity = NextButton.Opacity = 0;
-            PreviousButton.IsHitTestVisible = NextButton.IsHitTestVisible = false;
-
-            var t = FindName("ScrollingHost");
-        }
-
-        public void GoPreviousFlip()
-        {
-            var backPeer = new ButtonAutomationPeer(PreviousButton);
-            backPeer.Invoke();
-        }
-
-        public void GoNextFlip()
-        {
-            var nextPeer = new ButtonAutomationPeer(NextButton);
-            nextPeer.Invoke();
-        }
-    }
-}

Wino.Calendar/Controls/DayColumnControl.cs

@@ -1,78 +0,0 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Wino.Core.Domain.Models.Calendar;
-
-namespace Wino.Calendar.Controls
-{
-    public class DayColumnControl : Control
-    {
-        private const string PART_HeaderDateDayText = nameof(PART_HeaderDateDayText);
-        private const string PART_IsTodayBorder = nameof(PART_IsTodayBorder);
-        private const string PART_ColumnHeaderText = nameof(PART_ColumnHeaderText);
-
-        private const string PART_AllDayItemsControl = nameof(PART_AllDayItemsControl);
-
-        private const string TodayState = nameof(TodayState);
-        private const string NotTodayState = nameof(NotTodayState);
-
-        private TextBlock HeaderDateDayText;
-        private TextBlock ColumnHeaderText;
-        private Border IsTodayBorder;
-        private ItemsControl AllDayItemsControl;
-
-        public CalendarDayModel DayModel
-        {
-            get { return (CalendarDayModel)GetValue(DayModelProperty); }
-            set { SetValue(DayModelProperty, value); }
-        }
-
-        public static readonly DependencyProperty DayModelProperty = DependencyProperty.Register(nameof(DayModel), typeof(CalendarDayModel), typeof(DayColumnControl), new PropertyMetadata(null, new PropertyChangedCallback(OnRenderingPropertiesChanged)));
-
-        public DayColumnControl()
-        {
-            DefaultStyleKey = typeof(DayColumnControl);
-        }
-
-        protected override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            HeaderDateDayText = GetTemplateChild(PART_HeaderDateDayText) as TextBlock;
-            ColumnHeaderText = GetTemplateChild(PART_ColumnHeaderText) as TextBlock;
-            IsTodayBorder = GetTemplateChild(PART_IsTodayBorder) as Border;
-            AllDayItemsControl = GetTemplateChild(PART_AllDayItemsControl) as ItemsControl;
-
-            UpdateValues();
-        }
-
-        private static void OnRenderingPropertiesChanged(DependencyObject control, DependencyPropertyChangedEventArgs e)
-        {
-            if (control is DayColumnControl columnControl)
-            {
-                columnControl.UpdateValues();
-            }
-        }
-
-        private void UpdateValues()
-        {
-            if (HeaderDateDayText == null || IsTodayBorder == null || DayModel == null) return;
-
-            HeaderDateDayText.Text = DayModel.RepresentingDate.Day.ToString();
-
-            // Monthly template does not use it.
-            if (ColumnHeaderText != null)
-            {
-                ColumnHeaderText.Text = DayModel.RepresentingDate.ToString("dddd", DayModel.CalendarRenderOptions.CalendarSettings.CultureInfo);
-            }
-
-            AllDayItemsControl.ItemsSource = DayModel.EventsCollection.AllDayEvents;
-
-            bool isToday = DayModel.RepresentingDate.Date == DateTime.Now.Date;
-
-            VisualStateManager.GoToState(this, isToday ? TodayState : NotTodayState, false);
-
-            UpdateLayout();
-        }
-    }
-}