Remove class "ColoredEvent" from XCalendar UI projects

ME-MarvinE · Mar 10, 2024 · 174ae7b · 174ae7b
1 parent 0515fab
commit 174ae7b
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 61 deletions.
diff --git a/XCalendar.Forms/Views/DayView.xaml b/XCalendar.Forms/Views/DayView.xaml
@@ -56,7 +56,6 @@
                             <Setter.Value>
                                 <DataTemplate x:DataType="{x:Null}">
                                     <Rectangle
-                                        Fill="{Binding Color}"
                                         HeightRequest="{Binding EventHeightRequest, Source={x:Reference DayView_Unique}}"
                                         HorizontalOptions="CenterAndExpand"
                                         RadiusX="{Binding EventCornerRadius, Source={x:Reference DayView_Unique}}"

diff --git a/XCalendar.Maui/Models/ColoredEvent.cs b/XCalendar.Maui/Models/ColoredEvent.cs
diff --git a/XCalendar.Maui/Views/DayView.xaml b/XCalendar.Maui/Views/DayView.xaml
@@ -56,7 +56,6 @@
                             <Setter.Value>
                                 <DataTemplate x:DataType="{x:Null}">
                                     <Rectangle
-                                        Fill="{Binding Color}"
                                         HeightRequest="{Binding EventHeightRequest, Source={x:Reference DayView_Unique}}"
                                         HorizontalOptions="CenterAndExpand"
                                         RadiusX="{Binding EventCornerRadius, Source={x:Reference DayView_Unique}}"

diff --git a/XCalendar.Forms/Models/ColouredEvent.cs → ...alendarFormsSample/Models/ColoredEvent.cs b/XCalendar.Forms/Models/ColouredEvent.cs → ...alendarFormsSample/Models/ColoredEvent.cs
diff --git a/XCalendarFormsSample/XCalendarFormsSample/Models/Event.cs b/XCalendarFormsSample/XCalendarFormsSample/Models/Event.cs
diff --git a/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/PlaygroundPage.xaml
@@ -1007,6 +1007,18 @@
                                         IsToday="{Binding IsToday}"
                                         WidthRequest="{Binding BindingContext.DayWidthRequest, Source={x:Reference This}}">
 
+                                        <xc:DayView.EventTemplate>
+                                            <DataTemplate x:DataType="{x:Null}">
+                                                <Rectangle
+                                                    Fill="{Binding Color}"
+                                                    HeightRequest="8"
+                                                    HorizontalOptions="CenterAndExpand"
+                                                    RadiusX="100"
+                                                    RadiusY="100"
+                                                    VerticalOptions="Center"
+                                                    WidthRequest="8"/>
+                                            </DataTemplate>
+                                        </xc:DayView.EventTemplate>
                                         <xc:DayView.CurrentMonthStyle>
                                             <Style BasedOn="{StaticResource DefaultDayViewCurrentMonthStyle}" TargetType="{x:Type xc:DayView}">
                                                 <Setter Property="BackgroundColor" Value="{Binding BindingContext.DayCurrentMonthBackgroundColor, Source={x:Reference This}}"/>

diff --git a/XCalendarMauiSample/Models/Event.cs → XCalendarMauiSample/Models/ColoredEvent.cs b/XCalendarMauiSample/Models/Event.cs → XCalendarMauiSample/Models/ColoredEvent.cs
diff --git a/XCalendarMauiSample/Views/PlaygroundPage.xaml b/XCalendarMauiSample/Views/PlaygroundPage.xaml
@@ -1048,6 +1048,19 @@
                                 IsToday="{Binding IsToday}"
                                 WidthRequest="{Binding BindingContext.DayWidthRequest, Source={x:Reference This}}">
 
+                                <xc:DayView.EventTemplate>
+                                    <DataTemplate x:DataType="{x:Null}">
+                                        <Rectangle
+                                            Fill="{Binding Color}"
+                                            HeightRequest="8"
+                                            HorizontalOptions="CenterAndExpand"
+                                            RadiusX="100"
+                                            RadiusY="100"
+                                            VerticalOptions="Center"
+                                            WidthRequest="8"/>
+                                    </DataTemplate>
+                                </xc:DayView.EventTemplate>
+
                                 <xc:DayView.CurrentMonthStyle>
                                     <Style BasedOn="{StaticResource DefaultDayViewCurrentMonthStyle}" TargetType="{x:Type xc:DayView}">
                                         <Setter Property="BackgroundColor" Value="{Binding BindingContext.DayCurrentMonthBackgroundColor, Source={x:Reference This}}"/>