Merge pull request #420 from AndreasReitberger/417-add-missing-styles

Add missing styles
AndreasReitberger · Jan 9, 2024 · ae421f2 · ae421f2
2 parents f8c22dc + 2710548
commit ae421f2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 2 deletions.
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/AppShell.xaml b/src/SharedMauiXamlStylesLibrary.SampleApp/AppShell.xaml
@@ -11,8 +11,8 @@
     FlyoutBehavior="{OnPlatform WinUI=Locked, Default={OnIdiom Tablet=Locked, Default=Flyout}}"
     FlyoutBackgroundColor="{AppThemeBinding Light={OnPlatform WinUI={StaticResource Gray100}, Default={StaticResource White}}, Dark={OnPlatform WinUI={StaticResource Gray900}, Default={StaticResource Black}}}"
 
-    Shell.ItemTemplate="{StaticResource DefaultFlyoutTemplate}"
-    Shell.MenuItemTemplate="{StaticResource DefaultFlyoutTemplate}"
+    Shell.ItemTemplate="{StaticResource DataTemplate.Core.Flyout.Default}"
+    Shell.MenuItemTemplate="{StaticResource DataTemplate.Core.Flyout.Default}"
     x:DataType="viewModels:AppShellViewModel"
     >
 

diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfNumericEntry.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/SfNumericEntry.xaml
@@ -44,6 +44,10 @@
         </Setter>
     </Style>
 
+    <Style x:Key="Style.Syncfusion.SfNumericEntry.Transparent" TargetType="inputs:SfNumericEntry" BasedOn="{StaticResource Style.Syncfusion.SfNumericEntry.Default}">
+        <Setter Property="Background" Value="{StaticResource Transparent}" />
+    </Style>
+
     <Style x:Key="Style.Syncfusion.SfNumericEntry.Currency" TargetType="inputs:SfNumericEntry" BasedOn="{StaticResource Style.Syncfusion.SfNumericEntry.Default}">
         <Setter Property="CustomFormat" Value="C2" />
     </Style>

diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj b/src/SharedMauiXamlStylesLibrary.Syncfusion/SharedMauiXamlStylesLibrary.Syncfusion.csproj
@@ -28,6 +28,7 @@
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <EmbedUntrackedSources>true</EmbedUntrackedSources>
         <IncludeSymbols>true</IncludeSymbols>
+        <Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
 	<ItemGroup>

diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Label.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Label.xaml
@@ -40,6 +40,10 @@
         <Setter Property="LineHeight" Value="{OnPlatform Default=1.25, iOS=-1}"/>
     </Style>
 
+    <Style x:Key="Style.Core.Label.IconSmall.MaterialDesign" TargetType="Label" BasedOn="{StaticResource Style.Core.Label.Icon.MaterialDesign}">
+        <Setter Property="FontSize" Value="Small"/>
+    </Style>
+
     <Style x:Key="Style.Core.Label.IconSettings.MaterialDesign" TargetType="Label" BasedOn="{StaticResource Style.Core.Label.Icon}">
         <Setter Property="Text" Value="{x:Static icons:MaterialIcons.VectorSquare}" />
         <Setter Property="FontFamily" Value="{StaticResource MaterialDesignIcons}" />

diff --git a/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj b/src/SharedMauiXamlStylesLibrary/SharedMauiXamlStylesLibrary.csproj
@@ -27,6 +27,7 @@
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<IncludeSymbols>true</IncludeSymbols>
+		<Platforms>AnyCPU;x64</Platforms>
 	</PropertyGroup>
 
 	<ItemGroup>