Merge pull request #70 from MykhailoDav/refactoring_view_models_and_a…

…dding_samples

Refactored viewmodels;
Added new samples

README.md

@@ -21,6 +21,24 @@ Simple cross platform plugin for Calendar control featuring:
 | ------- | ------ |
 | ![Windiws Calendar Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/win.png) | ![Mac Calendar Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/mac.png) |
 
+Theme support
+| Ligth | Dark | Setting |
+| ------- | ------ | ------ |
+| ![Light theme Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/LightTheme.png) | ![Dark theme Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/DarkTheme.png) | ![Setting Page Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/ThemeSettingPage.png) |
+
+# New Samples
+
+Windows 11 calendar
+| Win     | Mac    |
+| ------- | ------ |
+| ![Windiws 11 android Calendar Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/W11_android.png) | ![Windiws 11 Calendar IOS Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/W11_ios.png) |
+
+Weekend calendar
+| Android     | IOS    |
+| ------- | ------ |
+| ![Weekend calendar Android Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/WeekendCalendar_android.png) | ![Weekend calendar IOS Screenshot](https://github.com/yurkinh/Plugin.Maui.Calendar/blob/main/res/WeekendCalendar_ios.png) |
+
+
 
 
 
@@ -33,6 +51,10 @@ Simple cross platform plugin for Calendar control featuring:
 * Added OnShownDateChangedCommand so we can take action when date is changed.
 * Added Dispose method to force handlers disconnect call.
 * Added new property **OtherMonthSelectedDayColor**
+* Fixed bug with **OtherMonthDayIsVisibleProperty**
+* Added a weekend calendar sample
+* Added a windows 11 calendar sample
+* Added theme support
 
 
 ### Usage

samples/SampleApp/App.xaml

@@ -1,8 +1,9 @@
-<?xml version = "1.0" encoding = "UTF-8" ?>
-<Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:SampleApp"
-             x:Class="SampleApp.App">
+<?xml version="1.0" encoding="UTF-8" ?>
+<Application
+    x:Class="SampleApp.App"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:SampleApp">
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

samples/SampleApp/App.xaml.cs

@@ -1,26 +1,31 @@
-using SampleApp.Views;
+using SampleApp.Model;
+using SampleApp.Services;
+using SampleApp.Views;
 
 namespace SampleApp;
 
 public partial class App : Application
 {
+    readonly IThemeService themeService;
+
     public static new App Current => (App)Application.Current;
-    public App()
+    public App(IThemeService themeService)
 	{
-		InitializeComponent();
+        this.themeService = themeService;
+        InitializeComponent();
 
         MainPage = new NavigationPage(new MainPage());
     }
 
 
     protected override void OnStart()
     {
-        AppTheme currentTheme = Application.Current.RequestedTheme;        
+        themeService.SetTheme((AppTheme)(Themes.System));
     }   
 
     protected override void OnResume()
     {
-        AppTheme currentTheme = Application.Current.RequestedTheme;        
+
     }
 
 }

samples/SampleApp/Controls/CalendarFooter.xaml.cs

@@ -1,11 +1,10 @@
-namespace SampleApp.Controls
+namespace SampleApp.Controls;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class CalendarFooter : ContentView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class CalendarFooter : ContentView
+    public CalendarFooter()
     {
-        public CalendarFooter()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }

samples/SampleApp/Controls/CalendarHeader.xaml.cs

@@ -1,11 +1,10 @@
-namespace SampleApp.Controls
+namespace SampleApp.Controls;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class CalendarHeader : DataTemplate
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class CalendarHeader : DataTemplate
+    public CalendarHeader()
     {
-        public CalendarHeader()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
     }
 }

samples/SampleApp/Controls/CalenderEvent.xaml.cs

@@ -1,29 +1,27 @@
-using SampleApp.Model;
-using System.Windows.Input;
+using System.Windows.Input;
 
-namespace SampleApp.Controls
+namespace SampleApp.Controls;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class CalenderEvent : ContentView
 {
-    [XamlCompilation(XamlCompilationOptions.Compile)]
-    public partial class CalenderEvent : ContentView
-    {
-        public static BindableProperty CalenderEventCommandProperty =
-            BindableProperty.Create(nameof(CalenderEventCommand), typeof(ICommand), typeof(CalenderEvent), null);
+    public static BindableProperty CalenderEventCommandProperty =
+        BindableProperty.Create(nameof(CalenderEventCommand), typeof(ICommand), typeof(CalenderEvent), null);
 
-        public CalenderEvent()
-        {
-            InitializeComponent();
-        }
+    public CalenderEvent()
+    {
+        InitializeComponent();
+    }
 
-        public ICommand CalenderEventCommand
-        {
-            get => (ICommand)GetValue(CalenderEventCommandProperty);
-            set => SetValue(CalenderEventCommandProperty, value);
-        }
+    public ICommand CalenderEventCommand
+    {
+        get => (ICommand)GetValue(CalenderEventCommandProperty);
+        set => SetValue(CalenderEventCommandProperty, value);
+    }
 
-        private void TapGestureRecognizer_Tapped(object sender, System.EventArgs e)
-        {
-            if (BindingContext is AdvancedEventModel eventModel)
-                CalenderEventCommand?.Execute(eventModel);
-        }
+    private void TapGestureRecognizer_Tapped(object sender, System.EventArgs e)
+    {
+        if (BindingContext is AdvancedEventModel eventModel)
+            CalenderEventCommand?.Execute(eventModel);
     }
 }

samples/SampleApp/Controls/DefaultDeviceCalendarHeaders/Windows11CalendarHeader.xaml

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<ContentView
+    x:Class="SampleApp.Controls.Windows11CalendarHeader"
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:controls="clr-namespace:SampleApp.Controls"
+    xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
+    x:Name="Header"
+    x:DataType="controls:CalendarHeader">
+    <ContentView.Resources>
+        <ResourceDictionary>
+            <Style x:Key="arrowButtonPrevStyle" TargetType="Button">
+                <Setter Property="FontFamily" Value="FontAwesomeSolid" />
+                <Setter Property="BorderColor" Value="Transparent" />
+                <Setter Property="BackgroundColor" Value="Transparent" />
+                <Setter Property="Text" Value="&#xf062;" />
+                <Setter Property="FontSize" Value="15" />
+                <Setter Property="TextColor" Value="DimGray" />
+            </Style>
+
+            <Style x:Key="arrowButtonNextStyle" TargetType="Button">
+                <Setter Property="FontFamily" Value="FontAwesomeSolid" />
+                <Setter Property="Text" Value="&#xf063;" />
+                <Setter Property="BorderColor" Value="Transparent" />
+                <Setter Property="BackgroundColor" Value="Transparent" />
+                <Setter Property="FontSize" Value="15" />
+                <Setter Property="TextColor" Value="DimGray" />
+            </Style>
+            <Style x:Key="ArrowFooterButtonUpStyle" TargetType="Button">
+                <Setter Property="BackgroundColor" Value="Transparent" />
+                <Setter Property="FontFamily" Value="FontAwesomeSolid" />
+                <Setter Property="FontAttributes" Value="Bold" />
+                <Setter Property="FontSize" Value="15" />
+                <Setter Property="HorizontalOptions" Value="End" />
+                <Setter Property="Text" Value="&#xf063;" />
+                <Setter Property="TextColor" Value="DimGray" />
+                <Setter Property="VerticalOptions" Value="Center" />
+            </Style>
+        </ResourceDictionary>
+    </ContentView.Resources>
+    <Grid
+        Padding="12,0,12,0"
+        ColumnDefinitions="*,Auto,Auto"
+        HorizontalOptions="Fill"
+        IsVisible="{Binding BindingContext.ShowMonthPicker, Source={x:Reference Header}}"
+        RowDefinitions="Auto"
+        VerticalOptions="Start">
+        <Label
+            Grid.Column="0"
+            FontAttributes="Bold"
+            FontSize="14"
+            HorizontalOptions="Start"
+            Style="{StaticResource HeaderLabelStyle}"
+            TextColor="{toolkit:AppThemeResource DaysTitleLabelTextColorMinimalistic}"
+            VerticalOptions="Center">
+            <Label.FormattedText>
+                <FormattedString>
+                    <Span Text="{Binding BindingContext.LayoutUnitText, Source={x:Reference Header}, Mode=TwoWay}" />
+                    <Span Text=" " />
+                    <Span Text="{Binding BindingContext.Year, Source={x:Reference Header}, Mode=TwoWay}" />
+                </FormattedString>
+            </Label.FormattedText>
+        </Label>
+        <Button
+            Grid.Column="1"
+            Command="{Binding BindingContext.PrevLayoutUnitCommand, Source={x:Reference Header}, Mode=OneWay}"
+            Style="{StaticResource arrowButtonPrevStyle}" />
+        <Button
+            Grid.Column="2"
+            Command="{Binding BindingContext.NextLayoutUnitCommand, Source={x:Reference Header}, Mode=OneWay}"
+            Style="{StaticResource arrowButtonNextStyle}" />
+    </Grid>
+</ContentView>

samples/SampleApp/Controls/DefaultDeviceCalendarHeaders/Windows11CalendarHeader.xaml.cs

@@ -0,0 +1,10 @@
+namespace SampleApp.Controls;
+
+[XamlCompilation(XamlCompilationOptions.Compile)]
+public partial class Windows11CalendarHeader : ContentView
+{
+	public Windows11CalendarHeader()
+	{
+		InitializeComponent();
+	}
+}

samples/SampleApp/GlobalNamespaces.cs

@@ -0,0 +1,4 @@
+global using CommunityToolkit.Mvvm.ComponentModel;
+global using CommunityToolkit.Mvvm.Input;
+global using SampleApp.Model;
+global using SampleApp.ViewModels;

samples/SampleApp/Helpers/ServiceHelper.cs

@@ -0,0 +1,10 @@
+namespace SampleApp.Helpers;
+public static class ServiceHelper
+{
+    public static IServiceProvider Services { get; private set; }
+
+    public static void Initialize(IServiceProvider serviceProvider) =>
+        Services = serviceProvider;
+
+    public static T GetService<T>() => Services.GetService<T>();
+}

samples/SampleApp/MauiProgram.cs

@@ -1,5 +1,9 @@
-using Microsoft.Extensions.Logging;
+using CommunityToolkit.Maui;
+using Microsoft.Extensions.Logging;
 using Mopups.Hosting;
+using SampleApp.Helpers;
+using SampleApp.Services;
+using SampleApp.Views;
 
 namespace SampleApp;
 
@@ -11,19 +15,39 @@ public static MauiApp CreateMauiApp()
 		builder
 			.UseMauiApp<App>()
 			.ConfigureMopups()
-			.ConfigureFonts(fonts =>
+            .UseMauiCommunityToolkit()
+            .InjectServices()
+            .InjectViewsAndViewModels()
+            .ConfigureFonts(fonts =>
 			{
-				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-				fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-                fonts.AddFont("font-awesome-5-free-solid.otf", "FontAwesomeSolid");
-                fonts.AddFont("font-awesome-5-free-regular.otf", "FontAwesomeRegular");
+                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+                fonts.AddFont("font-awesome-6-free-solid.otf", "FontAwesomeSolid");
+                fonts.AddFont("font-awesome-6-free-regular.otf", "FontAwesomeRegular");
+                fonts.AddFont("DarkerGrotesque-VariableFont_wght.ttf", "DarkerGrotesque");
             });
 
 #if DEBUG
 		builder.Logging.AddDebug();
 #endif
 
-		return builder.Build();
-	}
+        var app = builder.Build();
+
+        //we must initialize our service helper before using it
+        ServiceHelper.Initialize(app.Services);
+
+        return app;
+    }
+    static MauiAppBuilder InjectViewsAndViewModels(this MauiAppBuilder builder)
+    {
+        builder.Services.AddTransient<UserSettingPage>();
+        builder.Services.AddTransient<UserSettingViewModel>();
+        return builder;
+    }
+    static MauiAppBuilder InjectServices(this MauiAppBuilder builder)
+    {
+        builder.Services.AddSingleton<IThemeService, ThemeService>();
+        return builder;
+    }
 }
 

samples/SampleApp/Model/AdvancedEventModel.cs

@@ -1,9 +1,8 @@
-namespace SampleApp.Model
+namespace SampleApp.Model;
+
+public class AdvancedEventModel
 {
-    public class AdvancedEventModel
-    {
-        public string Name { get; set; }
-        public string Description { get; set; }
-        public DateTime Starting { get; set; }
-    }
+    public string Name { get; set; }
+    public string Description { get; set; }
+    public DateTime Starting { get; set; }
 }

samples/SampleApp/Model/CalendarPickerResult.cs

@@ -1,11 +1,8 @@
-using System;
+namespace SampleApp.Model;
 
-namespace SampleApp.Model
+public class CalendarPickerResult
 {
-    public class CalendarPickerResult
-    {
-        public bool IsSuccess { get; set; }
+    public bool IsSuccess { get; set; }
 
-        public DateTime? SelectedDate { get; set; }
-    }
+    public DateTime? SelectedDate { get; set; }
 }

samples/SampleApp/Model/CalendarRangePickerResult.cs

@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
+namespace SampleApp.Model;
 
-namespace SampleApp.Model
+public class CalendarRangePickerResult
 {
-    public class CalendarRangePickerResult
-    {
-        public bool IsSuccess { get; set; }
-        public List<DateTime> SelectedDates { get; set; } = new List<DateTime>();
-        public DateTime? SelectedStartDate { get; set; }
-        public DateTime? SelectedEndDate { get; set; }
-    }
+    public bool IsSuccess { get; set; }
+    public List<DateTime> SelectedDates { get; set; } = new List<DateTime>();
+    public DateTime? SelectedStartDate { get; set; }
+    public DateTime? SelectedEndDate { get; set; }
 }