fix: Add default back button icon for NavBar

unoplatform · Jun 19, 2023 · d5641ce · d5641ce
1 parent f04c15f
commit d5641ce
Show file tree

Hide file tree

Showing 23 changed files with 767 additions and 744 deletions.
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml.Navigation.cs
@@ -87,7 +87,7 @@ private Shell BuildShell()
 			AddNavigationItems(nv);
 
 			// landing navigation
-			ShellNavigateTo<RuntimeTestRunner>(
+			ShellNavigateTo<NavigationBarSamplePage>(
 #if WINDOWS_UWP
 				// note: on uwp, NavigationView.SelectedItem MUST be set on launch to avoid entering compact-mode
 				trySynchronizeCurrentItem: true

diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-100.png
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-150.png
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-200.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-200.png
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-300.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-300.png
diff --git a/src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png b/src/Uno.Toolkit.UI/Assets/BackIcon.scale-400.png
diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml b/src/Uno.Toolkit.UI/Controls/NavigationBar/NavigationBar.xaml
diff --git a/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml b/src/Uno.Toolkit.UI/Resources/AssetCatalog.UWP.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="BackButtonUriSource">ms-appx:///Uno.Toolkit.UI/Assets/BackIcon.png</x:String>
+</ResourceDictionary>
diff --git a/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml b/src/Uno.Toolkit.UI/Resources/AssetCatalog.WinUI.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="BackButtonUriSource">ms-appx:///Uno.Toolkit.WinUI/Assets/BackIcon.png</x:String>
+</ResourceDictionary>
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="MSBuild.Sdk.Extras/3.0.38">
 	<!--
 	Adding project references to this project requires some manual adjustments.
@@ -48,6 +48,7 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 
 	<Import Project="xamlmerge-toolkit.props" />

diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
@@ -36,6 +36,7 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 
 	<Import Project="..\winappsdk-workaround.targets" />

diff --git a/src/Uno.Toolkit.UI/xamlmerge-toolkit.props b/src/Uno.Toolkit.UI/xamlmerge-toolkit.props
@@ -6,6 +6,7 @@
 	<ItemGroup>
 		<XamlMergeInput Include="Controls\**\*.xaml" />
 		<XamlMergeInput Include="Behaviors\**\*.xaml" />
+		<XamlMergeInput Include="Resources\AssetCatalog.$(FrameworkLineage).xaml" />
 	</ItemGroup>
 
 	<Import Project="..\xamlmerge.props" />

diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-100.png
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-150.png
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-200.png
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-300.png
diff --git a/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png b/src/library/Uno.Toolkit.Material/Assets/MaterialBackIcon.scale-400.png
diff --git a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.UWP.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="MaterialBackButtonUriSource">ms-appx:///Uno.Toolkit.UI.Material/Assets/MaterialBackIcon.png</x:String>
+</ResourceDictionary>
diff --git a/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml b/src/library/Uno.Toolkit.Material/Resources/AssetCatalog.WinUI.xaml
@@ -0,0 +1,4 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+	<x:String x:Key="MaterialBackButtonUriSource">ms-appx:///Uno.Toolkit.WinUI.Material/Assets/MaterialBackIcon.png</x:String>
+</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
diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
@@ -19,7 +19,6 @@
 
 		<UnoXamlResourcesTrimming Condition="'$(OS)'=='Windows_NT' or '$(MSBuildRuntimeType)'=='Core'">true</UnoXamlResourcesTrimming>
 	</PropertyGroup>
-
 	<ItemGroup>
 		<PackageReference Include="Uno.Material" />
 		<PackageReference Include="Uno.UI" />
@@ -31,6 +30,7 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 
 	<ItemGroup Condition="$(IsXamarinIOS) or $(IsMonoAndroid) or $(IsXamarinMac)">

diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
@@ -18,7 +18,10 @@
 		<FrameworkLineage>WinUI</FrameworkLineage>
 		<UnoXamlResourcesTrimming Condition="'$(OS)'=='Windows_NT' or '$(MSBuildRuntimeType)'=='Core'">true</UnoXamlResourcesTrimming>
 	</PropertyGroup>
-
+	<ItemGroup>
+		<ExcludeXamlNamespaces Include="uwp_navbar" />
+		<IncludeXamlNamespaces Include="winui_navbar" />
+	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Uno.Material.WinUI" />
 		<PackageReference Include="Uno.WinUI" />
@@ -40,6 +43,7 @@
 
 	<ItemGroup>
 		<UpToDateCheckInput Include="**\*.xaml" Exclude="bin\**\*.xaml;obj\**\*.xaml" />
+		<Content Include="Assets\**\*.png" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\Uno.Toolkit.UI\Uno.Toolkit.WinUI.csproj" />

diff --git a/src/library/Uno.Toolkit.Material/xamlmerge-material.props b/src/library/Uno.Toolkit.Material/xamlmerge-material.props
@@ -6,6 +6,7 @@
 
 		<XamlMergeInput Include="Styles\Controls\v1\**\*.xaml" MergeFile="mergedpages.$(FrameworkLineage).v1.xaml" />
 		<XamlMergeInput Include="Styles\Controls\v2\**\*.xaml" MergeFile="mergedpages.$(FrameworkLineage).v2.xaml" />
+		<XamlMergeInput Include="Resources\AssetCatalog.$(FrameworkLineage).xaml" MergeFile="mergedpages.$(FrameworkLineage).v2.xaml" />
 	</ItemGroup>
 	<Import Project="..\..\xamlmerge.props" />
 </Project>