From ec2b52331a2d7fc067a6a8000c924616dc178ea4 Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Fri, 24 Nov 2023 18:33:14 +0100
Subject: [PATCH 1/5] Added new `SfPicker` styles

This commit adds the `SfPicker` styles
---
 .../Resources/Themes/Controls/SfPicker.xaml   | 117 ++++++++++++++++++
 .../Resources/Themes/SharedStyles.xaml        |   1 +
 ...redMauiXamlStylesLibrary.Syncfusion.csproj |   4 +
 3 files changed, 122 insertions(+)
 create mode 100644 src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml

diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
new file mode 100644
index 00000000..7d3cfadd
--- /dev/null
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<?xaml-comp compile="true" ?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    
+    xmlns:converters="clr-namespace:AndreasReitberger.Shared.Core.Converters;assembly=SharedMauiCoreLibrary"
+    
+    xmlns:picker="clr-namespace:Syncfusion.Maui.Picker;assembly=Syncfusion.Maui.Picker"
+    xmlns:shared="clr-namespace:AndreasReitberger.Shared;assembly=SharedMauiXamlStylesLibrary"
+    >
+    <ResourceDictionary.MergedDictionaries>
+        <shared:Colors />
+        <shared:Fonts />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <converters:ColorToLightForgroundConverter x:Key="ColorToLightForgroundConverter"  />
+    <converters:ColorToBlackWhiteConverter x:Key="ColorToBlackWhiteConverter" />
+    <converters:BrushToBlackWhiteConverter x:Key="BrushToBlackWhiteConverter" />
+
+    <Style x:Key="DefaultSfPickerStyle" TargetType="picker:SfPicker">
+        <Setter Property="ColumnDividerColor" Value="{DynamicResource PrimaryColor}" />
+        <Setter Property="Margin" Value="4,2"/>
+        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <!---->
+        <Setter Property="SelectionView">
+            <Setter.Value>
+                <picker:PickerSelectionView 
+                    CornerRadius="10"
+                    Padding="10, 5, 10, 5" 
+                    Background="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}"                
+                    >
+                </picker:PickerSelectionView>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="TextStyle">
+            <Setter.Value>
+                <picker:PickerTextStyle
+                    FontSize="12"
+                    FontFamily="{StaticResource MontserratRegular}"
+                    TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}"
+                    >
+                </picker:PickerTextStyle>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="SelectedTextStyle">
+            <Setter.Value>
+                <picker:PickerTextStyle
+                    FontSize="12"
+                    FontFamily="{StaticResource MontserratRegular}"
+                    TextColor="{DynamicResource PrimaryColor}"
+                    >
+                </picker:PickerTextStyle>
+            </Setter.Value>
+        </Setter>
+        <!--
+        <Setter Property="VisualStateManager.VisualStateGroups">
+            <VisualStateGroupList>
+                <VisualStateGroup>
+                    <VisualState x:Name="Default">
+                        <VisualState.Setters>
+                            
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+
+                        </VisualState.Setters>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateGroupList>
+        </Setter>
+        -->
+    </Style>
+    <Style TargetType="picker:SfPicker" BasedOn="{StaticResource DefaultSfPickerStyle}"/>
+    
+    <Style x:Key="DefaultSfDateTimePickerStyle" TargetType="picker:SfDateTimePicker">
+        <Setter Property="ColumnDividerColor" Value="{DynamicResource PrimaryColor}" />
+        <Setter Property="Margin" Value="4,2"/>
+        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
+        <Setter Property="TimeFormat" Value="HH_mm" />
+        <!---->
+        <Setter Property="SelectionView">
+            <Setter.Value>
+                <picker:PickerSelectionView 
+                    CornerRadius="10"
+                    Padding="10, 5, 10, 5" 
+                    Background="{DynamicResource PrimaryColor}"
+                    >
+                </picker:PickerSelectionView>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="TextStyle">
+            <Setter.Value>
+                <picker:PickerTextStyle
+                    FontSize="12"
+                    FontFamily="{StaticResource MontserratRegular}"
+                    TextColor="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray100}}"
+                    >
+                </picker:PickerTextStyle>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="SelectedTextStyle">
+            <Setter.Value>
+                <picker:PickerTextStyle
+                    FontSize="12"
+                    FontFamily="{StaticResource MontserratRegular}"
+                    TextColor="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"
+                    >
+                </picker:PickerTextStyle>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="picker:SfDateTimePicker" BasedOn="{StaticResource DefaultSfDateTimePickerStyle}"/>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml
index 52dd2af5..d837af51 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/SharedStyles.xaml
@@ -18,6 +18,7 @@
         <ResourceDictionary Source="/Resources/Themes/Controls/SfListView.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfMaskedEntry.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfNumericEntry.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/Controls/SfPicker.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfRadialGauge.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfSlider.xaml" />
         <ResourceDictionary Source="/Resources/Themes/Controls/SfRating.xaml" />
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
index d9f3ab02..41f9b059 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
@@ -61,6 +61,7 @@
 	  <PackageReference Include="Syncfusion.Maui.Gauges" Version="23.2.4" />
 	  <PackageReference Include="Syncfusion.Maui.Inputs" Version="23.2.4" />
 	  <PackageReference Include="Syncfusion.Maui.ListView" Version="23.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Picker" Version="23.2.4" />
 	  <PackageReference Include="Syncfusion.Maui.Scheduler" Version="23.2.4" />
 	  <PackageReference Include="Syncfusion.Maui.Sliders" Version="23.2.4" />
 	  <PackageReference Include="Syncfusion.Maui.TabView" Version="23.2.4" />
@@ -103,6 +104,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <MauiXaml Update="Resources\Themes\Controls\SfPicker.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	  <MauiXaml Update="Resources\Themes\SyncfusionTheme.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>

From 0189f5ba7aacacaadcca6a5fd2ada841bc6b3edc Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Sat, 25 Nov 2023 07:44:19 +0100
Subject: [PATCH 2/5] Added HeaderView

---
 .../Resources/Themes/Controls/SfPicker.xaml   | 17 ++++++++++++++
 ...redMauiXamlStylesLibrary.Syncfusion.csproj | 22 +++++++++----------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
index 7d3cfadd..5ae3214a 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
@@ -24,6 +24,14 @@
         <Setter Property="Margin" Value="4,2"/>
         <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
         <!---->
+        <Setter Property="HeaderView">
+            <Setter.Value>
+                <picker:PickerHeaderView 
+                    DividerColor="{DynamicResource PrimaryColor}"
+                    >
+                </picker:PickerHeaderView>
+            </Setter.Value>
+        </Setter>
         <Setter Property="SelectionView">
             <Setter.Value>
                 <picker:PickerSelectionView 
@@ -81,6 +89,15 @@
         <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
         <Setter Property="TimeFormat" Value="HH_mm" />
         <!---->
+        <Setter Property="HeaderView">
+            <Setter.Value>
+                <picker:DateTimePickerHeaderView 
+                    TimeFormat="HH:mm"
+                    DividerColor="{DynamicResource PrimaryColor}"
+                    >
+                </picker:DateTimePickerHeaderView>
+            </Setter.Value>
+        </Setter>
         <Setter Property="SelectionView">
             <Setter.Value>
                 <picker:PickerSelectionView 
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
index 41f9b059..7e750192 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
@@ -54,17 +54,17 @@
 	
 	<ItemGroup>
 	  <ProjectReference Include="..\SharedMauiXamlStylesLibrary\SharedMauiXamlStylesLibrary.csproj" />
-	  <PackageReference Include="Syncfusion.Maui.Charts" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.Core" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.DataGrid" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.Expander" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.Gauges" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.Inputs" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.ListView" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.Picker" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.Scheduler" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.Sliders" Version="23.2.4" />
-	  <PackageReference Include="Syncfusion.Maui.TabView" Version="23.2.4" />
+	  <PackageReference Include="Syncfusion.Maui.Charts" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Core" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.DataGrid" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Expander" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Gauges" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Inputs" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.ListView" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Picker" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Scheduler" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Sliders" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.TabView" Version="23.2.5" />
 	</ItemGroup>
 
 	<ItemGroup>

From 40fd991f4e08ec3765a807c0582da44113252ead Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Sun, 26 Nov 2023 17:07:17 +0100
Subject: [PATCH 3/5] Replaced `OpenSansRegular` fonts

---
 .../Resources/Themes/Controls/SfPicker.xaml                 | 6 ++++--
 .../Resources/Themes/Controls/Editor.xaml                   | 4 ++--
 .../Resources/Themes/Controls/Picker.xaml                   | 2 +-
 .../Resources/Themes/Controls/RadioButton.xaml              | 2 +-
 .../Resources/Themes/Controls/SearchBar.xaml                | 2 +-
 .../Resources/Themes/Controls/SearchHandler.xaml            | 2 +-
 .../Resources/Themes/Controls/TimePicker.xaml               | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
index 5ae3214a..dbe72ba3 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
@@ -23,7 +23,7 @@
         <Setter Property="ColumnDividerColor" Value="{DynamicResource PrimaryColor}" />
         <Setter Property="Margin" Value="4,2"/>
         <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
-        <!---->
+        <!--
         <Setter Property="HeaderView">
             <Setter.Value>
                 <picker:PickerHeaderView 
@@ -32,6 +32,7 @@
                 </picker:PickerHeaderView>
             </Setter.Value>
         </Setter>
+        -->
         <Setter Property="SelectionView">
             <Setter.Value>
                 <picker:PickerSelectionView 
@@ -88,7 +89,7 @@
         <Setter Property="Margin" Value="4,2"/>
         <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
         <Setter Property="TimeFormat" Value="HH_mm" />
-        <!---->
+        <!--
         <Setter Property="HeaderView">
             <Setter.Value>
                 <picker:DateTimePickerHeaderView 
@@ -98,6 +99,7 @@
                 </picker:DateTimePickerHeaderView>
             </Setter.Value>
         </Setter>
+        -->
         <Setter Property="SelectionView">
             <Setter.Value>
                 <picker:PickerSelectionView 
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml
index 3b74c389..de526c2a 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml
@@ -12,7 +12,7 @@
     
     <Style x:Key="DefaultEditorStyle" TargetType="Editor">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>
         <Setter Property="FontSize" Value="Default" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
@@ -35,7 +35,7 @@
 
     <Style x:Key="DefaultBorderlessEditorStyle" TargetType="control:BorderlessEditor">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>
         <Setter Property="FontSize" Value="Default" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
         <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml
index a905ddb5..e08c6515 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml
@@ -11,7 +11,7 @@
     <Style x:Key="DefaultPickerStyle" TargetType="Picker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>
         <Setter Property="FontSize" Value="Default"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml
index df787d77..102acffa 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml
@@ -10,7 +10,7 @@
     
     <Style x:Key="DefaultRadioButtonStyle" TargetType="RadioButton">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>
         <Setter Property="FontSize" Value="Default"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml
index e71e41dc..ed35fe0a 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml
@@ -12,7 +12,7 @@
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
         <Setter Property="CancelButtonColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontFamily" Value="{StaticResource MontserratRegular}" />
         <Setter Property="FontSize" Value="Default" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml
index 7ddde7a9..68a95e3e 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml
@@ -11,7 +11,7 @@
     <Style x:Key="DefaultSearchHandlerStyle" TargetType="SearchHandler">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
         <Setter Property="PlaceholderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular" />
+        <Setter Property="FontFamily" Value="{StaticResource MontserratRegular}" />
         <Setter Property="FontSize" Value="Default" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml
index 2e17f0a3..340b64b6 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml
@@ -10,7 +10,7 @@
     
     <Style x:Key="DefaultTimePickerStyle" TargetType="TimePicker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
-        <Setter Property="FontFamily" Value="OpenSansRegular"/>
+        <Setter Property="FontFamily" Value="{StaticResource MontserratRegular}"/>
         <Setter Property="FontSize" Value="Default"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>

From 3774386eb9b1852200299f82d27b552fcc82a1a8 Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Mon, 27 Nov 2023 19:56:45 +0100
Subject: [PATCH 4/5] Updated missing font access

---
 .../Resources/Themes/Controls/Editor.xaml                        | 1 +
 .../Resources/Themes/Controls/Picker.xaml                        | 1 +
 .../Resources/Themes/Controls/RadioButton.xaml                   | 1 +
 .../Resources/Themes/Controls/SearchBar.xaml                     | 1 +
 .../Resources/Themes/Controls/SearchHandler.xaml                 | 1 +
 .../Resources/Themes/Controls/Slider.xaml                        | 1 +
 .../Resources/Themes/Controls/TimePicker.xaml                    | 1 +
 7 files changed, 7 insertions(+)

diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml
index de526c2a..de15f4da 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Editor.xaml
@@ -8,6 +8,7 @@
     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
     
     <Style x:Key="DefaultEditorStyle" TargetType="Editor">
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml
index e08c6515..a41a3b5e 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Picker.xaml
@@ -6,6 +6,7 @@
     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
     
     <Style x:Key="DefaultPickerStyle" TargetType="Picker">
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml
index 102acffa..8a3a6dd5 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/RadioButton.xaml
@@ -6,6 +6,7 @@
     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
     
     <Style x:Key="DefaultRadioButtonStyle" TargetType="RadioButton">
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml
index ed35fe0a..7e6f3166 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchBar.xaml
@@ -6,6 +6,7 @@
     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="DefaultSearchBarStyle" TargetType="SearchBar">
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml
index 68a95e3e..ebbeb5e1 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/SearchHandler.xaml
@@ -6,6 +6,7 @@
     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Style x:Key="DefaultSearchHandlerStyle" TargetType="SearchHandler">
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Slider.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Slider.xaml
index 205bd3bf..ebc5375e 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Slider.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Slider.xaml
@@ -6,6 +6,7 @@
     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
     
     <Style x:Key="DefaultSliderStyle" TargetType="Slider">
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml
index 340b64b6..8d255d6f 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/TimePicker.xaml
@@ -6,6 +6,7 @@
     >
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="/Resources/Themes/SharedColors.xaml" />
+        <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
     
     <Style x:Key="DefaultTimePickerStyle" TargetType="TimePicker">

From 07e928878acc84de28c80b30bfebfe7a9bd85a3a Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Wed, 6 Dec 2023 17:30:36 +0100
Subject: [PATCH 5/5] Fixed picker

---
 .../Resources/Themes/Controls/SfPicker.xaml   | 15 +++++++++----
 ...redMauiXamlStylesLibrary.Syncfusion.csproj | 22 +++++++++----------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
index dbe72ba3..111153ff 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfPicker.xaml
@@ -58,7 +58,7 @@
                 <picker:PickerTextStyle
                     FontSize="12"
                     FontFamily="{StaticResource MontserratRegular}"
-                    TextColor="{DynamicResource PrimaryColor}"
+                    TextColor="{Binding Source={RelativeSource AncestorType={x:Type picker:SfPicker}}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"            
                     >
                 </picker:PickerTextStyle>
             </Setter.Value>
@@ -92,10 +92,17 @@
         <!--
         <Setter Property="HeaderView">
             <Setter.Value>
-                <picker:DateTimePickerHeaderView 
-                    TimeFormat="HH:mm"
+                <picker:DateTimePickerHeaderView
                     DividerColor="{DynamicResource PrimaryColor}"
+                    TimeFormat="HH:mm"
                     >
+                    <picker:DateTimePickerHeaderView.SelectionTextStyle>
+                        <picker:PickerTextStyle
+                            FontSize="12"
+                            FontFamily="{StaticResource MontserratRegular}"
+                            TextColor="{DynamicResource PrimaryColor}"
+                            />
+                    </picker:DateTimePickerHeaderView.SelectionTextStyle>
                 </picker:DateTimePickerHeaderView>
             </Setter.Value>
         </Setter>
@@ -125,7 +132,7 @@
                 <picker:PickerTextStyle
                     FontSize="12"
                     FontFamily="{StaticResource MontserratRegular}"
-                    TextColor="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"
+                    TextColor="{Binding Source={RelativeSource AncestorType={x:Type picker:SfDateTimePicker}}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"
                     >
                 </picker:PickerTextStyle>
             </Setter.Value>
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
index 7e750192..113b5828 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
@@ -54,17 +54,17 @@
 	
 	<ItemGroup>
 	  <ProjectReference Include="..\SharedMauiXamlStylesLibrary\SharedMauiXamlStylesLibrary.csproj" />
-	  <PackageReference Include="Syncfusion.Maui.Charts" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.Core" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.DataGrid" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.Expander" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.Gauges" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.Inputs" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.ListView" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.Picker" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.Scheduler" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.Sliders" Version="23.2.5" />
-	  <PackageReference Include="Syncfusion.Maui.TabView" Version="23.2.5" />
+	  <PackageReference Include="Syncfusion.Maui.Charts" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.Core" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.DataGrid" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.Expander" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.Gauges" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.Inputs" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.ListView" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.Picker" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.Scheduler" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.Sliders" Version="23.2.6" />
+	  <PackageReference Include="Syncfusion.Maui.TabView" Version="23.2.6" />
 	</ItemGroup>
 
 	<ItemGroup>