From 0c63a30670fdb97e7ce2857470a2f70e32f43807 Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Mon, 23 Sep 2024 08:42:37 +0200
Subject: [PATCH] Fixed `SwitchHeaderConventView`

This commit fixes issues with the `SwitchHeaderConventView`.

Fixed #566
---
 common.props                                  |   2 +-
 .../SortFilterHeaderConventView.xaml          | 148 ------------
 .../SortFilterHeaderConventView.xaml.cs       | 103 ---------
 .../ContentViews/SwitchHeaderConventView.xaml |  73 ------
 .../SwitchHeaderConventView.xaml.cs           |  81 -------
 ...redMauiXamlStylesLibrary.Syncfusion.csproj |   9 -
 .../SortFilterHeaderConventView.xaml          | 214 ++++++++----------
 .../SortFilterHeaderConventView.xaml.cs       |   3 +
 .../ContentViews/SwitchHeaderConventView.xaml |  60 +----
 .../TitleViewAccountConventView.xaml          |   1 -
 10 files changed, 104 insertions(+), 590 deletions(-)
 delete mode 100644 src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml
 delete mode 100644 src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml.cs
 delete mode 100644 src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml
 delete mode 100644 src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml.cs

diff --git a/common.props b/common.props
index 5eeb3fd8..969f62b1 100644
--- a/common.props
+++ b/common.props
@@ -1,7 +1,7 @@
 
 <Project>
     <PropertyGroup>
-        <Version>1.2.14</Version>
+        <Version>1.2.13.2</Version>
         <PackageIcon>ar_128.png</PackageIcon>
         <NeutralLanguage>en</NeutralLanguage>
         <PackageProjectUrl>https://github.com/AndreasReitberger/SharedMauiXamlStyles</PackageProjectUrl>
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml
deleted file mode 100644
index 9c1cd222..00000000
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="AndreasReitberger.Shared.Syncfusion.ContentViews.SortFilterHeaderConventView"
-    >
-    <ContentView.ControlTemplate>
-        <ControlTemplate>
-            <Grid
-                Background="{TemplateBinding Background}"
-                HorizontalOptions="FillAndExpand"
-                ColumnDefinitions="*,Auto"
-                >
-                <HorizontalStackLayout
-                    Margin="4,0"
-                    Grid.Column="1"
-                    CompressedLayout.IsHeadless="True"
-                    >
-                    <Button
-                        MinimumHeightRequest="{OnIdiom Phone=32, Default=48}"
-                        Margin="0"
-                        Padding="8,0"
-                        CornerRadius="0"
-                        Text="{TemplateBinding SortButtonText}"
-                        Command="{TemplateBinding SortButtonCommand}"
-                        CommandParameter="{TemplateBinding CommandParameter}"
-                        Grid.Column="1"
-                        Background="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}"
-                        TextColor="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"
-                        BorderWidth="0"
-                        Style="{StaticResource Style.Core.Button.Default}"
-                        >
-                        <Button.ImageSource>
-                            <FontImageSource
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Glyph="{TemplateBinding SortButtonIconText}"
-                                Color="{Binding Source={RelativeSource AncestorType={x:Type Button}, AncestorLevel=1}, Path=TextColor}"
-                                Size="Small"
-                                />
-                        </Button.ImageSource>
-                    </Button>
-                    <!-- Workaround (not needed any more)
-                    <Label
-                        Style="{StaticResource Style.Core.Label.Header}"
-                        VerticalTextAlignment="Center"
-                        >
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span 
-                                    Text="{TemplateBinding SortButtonIconText}"
-                                    FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                    Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                    />
-                                <Span Text="  " />
-                                <Span Text="{TemplateBinding SortButtonText}" />
-                            </FormattedString>
-                        </Label.FormattedText>
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding SortButtonCommand}"
-                                CommandParameter="{TemplateBinding CommandParameter}"
-                                />
-                        </Label.GestureRecognizers>
-                    </Label>
-                    -->
-                    <Button
-                        IsVisible="{TemplateBinding ShowFilterButton}"
-                        MinimumHeightRequest="{OnIdiom Phone=32, Default=48}"
-                        Margin="0"
-                        Padding="8,0"
-                        CornerRadius="0"
-                        Text="{TemplateBinding FilterButtonText}"
-                        Command="{TemplateBinding FilterButtonCommand}"
-                        CommandParameter="{TemplateBinding CommandParameter}"
-                        Background="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}"
-                        TextColor="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}"
-                        BorderWidth="0"
-                        Style="{StaticResource Style.Core.Button.Default}"
-                        >
-                        <Button.ImageSource>
-                            <FontImageSource
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Glyph="{TemplateBinding FilterButtonIconText}"
-                                Color="{Binding Source={RelativeSource AncestorType={x:Type Button}, AncestorLevel=1}, Path=TextColor}"
-                                Size="Small"
-                                />
-                        </Button.ImageSource>
-                    </Button>
-                    <!-- Workaround (not needed any more)
-                    <Label
-                        Style="{StaticResource Style.Core.Label.Header}"
-                        VerticalTextAlignment="Center"
-                        IsVisible="{TemplateBinding ShowFilterButton}"
-                        >
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span 
-                                    Text="{TemplateBinding FilterButtonIconText}"
-                                    FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                    Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                    />
-                                <Span Text="  " />
-                                <Span Text="{TemplateBinding FilterButtonText}" />
-                            </FormattedString>
-                        </Label.FormattedText>
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding FilterButtonCommand}"
-                                CommandParameter="{TemplateBinding CommandParameter}"
-                                />
-                        </Label.GestureRecognizers>
-                    </Label>
-                    -->
-                    <!-- Clear Filter -->
-                    <Button
-                        Margin="2,4"
-                        Text="{TemplateBinding ClearButtonIconText}"
-                        FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                        Command="{TemplateBinding ClearButtonCommand}"
-                        TextColor="{DynamicResource PrimaryColor}"
-                        FontSize="{OnPlatform Android=Small, Default=Default}"
-                        Background="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}"
-                        WidthRequest="{OnPlatform Android=40, Default=48}"
-                        HeightRequest="{OnPlatform Android=40, Default=48}"
-                        CornerRadius="{OnPlatform Android=20, Default=24}"
-                        >
-                        <Button.Style>
-                            <Style TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon}">
-                                <Setter Property="IsVisible" Value="False"/>
-                                <Style.Triggers>
-                                    <DataTrigger
-                                        TargetType="Button" 
-                                        Binding="{TemplateBinding IsFiltered}"
-                                        Value="True"
-                                        >
-                                        <Setter Property="IsVisible" Value="True"/>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
-                </HorizontalStackLayout>
-            </Grid>
-        </ControlTemplate>
-    </ContentView.ControlTemplate>
-</ContentView>
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml.cs b/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml.cs
deleted file mode 100644
index eec0e511..00000000
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SortFilterHeaderConventView.xaml.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-using System.Windows.Input;
-using AndreasReitberger.Shared.Syncfusion.FontIcons;
-
-namespace AndreasReitberger.Shared.Syncfusion.ContentViews;
-
-[Obsolete("Use the view from `AndreasReitberger.Shared.ContentViews` instead")]
-public partial class SortFilterHeaderConventView : ContentView
-{
-    #region Bindings
-
-    public static readonly BindableProperty IsFilteredProperty = BindableProperty.Create(nameof(IsFiltered), typeof(bool), typeof(SortFilterHeaderConventView), false);
-    public static readonly BindableProperty ShowFilterButtonProperty = BindableProperty.Create(nameof(ShowFilterButton), typeof(bool), typeof(SortFilterHeaderConventView), true);
-
-    public static readonly BindableProperty ButtonIconFontFamilyProperty = BindableProperty.Create(nameof(ButtonIconFontFamily), typeof(string), typeof(SortFilterHeaderConventView), "UIFontIcons");
-    public static readonly BindableProperty CommandParameterProperty = BindableProperty.Create(nameof(CommandParameter), typeof(object), typeof(SortFilterHeaderConventView), null);
-
-    public static readonly BindableProperty SortButtonTextProperty = BindableProperty.Create(nameof(SortButtonText), typeof(string), typeof(SortFilterHeaderConventView), string.Empty);
-    public static readonly BindableProperty FilterButtonTextProperty = BindableProperty.Create(nameof(FilterButtonText), typeof(string), typeof(SortFilterHeaderConventView), string.Empty);
-
-    public static readonly BindableProperty SortButtonIconTextProperty = BindableProperty.Create(nameof(SortButtonIconText), typeof(string), typeof(SortFilterHeaderConventView), SyncfusionIcons.Sort);
-    public static readonly BindableProperty FilterButtonIconTextProperty = BindableProperty.Create(nameof(FilterButtonIconText), typeof(string), typeof(SortFilterHeaderConventView), SyncfusionIcons.Filter);
-    public static readonly BindableProperty ClearButtonIconTextProperty = BindableProperty.Create(nameof(ClearButtonIconText), typeof(string), typeof(SortFilterHeaderConventView), SyncfusionIcons.Close);
-
-    public static readonly BindableProperty SortButtonCommandProperty = BindableProperty.Create(nameof(SortButtonCommand), typeof(ICommand), typeof(SortFilterHeaderConventView), null);
-    public static readonly BindableProperty FilterButtonCommandProperty = BindableProperty.Create(nameof(FilterButtonCommand), typeof(ICommand), typeof(SortFilterHeaderConventView), null);
-    public static readonly BindableProperty ClearButtonCommandProperty = BindableProperty.Create(nameof(ClearButtonCommand), typeof(ICommand), typeof(SortFilterHeaderConventView), null);
-
-    #endregion
-
-    #region Properties
-    public string SortButtonText
-    {
-        get => (string)GetValue(SortButtonTextProperty);
-        set => SetValue(SortButtonTextProperty, value);
-    }
-    public string FilterButtonText
-    {
-        get => (string)GetValue(FilterButtonTextProperty);
-        set => SetValue(FilterButtonTextProperty, value);
-    }
-
-    public string SortButtonIconText
-    {
-        get => (string)GetValue(SortButtonIconTextProperty);
-        set => SetValue(SortButtonIconTextProperty, value);
-    }
-    public string FilterButtonIconText
-    {
-        get => (string)GetValue(FilterButtonIconTextProperty);
-        set => SetValue(FilterButtonIconTextProperty, value);
-    }
-    public string ClearButtonIconText
-    {
-        get => (string)GetValue(ClearButtonIconTextProperty);
-        set => SetValue(ClearButtonIconTextProperty, value);
-    }
-
-    public string ButtonIconFontFamily
-    {
-        get => (string)GetValue(ButtonIconFontFamilyProperty);
-        set => SetValue(ButtonIconFontFamilyProperty, value);
-    }
-    public object CommandParameter
-    {
-        get => (object)GetValue(CommandParameterProperty);
-        set => SetValue(CommandParameterProperty, value);
-    }
-
-
-    public bool IsFiltered
-    {
-        get => (bool)GetValue(IsFilteredProperty);
-        set => SetValue(IsFilteredProperty, value);
-    }
-
-    public bool ShowFilterButton
-    {
-        get => (bool)GetValue(ShowFilterButtonProperty);
-        set => SetValue(ShowFilterButtonProperty, value);
-    }
-
-    public ICommand SortButtonCommand
-    {
-        get => (ICommand)GetValue(SortButtonCommandProperty);
-        set => SetValue(SortButtonCommandProperty, value);
-    }
-    public ICommand FilterButtonCommand
-    {
-        get => (ICommand)GetValue(FilterButtonCommandProperty);
-        set => SetValue(FilterButtonCommandProperty, value);
-    }
-    public ICommand ClearButtonCommand
-    {
-        get => (ICommand)GetValue(ClearButtonCommandProperty);
-        set => SetValue(ClearButtonCommandProperty, value);
-    }
-    #endregion
-
-    public SortFilterHeaderConventView()
-    {
-        InitializeComponent();
-    }
-}
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml
deleted file mode 100644
index b16bb4d3..00000000
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<ContentView
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    x:Class="AndreasReitberger.Shared.Syncfusion.ContentViews.SwitchHeaderConventView"
-    >
-    <ContentView.ControlTemplate>
-        <ControlTemplate>
-            <Grid
-                Background="{TemplateBinding Background}"
-                HeightRequest="{TemplateBinding HeightRequest}"
-                HorizontalOptions="FillAndExpand"
-                ColumnDefinitions="Auto,*,Auto"
-                >
-                <Label
-                    Style="{StaticResource Style.Core.Label.Header}"
-                    VerticalTextAlignment="Center"
-                    >
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span 
-                                Text="{TemplateBinding BackButtonIconText}"
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                />
-                            <Span Text="  " />
-                            <Span Text="{TemplateBinding BackButtonText}" />
-                        </FormattedString>
-                    </Label.FormattedText>
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding BackButtonCommand}"
-                                CommandParameter="{Binding .}"
-                                />
-                    </Label.GestureRecognizers>
-                </Label>
-                <Label 
-                    Grid.Column="1"
-                    FormattedText="{TemplateBinding TitleLabelFormattedString}"
-                    Text="{TemplateBinding TitleLabelText}"
-                    Style="{StaticResource Style.Core.Label.Default}"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"
-                    />
-                <Label
-                    Grid.Column="2"
-                    Style="{StaticResource Style.Core.Label.Header}"
-                    VerticalTextAlignment="Center"
-                    >
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span 
-                                Text="{TemplateBinding NextButtonIconText}"
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                />
-                            <Span Text="  " />
-                            <Span Text="{TemplateBinding NextButtonText}" />
-                        </FormattedString>
-                    </Label.FormattedText>
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding NextButtonCommand}"
-                                CommandParameter="{Binding .}"
-                                />
-                    </Label.GestureRecognizers>
-                </Label>
-            </Grid>
-        </ControlTemplate>
-    </ContentView.ControlTemplate>
-</ContentView>
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml.cs b/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml.cs
deleted file mode 100644
index bbe4ecdc..00000000
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/ContentViews/SwitchHeaderConventView.xaml.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using AndreasReitberger.Shared.FontIcons;
-using System.Windows.Input;
-
-namespace AndreasReitberger.Shared.Syncfusion.ContentViews;
-
-public partial class SwitchHeaderConventView : ContentView
-{
-    #region Bindings
-
-    public static readonly BindableProperty ButtonIconFontFamilyProperty = BindableProperty.Create(nameof(ButtonIconFontFamily), typeof(string), typeof(SwitchHeaderConventView), "MaterialDesignIcons");
-
-    public static readonly BindableProperty BackButtonTextProperty = BindableProperty.Create(nameof(BackButtonText), typeof(string), typeof(SwitchHeaderConventView), string.Empty);
-    public static readonly BindableProperty NextButtonTextProperty = BindableProperty.Create(nameof(NextButtonText), typeof(string), typeof(SwitchHeaderConventView), string.Empty);
-
-    public static readonly BindableProperty TitleLabelTextProperty = BindableProperty.Create(nameof(TitleLabelText), typeof(string), typeof(SwitchHeaderConventView), null);
-    public static readonly BindableProperty TitleLabelFormattedStringProperty = BindableProperty.Create(nameof(TitleLabelFormattedString), typeof(FormattedString), typeof(SwitchHeaderConventView), null);
-
-    public static readonly BindableProperty BackButtonIconTextProperty = BindableProperty.Create(nameof(BackButtonIconText), typeof(string), typeof(SwitchHeaderConventView), MaterialIcons.Filter);
-    public static readonly BindableProperty NextButtonIconTextProperty = BindableProperty.Create(nameof(NextButtonIconText), typeof(string), typeof(SwitchHeaderConventView), MaterialIcons.Sort);
-
-    public static readonly BindableProperty BackButtonCommandProperty = BindableProperty.Create(nameof(BackButtonCommand), typeof(ICommand), typeof(SwitchHeaderConventView), null);
-    public static readonly BindableProperty NextButtonCommandProperty = BindableProperty.Create(nameof(NextButtonCommand), typeof(ICommand), typeof(SwitchHeaderConventView), null);
-
-    #endregion
-
-    #region Properties
-    public string BackButtonText
-    {
-        get => (string)GetValue(BackButtonTextProperty);
-        set => SetValue(BackButtonTextProperty, value);
-    }
-    public string NextButtonText
-    {
-        get => (string)GetValue(NextButtonTextProperty);
-        set => SetValue(NextButtonTextProperty, value);
-    }
-    public string TitleLabelText
-    {
-        get => (string)GetValue(TitleLabelTextProperty);
-        set => SetValue(TitleLabelTextProperty, value);
-    }
-    public FormattedString TitleLabelFormattedString
-    {
-        get => (FormattedString)GetValue(TitleLabelFormattedStringProperty);
-        set => SetValue(TitleLabelFormattedStringProperty, value);
-    }
-
-    public string NextButtonIconText
-    {
-        get => (string)GetValue(NextButtonIconTextProperty);
-        set => SetValue(NextButtonIconTextProperty, value);
-    }
-    public string BackButtonIconText
-    {
-        get => (string)GetValue(BackButtonIconTextProperty);
-        set => SetValue(BackButtonIconTextProperty, value);
-    }
-
-    public string ButtonIconFontFamily
-    {
-        get => (string)GetValue(ButtonIconFontFamilyProperty);
-        set => SetValue(ButtonIconFontFamilyProperty, value);
-    }
-
-    public ICommand BackButtonCommand
-    {
-        get => (ICommand)GetValue(BackButtonCommandProperty);
-        set => SetValue(BackButtonCommandProperty, value);
-    }
-    public ICommand NextButtonCommand
-    {
-        get => (ICommand)GetValue(NextButtonCommandProperty);
-        set => SetValue(NextButtonCommandProperty, value);
-    }
-    #endregion
-
-    public SwitchHeaderConventView()
-    {
-        InitializeComponent();
-    }
-}
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
index 7b590a71..481a87f1 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
@@ -69,9 +69,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Compile Update="ContentViews\SwitchHeaderConventView.xaml.cs">
-	    <DependentUpon>%(Filename)</DependentUpon>
-	  </Compile>
 	  <Compile Update="ContentViews\AccountConventView.xaml.cs">
 	    <DependentUpon>AccountConventView.xaml</DependentUpon>
 	  </Compile>
@@ -118,12 +115,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <MauiXaml Update="ContentViews\SortFilterHeaderConventView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
-	  <MauiXaml Update="ContentViews\SwitchHeaderConventView.xaml">
-	    <Generator>MSBuild:Compile</Generator>
-	  </MauiXaml>
 	  <MauiXaml Update="ContentViews\AccountConventView.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
diff --git a/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml b/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml
index 14e71a40..2fdc9a32 100644
--- a/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml
+++ b/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml
@@ -7,135 +7,109 @@
     <ContentView.ControlTemplate>
         <ControlTemplate>
             <Grid
+                x:Name="root"
                 Background="{TemplateBinding Background}"
+                HeightRequest="{TemplateBinding HeightRequest}"
                 HorizontalOptions="FillAndExpand"
-                ColumnDefinitions="*,Auto"
+                ColumnDefinitions="*,Auto,Auto,Auto"
                 >
-                <HorizontalStackLayout
-                    Margin="4,0"
+                <Button
                     Grid.Column="1"
-                    CompressedLayout.IsHeadless="True"
-                    HeightRequest="{TemplateBinding ContainerHeight}"
+                    MinimumWidthRequest="{OnIdiom Phone=92, Default=144}"
+                    Margin="0"
+                    CornerRadius="0"
+                    Text="{TemplateBinding SortButtonText}"
+                    Command="{TemplateBinding SortButtonCommand}"
+                    CommandParameter="{TemplateBinding CommandParameter}"
+                    BorderWidth="0"
+                    Style="{StaticResource Style.Core.Button.Default}"
+                    MinimumHeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
+                    HeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
                     >
-                    <Button
-                        MinimumWidthRequest="{OnIdiom Phone=92, Default=144}"
-                        Margin="0"
-                        CornerRadius="0"
-                        Text="{TemplateBinding SortButtonText}"
-                        Command="{TemplateBinding SortButtonCommand}"
-                        CommandParameter="{TemplateBinding CommandParameter}"
-                        BorderWidth="0"
-                        Style="{StaticResource Style.Core.Button.Default}"
-                        >
-                        <Button.ImageSource>
-                            <FontImageSource
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Glyph="{TemplateBinding SortButtonIconText}"
-                                Color="{Binding Source={RelativeSource AncestorType={x:Type Button}, AncestorLevel=1}, Path=TextColor}"
-                                Size="Small"
-                                />
-                        </Button.ImageSource>
-                    </Button>
-                    <!-- Workaround (not needed any more)
-                    <Label
-                        Style="{StaticResource Style.Core.Label.Header}"
-                        VerticalTextAlignment="Center"
-                        >
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span 
-                                    Text="{TemplateBinding SortButtonIconText}"
-                                    FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                    Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                    />
-                                <Span Text="  " />
-                                <Span Text="{TemplateBinding SortButtonText}" />
-                            </FormattedString>
-                        </Label.FormattedText>
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding SortButtonCommand}"
-                                CommandParameter="{TemplateBinding CommandParameter}"
-                                />
-                        </Label.GestureRecognizers>
-                    </Label>
-                    -->
-                    <Button
-                        IsVisible="{TemplateBinding ShowFilterButton}"
-                        MinimumWidthRequest="{OnIdiom Phone=92, Default=144}"
-                        Margin="0"
-                        CornerRadius="0"
-                        Text="{TemplateBinding FilterButtonText}"
-                        Command="{TemplateBinding FilterButtonCommand}"
-                        CommandParameter="{TemplateBinding CommandParameter}"
-                        BorderWidth="0"
-                        Style="{StaticResource Style.Core.Button.Default}"
-                        >
-                        <Button.ImageSource>
-                            <FontImageSource
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Glyph="{TemplateBinding FilterButtonIconText}"
-                                Color="{Binding Source={RelativeSource AncestorType={x:Type Button}, AncestorLevel=1}, Path=TextColor}"
-                                Size="Small"
-                                />
-                        </Button.ImageSource>
-                    </Button>
-                    <!-- Workaround (not needed any more)
-                    <Label
-                        Style="{StaticResource Style.Core.Label.Header}"
-                        VerticalTextAlignment="Center"
-                        IsVisible="{TemplateBinding ShowFilterButton}"
-                        >
-                        <Label.FormattedText>
-                            <FormattedString>
-                                <Span 
-                                    Text="{TemplateBinding FilterButtonIconText}"
-                                    FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                    Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                    />
-                                <Span Text="  " />
-                                <Span Text="{TemplateBinding FilterButtonText}" />
-                            </FormattedString>
-                        </Label.FormattedText>
-                        <Label.GestureRecognizers>
-                            <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding FilterButtonCommand}"
-                                CommandParameter="{TemplateBinding CommandParameter}"
-                                />
-                        </Label.GestureRecognizers>
-                    </Label>
-                    -->                  
-                    <!-- Clear Filter -->
-                    <Button
-                        Margin="2,4"
-                        Text="{TemplateBinding ClearButtonIconText}"
-                        FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                        Command="{TemplateBinding ClearButtonCommand}"
-                        TextColor="{DynamicResource PrimaryColor}"
-                        FontSize="{OnPlatform Android=Small, Default=Default}"
-                        Background="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}"
-                        WidthRequest="{OnPlatform Android=40, Default=48}"
-                        HeightRequest="{OnPlatform Android=40, Default=48}"
-                        CornerRadius="{OnPlatform Android=20, Default=24}"
-                        >
-                        <Button.Style>
-                            <Style TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon}">
-                                <Setter Property="IsVisible" Value="False"/>
-                                <Style.Triggers>
-                                    <DataTrigger
+                    <Button.ImageSource>
+                        <FontImageSource
+                            FontFamily="{TemplateBinding ButtonIconFontFamily}"
+                            Glyph="{TemplateBinding SortButtonIconText}"
+                            Color="{Binding Source={RelativeSource AncestorType={x:Type Button}, AncestorLevel=1}, Path=TextColor}"
+                            Size="Small"
+                            />
+                    </Button.ImageSource>
+                </Button>
+                <Button
+                    Grid.Column="2"
+                    IsVisible="{TemplateBinding ShowFilterButton}"
+                    MinimumWidthRequest="{OnIdiom Phone=92, Default=144}"
+                    Margin="0"
+                    CornerRadius="0"
+                    Text="{TemplateBinding FilterButtonText}"
+                    Command="{TemplateBinding FilterButtonCommand}"
+                    CommandParameter="{TemplateBinding CommandParameter}"
+                    BorderWidth="0"
+                    Style="{StaticResource Style.Core.Button.Default}"
+                    MinimumHeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
+                    HeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
+                    >
+                    <Button.ImageSource>
+                        <FontImageSource
+                            FontFamily="{TemplateBinding ButtonIconFontFamily}"
+                            Glyph="{TemplateBinding FilterButtonIconText}"
+                            Color="{Binding Source={RelativeSource AncestorType={x:Type Button}, AncestorLevel=1}, Path=TextColor}"
+                            Size="Small"
+                            />
+                    </Button.ImageSource>
+                </Button>
+                <Button
+                    Grid.Column="3"
+                    Margin="0"
+                    Text="{TemplateBinding ClearButtonIconText}"
+                    FontFamily="{TemplateBinding ButtonIconFontFamily}"
+                    Command="{TemplateBinding ClearButtonCommand}"
+                    FontSize="{OnPlatform Android=Small, Default=Default}"
+                    MinimumHeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
+                    HeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
+                    WidthRequest="{OnPlatform Android=40, Default=48}"
+                    CornerRadius="0"
+                    BorderWidth="0"
+                    >
+                    <Button.Style>
+                        <Style TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon}">
+                            <Setter Property="Background" Value="{StaticResource Red}" />
+                            <Setter Property="VisualStateManager.VisualStateGroups">
+                                <VisualStateGroupList>
+                                    <VisualStateGroup x:Name="CommonStates">
+                                        <VisualState x:Name="Normal">
+                                            <VisualState.Setters>
+                                                <Setter Property="TextColor" Value="{StaticResource White}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="PointerOver">
+                                            <VisualState.Setters>
+                                                <Setter Property="Background" Value="{StaticResource Red}" />
+                                                <Setter Property="TextColor" Value="{StaticResource White}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                        <VisualState x:Name="Disabled">
+                                            <VisualState.Setters>
+                                                <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                                                <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
+                                            </VisualState.Setters>
+                                        </VisualState>
+                                    </VisualStateGroup>
+                                </VisualStateGroupList>
+                            </Setter>
+                            <Setter Property="IsVisible" Value="False"/>
+                            <Style.Triggers>
+                                <DataTrigger
                                         TargetType="Button" 
                                         Binding="{TemplateBinding IsFiltered}"
                                         Value="True"
                                         >
-                                        <Setter Property="IsVisible" Value="True"/>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Button.Style>
-                    </Button>
-                </HorizontalStackLayout>
+                                    <Setter Property="IsVisible" Value="True"/>
+                                </DataTrigger>
+                            </Style.Triggers>
+                        </Style>
+                    </Button.Style>
+                </Button>
             </Grid>
         </ControlTemplate>
     </ContentView.ControlTemplate>
diff --git a/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml.cs b/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml.cs
index 2bc55f6f..a2353d9c 100644
--- a/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml.cs
+++ b/src/SharedMauiXamlStylesLibrary/ContentViews/SortFilterHeaderConventView.xaml.cs
@@ -8,6 +8,8 @@ public partial class SortFilterHeaderConventView : ContentView
     #region Bindings
 
     public static readonly BindableProperty IsFilteredProperty = BindableProperty.Create(nameof(IsFiltered), typeof(bool), typeof(SortFilterHeaderConventView), false);
+
+    [Obsolete("Use `HeightRequest` instead")]
     public static readonly BindableProperty ContainerHeightProperty = BindableProperty.Create(nameof(ContainerHeight), typeof(int), typeof(SortFilterHeaderConventView), 45);
     public static readonly BindableProperty ShowFilterButtonProperty = BindableProperty.Create(nameof(ShowFilterButton), typeof(bool), typeof(SortFilterHeaderConventView), true);
 
@@ -72,6 +74,7 @@ public bool IsFiltered
         set => SetValue(IsFilteredProperty, value);
     }
 
+    [Obsolete("Use `HeightRequest` instead")]
     public int ContainerHeight
     {
         get => (int)GetValue(ContainerHeightProperty);
diff --git a/src/SharedMauiXamlStylesLibrary/ContentViews/SwitchHeaderConventView.xaml b/src/SharedMauiXamlStylesLibrary/ContentViews/SwitchHeaderConventView.xaml
index be3169c7..24030436 100644
--- a/src/SharedMauiXamlStylesLibrary/ContentViews/SwitchHeaderConventView.xaml
+++ b/src/SharedMauiXamlStylesLibrary/ContentViews/SwitchHeaderConventView.xaml
@@ -7,6 +7,7 @@
     <ContentView.ControlTemplate>
         <ControlTemplate>
             <Grid
+                x:Name="root"
                 Background="{TemplateBinding Background}"
                 HeightRequest="{TemplateBinding HeightRequest}"
                 HorizontalOptions="FillAndExpand"
@@ -14,7 +15,6 @@
                 >
                 <!--  Back Button  -->
                 <Button
-                    HeightRequest="{OnPlatform Android=40, Default=50}"
                     Margin="0"
                     Padding="0"
                     Command="{TemplateBinding BackButtonCommand}"
@@ -23,32 +23,9 @@
                     Text="{TemplateBinding BackButtonIconText}"
                     FontFamily="{TemplateBinding ButtonIconFontFamily}"
                     Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
+                    MinimumHeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
+                    HeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
                     />
-                <!-- Workaround (not needed any more)
-                <Label
-                    Style="{StaticResource Style.Core.Label.Header}"
-                    VerticalTextAlignment="Center"
-                    >
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span 
-                                Text="{TemplateBinding BackButtonIconText}"
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                />
-                            <Span Text="  " />
-                            <Span Text="{TemplateBinding BackButtonText}" />
-                        </FormattedString>
-                    </Label.FormattedText>
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding BackButtonCommand}"
-                                CommandParameter="{Binding .}"
-                                />
-                    </Label.GestureRecognizers>
-                </Label>
-                -->
                 <Label 
                     Grid.Column="1"
                     FormattedText="{TemplateBinding TitleLabelFormattedString}"
@@ -59,43 +36,18 @@
                     />
                 <!--  Next Button  -->
                 <Button
-                    HeightRequest="{OnPlatform Android=40, Default=50}"
                     Grid.Column="2"
                     Margin="0"
                     Padding="0"
-                    Command="{TemplateBinding BackButtonCommand}"
+                    Command="{TemplateBinding NextButtonCommand}"
                     CommandParameter="{Binding .}"
                     CornerRadius="0"
                     Text="{TemplateBinding NextButtonIconText}"
                     FontFamily="{TemplateBinding ButtonIconFontFamily}"
                     Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
+                    MinimumHeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
+                    HeightRequest="{Binding Source={Reference root}, Path=HeightRequest}"
                     />
-                <!-- Workaround (not needed any more)
-                <Label
-                    Grid.Column="2"
-                    Style="{StaticResource Style.Core.Label.Header}"
-                    VerticalTextAlignment="Center"
-                    >
-                    <Label.FormattedText>
-                        <FormattedString>
-                            <Span 
-                                Text="{TemplateBinding NextButtonIconText}"
-                                FontFamily="{TemplateBinding ButtonIconFontFamily}"
-                                Style="{StaticResource Style.Core.Span.Icon.MaterialDesign}" 
-                                />
-                            <Span Text="  " />
-                            <Span Text="{TemplateBinding NextButtonText}" />
-                        </FormattedString>
-                    </Label.FormattedText>
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                                NumberOfTapsRequired="1"
-                                Command="{TemplateBinding NextButtonCommand}"
-                                CommandParameter="{Binding .}"
-                                />
-                    </Label.GestureRecognizers>
-                </Label>
-                -->
             </Grid>
         </ControlTemplate>
     </ContentView.ControlTemplate>
diff --git a/src/SharedMauiXamlStylesLibrary/ContentViews/TitleViewAccountConventView.xaml b/src/SharedMauiXamlStylesLibrary/ContentViews/TitleViewAccountConventView.xaml
index d2b94627..07135cec 100644
--- a/src/SharedMauiXamlStylesLibrary/ContentViews/TitleViewAccountConventView.xaml
+++ b/src/SharedMauiXamlStylesLibrary/ContentViews/TitleViewAccountConventView.xaml
@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="AndreasReitberger.Shared.ContentViews.TitleViewAccountConventView"
     
-    xmlns:core="clr-namespace:Syncfusion.Maui.Core;assembly=Syncfusion.Maui.Core"
     xmlns:shared="clr-namespace:AndreasReitberger.Shared"
     xmlns:icons="clr-namespace:AndreasReitberger.Shared.FontIcons"
     >