Event compose implementation.

Wino.Mail.WinUI/Dialogs/SingleCalendarPickerDialog.xaml

@@ -28,12 +28,12 @@
     <ScrollViewer Margin="0,8,0,0">
         <ItemsControl ItemsSource="{x:Bind AvailableGroups}">
             <ItemsControl.ItemTemplate>
-                <DataTemplate>
+                <DataTemplate x:DataType="calendar:CalendarPickerAccountGroup">
                     <StackPanel Margin="0,0,0,12" Spacing="6">
                         <TextBlock FontWeight="SemiBold">
-                            <Run Text="{Binding Account.Name}" />
+                            <Run Text="{x:Bind Account.Name}" />
                             <Run Text=" (" />
-                            <Run Text="{Binding Account.Address}" />
+                            <Run Text="{x:Bind Account.Address}" />
                             <Run Text=")" />
                         </TextBlock>
 
@@ -41,10 +41,10 @@
                             IsItemClickEnabled="True"
                             ItemClick="CalendarClicked"
                             ItemContainerStyle="{StaticResource CalendarPickerListItemStyle}"
-                            ItemsSource="{Binding Calendars}"
+                            ItemsSource="{x:Bind Calendars}"
                             SelectionMode="None">
                             <ListView.ItemTemplate>
-                                <DataTemplate>
+                                <DataTemplate x:DataType="sharedCalendar:AccountCalendar">
                                     <Grid ColumnSpacing="10">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto" />
@@ -55,12 +55,12 @@
                                             Width="14"
                                             Height="14"
                                             VerticalAlignment="Center"
-                                            Fill="{ThemeResource AccentFillColorDefaultBrush}" />
+                                            Fill="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" />
 
                                         <TextBlock
                                             Grid.Column="1"
                                             VerticalAlignment="Center"
-                                            Text="{Binding Name}" />
+                                            Text="{x:Bind Name}" />
                                     </Grid>
                                 </DataTemplate>
                             </ListView.ItemTemplate>

Wino.Mail.WinUI/MailAppShell.xaml

@@ -157,6 +157,7 @@
                     <coreControls:WinoFontIcon Icon="NewMail" />
                 </muxc:NavigationViewItem.Icon>
                 <TextBlock
+                    Margin="0,-2,0,0"
                     VerticalAlignment="Center"
                     FontSize="16"
                     Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"

Wino.Mail.WinUI/Services/PreferencesService.cs

@@ -290,6 +290,18 @@ public class PreferencesService(IConfigurationService configurationService) : Ob
         set => SaveProperty(propertyName: nameof(DefaultSnoozeDurationInMinutes), value);
     }
 
+    public NewEventButtonBehavior NewEventButtonBehavior
+    {
+        get => _configurationService.Get(nameof(NewEventButtonBehavior), NewEventButtonBehavior.AskEachTime);
+        set => SetPropertyAndSave(nameof(NewEventButtonBehavior), value);
+    }
+
+    public Guid? DefaultNewEventCalendarId
+    {
+        get => _configurationService.Get<Guid?>(nameof(DefaultNewEventCalendarId), null);
+        set => SetPropertyAndSave(nameof(DefaultNewEventCalendarId), value);
+    }
+
     public int EmailSyncIntervalMinutes
     {
         get => _configurationService.Get(nameof(EmailSyncIntervalMinutes), 3);

Wino.Mail.WinUI/Styles/WebViewEditorControl.xaml

@@ -9,7 +9,7 @@
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="controls:WebViewEditorControl">
-                        <Grid CornerRadius="3">
+                        <Grid CornerRadius="{StaticResource ControlCornerRadius}">
                             <Grid Background="White" Visibility="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=IsEditorDarkMode, Mode=OneWay, Converter={StaticResource ReverseBooleanToVisibilityConverter}}" />
                             <WebView2 x:Name="WebView" />
                         </Grid>

Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml

@@ -14,6 +14,7 @@
     xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
     xmlns:interfaces="using:Wino.Core.Domain.Interfaces"
     xmlns:local="using:Wino.Views"
+    xmlns:mailViewModels="using:Wino.Mail.ViewModels"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
     xmlns:ui="using:CommunityToolkit.WinUI"
@@ -50,7 +51,7 @@
                             VerticalAlignment="Center"
                             Checked="SyncFolderToggled"
                             IsChecked="{x:Bind IsSynchronizationEnabled, Mode=OneWay}"
-                            Tag="{Binding}"
+                            Tag="{x:Bind}"
                             Unchecked="SyncFolderToggled"
                             Visibility="{x:Bind IsMoveTarget}" />
 
@@ -61,7 +62,7 @@
                             VerticalAlignment="Center"
                             Checked="UnreadBadgeCheckboxToggled"
                             IsChecked="{x:Bind ShowUnreadCount, Mode=OneWay}"
-                            Tag="{Binding}"
+                            Tag="{x:Bind}"
                             Unchecked="UnreadBadgeCheckboxToggled"
                             Visibility="{x:Bind IsMoveTarget}" />
                     </Grid>
@@ -296,27 +297,72 @@
                 Visibility="Collapsed">
                 <StackPanel MaxWidth="900" Spacing="12">
 
+                    <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_PrimaryCalendarDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_PrimaryCalendar, Mode=OneTime}">
+                        <controls:SettingsCard.HeaderIcon>
+                            <FontIcon Glyph="&#xE735;" />
+                        </controls:SettingsCard.HeaderIcon>
+                        <ComboBox ItemsSource="{x:Bind ViewModel.AccountCalendars, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedPrimaryCalendar, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendar:AccountCalendar">
+                                    <TextBlock Text="{x:Bind Name}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </controls:SettingsCard>
+
                     <!--  Calendars List  -->
-                    <ItemsControl ItemsSource="{x:Bind ViewModel.AccountCalendars, Mode=OneWay}">
+                    <ItemsControl ItemsSource="{x:Bind ViewModel.AccountCalendarSettingsItems, Mode=OneWay}">
                         <ItemsControl.ItemTemplate>
-                            <DataTemplate x:DataType="calendar:AccountCalendar">
-                                <controls:SettingsCard
-                                    Margin="0,0,0,4"
-                                    ActionIcon="{ui:FontIcon Glyph=&#xE974;}"
-                                    Click="CalendarItemClicked"
-                                    CommandParameter="{x:Bind}"
+                            <DataTemplate x:DataType="mailViewModels:AccountCalendarSettingsItemViewModel">
+                                <controls:SettingsExpander
+                                    Margin="0,0,0,8"
                                     Description="{x:Bind TimeZone, Mode=OneWay}"
                                     Header="{x:Bind Name, Mode=OneWay}"
-                                    IsClickEnabled="True">
-                                    <controls:SettingsCard.HeaderIcon>
-                                        <FontIcon Glyph="&#xE163;" />
-                                    </controls:SettingsCard.HeaderIcon>
-                                    <Border
-                                        Width="32"
-                                        Height="32"
-                                        Background="{x:Bind BackgroundColorHex, Mode=OneWay}"
-                                        CornerRadius="4" />
-                                </controls:SettingsCard>
+                                    IsExpanded="False">
+                                    <controls:SettingsExpander.HeaderIcon>
+                                        <SymbolIcon Foreground="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}" Symbol="Calendar" />
+                                    </controls:SettingsExpander.HeaderIcon>
+                                    <controls:SettingsExpander.Items>
+
+                                        <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_AccountColorDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_AccountColor, Mode=OneTime}">
+                                            <controls:SettingsCard.HeaderIcon>
+                                                <FontIcon Glyph="&#xE790;" />
+                                            </controls:SettingsCard.HeaderIcon>
+                                            <Border
+                                                Width="32"
+                                                Height="32"
+                                                Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
+                                                CornerRadius="4" />
+                                        </controls:SettingsCard>
+
+                                        <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_SyncEnabledDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_SyncEnabled, Mode=OneTime}">
+                                            <controls:SettingsCard.HeaderIcon>
+                                                <FontIcon Glyph="&#xE895;" />
+                                            </controls:SettingsCard.HeaderIcon>
+                                            <ToggleSwitch
+                                                IsOn="{x:Bind IsSynchronizationEnabled, Mode=OneWay}"
+                                                Tag="{x:Bind}"
+                                                Toggled="CalendarSynchronizationToggled" />
+                                        </controls:SettingsCard>
+
+                                        <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarAccountSettings_DefaultShowAsDescription, Mode=OneTime}" Header="{x:Bind domain:Translator.CalendarAccountSettings_DefaultShowAs, Mode=OneTime}">
+                                            <controls:SettingsCard.HeaderIcon>
+                                                <FontIcon Glyph="&#xE163;" />
+                                            </controls:SettingsCard.HeaderIcon>
+                                            <ComboBox
+                                                ItemsSource="{x:Bind ShowAsOptions, Mode=OneWay}"
+                                                SelectedItem="{x:Bind SelectedShowAsOption, Mode=OneWay}"
+                                                SelectionChanged="CalendarShowAsSelectionChanged"
+                                                Tag="{x:Bind}">
+                                                <ComboBox.ItemTemplate>
+                                                    <DataTemplate x:DataType="mailViewModels:AccountCalendarShowAsOption">
+                                                        <TextBlock Text="{x:Bind DisplayText}" />
+                                                    </DataTemplate>
+                                                </ComboBox.ItemTemplate>
+                                            </ComboBox>
+                                        </controls:SettingsCard>
+                                    </controls:SettingsExpander.Items>
+                                </controls:SettingsExpander>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
                     </ItemsControl>

Wino.Mail.WinUI/Views/Account/AccountDetailsPage.xaml.cs

@@ -1,8 +1,8 @@
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
-using Wino.Core.Domain.Entities.Calendar;
 using Wino.Core.Domain.Models.Folders;
+using Wino.Mail.ViewModels;
 using Wino.Views.Abstract;
 
 namespace Wino.Views;
@@ -37,11 +37,21 @@ public sealed partial class AccountDetailsPage : AccountDetailsPageAbstract
         }
     }
 
-    private void CalendarItemClicked(object sender, RoutedEventArgs e)
+    private async void CalendarSynchronizationToggled(object sender, RoutedEventArgs e)
     {
-        if (sender is CommunityToolkit.WinUI.Controls.SettingsCard settingsCard && settingsCard.CommandParameter is AccountCalendar calendar)
+        if (sender is ToggleSwitch { Tag: AccountCalendarSettingsItemViewModel calendarItem } toggleSwitch)
         {
-            ViewModel.CalendarItemClickedCommand?.Execute(calendar);
+            calendarItem.IsSynchronizationEnabled = toggleSwitch.IsOn;
+            await ViewModel.UpdateCalendarSynchronizationAsync(calendarItem.Calendar, toggleSwitch.IsOn);
+        }
+    }
+
+    private async void CalendarShowAsSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        if (sender is ComboBox { Tag: AccountCalendarSettingsItemViewModel calendarItem, SelectedItem: AccountCalendarShowAsOption option })
+        {
+            calendarItem.SelectedShowAsOption = option;
+            await ViewModel.UpdateCalendarDefaultShowAsAsync(calendarItem.Calendar, option);
         }
     }
 

Wino.Mail.WinUI/Views/Calendar/CalendarAccountSettingsPage.xaml

@@ -3,6 +3,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:calendarViewModels="using:Wino.Calendar.ViewModels"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:domain="using:Wino.Core.Domain"
@@ -56,16 +57,6 @@
                     <ToggleSwitch IsOn="{x:Bind ViewModel.IsSyncEnabled, Mode=TwoWay}" />
                 </controls:SettingsCard>
 
-                <!--  Primary Calendar  -->
-                <controls:SettingsCard
-                    Description="{x:Bind domain:Translator.CalendarAccountSettings_PrimaryCalendarDescription, Mode=OneTime}"
-                    Header="{x:Bind domain:Translator.CalendarAccountSettings_PrimaryCalendar, Mode=OneTime}">
-                    <controls:SettingsCard.HeaderIcon>
-                        <FontIcon Glyph="&#xE735;" />
-                    </controls:SettingsCard.HeaderIcon>
-                    <ToggleSwitch IsOn="{x:Bind ViewModel.IsPrimaryCalendar, Mode=TwoWay}" />
-                </controls:SettingsCard>
-
                 <!--  Default Show As Status  -->
                 <controls:SettingsCard
                     Description="{x:Bind domain:Translator.CalendarAccountSettings_DefaultShowAsDescription, Mode=OneTime}"
@@ -75,9 +66,14 @@
                     </controls:SettingsCard.HeaderIcon>
                     <ComboBox
                         MinWidth="150"
-                        DisplayMemberPath="DisplayText"
                         ItemsSource="{x:Bind ViewModel.ShowAsOptions, Mode=OneWay}"
-                        SelectedItem="{x:Bind ViewModel.SelectedDefaultShowAsOption, Mode=TwoWay}" />
+                        SelectedItem="{x:Bind ViewModel.SelectedDefaultShowAsOption, Mode=TwoWay}">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate x:DataType="calendarViewModels:ShowAsOption">
+                                <TextBlock Text="{x:Bind DisplayText}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
                 </controls:SettingsCard>
 
             </StackPanel>

Wino.Mail.WinUI/Views/Calendar/CalendarAppShell.xaml

@@ -82,10 +82,10 @@
                         VerticalAlignment="Center"
                         HorizontalContentAlignment="Left"
                         Background="Transparent"
+                        DisplayType="{x:Bind ViewModel.StatePersistenceService.CalendarDisplayType, Mode=OneWay}"
                         FontSize="14"
                         FontWeight="Normal"
                         IsHitTestVisible="False"
-                        DisplayType="{x:Bind ViewModel.StatePersistenceService.CalendarDisplayType, Mode=OneWay}"
                         ItemsSource="{x:Bind ViewModel.DateNavigationHeaderItems}"
                         SelectedIndex="{x:Bind ViewModel.SelectedDateNavigationHeaderIndex, Mode=OneWay}">
                         <FlipView.ItemTemplate>
@@ -156,13 +156,24 @@
                     </Grid.RowDefinitions>
 
                     <Button
-                        Margin="14,12,14,0"
+                        Margin="10,12,10,0"
+                        Padding="4,12"
                         HorizontalAlignment="Stretch"
-                        Command="{x:Bind ViewModel.NewEventCommand}"
-                        Style="{StaticResource AccentButtonStyle}">
-                        <StackPanel HorizontalAlignment="Center" Orientation="Horizontal" Spacing="8">
+                        HorizontalContentAlignment="Left"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Command="{x:Bind ViewModel.NewEventCommand}">
+                        <StackPanel
+                            HorizontalAlignment="Center"
+                            Orientation="Horizontal"
+                            Spacing="8">
                             <coreControls:WinoFontIcon FontSize="16" Icon="NewMail" />
-                            <TextBlock Text="{x:Bind domain:Translator.CalendarEventCompose_NewEventButton}" />
+                            <TextBlock
+                                Margin="10,-2,0,0"
+                                VerticalAlignment="Center"
+                                FontSize="16"
+                                Style="{StaticResource FlyoutPickerTitleTextBlockStyle}"
+                                Text="{x:Bind domain:Translator.CalendarEventCompose_NewEventButton}" />
                         </StackPanel>
                     </Button>
 
@@ -279,7 +290,10 @@
                         <ListView.Items>
                             <ListViewItem>
                                 <StackPanel Orientation="Horizontal" Spacing="12">
-                                    <FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" FontSize="16" Glyph="&#xE77B;" />
+                                    <FontIcon
+                                        FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                        FontSize="16"
+                                        Glyph="&#xE77B;" />
 
                                     <TextBlock VerticalAlignment="Center" Text="{x:Bind domain:Translator.MenuManageAccounts}" />
                                 </StackPanel>

Wino.Mail.WinUI/Views/Calendar/CalendarEventComposePage.xaml.cs

@@ -137,6 +137,14 @@ public sealed partial class CalendarEventComposePage : CalendarEventComposePageA
         }
     }
 
+    private void ComposeCalendarClicked(object sender, ItemClickEventArgs e)
+    {
+        if (e.ClickedItem is AccountCalendarViewModel calendar)
+        {
+            ViewModel.SelectedCalendar = calendar;
+        }
+    }
+
     public void Receive(ApplicationThemeChanged message)
     {
         ViewModel.IsDarkWebviewRenderer = message.IsUnderlyingThemeDark;

Wino.Mail.WinUI/Views/Calendar/CalendarSettingsPage.xaml

@@ -3,9 +3,11 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:abstract="using:Wino.Mail.WinUI.Views.Abstract"
+    xmlns:calendarViewModels="using:Wino.Calendar.ViewModels"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
     xmlns:controls1="using:Microsoft.UI.Xaml.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:data="using:Wino.Calendar.ViewModels.Data"
     xmlns:domain="using:Wino.Core.Domain"
     xmlns:entities="using:Wino.Core.Domain.Entities.Shared"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -236,9 +238,7 @@
                 </controls:SettingsCard.Content>
             </controls:SettingsCard>
 
-            <controls:SettingsCard
-                Description="{x:Bind domain:Translator.CalendarSettings_DefaultSnoozeDuration_Description}"
-                Header="{x:Bind domain:Translator.CalendarSettings_DefaultSnoozeDuration_Header}">
+            <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarSettings_DefaultSnoozeDuration_Description}" Header="{x:Bind domain:Translator.CalendarSettings_DefaultSnoozeDuration_Header}">
                 <controls:SettingsCard.HeaderIcon>
                     <PathIcon Data="F1 M 10 1.25 C 10.456706 1.25 10.889486 1.337565 11.298339 1.512695 C 11.707192 1.687826 12.072591 1.927409 12.394531 2.231445 C 12.716471 2.535482 12.97656 2.892253 13.173828 3.301758 C 13.371096 3.711263 13.481771 4.146484 13.505859 4.607422 L 13.505859 5 C 13.969401 5.028646 14.386068 5.16276 14.755859 5.402344 C 15.125651 5.641927 15.414713 5.947917 15.623047 6.320312 C 15.83138 6.692709 15.9349 7.096355 15.933594 7.53125 L 15.933594 8.75 L 16.25 8.75 C 16.822917 8.75 17.317057 8.95638 17.732422 9.369141 C 18.147787 9.781901 18.357422 10.273437 18.359375 10.84375 L 18.359375 16.40625 C 18.359375 16.979167 18.153971 17.473308 17.743164 17.888672 C 17.332357 18.304037 16.839844 18.511719 16.265625 18.511719 L 3.734375 18.511719 C 3.164062 18.511719 2.671549 18.304037 2.256836 17.888672 C 1.842122 17.473308 1.634114 16.979167 1.630859 16.40625 L 1.630859 10.84375 C 1.630859 10.273437 1.837565 9.781901 2.250977 9.369141 C 2.664388 8.95638 3.156901 8.75 3.728516 8.75 L 4.0625 8.75 L 4.0625 7.53125 C 4.0625 7.09375 4.166341 6.689453 4.374023 6.314453 C 4.581706 5.939453 4.86914 5.632486 5.236328 5.393555 C 5.603516 5.154623 6.019532 5.021485 6.484375 4.994141 L 6.484375 4.607422 C 6.506511 4.148438 6.617838 3.714518 6.818359 3.305664 C 7.01888 2.896811 7.282877 2.539063 7.610352 2.232422 C 7.937826 1.92578 8.308268 1.685222 8.721679 1.510742 C 9.135091 1.336264 9.56575 1.249024 10.013672 1.249024 Z M 10.013672 2.5 C 9.441406 2.5 8.947916 2.706381 8.533203 3.119141 C 8.118489 3.531901 7.911459 4.023437 7.912109 4.59375 L 7.912109 6.25 L 12.089844 6.25 L 12.089844 4.59375 C 12.089844 4.023438 11.882161 3.531902 11.466797 3.119141 C 11.051433 2.706382 10.557292 2.5 9.984375 2.5 Z M 5.3125 7.53125 L 5.3125 8.75 L 14.6875 8.75 L 14.6875 7.53125 C 14.6875 7.303385 14.605144 7.107747 14.440429 6.944336 C 14.275714 6.780925 14.080729 6.69987 13.855469 6.703125 L 6.142578 6.703125 C 5.914713 6.703125 5.71875 6.785482 5.552734 6.950195 C 5.386719 7.114909 5.30339 7.310547 5.300781 7.537109 Z M 16.25 10 L 3.75 10 C 3.540365 10 3.361328 10.071615 3.212891 10.214844 C 3.064453 10.358073 2.989258 10.534505 2.986328 10.744141 L 2.986328 16.40625 C 2.986328 16.618489 3.058595 16.797526 3.203125 16.943359 C 3.347656 17.089193 3.526693 17.161458 3.740234 17.15625 L 16.25 17.15625 C 16.458333 17.15625 16.636067 17.082683 16.783203 16.935547 C 16.930339 16.788411 17.003906 16.609375 17.003906 16.398437 L 17.003906 10.742187 C 17.003906 10.536459 16.932942 10.359049 16.791016 10.209961 C 16.64909 10.060873 16.469401 9.986328 16.257812 9.986328 Z M 10 11.5625 C 10.227865 11.5625 10.423502 11.644856 10.586914 11.809571 C 10.750325 11.974285 10.83138 12.16862 10.830078 12.393555 L 10.830078 13.427734 L 11.855469 13.427734 C 12.080404 13.427734 12.273437 13.509115 12.434571 13.671875 C 12.595704 13.834636 12.675781 14.026693 12.675781 14.248047 C 12.675781 14.46224 12.596354 14.653321 12.4375 14.813477 C 12.278646 14.973633 12.089192 15.053711 11.869141 15.053711 L 10.830078 15.053711 L 10.830078 16.074219 C 10.830078 16.296224 10.748372 16.486981 10.584961 16.646484 C 10.42155 16.805989 10.229818 16.885742 10.005859 16.885742 C 9.781901 16.885742 9.590495 16.806315 9.431641 16.647461 C 9.272786 16.488607 9.193359 16.296875 9.193359 16.072266 L 9.193359 15.053711 L 8.15625 15.053711 C 7.931314 15.053711 7.738934 14.972331 7.579102 14.80957 C 7.419269 14.646809 7.339192 14.454753 7.338867 14.233399 C 7.338867 14.008464 7.419921 13.815755 7.582031 13.655274 C 7.744141 13.494793 7.935872 13.414551 8.157227 13.414551 L 9.193359 13.414551 L 9.193359 12.394531 C 9.193359 12.166667 9.275715 11.971029 9.440429 11.807618 C 9.605144 11.644206 9.799479 11.562825 10.023437 11.5625 Z" />
                 </controls:SettingsCard.HeaderIcon>
@@ -246,6 +246,40 @@
                     <ComboBox ItemsSource="{x:Bind ViewModel.SnoozeOptions, Mode=OneWay}" SelectedIndex="{x:Bind ViewModel.SelectedDefaultSnoozeIndex, Mode=TwoWay}" />
                 </controls:SettingsCard.Content>
             </controls:SettingsCard>
+
+            <controls:SettingsCard Description="{x:Bind domain:Translator.CalendarSettings_NewEventBehavior_Description}" Header="{x:Bind domain:Translator.CalendarSettings_NewEventBehavior_Header}">
+                <controls:SettingsCard.HeaderIcon>
+                    <FontIcon Glyph="&#xE163;" />
+                </controls:SettingsCard.HeaderIcon>
+                <controls:SettingsCard.Content>
+                    <StackPanel Spacing="12">
+                        <ComboBox ItemsSource="{x:Bind ViewModel.NewEventBehaviorOptions, Mode=OneWay}" SelectedItem="{x:Bind ViewModel.SelectedNewEventBehaviorOption, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendarViewModels:CalendarNewEventBehaviorOption">
+                                    <TextBlock Text="{x:Bind DisplayText}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+
+                        <ComboBox
+                            ItemsSource="{x:Bind ViewModel.AvailableNewEventCalendars, Mode=OneWay}"
+                            SelectedItem="{x:Bind ViewModel.SelectedNewEventCalendar, Mode=TwoWay}"
+                            Visibility="{x:Bind ViewModel.ShouldShowSpecificNewEventCalendar, Mode=OneWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="data:AccountCalendarViewModel">
+                                    <StackPanel Orientation="Vertical" Spacing="2">
+                                        <TextBlock Text="{x:Bind Name}" />
+                                        <TextBlock
+                                            FontSize="12"
+                                            Foreground="{ThemeResource TextFillColorSecondaryBrush}"
+                                            Text="{x:Bind Account.Address}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
+                    </StackPanel>
+                </controls:SettingsCard.Content>
+            </controls:SettingsCard>
         </StackPanel>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup x:Name="ClockIdentifierStates">

Wino.Mail.WinUI/Views/Calendar/EventDetailsPage.xaml

@@ -179,9 +179,14 @@
                         <ComboBox
                             Width="150"
                             VerticalAlignment="Center"
-                            DisplayMemberPath="DisplayText"
                             ItemsSource="{x:Bind ViewModel.ShowAsOptions}"
-                            SelectedItem="{x:Bind ViewModel.SelectedShowAsOption, Mode=TwoWay}" />
+                            SelectedItem="{x:Bind ViewModel.SelectedShowAsOption, Mode=TwoWay}">
+                            <ComboBox.ItemTemplate>
+                                <DataTemplate x:DataType="calendarViewModels:ShowAsOption">
+                                    <TextBlock Text="{x:Bind DisplayText}" />
+                                </DataTemplate>
+                            </ComboBox.ItemTemplate>
+                        </ComboBox>
                     </StackPanel>
 
                     <!--  Reminder  -->