Merge pull request #70 from ME-MarvinE/dev

4.2.0 Changes
ME-MarvinE · Oct 20, 2022 · bb1dfbc · bb1dfbc
2 parents a29362f + 62fb548
commit bb1dfbc
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 39 deletions.
diff --git a/XCalendar.Core/FodyWeavers.xml b/XCalendar.Core/FodyWeavers.xml
diff --git a/XCalendar.Forms/Views/CalendarView.xaml b/XCalendar.Forms/Views/CalendarView.xaml
@@ -33,7 +33,7 @@
         <xc:NavigationView
             BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={x:Reference CalendarView_Unique}}"
             BackwardsArrowCommandParameter="{Binding BackwardsArrowCommandParameter, Source={x:Reference CalendarView_Unique}}"
-            ControlTemplate="{Binding NavigationTemplate, Source={x:Reference CalendarView_Unique}}"
+            ControlTemplate="{Binding NavigationViewTemplate, Source={x:Reference CalendarView_Unique}}"
             ForwardsArrowCommand="{Binding ForwardsArrowCommand, Source={x:Reference CalendarView_Unique}}"
             ForwardsArrowCommandParameter="{Binding ForwardsArrowCommandParameter, Source={x:Reference CalendarView_Unique}}"
             Text="{Binding NavigatedDate, StringFormat='{0:MMMM yyy}', Source={x:Reference CalendarView_Unique}}"/>

diff --git a/XCalendar.Forms/Views/CalendarView.xaml.cs b/XCalendar.Forms/Views/CalendarView.xaml.cs
@@ -98,10 +98,10 @@ public double DaysViewHeightRequest
         /// <summary>
         /// The template used to display the view for navigating the calendar.
         /// </summary>
-        public ControlTemplate NavigationTemplate
+        public ControlTemplate NavigationViewTemplate
         {
-            get { return (ControlTemplate)GetValue(NavigationTemplateProperty); }
-            set { SetValue(NavigationTemplateProperty, value); }
+            get { return (ControlTemplate)GetValue(NavigationViewTemplateProperty); }
+            set { SetValue(NavigationViewTemplateProperty, value); }
         }
         /// <summary>
         /// The template used to display a <see cref="ICalendarDay"/>
@@ -128,7 +128,7 @@ public DataTemplate DayTemplate
         public static readonly BindableProperty DayNameHorizontalSpacingProperty = BindableProperty.Create(nameof(DayNameHorizontalSpacing), typeof(double), typeof(CalendarView));
         public static readonly BindableProperty DaysViewTemplateProperty = BindableProperty.Create(nameof(DaysViewTemplate), typeof(ControlTemplate), typeof(CalendarView));
         public static readonly BindableProperty DaysViewHeightRequestProperty = BindableProperty.Create(nameof(DaysViewHeightRequest), typeof(double), typeof(CalendarView), 300d);
-        public static readonly BindableProperty NavigationTemplateProperty = BindableProperty.Create(nameof(NavigationTemplate), typeof(ControlTemplate), typeof(CalendarView));
+        public static readonly BindableProperty NavigationViewTemplateProperty = BindableProperty.Create(nameof(NavigationViewTemplate), typeof(ControlTemplate), typeof(CalendarView));
         #endregion
 
         #endregion

diff --git a/XCalendar.Forms/XCalendar.Forms.csproj b/XCalendar.Forms/XCalendar.Forms.csproj
@@ -6,7 +6,7 @@
     <Description>A plugin for Xamarin Forms providing a Calendar API and DateTime extensions along with custom controls to consume them with.</Description>
     <PackageId>$(AssemblyName)</PackageId>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <RepositoryUrl>https://github.com/ME-MarvinE/XCalendar</RepositoryUrl>
     <PackageTags>csharp; dotnet; cross-platform; calendar; calendar-component;  plugin; xamarin; xamarinforms; xamarin-forms;</PackageTags>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>

diff --git a/XCalendar.Maui/Views/CalendarView.xaml b/XCalendar.Maui/Views/CalendarView.xaml
@@ -38,7 +38,7 @@
         <xc:NavigationView
             BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={x:Reference CalendarView_Unique}}"
             BackwardsArrowCommandParameter="{Binding BackwardsArrowCommandParameter, Source={x:Reference CalendarView_Unique}}"
-            ControlTemplate="{Binding NavigationTemplate, Source={x:Reference CalendarView_Unique}}"
+            ControlTemplate="{Binding NavigationViewTemplate, Source={x:Reference CalendarView_Unique}}"
             ForwardsArrowCommand="{Binding ForwardsArrowCommand, Source={x:Reference CalendarView_Unique}}"
             ForwardsArrowCommandParameter="{Binding ForwardsArrowCommandParameter, Source={x:Reference CalendarView_Unique}}"
             Text="{Binding NavigatedDate, StringFormat='{0:MMMM yyy}', Source={x:Reference CalendarView_Unique}}"/>

diff --git a/XCalendar.Maui/Views/CalendarView.xaml.cs b/XCalendar.Maui/Views/CalendarView.xaml.cs
@@ -93,10 +93,10 @@ public double DaysViewHeightRequest
         /// <summary>
         /// The template used to display the view for navigating the calendar.
         /// </summary>
-        public ControlTemplate NavigationTemplate
+        public ControlTemplate NavigationViewTemplate
         {
-            get { return (ControlTemplate)GetValue(NavigationTemplateProperty); }
-            set { SetValue(NavigationTemplateProperty, value); }
+            get { return (ControlTemplate)GetValue(NavigationViewTemplateProperty); }
+            set { SetValue(NavigationViewTemplateProperty, value); }
         }
         /// <summary>
         /// The template used to display a <see cref="ICalendarDay"/>
@@ -123,7 +123,7 @@ public DataTemplate DayTemplate
         public static readonly BindableProperty DayNameHorizontalSpacingProperty = BindableProperty.Create(nameof(DayNameHorizontalSpacing), typeof(double), typeof(CalendarView));
         public static readonly BindableProperty DaysViewTemplateProperty = BindableProperty.Create(nameof(DaysViewTemplate), typeof(ControlTemplate), typeof(CalendarView));
         public static readonly BindableProperty DaysViewHeightRequestProperty = BindableProperty.Create(nameof(DaysViewHeightRequest), typeof(double), typeof(CalendarView), 300d);
-        public static readonly BindableProperty NavigationTemplateProperty = BindableProperty.Create(nameof(NavigationTemplate), typeof(ControlTemplate), typeof(CalendarView));
+        public static readonly BindableProperty NavigationViewTemplateProperty = BindableProperty.Create(nameof(NavigationViewTemplate), typeof(ControlTemplate), typeof(CalendarView));
         #endregion
 
         #endregion

diff --git a/XCalendar.Maui/XCalendar.Maui.csproj b/XCalendar.Maui/XCalendar.Maui.csproj
@@ -16,7 +16,7 @@
 		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
 		<Authors>MarvinE</Authors>
-		<Version>4.1.0-pre1</Version>
+		<Version>4.2.0</Version>
 		<Description>A plugin for .NET MAUI providing a Calendar API and DateTime extensions along with custom controls to consume them with.</Description>
 		<PackageIcon>XCalendar Nuget Icon.png</PackageIcon>
 		<RepositoryUrl>https://github.com/ME-MarvinE/XCalendar</RepositoryUrl>

diff --git a/XCalendarFormsSample/XCalendarFormsSample/Popups/DatePickerDialogPopup.xaml b/XCalendarFormsSample/XCalendarFormsSample/Popups/DatePickerDialogPopup.xaml
@@ -68,7 +68,7 @@
             ForwardsArrowCommandParameter="{Binding Calendar.ForwardsNavigationAmount, Source={x:Reference This}}"
             NavigatedDate="{Binding Calendar.NavigatedDate, Source={x:Reference This}}">
 
-            <xc:CalendarView.NavigationTemplate>
+            <xc:CalendarView.NavigationViewTemplate>
                 <ControlTemplate>
                     <xc:NavigationView
                         ArrowColor="{StaticResource ContentTextColor}"
@@ -81,7 +81,7 @@
                         Text="{Binding Text, Source={RelativeSource TemplatedParent}}"
                         TextColor="{StaticResource ContentTextColor}"/>
                 </ControlTemplate>
-            </xc:CalendarView.NavigationTemplate>
+            </xc:CalendarView.NavigationViewTemplate>
 
             <xc:CalendarView.DayNameTemplate>
                 <DataTemplate x:DataType="{x:Type System:DayOfWeek}">

diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/CustomisingADayExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/CustomisingADayExamplePage.xaml
@@ -24,7 +24,7 @@
             NavigatedDate="{Binding Calendar.NavigatedDate}"
             Style="{StaticResource DefaultCalendarViewStyle}">
 
-            <xc:CalendarView.NavigationTemplate>
+            <xc:CalendarView.NavigationViewTemplate>
                 <ControlTemplate>
                     <xc:NavigationView
                         BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={RelativeSource TemplatedParent}}"
@@ -34,7 +34,7 @@
                         Style="{StaticResource DefaultNavigationViewStyle}"
                         Text="{Binding Text, Source={RelativeSource TemplatedParent}}"/>
                 </ControlTemplate>
-            </xc:CalendarView.NavigationTemplate>
+            </xc:CalendarView.NavigationViewTemplate>
 
             <xc:CalendarView.DayTemplate>
                 <DataTemplate x:DataType="{x:Type xcModels:CalendarDay}">

diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml
@@ -53,7 +53,7 @@
                 NavigatedDate="{Binding EventCalendar.NavigatedDate}"
                 Style="{StaticResource DefaultCalendarViewStyle}">
 
-                <xc:CalendarView.NavigationTemplate>
+                <xc:CalendarView.NavigationViewTemplate>
                     <ControlTemplate>
                         <xc:NavigationView
                             ArrowColor="{StaticResource ContentTextColor}"
@@ -67,7 +67,7 @@
                             Text="{Binding Text, Source={RelativeSource TemplatedParent}}"
                             TextColor="{StaticResource ContentTextColor}"/>
                     </ControlTemplate>
-                </xc:CalendarView.NavigationTemplate>
+                </xc:CalendarView.NavigationViewTemplate>
 
                 <xc:CalendarView.DayTemplate>
                     <DataTemplate x:DataType="{x:Type Models:EventDay}">

diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml
@@ -936,7 +936,7 @@
                     NavigatedDate="{Binding Calendar.NavigatedDate}"
                     Style="{StaticResource DefaultCalendarViewStyle}">
 
-                    <xc:CalendarView.NavigationTemplate>
+                    <xc:CalendarView.NavigationViewTemplate>
                         <ControlTemplate>
                             <xc:NavigationView
                                 ArrowBackgroundColor="{Binding NavigationArrowBackgroundColor}"
@@ -952,7 +952,7 @@
                                 Text="{Binding Text, Source={RelativeSource TemplatedParent}}"
                                 TextColor="{Binding NavigationTextColor}"/>
                         </ControlTemplate>
-                    </xc:CalendarView.NavigationTemplate>
+                    </xc:CalendarView.NavigationViewTemplate>
 
                     <xc:CalendarView.DayTemplate>
                         <DataTemplate x:DataType="{x:Type xcModels:CalendarDay}">

diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/SelectionExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/SelectionExamplePage.xaml
@@ -36,7 +36,7 @@
                 NavigatedDate="{Binding Calendar.NavigatedDate}"
                 Style="{StaticResource DefaultCalendarViewStyle}">
 
-                <xc:CalendarView.NavigationTemplate>
+                <xc:CalendarView.NavigationViewTemplate>
                     <ControlTemplate>
                         <xc:NavigationView
                             BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={x:RelativeSource TemplatedParent}}"
@@ -46,7 +46,7 @@
                             Style="{StaticResource DefaultNavigationViewStyle}"
                             Text="{Binding Text, Source={RelativeSource TemplatedParent}}"/>
                     </ControlTemplate>
-                </xc:CalendarView.NavigationTemplate>
+                </xc:CalendarView.NavigationViewTemplate>
 
                 <!--  Not Required, used only for styling.  -->
                 <xc:CalendarView.DayTemplate>

diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/UsingDayViewExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/UsingDayViewExamplePage.xaml
@@ -25,7 +25,7 @@
                 NavigatedDate="{Binding Calendar.NavigatedDate}"
                 Style="{StaticResource DefaultCalendarViewStyle}">
 
-                <xc:CalendarView.NavigationTemplate>
+                <xc:CalendarView.NavigationViewTemplate>
                     <ControlTemplate>
                         <xc:NavigationView
                             BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={RelativeSource TemplatedParent}}"
@@ -35,7 +35,7 @@
                             Style="{StaticResource DefaultNavigationViewStyle}"
                             Text="{Binding Text, Source={RelativeSource TemplatedParent}}"/>
                     </ControlTemplate>
-                </xc:CalendarView.NavigationTemplate>
+                </xc:CalendarView.NavigationViewTemplate>
 
                 <xc:CalendarView.DayTemplate>
                     <DataTemplate x:DataType="{x:Type xcModels:CalendarDay}">

diff --git a/XCalendarMauiSample/Popups/DatePickerDialogPopup.xaml b/XCalendarMauiSample/Popups/DatePickerDialogPopup.xaml
@@ -68,7 +68,7 @@
             ForwardsArrowCommandParameter="{Binding Calendar.ForwardsNavigationAmount, Source={x:Reference This}}"
             NavigatedDate="{Binding Calendar.NavigatedDate, Source={x:Reference This}}">
 
-            <xc:CalendarView.NavigationTemplate>
+            <xc:CalendarView.NavigationViewTemplate>
                 <ControlTemplate>
                     <xc:NavigationView
                         ArrowColor="{StaticResource ContentTextColor}"
@@ -81,7 +81,7 @@
                         Text="{Binding Text, Source={RelativeSource TemplatedParent}}"
                         TextColor="{StaticResource ContentTextColor}"/>
                 </ControlTemplate>
-            </xc:CalendarView.NavigationTemplate>
+            </xc:CalendarView.NavigationViewTemplate>
 
             <xc:CalendarView.DayNameTemplate>
                 <DataTemplate x:DataType="{x:Type System:DayOfWeek}">

diff --git a/XCalendarMauiSample/Views/CustomisingADayExamplePage.xaml b/XCalendarMauiSample/Views/CustomisingADayExamplePage.xaml
@@ -24,7 +24,7 @@
             NavigatedDate="{Binding Calendar.NavigatedDate}"
             Style="{StaticResource DefaultCalendarViewStyle}">
 
-            <xc:CalendarView.NavigationTemplate>
+            <xc:CalendarView.NavigationViewTemplate>
                 <ControlTemplate>
                     <xc:NavigationView
                         BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={RelativeSource TemplatedParent}}"
@@ -34,7 +34,7 @@
                         Style="{StaticResource DefaultNavigationViewStyle}"
                         Text="{Binding Text, Source={RelativeSource TemplatedParent}}"/>
                 </ControlTemplate>
-            </xc:CalendarView.NavigationTemplate>
+            </xc:CalendarView.NavigationViewTemplate>
 
             <xc:CalendarView.DayTemplate>
                 <DataTemplate x:DataType="{x:Type xcModels:CalendarDay}">

diff --git a/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml b/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml
@@ -54,7 +54,7 @@
                 NavigatedDate="{Binding EventCalendar.NavigatedDate}"
                 Style="{StaticResource DefaultCalendarViewStyle}">
 
-                <xc:CalendarView.NavigationTemplate>
+                <xc:CalendarView.NavigationViewTemplate>
                     <ControlTemplate>
                         <xc:NavigationView
                             ArrowColor="{StaticResource ContentTextColor}"
@@ -68,7 +68,7 @@
                             Text="{Binding Text, Source={RelativeSource TemplatedParent}}"
                             TextColor="{StaticResource ContentTextColor}"/>
                     </ControlTemplate>
-                </xc:CalendarView.NavigationTemplate>
+                </xc:CalendarView.NavigationViewTemplate>
 
                 <xc:CalendarView.DayTemplate>
                     <DataTemplate x:DataType="{x:Type Models:EventDay}">

diff --git a/XCalendarMauiSample/Views/PlaygroundPage.xaml b/XCalendarMauiSample/Views/PlaygroundPage.xaml
@@ -978,7 +978,7 @@
                 NavigatedDate="{Binding Calendar.NavigatedDate}"
                 Style="{StaticResource DefaultCalendarViewStyle}">
 
-                <xc:CalendarView.NavigationTemplate>
+                <xc:CalendarView.NavigationViewTemplate>
                     <ControlTemplate>
                         <xc:NavigationView
                             ArrowBackgroundColor="{Binding NavigationArrowBackgroundColor}"
@@ -994,7 +994,7 @@
                             Text="{Binding Text, Source={RelativeSource TemplatedParent}}"
                             TextColor="{Binding NavigationTextColor}"/>
                     </ControlTemplate>
-                </xc:CalendarView.NavigationTemplate>
+                </xc:CalendarView.NavigationViewTemplate>
 
                 <xc:CalendarView.DayTemplate>
                     <DataTemplate x:DataType="{x:Type xcModels:CalendarDay}">

diff --git a/XCalendarMauiSample/Views/SelectionExamplePage.xaml b/XCalendarMauiSample/Views/SelectionExamplePage.xaml
@@ -37,7 +37,7 @@
                 NavigatedDate="{Binding Calendar.NavigatedDate}"
                 Style="{StaticResource DefaultCalendarViewStyle}">
 
-                <xc:CalendarView.NavigationTemplate>
+                <xc:CalendarView.NavigationViewTemplate>
                     <ControlTemplate>
                         <xc:NavigationView
                             BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={RelativeSource TemplatedParent}}"
@@ -47,7 +47,7 @@
                             Style="{StaticResource DefaultNavigationViewStyle}"
                             Text="{Binding Text, Source={RelativeSource TemplatedParent}}"/>
                     </ControlTemplate>
-                </xc:CalendarView.NavigationTemplate>
+                </xc:CalendarView.NavigationViewTemplate>
 
                 <!--  Not Required, used only for styling.  -->
                 <xc:CalendarView.DayTemplate>

diff --git a/XCalendarMauiSample/Views/UsingDayViewExamplePage.xaml b/XCalendarMauiSample/Views/UsingDayViewExamplePage.xaml
@@ -25,7 +25,7 @@
                 NavigatedDate="{Binding Calendar.NavigatedDate}"
                 Style="{StaticResource DefaultCalendarViewStyle}">
 
-                <xc:CalendarView.NavigationTemplate>
+                <xc:CalendarView.NavigationViewTemplate>
                     <ControlTemplate>
                         <xc:NavigationView
                             BackwardsArrowCommand="{Binding BackwardsArrowCommand, Source={RelativeSource TemplatedParent}}"
@@ -35,7 +35,7 @@
                             Style="{StaticResource DefaultNavigationViewStyle}"
                             Text="{Binding Text, Source={RelativeSource TemplatedParent}}"/>
                     </ControlTemplate>
-                </xc:CalendarView.NavigationTemplate>
+                </xc:CalendarView.NavigationViewTemplate>
 
                 <xc:CalendarView.DayTemplate>
                     <DataTemplate x:DataType="{x:Type xcModels:CalendarDay}">