javier/Wino-Mail
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Listing account calendars on the shell, some visual state updates and reacting to calendar setting changes properly.

Browse Source
This commit is contained in:
Burak Kaan Köse
2024-12-29 17:41:54 +01:00
parent 8d8d7d0f8c
commit eef2ee1baa
16 changed files with 484 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Wino.Calendar/App.xaml.cs
View File

@@ -12,6 +12,7 @@ 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;
@@ -71,6 +72,7 @@ namespace Wino.Calendar
services.AddTransient<ISettingsBuilderService, SettingsBuilderService>();
services.AddTransient<IProviderService, ProviderService>();
services.AddSingleton<IAuthenticatorConfig, CalendarAuthenticatorConfig>();
services.AddSingleton<IAccountCalendarStateService, AccountCalendarStateService>();
}
private void RegisterViewModels(IServiceCollection services)

13
Wino.Calendar/Services/AccountCalendarStateService.cs Normal file
View File

@@ -0,0 +1,13 @@
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.ComponentModel;
using Wino.Calendar.ViewModels.Data;
using Wino.Calendar.ViewModels.Interfaces;
namespace Wino.Calendar.Services
{
public partial class AccountCalendarStateService : ObservableObject, IAccountCalendarStateService
{
[ObservableProperty]
private ObservableCollection<GroupedAccountCalendarViewModel> _groupedAccountCalendars = new ObservableCollection<GroupedAccountCalendarViewModel>();
}
}

85
Wino.Calendar/Views/AppShell.xaml
View File

@@ -9,6 +9,7 @@
xmlns:coreControls="using:Wino.Core.UWP.Controls"
xmlns:coreSelectors="using:Wino.Core.UWP.Selectors"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:data="using:Wino.Calendar.ViewModels.Data"
xmlns:domain="using:Wino.Core.Domain"
xmlns:helpers="using:Wino.Helpers"
xmlns:local="using:Wino.Calendar.Views"
@@ -174,20 +175,87 @@
HighlightedDateRange="{x:Bind ViewModel.HighlightedDateRange, Mode=OneWay}"
TodayBackgroundColor="{ThemeResource SystemAccentColor}" />
<ScrollViewer
<!-- Account Calendars Host -->
<ListView
Grid.Row="1"
HorizontalScrollMode="Disabled"
VerticalScrollBarVisibility="Hidden">
<Grid>
ItemsSource="{x:Bind ViewModel.AccountCalendarStateService.GroupedAccountCalendars}"
SelectionMode="None">
<ListView.Header>
<TextBlock
Margin="20,12,12,12"
FontSize="16"
Text="Calendars" />
</ListView.Header>
<ListView.ItemTemplate>
<DataTemplate x:DataType="data:GroupedAccountCalendarViewModel">
<muxc:Expander
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
IsExpanded="{x:Bind IsExpanded, Mode=TwoWay}">
<muxc:Expander.Header>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<CheckBox
Width="26"
MinWidth="0"
IsChecked="{x:Bind IsCheckedState, Mode=TwoWay}"
IsThreeState="True" />
<TextBlock
Grid.Column="1"
VerticalAlignment="Center"
TextWrapping="Wrap">
<Run FontWeight="SemiBold" Text="{x:Bind Account.Name}" />
<Run FontSize="12" Text="(" /><Run FontSize="12" Text="{x:Bind Account.Address}" /><Run FontSize="12" Text=")" />
</TextBlock>
</Grid>
</muxc:Expander.Header>
<muxc:Expander.Content>
<ItemsControl ItemsSource="{x:Bind AccountCalendars}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="data:AccountCalendarViewModel">
<CheckBox
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
HorizontalContentAlignment="Stretch"
VerticalContentAlignment="Stretch"
IsChecked="{x:Bind IsChecked, Mode=TwoWay}">
<Border
Margin="0,0,0,4"
Padding="4,2,4,2"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Background="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(BackgroundColorHex), Mode=OneWay}"
CornerRadius="3">
<TextBlock
FontSize="14"
Foreground="{x:Bind helpers:XamlHelpers.GetSolidColorBrushFromHex(TextColorHex), Mode=OneWay}"
Text="{x:Bind Name, Mode=OneWay}"
TextWrapping="Wrap" />
</Border>
</CheckBox>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</muxc:Expander.Content>
</muxc:Expander>
</DataTemplate>
</ListView.ItemTemplate>
<ListView.Footer>
<Button
Margin="14,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Bottom"
Command="{x:Bind ViewModel.SyncCommand}"
Content="Test Sync" />
</Grid>
</ScrollViewer>
</ListView.Footer>
</ListView>
<!-- Menu Items -->
<ListView
Grid.Row="2"
ItemTemplateSelector="{StaticResource NavigationMenuTemplateSelector}"
@@ -219,6 +287,7 @@
</ListViewItem>
</ListView.Items>
</ListView>
<!--<CommandBar Grid.Row="2" DefaultLabelPosition="Right">
<AppBarButton Label="Manage Accounts">
<AppBarButton.Icon>
@@ -270,11 +339,15 @@
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="1200" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="MainSplitView.IsPaneOpen" Value="True" />
</VisualState.Setters>
</VisualState>
<VisualState x:Name="SmallScreen">
<VisualState.Setters>
<Setter Target="NavigationTitleStack.Visibility" Value="Collapsed" />
<Setter Target="SearchBox.(Grid.ColumnSpan)" Value="2" />
<Setter Target="MainSplitView.IsPaneOpen" Value="False" />
</VisualState.Setters>
<VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="0" />

1
Wino.Calendar/Views/CalendarPage.xaml
View File

@@ -56,7 +56,6 @@
<TimePicker x:Name="EventTimePicker" ClockIdentifier="24HourClock" />
<!-- Create events dialog -->
<Button
x:Name="AddEvent"

5
Wino.Calendar/Views/Settings/PersonalizationPage.xaml
View File

File diff suppressed because one or more lines are too long

3
Wino.Calendar/Wino.Calendar.csproj
View File

@@ -155,6 +155,7 @@
</Compile>
<Compile Include="Models\CalendarItemMeasurement.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Services\AccountCalendarStateService.cs" />
<Compile Include="Services\CalendarAuthenticatorConfig.cs" />
<Compile Include="Services\DialogService.cs" />
<Compile Include="Services\NavigationService.cs" />
@@ -367,4 +368,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>