diff --git a/XCalendar.Core/FodyWeavers.xml b/XCalendar.Core/FodyWeavers.xml deleted file mode 100644 index d5abfed..0000000 --- a/XCalendar.Core/FodyWeavers.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/XCalendar.Forms/Views/CalendarView.xaml b/XCalendar.Forms/Views/CalendarView.xaml index ee51a13..ac2d02c 100644 --- a/XCalendar.Forms/Views/CalendarView.xaml +++ b/XCalendar.Forms/Views/CalendarView.xaml @@ -33,7 +33,7 @@ diff --git a/XCalendar.Forms/Views/CalendarView.xaml.cs b/XCalendar.Forms/Views/CalendarView.xaml.cs index 084d0e6..fe5275c 100644 --- a/XCalendar.Forms/Views/CalendarView.xaml.cs +++ b/XCalendar.Forms/Views/CalendarView.xaml.cs @@ -98,10 +98,10 @@ public double DaysViewHeightRequest /// /// The template used to display the view for navigating the calendar. /// - public ControlTemplate NavigationTemplate + public ControlTemplate NavigationViewTemplate { - get { return (ControlTemplate)GetValue(NavigationTemplateProperty); } - set { SetValue(NavigationTemplateProperty, value); } + get { return (ControlTemplate)GetValue(NavigationViewTemplateProperty); } + set { SetValue(NavigationViewTemplateProperty, value); } } /// /// The template used to display a @@ -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 index efe9c77..d7aa245 100644 --- a/XCalendar.Forms/XCalendar.Forms.csproj +++ b/XCalendar.Forms/XCalendar.Forms.csproj @@ -6,7 +6,7 @@ A plugin for Xamarin Forms providing a Calendar API and DateTime extensions along with custom controls to consume them with. $(AssemblyName) False - 4.1.0 + 4.2.0 https://github.com/ME-MarvinE/XCalendar csharp; dotnet; cross-platform; calendar; calendar-component; plugin; xamarin; xamarinforms; xamarin-forms; True diff --git a/XCalendar.Maui/Views/CalendarView.xaml b/XCalendar.Maui/Views/CalendarView.xaml index 4ca3181..6688dff 100644 --- a/XCalendar.Maui/Views/CalendarView.xaml +++ b/XCalendar.Maui/Views/CalendarView.xaml @@ -38,7 +38,7 @@ diff --git a/XCalendar.Maui/Views/CalendarView.xaml.cs b/XCalendar.Maui/Views/CalendarView.xaml.cs index 4a9c34c..ac24f91 100644 --- a/XCalendar.Maui/Views/CalendarView.xaml.cs +++ b/XCalendar.Maui/Views/CalendarView.xaml.cs @@ -93,10 +93,10 @@ public double DaysViewHeightRequest /// /// The template used to display the view for navigating the calendar. /// - public ControlTemplate NavigationTemplate + public ControlTemplate NavigationViewTemplate { - get { return (ControlTemplate)GetValue(NavigationTemplateProperty); } - set { SetValue(NavigationTemplateProperty, value); } + get { return (ControlTemplate)GetValue(NavigationViewTemplateProperty); } + set { SetValue(NavigationViewTemplateProperty, value); } } /// /// The template used to display a @@ -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 index 58b063a..eeda694 100644 --- a/XCalendar.Maui/XCalendar.Maui.csproj +++ b/XCalendar.Maui/XCalendar.Maui.csproj @@ -16,7 +16,7 @@ 10.0.17763.0 6.5 MarvinE - 4.1.0-pre1 + 4.2.0 A plugin for .NET MAUI providing a Calendar API and DateTime extensions along with custom controls to consume them with. XCalendar Nuget Icon.png https://github.com/ME-MarvinE/XCalendar diff --git a/XCalendarFormsSample/XCalendarFormsSample/Popups/DatePickerDialogPopup.xaml b/XCalendarFormsSample/XCalendarFormsSample/Popups/DatePickerDialogPopup.xaml index 91a9c8e..e91d7f7 100644 --- 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}}"> - + - + diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/CustomisingADayExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/CustomisingADayExamplePage.xaml index a03a7d7..5a57dcf 100644 --- a/XCalendarFormsSample/XCalendarFormsSample/Views/CustomisingADayExamplePage.xaml +++ b/XCalendarFormsSample/XCalendarFormsSample/Views/CustomisingADayExamplePage.xaml @@ -24,7 +24,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml index 169300a..6341213 100644 --- a/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml +++ b/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml @@ -53,7 +53,7 @@ NavigatedDate="{Binding EventCalendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml index 3109968..36db62f 100644 --- a/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml +++ b/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml @@ -936,7 +936,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/SelectionExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/SelectionExamplePage.xaml index 1d609a3..2feaab6 100644 --- a/XCalendarFormsSample/XCalendarFormsSample/Views/SelectionExamplePage.xaml +++ b/XCalendarFormsSample/XCalendarFormsSample/Views/SelectionExamplePage.xaml @@ -36,7 +36,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/UsingDayViewExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/UsingDayViewExamplePage.xaml index c560746..412d945 100644 --- a/XCalendarFormsSample/XCalendarFormsSample/Views/UsingDayViewExamplePage.xaml +++ b/XCalendarFormsSample/XCalendarFormsSample/Views/UsingDayViewExamplePage.xaml @@ -25,7 +25,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarMauiSample/Popups/DatePickerDialogPopup.xaml b/XCalendarMauiSample/Popups/DatePickerDialogPopup.xaml index 2178176..235cfa5 100644 --- 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}}"> - + - + diff --git a/XCalendarMauiSample/Views/CustomisingADayExamplePage.xaml b/XCalendarMauiSample/Views/CustomisingADayExamplePage.xaml index 5a9f125..90a13d3 100644 --- a/XCalendarMauiSample/Views/CustomisingADayExamplePage.xaml +++ b/XCalendarMauiSample/Views/CustomisingADayExamplePage.xaml @@ -24,7 +24,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml b/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml index 76e764e..729b5a3 100644 --- a/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml +++ b/XCalendarMauiSample/Views/EventCalendarExamplePage.xaml @@ -54,7 +54,7 @@ NavigatedDate="{Binding EventCalendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarMauiSample/Views/PlaygroundPage.xaml b/XCalendarMauiSample/Views/PlaygroundPage.xaml index 0b84db6..5f12970 100644 --- a/XCalendarMauiSample/Views/PlaygroundPage.xaml +++ b/XCalendarMauiSample/Views/PlaygroundPage.xaml @@ -978,7 +978,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarMauiSample/Views/SelectionExamplePage.xaml b/XCalendarMauiSample/Views/SelectionExamplePage.xaml index 1e8e413..2c6c7ed 100644 --- a/XCalendarMauiSample/Views/SelectionExamplePage.xaml +++ b/XCalendarMauiSample/Views/SelectionExamplePage.xaml @@ -37,7 +37,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - + diff --git a/XCalendarMauiSample/Views/UsingDayViewExamplePage.xaml b/XCalendarMauiSample/Views/UsingDayViewExamplePage.xaml index 0e87f50..a9cd1cc 100644 --- a/XCalendarMauiSample/Views/UsingDayViewExamplePage.xaml +++ b/XCalendarMauiSample/Views/UsingDayViewExamplePage.xaml @@ -25,7 +25,7 @@ NavigatedDate="{Binding Calendar.NavigatedDate}" Style="{StaticResource DefaultCalendarViewStyle}"> - + - +