refactor: check for missing explicit and implicit v2 styles (#621)

unoplatform · Jun 22, 2023 · b9c0e7a · b9c0e7a
1 parent 3b192b9
commit b9c0e7a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Divider.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/Divider.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:utu="using:Uno.Toolkit.UI">
 
@@ -35,4 +35,8 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
+
+	<Style x:Key="MaterialDefaultDividerStyle"
+		   TargetType="utu:Divider"
+		   BasedOn="{StaticResource MaterialDividerStyle}" />
 </ResourceDictionary>
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/NavigationBar.xaml
@@ -1039,7 +1039,12 @@
 		<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
 	</Style>
 
+	<!--#endregion-->
 
+	<!--#region Default NavigationBar style-->
+	<Style x:Key="MaterialDefaultNavigationBarStyle"
+		   TargetType="utu:NavigationBar"
+		   BasedOn="{StaticResource MaterialNavigationBarStyle}" />
 	<!--#endregion-->
 
 	<ios:ControlTemplate x:Key="MaterialNativeNavigationBarTemplate"

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml
@@ -885,4 +885,9 @@
 	</Style>
 	<!--#endregion-->
 
+	<!--#region Default AppBar style-->
+	<Style x:Key="MaterialDefaultMainCommandStyle"
+		   TargetType="AppBarButton"
+		   BasedOn="{StaticResource MaterialMainCommandStyle}" />
+	<!--#endregion-->
 </ResourceDictionary>
diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/_Common.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/_Common.xaml
@@ -1,12 +1,12 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 					xmlns:utu="using:Uno.Toolkit.UI"
 					xmlns:um="using:Uno.Material"
 					xmlns:toolkit="using:Uno.UI.Toolkit">
 	<!-- Implicit styles -->
-	<Style BasedOn="{StaticResource MaterialDividerStyle}" TargetType="utu:Divider" />
-	<Style BasedOn="{StaticResource MaterialNavigationBarStyle}" TargetType="utu:NavigationBar" />
-	<Style BasedOn="{StaticResource MaterialMainCommandStyle}" TargetType="AppBarButton" />
+	<Style BasedOn="{StaticResource MaterialDefaultDividerStyle}" TargetType="utu:Divider" />
+	<Style BasedOn="{StaticResource MaterialDefaultNavigationBarStyle}" TargetType="utu:NavigationBar" />
+	<Style BasedOn="{StaticResource MaterialDefaultMainCommandStyle}" TargetType="AppBarButton" />
 
 	<!-- Implicit styles aliases -->
 	<StaticResource x:Key="DividerStyle" ResourceKey="MaterialDividerStyle"			/>