From fe2a3896c6e642fc3e56b91d062d6bb5761fc0e7 Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Sun, 7 Jan 2024 13:24:20 +0100
Subject: [PATCH] Renamed `DataTemplates`

This commit renames all `DataTemplates` to fit the new naming syntax.

Fixed #413
---
 .../Controls/Core/EnhancedListView.xaml       |  34 +-
 .../Resources/Themes/Controls/SfListView.xaml |   4 +-
 .../ListViewGroupHeaderTemplates.xaml         |   2 +-
 .../ItemTemplates/ListViewItemTemplates.xaml  | 202 +-----------
 .../ItemTemplates/ListViewSwipeTemplates.xaml | 303 +++++++++---------
 .../CarouselViewItemTemplates.xaml            |   2 +-
 .../ItemTemplates/GeneralItemTemplates.xaml   |   2 +-
 .../ListViewGroupHeaderTemplates.xaml         |   2 +-
 .../ItemTemplates/ListViewItemTemplates.xaml  |  16 +-
 .../ItemTemplates/ShellItemTemplates.xaml     |   2 +-
 10 files changed, 181 insertions(+), 388 deletions(-)

diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/EnhancedListView.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/EnhancedListView.xaml
index e4d24a86..518fb165 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/EnhancedListView.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/EnhancedListView.xaml
@@ -12,8 +12,8 @@
         <shared:Colors />
         <ResourceDictionary Source="/Resources/Themes/ItemTemplates/ListViewSwipeTemplates.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    
-    <Style TargetType="controls:EnhancedListView">
+
+    <Style x:Key="Style.Syncfusion.EnhancedListView.Default" TargetType="controls:EnhancedListView">
         <Setter Property="SelectionBackground" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
         <Style.Triggers>
             <Trigger Property="IsEnabled" Value="False" TargetType="controls:EnhancedListView">
@@ -22,28 +22,30 @@
         </Style.Triggers>
     </Style>
 
-    <Style x:Key="DeleteGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" >
+    <Style TargetType="controls:EnhancedListView" BasedOn="{StaticResource Style.Syncfusion.EnhancedListView.Default}"/>
+
+    <Style x:Key="Style.Syncfusion.EnhancedListView.DeleteGestureSwipe" TargetType="controls:EnhancedListView" >
         <Setter Property="AllowSwiping" Value="True" />
         <Setter Property="SwipeThreshold" Value="70" />
-        <Setter Property="EndSwipeTemplate" Value="{StaticResource DeleteGestureSwipeTemplate}" />
+        <Setter Property="EndSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Delete}" />
     </Style>
 
-    <Style x:Key="DeleteEditGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource DeleteGestureSwipeEnhancedListViewStyle}">
-        <Setter Property="StartSwipeTemplate" Value="{StaticResource DeleteGestureSwipeTemplate}" />
-        <Setter Property="EndSwipeTemplate" Value="{StaticResource EditDeleteGestureSwipeTemplate}" />
+    <Style x:Key="DeleteEditGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource Style.Syncfusion.EnhancedListView.DeleteGestureSwipe}">
+        <Setter Property="StartSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Delete}" />
+        <Setter Property="EndSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.EditDelete}" />
     </Style>
 
-    <Style x:Key="PrintDeleteViewGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource DeleteGestureSwipeEnhancedListViewStyle}">
-        <Setter Property="StartSwipeTemplate" Value="{StaticResource PrintGestureSwipeTemplate}" />
-        <Setter Property="EndSwipeTemplate" Value="{StaticResource ViewDeleteGestureSwipeTemplate}" />
+    <Style x:Key="PrintDeleteViewGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource Style.Syncfusion.EnhancedListView.DeleteGestureSwipe}">
+        <Setter Property="StartSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Print3d}" />
+        <Setter Property="EndSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.ViewDelete}" />
     </Style>
 
-    <Style x:Key="DeleteViewPrintGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource DeleteGestureSwipeEnhancedListViewStyle}">
-        <Setter Property="StartSwipeTemplate" Value="{StaticResource DeleteGestureSwipeTemplate}" />
-        <Setter Property="EndSwipeTemplate" Value="{StaticResource PrintViewGestureSwipeTemplate}" />
+    <Style x:Key="DeleteViewPrintGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource Style.Syncfusion.EnhancedListView.DeleteGestureSwipe}">
+        <Setter Property="StartSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Delete}" />
+        <Setter Property="EndSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Print3dView }" />
     </Style>
-    <Style x:Key="DeleteEditExecuteGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource DeleteGestureSwipeEnhancedListViewStyle}">
-        <Setter Property="StartSwipeTemplate" Value="{StaticResource DeleteGestureSwipeTemplate}" />
-        <Setter Property="EndSwipeTemplate" Value="{StaticResource ExecuteEditGestureSwipeTemplate}" />
+    <Style x:Key="DeleteEditExecuteGestureSwipeEnhancedListViewStyle" TargetType="controls:EnhancedListView" BasedOn="{StaticResource Style.Syncfusion.EnhancedListView.DeleteGestureSwipe}">
+        <Setter Property="StartSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Delete}" />
+        <Setter Property="EndSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.ExecuteEdit}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfListView.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfListView.xaml
index 773e90b8..03018d2b 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfListView.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfListView.xaml
@@ -26,7 +26,7 @@
     <Style x:Key="Style.Syncfusion.SfListView.Swipe.DeleteEdit" TargetType="listView:SfListView" BasedOn="{StaticResource Style.Syncfusion.SfListView.Default}">
         <Setter Property="AllowSwiping" Value="True" />
         <Setter Property="SwipeThreshold" Value="70" />
-        <Setter Property="StartSwipeTemplate" Value="{StaticResource DeleteGestureSwipeTemplate}" />
-        <Setter Property="EndSwipeTemplate" Value="{StaticResource EditGestureSwipeTemplate}" />
+        <Setter Property="StartSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Delete}" />
+        <Setter Property="EndSwipeTemplate" Value="{StaticResource DataTemplate.Syncfusion.Swipe.Edit}" />
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml
index e286410f..5cf690c5 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml
@@ -14,7 +14,7 @@
     >
     <converters:UriToStringConverter x:Key="UriToStringConverter" />
 
-    <DataTemplate x:Key="GroupHeaderSyncfusionTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Header.Group">
         <ViewCell>
             <StackLayout 
                 Style="{StaticResource Style.Core.StackLayout.Header}" 
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml
index f61694f4..df694273 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml
@@ -17,7 +17,7 @@
     >
     <converters:UriToStringConverter x:Key="UriToStringConverter" />
 
-    <DataTemplate x:Key="ProFeatureItemTemplate" x:DataType="documentation:ProVersionFeature">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.ProVersionFeature.Default" x:DataType="documentation:ProVersionFeature">
         <ViewCell>
             <Grid 
                 Padding="8,6"
@@ -48,204 +48,4 @@
             </Grid>
         </ViewCell>
     </DataTemplate>
-
-    <DataTemplate x:Key="AppEventTemplate" x:DataType="eventLogger:AppEvent">
-        <ViewCell>
-            <Grid 
-                x:Name="Grid"
-                Padding="16,12"
-                ColumnSpacing="16"
-                RowSpacing="2"
-                RowDefinitions="Auto"
-                ColumnDefinitions="48,*"
-                >
-                <!-- Icon -->
-                <Label
-                    Margin="3.5,0,0,0" 
-                    HorizontalTextAlignment="Center"
-                    VerticalTextAlignment="Center"
-                    >
-                    <Label.Style>
-                        <Style TargetType="Label" BasedOn="{StaticResource Style.Core.Label.Icon}">
-                            <Setter Property="Text" Value="{x:Static icons:MaterialIcons.AlertCircleOutline}"/>
-                            <Style.Triggers>
-                                <!-- Info -->
-                                <DataTrigger TargetType="Label" Binding="{Binding Level}" Value="Info">
-                                    <Setter Property="Text" Value="{x:Static icons:MaterialIcons.InformationOutline}"/>
-                                    <Setter Property="TextColor" Value="{StaticResource Blue}"/>
-                                </DataTrigger>
-                                <!-- Alert -->
-                                <DataTrigger TargetType="Label" Binding="{Binding Level}" Value="Warning">
-                                    <Setter Property="Text" Value="{x:Static icons:MaterialIcons.AlertCircleOutline}"/>
-                                    <Setter Property="TextColor" Value="{StaticResource Yellow}"/>
-                                </DataTrigger>
-                                <!-- Error -->
-                                <DataTrigger TargetType="Label" Binding="{Binding Level}" Value="Critical">
-                                    <Setter Property="Text" Value="{x:Static icons:MaterialIcons.CloseCircleOutline}"/>
-                                    <Setter Property="TextColor" Value="{StaticResource Red}"/>
-                                </DataTrigger>
-                                <!-- Performance -->
-                                <DataTrigger TargetType="Label" Binding="{Binding Level}" Value="Performance">
-                                    <Setter Property="Text" Value="{x:Static icons:MaterialIcons.Speedometer}"/>
-                                    <Setter Property="TextColor" Value="{StaticResource LightGreen}"/>
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </Label.Style>
-                </Label>
-                <!-- Quick Infos -->
-                <StackLayout 
-                    Grid.Column="1" 
-                    Spacing="1"
-                    CompressedLayout.IsHeadless="true"
-                    >
-                    <Label 
-                        LineBreakMode="WordWrap" 
-                        Style="{StaticResource Style.Core.Label.Default}" 
-                        Text="{Binding Message}"
-                        FontAttributes="Bold"
-                        VerticalTextAlignment="Center"
-                        />
-                    <Label 
-                        LineBreakMode="WordWrap" 
-                        Text="{Binding Args}"
-                        VerticalTextAlignment="Center"
-                        >
-                        <Label.Style>
-                            <Style TargetType="Label" BasedOn="{StaticResource Style.Core.Label.Small}">
-                                <Setter Property="IsVisible" Value="True"/>
-                                <Style.Triggers>
-                                    <!-- Has no args -->
-                                    <DataTrigger TargetType="Label" Binding="{Binding Args}" Value="{x:Null}">
-                                        <Setter Property="IsVisible" Value="False"/>
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Label.Style>
-                    </Label>
-                </StackLayout>
-            </Grid>
-        </ViewCell>
-    </DataTemplate>
-
-    <!-- Localization -->
-    <DataTemplate x:Key="LanguageItemTemplate" x:DataType="language:LocalizationInfo">
-        <ViewCell>
-            <Grid 
-                Padding="2" 
-                Margin="1" 
-                ColumnDefinitions="48,*"
-                >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="{OnIdiom Tablet=80, Default=60}" />
-                </Grid.RowDefinitions>
-                <!-- Flag -->
-                <Image 
-                    HeightRequest="24"                                          
-                    Source="{Binding FlagUri, Converter={StaticResource UriToStringConverter}}"
-                    />
-
-                <!-- Infos -->
-                <StackLayout
-                    Grid.Column="1"
-                    Spacing="1" 
-                    Padding="2,5,-10,0"
-                    CompressedLayout.IsHeadless="true"
-                    >
-                    <!-- Language name -->
-                    <Label 
-                        LineBreakMode="NoWrap" 
-                        Style="{StaticResource Style.Core.Label.Primary}" 
-                        Text="{Binding Name}"
-                        />
-                    <!-- Translator -->
-                    <Label 
-                        Style="{StaticResource Style.Core.Label.Default}" 
-                        LineBreakMode="WordWrap" 
-                        Text="{Binding Translator}"
-                        FontSize="12"
-                        />
-                </StackLayout>
-            </Grid>
-        </ViewCell>
-    </DataTemplate>
-
-    <DataTemplate x:Key="LanguageSelectedItemTemplate" x:DataType="language:LocalizationInfo">
-        <ViewCell>
-            <Grid 
-                Padding="2"
-                Margin="1"
-                Background="{DynamicResource PrimaryColor}"
-                ColumnDefinitions="48,*"
-                >
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="{OnIdiom Tablet=80, Default=60}" />
-                </Grid.RowDefinitions>
-
-                <!-- Flag -->
-                <Image 
-                    HeightRequest="24"                                          
-                    Source="{Binding FlagUri, Converter={StaticResource UriToStringConverter}}"
-                    />
-
-                <!-- Infos -->
-                <StackLayout 
-                    Grid.Column="1" 
-                    Spacing="1" 
-                    Padding="2,5,-10,0"
-                    CompressedLayout.IsHeadless="true"
-                    >
-                    <!-- Language name -->
-                    <Label 
-                        LineBreakMode="NoWrap" 
-                        Style="{StaticResource Style.Core.Label.Primary}" 
-                        TextColor="{StaticResource White}"
-                        Text="{Binding Name}"
-                        />
-                    <!-- Translator -->
-                    <Label 
-                        Style="{StaticResource Style.Core.Label.Default}" 
-                        LineBreakMode="WordWrap" 
-                        Text="{Binding Translator}"
-                        TextColor="{StaticResource White}"
-                        FontSize="12"
-                        />
-                </StackLayout>
-            </Grid>
-        </ViewCell>
-    </DataTemplate>
-
-    <!-- Documentation -->
-    <DataTemplate x:Key="ChangelogItemTemplate" x:DataType="documentation:ChangelogInfo">
-        <ViewCell>
-            <Grid
-                x:Name="Grid"
-                Padding="16,12"
-                ColumnSpacing="16"
-                RowSpacing="2"
-                ColumnDefinitions="*,Auto"
-                >
-                <Label
-                    Style="{StaticResource Style.Core.Label.Default}"
-                    LineBreakMode="WordWrap"
-                    Text="{Binding Changelog}"
-                    />
-                <Border 
-                    Background="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" 
-                    Style="{StaticResource Style.Core.Border.Profile}"
-                    Grid.Column="1"
-                    VerticalOptions="Center"
-                    >
-                    <Label
-                        Margin="4"
-                        Style="{StaticResource Style.Core.Label.Icon.MaterialDesign}"
-                        Text="{Binding Type, Converter={StaticResource StringToChangelogIconConverter}}"
-                        VerticalTextAlignment="Center"
-                        HorizontalTextAlignment="Center"
-                        />
-                </Border>
-            </Grid>
-        </ViewCell>
-    </DataTemplate>
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewSwipeTemplates.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewSwipeTemplates.xaml
index c85f86a8..ff915089 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewSwipeTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/ItemTemplates/ListViewSwipeTemplates.xaml
@@ -19,7 +19,7 @@
 
     <!-- Single Swipe Templates -->
 
-    <DataTemplate x:Key="DeleteGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.Delete">
         <Label
             Style="{StaticResource Style.Core.Label.Icon}"
             Text="{x:Static iconsSyncfusion:SyncfusionIcons.Delete}"
@@ -39,55 +39,47 @@
         </Label>
     </DataTemplate>
 
-    <DataTemplate x:Key="EditGestureSwipeTemplate">
-        <Grid
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.Edit">
+        <Label
+            Style="{StaticResource Style.Core.Label.Icon}"
+            Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
+            TextColor="{StaticResource White}"
             Background="{StaticResource Green}"
+            VerticalTextAlignment="Center"
+            HorizontalTextAlignment="Center"
+            Margin="0"
             >
-            <Label
-                Style="{StaticResource Style.Core.Label.Icon}"
-                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
-                TextColor="{StaticResource White}"
-                Background="{StaticResource Green}"
-                VerticalTextAlignment="Center"
-                HorizontalTextAlignment="Center"
-                Margin="0"
-                >
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer
-                        NumberOfTapsRequired="1"
-                        Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                        CommandParameter="{Binding .}"
-                        />
-                </Label.GestureRecognizers>
-            </Label>
-        </Grid>
+            <Label.GestureRecognizers>
+                <TapGestureRecognizer
+                    NumberOfTapsRequired="1"
+                    Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                    CommandParameter="{Binding .}"
+                    />
+            </Label.GestureRecognizers>
+        </Label>
     </DataTemplate>
 
-    <DataTemplate x:Key="ViewGestureSwipeTemplate">
-        <Grid
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.View">
+        <Label
+            Style="{StaticResource Style.Core.Label.Icon}"
+            Text="{x:Static iconsSyncfusion:SyncfusionIcons.Show}"
+            TextColor="{StaticResource White}"
             Background="{StaticResource Blue}"
+            VerticalTextAlignment="Center"
+            HorizontalTextAlignment="Center"
+            Margin="0"
             >
-            <Label
-                Style="{StaticResource Style.Core.Label.Icon}"
-                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Show}"
-                TextColor="{StaticResource White}"
-                Background="{StaticResource Blue}"
-                VerticalTextAlignment="Center"
-                HorizontalTextAlignment="Center"
-                Margin="0"
-                >
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer
-                        NumberOfTapsRequired="1"
-                        Command="{Binding BindingContext.ViewItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                        CommandParameter="{Binding .}"
-                        />
-                </Label.GestureRecognizers>
-            </Label>
-        </Grid>
+            <Label.GestureRecognizers>
+                <TapGestureRecognizer
+                    NumberOfTapsRequired="1"
+                    Command="{Binding BindingContext.ViewItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                    CommandParameter="{Binding .}"
+                    />
+            </Label.GestureRecognizers>
+        </Label>
     </DataTemplate>
 
-    <DataTemplate x:Key="PrintGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.Print3d">
         <Label
             Style="{StaticResource Style.Core.Label.Icon.MaterialDesign}"
             Text="{x:Static icons:MaterialIcons.Printer3dNozzleOutline}"
@@ -107,7 +99,7 @@
         </Label>
     </DataTemplate>
 
-    <DataTemplate x:Key="ExecuteGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.Execute">
         <Label
             Style="{StaticResource Style.Core.Label.Icon.MaterialDesign}"
             Text="{x:Static icons:MaterialIcons.RunFast}"
@@ -128,128 +120,127 @@
     </DataTemplate>
 
     <!-- Double Swipe Templates -->
-    <DataTemplate x:Key="EditDeleteGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.EditDelete">
         <Grid
-                ColumnDefinitions="*,*"
+            ColumnDefinitions="*,*"
+            >
+            <Label
+                Style="{StaticResource Style.Core.Label.Icon}"
+                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Delete}"
+                TextColor="{StaticResource White}"
+                Background="{StaticResource Red}"
+                VerticalTextAlignment="Center"
+                HorizontalTextAlignment="Center"
+                Margin="0"
                 >
-                <Label
-                    Style="{StaticResource Style.Core.Label.Icon}"
-                    Text="{x:Static iconsSyncfusion:SyncfusionIcons.Delete}"
-                    TextColor="{StaticResource White}"
-                    Background="{StaticResource Red}"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"
-                    Margin="0"
-                    >
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                            NumberOfTapsRequired="1"
-                            Command="{Binding BindingContext.DeleteItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                            CommandParameter="{Binding .}"
-                            />
-                    </Label.GestureRecognizers>
-                </Label>
-                <Label
-                    Grid.Column="1"
-                    Style="{StaticResource Style.Core.Label.Icon}"
-                    Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
-                    TextColor="{StaticResource White}"
-                    Background="{StaticResource Green}"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"
-                    Margin="0"
-                    >
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                            NumberOfTapsRequired="1"
-                            Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                            CommandParameter="{Binding .}"
-                            />
-                    </Label.GestureRecognizers>
-                </Label>
-            </Grid>
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer
+                        NumberOfTapsRequired="1"
+                        Command="{Binding BindingContext.DeleteItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                        CommandParameter="{Binding .}"
+                        />
+                </Label.GestureRecognizers>
+            </Label>
+            <Label
+                Grid.Column="1"
+                Style="{StaticResource Style.Core.Label.Icon}"
+                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
+                TextColor="{StaticResource White}"
+                Background="{StaticResource Green}"
+                VerticalTextAlignment="Center"
+                HorizontalTextAlignment="Center"
+                Margin="0"
+                >
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer
+                        NumberOfTapsRequired="1"
+                        Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                        CommandParameter="{Binding .}"
+                        />
+                </Label.GestureRecognizers>
+            </Label>
+        </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="EditExportGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.EditExport">
         <Grid
-                ColumnDefinitions="*,*"
+            ColumnDefinitions="*,*"
+            >
+            <Label
+                Style="{StaticResource Style.Core.Label.Icon}"
+                Text="{x:Static iconsSyncfusion:SyncfusionIcons.FileExplorer}"
+                TextColor="{StaticResource White}"
+                VerticalTextAlignment="Center"
+                HorizontalTextAlignment="Center"
+                Margin="0"
+                Background="{StaticResource Yellow}"
                 >
-                <Label
-                    Style="{StaticResource Style.Core.Label.Icon}"
-                    Text="{x:Static iconsSyncfusion:SyncfusionIcons.FileExplorer}"
-                    TextColor="{StaticResource White}"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"
-                    Margin="0"
-                    Background="{StaticResource Yellow}"
-                    >
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                            NumberOfTapsRequired="1"
-                            Command="{Binding BindingContext.ExportItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                            CommandParameter="{Binding .}"
-                            />
-                    </Label.GestureRecognizers>
-                </Label>
-
-                <Label
-                    Grid.Column="1"
-                    Style="{StaticResource Style.Core.Label.Icon}"
-                    Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
-                    TextColor="{StaticResource White}"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"
-                    Margin="0"
-                    Background="{StaticResource Green}"
-                    >
-                    <Label.GestureRecognizers>
-                        <TapGestureRecognizer
-                            NumberOfTapsRequired="1"
-                            Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                            CommandParameter="{Binding .}"
-                            />
-                    </Label.GestureRecognizers>
-                </Label>
-            </Grid>
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer
+                        NumberOfTapsRequired="1"
+                        Command="{Binding BindingContext.ExportItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                        CommandParameter="{Binding .}"
+                        />
+                </Label.GestureRecognizers>
+            </Label>
+            <Label
+                Grid.Column="1"
+                Style="{StaticResource Style.Core.Label.Icon}"
+                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
+                TextColor="{StaticResource White}"
+                VerticalTextAlignment="Center"
+                HorizontalTextAlignment="Center"
+                Margin="0"
+                Background="{StaticResource Green}"
+                >
+                <Label.GestureRecognizers>
+                    <TapGestureRecognizer
+                        NumberOfTapsRequired="1"
+                        Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                        CommandParameter="{Binding .}"
+                        />
+                </Label.GestureRecognizers>
+            </Label>
+        </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="DeleteEditViewGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.DeleteEditView">
         <Grid
             ColumnDefinitions="*,*,*"
             >
             <Label
-                    Style="{StaticResource Style.Core.Label.Icon}"
-                    Text="{x:Static iconsSyncfusion:SyncfusionIcons.Delete}"
-                    TextColor="{StaticResource White}"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"
-                    Margin="0"
-                    Background="{StaticResource Red}"
-                    >
+                Style="{StaticResource Style.Core.Label.Icon}"
+                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Delete}"
+                TextColor="{StaticResource White}"
+                VerticalTextAlignment="Center"
+                HorizontalTextAlignment="Center"
+                Margin="0"
+                Background="{StaticResource Red}"
+                >
                 <Label.GestureRecognizers>
                     <TapGestureRecognizer
-                            NumberOfTapsRequired="1"
-                            Command="{Binding BindingContext.DeleteItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                            CommandParameter="{Binding .}"
-                            />
+                        NumberOfTapsRequired="1"
+                        Command="{Binding BindingContext.DeleteItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                        CommandParameter="{Binding .}"
+                        />
                 </Label.GestureRecognizers>
             </Label>
             <Label
-                    Grid.Column="1"
-                    Style="{StaticResource Style.Core.Label.Icon}"
-                    Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
-                    TextColor="{StaticResource White}"
-                    VerticalTextAlignment="Center"
-                    HorizontalTextAlignment="Center"
-                    Margin="0"
-                    Background="{StaticResource Green}"
-                    >
+                Grid.Column="1"
+                Style="{StaticResource Style.Core.Label.Icon}"
+                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Edit}"
+                TextColor="{StaticResource White}"
+                VerticalTextAlignment="Center"
+                HorizontalTextAlignment="Center"
+                Margin="0"
+                Background="{StaticResource Green}"
+                >
                 <Label.GestureRecognizers>
                     <TapGestureRecognizer
-                            NumberOfTapsRequired="1"
-                            Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                            CommandParameter="{Binding .}"
-                            />
+                        NumberOfTapsRequired="1"
+                        Command="{Binding BindingContext.EditItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                        CommandParameter="{Binding .}"
+                        />
                 </Label.GestureRecognizers>
             </Label>
             <Label
@@ -264,16 +255,16 @@
                 >
                 <Label.GestureRecognizers>
                     <TapGestureRecognizer
-                            NumberOfTapsRequired="1"
-                            Command="{Binding BindingContext.ViewItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
-                            CommandParameter="{Binding .}"
-                            />
+                        NumberOfTapsRequired="1"
+                        Command="{Binding BindingContext.ViewItemCommand, Source={x:RelativeSource AncestorType={x:Type listView:SfListView}, AncestorLevel=1}}"
+                        CommandParameter="{Binding .}"
+                        />
                 </Label.GestureRecognizers>
             </Label>
         </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="ViewDeleteGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.ViewDelete">
         <Grid
             ColumnDefinitions="*,*"
             >
@@ -315,7 +306,7 @@
         </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="ViewEditGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.ViewEdit">
         <Grid
             ColumnDefinitions="*,*"
             >
@@ -357,7 +348,7 @@
         </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="ViewEditDeleteGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.ViewEditDelete">
         <Grid
             ColumnDefinitions="*,*,*"
             >
@@ -417,7 +408,7 @@
         </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="PrintViewGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.SwipePrint3dView ">
         <Grid
             ColumnDefinitions="*,*"
             >
@@ -459,7 +450,7 @@
         </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="ExecuteEditGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.ExecuteEdit">
         <Grid
             ColumnDefinitions="*,*"
             >
@@ -501,7 +492,7 @@
         </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="DuplicateEditDeleteGestureSwipeTemplate">
+    <DataTemplate x:Key="DataTemplate.Syncfusion.Swipe.DuplicateEditDelete">
         <ViewCell>
             <Grid
                 ColumnDefinitions="*,*,*"
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/CarouselViewItemTemplates.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/CarouselViewItemTemplates.xaml
index 3c3f0ee7..1c1b8917 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/CarouselViewItemTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/CarouselViewItemTemplates.xaml
@@ -14,7 +14,7 @@
     <converters:ColorToBlackWhiteConverter x:Key="ColorToBlackWhiteConverter" />
     <converters:ColorToStringConverter x:Key="ColorToStringConverter" />
 
-    <DataTemplate x:Key="DefaultThemeColorInfoItemTemplate" x:DataType="theme:ThemeColorInfo">
+    <DataTemplate x:Key="DataTemplate.Core.ThemeColorInfo.Enhanced" x:DataType="theme:ThemeColorInfo">
         <Grid>
             <VisualStateManager.VisualStateGroups>
                 <VisualStateGroup x:Name="CommonStates">
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/GeneralItemTemplates.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/GeneralItemTemplates.xaml
index e3ec755d..9d73a466 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/GeneralItemTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/GeneralItemTemplates.xaml
@@ -17,7 +17,7 @@
     </ResourceDictionary.MergedDictionaries>
     <converters:UriToStringConverter x:Key="UriToStringConverter" />
 
-    <DataTemplate x:Key="TutorialStepItemTemplate" x:DataType="documentation:TutorialStep">
+    <DataTemplate x:Key="DataTemplate.Core.TutorialStep.Default" x:DataType="documentation:TutorialStep">
         <Grid 
             Padding="8,6"
             ColumnSpacing="4"
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml
index 24c7b70e..e3fc43e3 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewGroupHeaderTemplates.xaml
@@ -14,7 +14,7 @@
     >
     <converters:UriToStringConverter x:Key="UriToStringConverter" />
 
-    <DataTemplate x:Key="GroupHeaderTemplate">
+    <DataTemplate x:Key="DataTemplate.Core.Header.Group">
         <ViewCell>
             <StackLayout 
                 Style="{StaticResource Style.Core.StackLayout.Header}" 
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml
index b1e8ad7a..61fc5173 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ListViewItemTemplates.xaml
@@ -14,7 +14,7 @@
     >
     <converters:UriToStringConverter x:Key="UriToStringConverter" />
 
-    <DataTemplate x:Key="ProFeatureItemTemplate" x:DataType="documentation:ProVersionFeature">
+    <DataTemplate x:Key="DataTemplate.Core.ProVersionFeature.Default" x:DataType="documentation:ProVersionFeature">
         <ViewCell>
             <Grid 
                 Padding="8,6"
@@ -46,7 +46,7 @@
         </ViewCell>
     </DataTemplate>
 
-    <DataTemplate x:Key="AppEventTemplate" x:DataType="eventLogger:AppEvent">
+    <DataTemplate x:Key="DataTemplate.Core.AppEvent.Default" x:DataType="eventLogger:AppEvent">
         <ViewCell>
             <Grid 
                 x:Name="Grid"
@@ -126,7 +126,7 @@
     </DataTemplate>
 
     <!-- Localization -->
-    <DataTemplate x:Key="LanguageItemTemplate" x:DataType="language:LocalizationInfo">
+    <DataTemplate x:Key="DataTemplate.Core.LocalizationInfo.Default" x:DataType="language:LocalizationInfo">
         <ViewCell>
             <Grid 
                 Padding="2" 
@@ -167,7 +167,7 @@
         </ViewCell>
     </DataTemplate>
 
-    <DataTemplate x:Key="LanguageSelectedItemTemplate" x:DataType="language:LocalizationInfo">
+    <DataTemplate x:Key="DataTemplate.Core.LocalizationInfo.Selected" x:DataType="language:LocalizationInfo">
         <ViewCell>
             <Grid 
                 Padding="2"
@@ -213,7 +213,7 @@
     </DataTemplate>
 
     <!-- Documentation -->
-    <DataTemplate x:Key="ChangelogItemTemplate" x:DataType="documentation:ChangelogInfo">
+    <DataTemplate x:Key="DataTemplate.Core.ChangelogInfo.Default" x:DataType="documentation:ChangelogInfo">
         <ViewCell>
             <Grid
                 x:Name="Grid"
@@ -245,7 +245,7 @@
         </ViewCell>
     </DataTemplate>
 
-    <DataTemplate x:Key="ChangeInfoItemTemplate" x:DataType="documentation:ChangeInfo">
+    <DataTemplate x:Key="DataTemplate.Core.ChangeInfo.Default" x:DataType="documentation:ChangeInfo">
         <ViewCell>
             <Grid
                 x:Name="Grid"
@@ -278,7 +278,7 @@
     </DataTemplate>
 
     <!-- Theme -->
-    <DataTemplate x:Key="DefaultThemeColorInfoListViewItemTemplate" x:DataType="theme:ThemeColorInfo">
+    <DataTemplate x:Key="DataTemplate.Core.ThemeColorInfo.Default" x:DataType="theme:ThemeColorInfo">
         <Grid>
             <Border
                 StrokeShape="RoundRectangle 10"
@@ -345,7 +345,7 @@
         </Grid>
     </DataTemplate>
 
-    <DataTemplate x:Key="ColorInfoListViewItemTemplate" x:DataType="theme:ColorInfo">
+    <DataTemplate x:Key="DataTemplate.Core.ColorInfo.Default" x:DataType="theme:ColorInfo">
         <Grid>
             <Border
                 StrokeShape="RoundRectangle 5"
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ShellItemTemplates.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ShellItemTemplates.xaml
index 100e586e..82fc1e62 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ShellItemTemplates.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/ItemTemplates/ShellItemTemplates.xaml
@@ -16,7 +16,7 @@
         <ResourceDictionary Source="/Resources/Themes/SharedFonts.xaml" />
     </ResourceDictionary.MergedDictionaries>
     
-    <DataTemplate x:Key="DefaultFlyoutTemplate">
+    <DataTemplate x:Key="DataTemplate.Core.Flyout.Default">
         <Grid
             x:Name="FlyoutItemLayout"
             HeightRequest="{OnPlatform 44, Android=50}"