feat: Add local MaterialRootModalNavigationBarStyle

2021-11-17 13:58:50 -05:00 · 2021-11-17 13:58:50 -05:00 · c8fdcee61c
--- a/samples/Commerce/Commerce.Droid/Commerce.Droid.csproj
+++ b/samples/Commerce/Commerce.Droid/Commerce.Droid.csproj
@ -66,8 +66,8 @@
    <PackageReference Include="CommunityToolkit.Mvvm" Version="7.0.3" />
    <PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
    <PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
-    <PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
-    <PackageReference Include="Uno.Toolkit.UI.Material" Version="0.1.0-dev.120" />
+    <PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.124" />
+    <PackageReference Include="Uno.Toolkit.UI.Material" Version="0.1.0-dev.124" />
    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
@ -167,4 +167,4 @@
      <Compile Remove="$(_AndroidResourceDesignerFile)" />
    </ItemGroup>
  </Target>
-</Project>
+</Project>
--- a/samples/Commerce/Commerce.Shared/App.xaml
+++ b/samples/Commerce/Commerce.Shared/App.xaml
@ -23,6 +23,7 @@
 				<MaterialToolkitResources xmlns="using:Uno.Toolkit.UI.Material" />

 				<ResourceDictionary Source="ms-appx:///Styles/FeedView.xaml" />
+				<ResourceDictionary Source="ms-appx:///Styles/NavigationBar.xaml" />
 			</ResourceDictionary.MergedDictionaries>
 			<x:Double x:Key="LandscapeMaxPageWidth">500</x:Double>
 			<!-- Workaround for https://github.com/unoplatform/uno/issues/5372 -->
--- a/samples/Commerce/Commerce.Shared/Assets/BitmapIcons/close.png
+++ b/samples/Commerce/Commerce.Shared/Assets/BitmapIcons/close.png
--- a/samples/Commerce/Commerce.Shared/Commerce.Shared.projitems
+++ b/samples/Commerce/Commerce.Shared/Commerce.Shared.projitems
@ -91,6 +91,10 @@
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Styles\NavigationBar.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
    <Page Include="$(MSBuildThisFileDirectory)Views\CartDialog.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
@ -145,6 +149,7 @@
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
    <Content Include="$(MSBuildThisFileDirectory)Assets\BitmapIcons\help_outline.png" />
+    <Content Include="$(MSBuildThisFileDirectory)Assets\BitmapIcons\close.png" />
    <Content Include="$(MSBuildThisFileDirectory)Assets\BitmapIcons\notifications.png" />
    <Content Include="$(MSBuildThisFileDirectory)Assets\Products\bondi-7-running-shoes.png" />
    <Content Include="$(MSBuildThisFileDirectory)Assets\Products\fresh-foam-hierro-v6.png" />
--- a/samples/Commerce/Commerce.Shared/Styles/NavigationBar.xaml
+++ b/samples/Commerce/Commerce.Shared/Styles/NavigationBar.xaml
@ -0,0 +1,61 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:android="http://uno.ui/android"
+	xmlns:ios="http://uno.ui/ios"
+	xmlns:wasm="http://uno.ui/wasm"
+	xmlns:macos="http://uno.ui/macos"
+	xmlns:skia="http://uno.ui/skia"
+	xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:toolkit="using:Uno.Toolkit.UI.Controls"
+	mc:Ignorable="android ios wasm skia macos">
+
+	<x:String x:Key="BitmapIcon_close">M 14 1.4099998474121094 L 12.59000015258789 0 L 7 5.590000152587891 L 1.4099998474121094 0 L 0 1.4099998474121094 L 5.590000152587891 7 L 0 12.59000015258789 L 1.4099998474121094 14 L 7 8.40999984741211 L 12.59000015258789 14 L 14 12.59000015258789 L 8.40999984741211 7 L 14 1.4099998474121094 Z</x:String>
+	
+	<Style x:Key="MaterialRootModalLeftCommandStyle"
+           TargetType="AppBarButton"
+           BasedOn="{StaticResource MaterialModalLeftCommandStyle}">
+		<win:Setter Property="Icon">
+			<Setter.Value>
+				<PathIcon Data="{StaticResource BitmapIcon_close}" />
+			</Setter.Value>
+		</win:Setter>
+		<skia:Setter Property="Icon">
+			<Setter.Value>
+				<PathIcon Data="{StaticResource BitmapIcon_close}" />
+			</Setter.Value>
+		</skia:Setter>
+		<wasm:Setter Property="Icon">
+			<Setter.Value>
+				<PathIcon Data="{StaticResource BitmapIcon_close}" />
+			</Setter.Value>
+		</wasm:Setter>
+		<macos:Setter Property="Icon">
+			<Setter.Value>
+				<PathIcon Data="{StaticResource BitmapIcon_close}" />
+			</Setter.Value>
+		</macos:Setter>
+		<ios:Setter Property="Icon">
+			<Setter.Value>
+				<BitmapIcon ShowAsMonochrome="False"
+						UriSource="ms-appx:///Assets/BitmapIcons/close.png" />
+			</Setter.Value>
+		</ios:Setter>
+		<android:Setter Property="Icon">
+			<Setter.Value>
+				<BitmapIcon ShowAsMonochrome="False"
+						UriSource="ms-appx:///Assets/BitmapIcons/close.png" />
+			</Setter.Value>
+		</android:Setter>
+	</Style>
+
+	<Style x:Key="MaterialRootModalNavigationBarStyle"
+           TargetType="toolkit:NavigationBar"
+           BasedOn="{StaticResource MaterialModalNavigationBarStyle}">
+		<Setter Property="LeftCommandStyle"
+                Value="{StaticResource MaterialRootModalLeftCommandStyle}" />
+		<Setter Property="LeftCommandMode"
+                Value="Action" />
+	</Style>
+</ResourceDictionary>
--- a/samples/Commerce/Commerce.Skia.Gtk/Commerce.Skia.Gtk.csproj
+++ b/samples/Commerce/Commerce.Skia.Gtk/Commerce.Skia.Gtk.csproj
@ -17,7 +17,7 @@
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
    <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.0.0-dev.5594" />
    <PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
+		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.124" />
 		<PackageReference Include="Uno.Core" Version="4.0.0-dev.7" />
 		<PackageReference Include="Uno.Material">
 			<Version>1.1.0-dev.13</Version>
--- a/samples/Commerce/Commerce.Skia.WPF/Commerce.Skia.WPF.csproj
+++ b/samples/Commerce/Commerce.Skia.WPF/Commerce.Skia.WPF.csproj
@ -8,7 +8,7 @@
 		<PackageReference Include="Uno.UI.Skia.Wpf" Version="4.0.0-dev.5594" />
 		<PackageReference Include="Uno.UI.RemoteControl" Version="4.0.0-dev.5594" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="System.Linq.Async" Version="4.0.0" />
-		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
+		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.124" />
 		<PackageReference Include="Uno.Core" Version="4.0.0-dev.7" />
 		<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="7.0.3" />
--- a/samples/Commerce/Commerce.UWP/Commerce.Uwp.csproj
+++ b/samples/Commerce/Commerce.UWP/Commerce.Uwp.csproj
@ -23,7 +23,7 @@
      <Version>1.1.0-dev.13</Version>
    </PackageReference>
    <PackageReference Include="Uno.Toolkit.UI.Material">
-      <Version>0.1.0-dev.120</Version>
+      <Version>0.1.0-dev.124</Version>
    </PackageReference>
    <PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
@ -32,7 +32,7 @@
    <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.0" />
    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="6.0.0" />
    <PackageReference Include="System.Linq.Async" Version="4.0.0" />
-    <PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
+    <PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.124" />
  </ItemGroup>
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
--- a/samples/Commerce/Commerce.Wasm/Commerce.Wasm.csproj
+++ b/samples/Commerce/Commerce.Wasm/Commerce.Wasm.csproj
@ -55,8 +55,8 @@
 		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="3.0.0" />
 		<PackageReference Include="System.Linq.Async" Version="4.0.0" />
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
-    <PackageReference Include="Uno.Toolkit.UI.Material" Version="0.1.0-dev.120" />
+		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.124" />
+    <PackageReference Include="Uno.Toolkit.UI.Material" Version="0.1.0-dev.124" />
 		<PackageReference Include="Uno.Core" Version="4.0.0-dev.7" />
 		<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
 	</ItemGroup>
--- a/samples/Commerce/Commerce.iOS/Commerce.iOS.csproj
+++ b/samples/Commerce/Commerce.iOS/Commerce.iOS.csproj
@ -122,7 +122,7 @@
    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
    <PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.3.0-dev.1" />
    <PackageReference Include="System.Linq.Async" Version="4.0.0" />
-    <PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
+    <PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.124" />
    <PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
  </ItemGroup>
  <ItemGroup>
--- a/samples/Commerce/Commerce.macOS/Commerce.macOS.csproj
+++ b/samples/Commerce/Commerce.macOS/Commerce.macOS.csproj
@ -74,7 +74,7 @@
    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
    <PackageReference Include="Uno.Toolkit.UI">
-      <Version>0.1.0-dev.120</Version>
+      <Version>0.1.0-dev.124</Version>
    </PackageReference>
    <PackageReference Include="Uno.Core" Version="4.0.0-dev.7" />
    <PackageReference Include="Uno.Material">
--- a/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.csproj
+++ b/src/Uno.Extensions.Navigation.Toolkit/Uno.Extensions.Navigation.Toolkit.csproj
@ -22,6 +22,6 @@
 	<ItemGroup>
 		<PackageReference Include="Uno.UI" Version="4.0.0-dev.5594" />
 		<PackageReference Include="Uno.Core" Version="4.0.0-dev.7" />
-		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.116" />
+		<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.124" />
 	</ItemGroup>
 </Project>