Move implementation of coloured events from sample apps to base UI pr…

…ojects
ME-MarvinE · Mar 10, 2024 · fa3ea4a · fa3ea4a
1 parent e712b2d
commit fa3ea4a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/...alendarFormsSample/Models/ColoredEvent.cs → XCalendar.Forms/Models/ColoredEvent.cs b/...alendarFormsSample/Models/ColoredEvent.cs → XCalendar.Forms/Models/ColoredEvent.cs
diff --git a/XCalendar.Forms/Views/DayView.xaml b/XCalendar.Forms/Views/DayView.xaml
@@ -56,6 +56,7 @@
                             <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/XCalendarMauiSample/Models/ColoredEvent.cs → XCalendar.Maui/Models/ColoredEvent.cs b/XCalendarMauiSample/Models/ColoredEvent.cs → XCalendar.Maui/Models/ColoredEvent.cs
diff --git a/XCalendar.Maui/Views/DayView.xaml b/XCalendar.Maui/Views/DayView.xaml
@@ -56,6 +56,7 @@
                             <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/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml b/XCalendarFormsSample/XCalendarFormsSample/Views/EventCalendarExamplePage.xaml
@@ -171,23 +171,23 @@
                                     Spacing="0">
                                     <StackLayout Orientation="Horizontal" Spacing="0">
                                         <Label
-                                        FontAttributes="Bold"
-                                        FontSize="20"
-                                        Text="{Binding StartDate, StringFormat='{0:dd MMMM HH:mm}'}"
-                                        TextColor="{StaticResource ContentTextColor}"
-                                        VerticalTextAlignment="Center"/>
+                                            FontAttributes="Bold"
+                                            FontSize="20"
+                                            Text="{Binding StartDate, StringFormat='{0:dd MMMM HH:mm}'}"
+                                            TextColor="{StaticResource ContentTextColor}"
+                                            VerticalTextAlignment="Center"/>
                                         <Label
-                                        FontAttributes="Bold"
-                                        FontSize="20"
-                                        Text=" - "
-                                        TextColor="{StaticResource ContentTextColor}"
-                                        VerticalTextAlignment="Center"/>
+                                            FontAttributes="Bold"
+                                            FontSize="20"
+                                            Text=" - "
+                                            TextColor="{StaticResource ContentTextColor}"
+                                            VerticalTextAlignment="Center"/>
                                         <Label
-                                        FontAttributes="Bold"
-                                        FontSize="20"
-                                        Text="{Binding EndDate, StringFormat='{0:dd MMMM HH:mm}', TargetNullValue='No End Date'}"
-                                        TextColor="{StaticResource ContentTextColor}"
-                                        VerticalTextAlignment="Center"/>
+                                            FontAttributes="Bold"
+                                            FontSize="20"
+                                            Text="{Binding EndDate, StringFormat='{0:dd MMMM HH:mm}', TargetNullValue='No End Date'}"
+                                            TextColor="{StaticResource ContentTextColor}"
+                                            VerticalTextAlignment="Center"/>
                                     </StackLayout>
                                     <Label
                                         Margin="5,0,0,0"