Merge branch 'main' into dev/djo/cart-life
This commit is contained in:
Nick Randolph
GitHub
Коммит
acf93a3758
|
|
@ -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.116" />
|
||||
<PackageReference Include="Uno.Toolkit.UI.Material" Version="0.1.0-dev.116" />
|
||||
<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.UniversalImageLoader" Version="1.9.33" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
|
||||
|
|
|
|||
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 554 B |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 312 B |
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/bondi-7-running-shoes.png
Normal file
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/bondi-7-running-shoes.png
Normal file
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 448 KiB |
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/fresh-foam-hierro-v6.png
Normal file
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/fresh-foam-hierro-v6.png
Normal file
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 251 KiB |
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/gel-nimbus-23-running-shoes.png
Normal file
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/gel-nimbus-23-running-shoes.png
Normal file
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 294 KiB |
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 404 KiB |
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/gt-1000-10-gs-running-shoes.png
Normal file
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/gt-1000-10-gs-running-shoes.png
Normal file
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 266 KiB |
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/isochill-armourvent-hat.png
Normal file
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/isochill-armourvent-hat.png
Normal file
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 365 KiB |
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/profile-michael-scott.png
Normal file
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/profile-michael-scott.png
Normal file
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 512 KiB |
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/the-absolute-freedom.png
Normal file
Двоичные данные
samples/Commerce/Commerce.Shared/Assets/Products/the-absolute-freedom.png
Normal file
Двоичный файл не отображается.
|
После Ширина: | Высота: | Размер: 147 KiB |
|
|
@ -136,6 +136,16 @@
|
|||
<Content Include="$(MSBuildThisFileDirectory)appsettings.json">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="$(MSBuildThisFileDirectory)Assets\BitmapIcons\help_outline.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" />
|
||||
<Content Include="$(MSBuildThisFileDirectory)Assets\Products\gel-nimbus-23-running-shoes.png" />
|
||||
<Content Include="$(MSBuildThisFileDirectory)Assets\Products\gocap-century.png" />
|
||||
<Content Include="$(MSBuildThisFileDirectory)Assets\Products\gt-1000-10-gs-running-shoes.png" />
|
||||
<Content Include="$(MSBuildThisFileDirectory)Assets\Products\isochill-armourvent-hat.png" />
|
||||
<Content Include="$(MSBuildThisFileDirectory)Assets\Products\profile-michael-scott.png" />
|
||||
<Content Include="$(MSBuildThisFileDirectory)Assets\Products\the-absolute-freedom.png" />
|
||||
<None Include="$(MSBuildThisFileDirectory)Assets\SharedAssets.md" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -3,13 +3,16 @@ namespace Commerce.Models;
|
|||
public class Product
|
||||
{
|
||||
public int ProductId { get; set; }
|
||||
public string Brand { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string LongName { get; set; }
|
||||
public string Description { get; set; }
|
||||
public string Category { get; set; }
|
||||
public string FullPrice { get; set; }
|
||||
public string Price { get; set; }
|
||||
public string Discount { get; set; }
|
||||
public string Photo { get; set; }
|
||||
public double? Rating { get; set; }
|
||||
|
||||
public Review[] Reviews { get; set; }
|
||||
|
||||
|
|
|
|||
|
|
@ -1,33 +1,29 @@
|
|||
<Page x:Class="Commerce.CommerceHomePage"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:aut="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="using:Commerce"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:nav="using:Uno.Extensions.Navigation.Controls"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:aut="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="using:Commerce"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:nav="using:Uno.Extensions.Navigation.Controls"
|
||||
xmlns:utu="using:Uno.Toolkit.UI.Controls"
|
||||
xmlns:uen="using:Uno.Extensions.Navigation.Controls"
|
||||
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
|
||||
mc:Ignorable="d"
|
||||
xmlns:toolkit="using:Uno.Toolkit.UI.Controls"
|
||||
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
||||
<Grid x:Name="NavRoot">
|
||||
xmlns:uen="using:Uno.Extensions.Navigation.Controls"
|
||||
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
|
||||
mc:Ignorable="d"
|
||||
xmlns:toolkit="using:Uno.Toolkit.UI.Controls"
|
||||
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
|
||||
<Grid x:Name="NavRoot">
|
||||
<Grid.Resources>
|
||||
<PathIcon x:Key="Icon_bolt"
|
||||
Data="M 3.9962074756622314 18 L 2.9962074756622314 18 L 3.9962074756622314 11 L 0.4962073564529419 11 C -0.08379262685775757 11 -0.07379274815320969 10.68000015616417 0.11620724946260452 10.34000015258789 C 0.30620724707841873 10.000000149011612 0.16620741412043571 10.260000266134739 0.18620741367340088 10.220000267028809 C 1.4762073755264282 7.940000295639038 3.4162073135375977 4.539999961853027 5.996207237243652 0 L 6.996207237243652 0 L 5.996207237243652 7 L 9.496207237243652 7 C 9.986207246780396 7 10.056206554174423 7.330000221729279 9.966206550598145 7.510000228881836 L 9.896206855773926 7.659999847412109 C 5.956206798553467 14.549999713897705 3.9962074756622314 18 3.9962074756622314 18 Z" />
|
||||
<PathIcon x:Key="Icon_person"
|
||||
Data="M 8 8 C 10.210000038146973 8 12 6.210000038146973 12 4 C 12 1.7899999618530273 10.210000038146973 0 8 0 C 5.789999961853027 0 4 1.7899999618530273 4 4 C 4 6.210000038146973 5.789999961853027 8 8 8 Z M 8 10 C 5.329999923706055 10 0 11.339999914169312 0 14 L 0 16 L 16 16 L 16 14 C 16 11.339999914169312 10.670000076293945 10 8 10 Z" />
|
||||
<PathIcon x:Key="Icon_shopping_cart"
|
||||
Data="M 6 16 C 4.899999976158142 16 4.010000228881836 16.899999976158142 4.010000228881836 18 C 4.010000228881836 19.100000023841858 4.899999976158142 20 6 20 C 7.100000023841858 20 8 19.100000023841858 8 18 C 8 16.899999976158142 7.100000023841858 16 6 16 Z M 0 0 L 0 2 L 2 2 L 5.599999904632568 9.59000015258789 L 4.25 12.039999961853027 C 4.090000003576279 12.31999996304512 4 12.650000005960464 4 13 C 4 14.100000023841858 4.899999976158142 15 6 15 L 18 15 L 18 13 L 6.420000076293945 13 C 6.280000075697899 13 6.170000076293945 12.890000000596046 6.170000076293945 12.75 L 6.199999809265137 12.630000114440918 L 7.100000381469727 11 L 14.550000190734863 11 C 15.300000190734863 11 15.959999233484268 10.59000027179718 16.299999237060547 9.970000267028809 L 19.8799991607666 3.4800000190734863 C 19.959999158978462 3.34000001847744 20 3.1700000017881393 20 3 C 20 2.449999988079071 19.55000001192093 2 19 2 L 4.210000038146973 2 L 3.2699999809265137 0 L 0 0 Z M 16 16 C 14.899999976158142 16 14.010000228881836 16.899999976158142 14.010000228881836 18 C 14.010000228881836 19.100000023841858 14.899999976158142 20 16 20 C 17.100000023841858 20 18 19.100000023841858 18 18 C 18 16.899999976158142 17.100000023841858 16 16 16 Z" />
|
||||
<PathIcon x:Key="Icon_storefront"
|
||||
Data="M 19.894636154174805 5.890000343322754 L 18.844636917114258 1.5199999809265137 C 18.62463691830635 0.6200000047683716 17.844637095928192 8.881784197001252e-16 16.93463706970215 8.881784197001252e-16 L 3.044635772705078 8.881784197001252e-16 C 2.144635796546936 4.440892098500626e-16 1.3546356707811356 0.6299999952316284 1.1446356773376465 1.5199999809265137 L 0.0946355015039444 5.890000343322754 C -0.14536449313163757 6.910000324249268 0.07463562488555908 7.950000464916229 0.7146356105804443 8.770000457763672 C 0.794635608792305 8.880000457167625 0.9046355783939362 8.960000418126583 0.9946355819702148 9.0600004196167 L 0.9946355819702148 16 C 0.9946355819702148 17.100000023841858 1.894635558128357 18 2.994635581970215 18 L 16.99463653564453 18 C 18.09463655948639 18 18.99463653564453 17.100000023841858 18.99463653564453 16 L 18.99463653564453 9.0600004196167 C 19.08463653922081 8.97000041604042 19.19463722407818 8.879999734461308 19.27463722229004 8.779999732971191 C 19.914637207984924 7.959999740123749 20.144636154174805 6.910000324249268 19.894636154174805 5.890000343322754 Z M 16.90463638305664 1.989999771118164 L 17.954635620117188 6.359999656677246 C 18.054635621607304 6.779999643564224 17.964635610580444 7.1999997198581696 17.704635620117188 7.529999732971191 C 17.56463561952114 7.709999740123749 17.264636993408203 8 16.764636993408203 8 C 16.15463697910309 8 15.62463504821062 7.509999632835388 15.554635047912598 6.859999656677246 L 14.974635124206543 2 L 16.90463638305664 1.989999771118164 Z M 10.994635581970215 2 L 12.954635620117188 2 L 13.494635581970215 6.520000457763672 C 13.544635582715273 6.910000443458557 13.424635648727417 7.300000160932541 13.16463565826416 7.590000152587891 C 12.944635659456253 7.8500001430511475 12.624635845422745 8 12.214635848999023 8 C 11.544635832309723 8 10.994635581970215 7.40999960899353 10.994635581970215 6.689999580383301 L 10.994635581970215 2 Z M 6.484635353088379 6.520000457763672 L 7.034635543823242 2 L 8.994635581970215 2 L 8.994635581970215 6.689999580383301 C 8.994635581970215 7.40999960899353 8.44463562965393 8 7.7046356201171875 8 C 7.364635616540909 8 7.054635271430016 7.8500001430511475 6.814635276794434 7.590000152587891 C 6.564635276794434 7.300000160932541 6.444635353982449 6.910000443458557 6.484635353088379 6.520000457763672 Z M 2.034635543823242 6.359999656677246 L 3.044635772705078 2 L 5.0146355628967285 2 L 4.434635639190674 6.859999656677246 C 4.354635640978813 7.509999632835388 3.834635615348816 8 3.224635601043701 8 C 2.734635591506958 8 2.4246357679367065 7.709999740123749 2.294635772705078 7.529999732971191 C 2.024635761976242 7.209999740123749 1.934635542333126 6.779999643564224 2.034635543823242 6.359999656677246 Z M 2.994635581970215 16 L 2.994635581970215 9.970000267028809 C 3.0746355801820755 9.980000266805291 3.1446356028318405 10 3.224635601043701 10 C 4.094635605812073 10 4.884635388851166 9.64000016450882 5.464635372161865 9.050000190734863 C 6.064635396003723 9.650000214576721 6.8646352887153625 10 7.774635314941406 10 C 8.644635319709778 10 9.424635827541351 9.639999687671661 10.00463581085205 9.069999694824219 C 10.594635784626007 9.639999687671661 11.394635796546936 10 12.294635772705078 10 C 13.134635746479034 10 13.9346364736557 9.650000214576721 14.534636497497559 9.050000190734863 C 15.114636480808258 9.64000016450882 15.904637217521667 10 16.77463722229004 10 C 16.8546372205019 10 16.924636766314507 9.980000266805291 17.004636764526367 9.970000267028809 L 17.004636764526367 16 L 2.994635581970215 16 Z" />
|
||||
<x:String x:Key="Icon_bolt">M 3.9962074756622314 18 L 2.9962074756622314 18 L 3.9962074756622314 11 L 0.4962073564529419 11 C -0.08379262685775757 11 -0.07379274815320969 10.68000015616417 0.11620724946260452 10.34000015258789 C 0.30620724707841873 10.000000149011612 0.16620741412043571 10.260000266134739 0.18620741367340088 10.220000267028809 C 1.4762073755264282 7.940000295639038 3.4162073135375977 4.539999961853027 5.996207237243652 0 L 6.996207237243652 0 L 5.996207237243652 7 L 9.496207237243652 7 C 9.986207246780396 7 10.056206554174423 7.330000221729279 9.966206550598145 7.510000228881836 L 9.896206855773926 7.659999847412109 C 5.956206798553467 14.549999713897705 3.9962074756622314 18 3.9962074756622314 18 Z</x:String>
|
||||
<x:String x:Key="Icon_person">M 8 8 C 10.210000038146973 8 12 6.210000038146973 12 4 C 12 1.7899999618530273 10.210000038146973 0 8 0 C 5.789999961853027 0 4 1.7899999618530273 4 4 C 4 6.210000038146973 5.789999961853027 8 8 8 Z M 8 10 C 5.329999923706055 10 0 11.339999914169312 0 14 L 0 16 L 16 16 L 16 14 C 16 11.339999914169312 10.670000076293945 10 8 10 Z</x:String>
|
||||
<x:String x:Key="Icon_shopping_cart">M 6 16 C 4.899999976158142 16 4.010000228881836 16.899999976158142 4.010000228881836 18 C 4.010000228881836 19.100000023841858 4.899999976158142 20 6 20 C 7.100000023841858 20 8 19.100000023841858 8 18 C 8 16.899999976158142 7.100000023841858 16 6 16 Z M 0 0 L 0 2 L 2 2 L 5.599999904632568 9.59000015258789 L 4.25 12.039999961853027 C 4.090000003576279 12.31999996304512 4 12.650000005960464 4 13 C 4 14.100000023841858 4.899999976158142 15 6 15 L 18 15 L 18 13 L 6.420000076293945 13 C 6.280000075697899 13 6.170000076293945 12.890000000596046 6.170000076293945 12.75 L 6.199999809265137 12.630000114440918 L 7.100000381469727 11 L 14.550000190734863 11 C 15.300000190734863 11 15.959999233484268 10.59000027179718 16.299999237060547 9.970000267028809 L 19.8799991607666 3.4800000190734863 C 19.959999158978462 3.34000001847744 20 3.1700000017881393 20 3 C 20 2.449999988079071 19.55000001192093 2 19 2 L 4.210000038146973 2 L 3.2699999809265137 0 L 0 0 Z M 16 16 C 14.899999976158142 16 14.010000228881836 16.899999976158142 14.010000228881836 18 C 14.010000228881836 19.100000023841858 14.899999976158142 20 16 20 C 17.100000023841858 20 18 19.100000023841858 18 18 C 18 16.899999976158142 17.100000023841858 16 16 16 Z</x:String>
|
||||
<x:String x:Key="Icon_storefront">M 19.894636154174805 5.890000343322754 L 18.844636917114258 1.5199999809265137 C 18.62463691830635 0.6200000047683716 17.844637095928192 8.881784197001252e-16 16.93463706970215 8.881784197001252e-16 L 3.044635772705078 8.881784197001252e-16 C 2.144635796546936 4.440892098500626e-16 1.3546356707811356 0.6299999952316284 1.1446356773376465 1.5199999809265137 L 0.0946355015039444 5.890000343322754 C -0.14536449313163757 6.910000324249268 0.07463562488555908 7.950000464916229 0.7146356105804443 8.770000457763672 C 0.794635608792305 8.880000457167625 0.9046355783939362 8.960000418126583 0.9946355819702148 9.0600004196167 L 0.9946355819702148 16 C 0.9946355819702148 17.100000023841858 1.894635558128357 18 2.994635581970215 18 L 16.99463653564453 18 C 18.09463655948639 18 18.99463653564453 17.100000023841858 18.99463653564453 16 L 18.99463653564453 9.0600004196167 C 19.08463653922081 8.97000041604042 19.19463722407818 8.879999734461308 19.27463722229004 8.779999732971191 C 19.914637207984924 7.959999740123749 20.144636154174805 6.910000324249268 19.894636154174805 5.890000343322754 Z M 16.90463638305664 1.989999771118164 L 17.954635620117188 6.359999656677246 C 18.054635621607304 6.779999643564224 17.964635610580444 7.1999997198581696 17.704635620117188 7.529999732971191 C 17.56463561952114 7.709999740123749 17.264636993408203 8 16.764636993408203 8 C 16.15463697910309 8 15.62463504821062 7.509999632835388 15.554635047912598 6.859999656677246 L 14.974635124206543 2 L 16.90463638305664 1.989999771118164 Z M 10.994635581970215 2 L 12.954635620117188 2 L 13.494635581970215 6.520000457763672 C 13.544635582715273 6.910000443458557 13.424635648727417 7.300000160932541 13.16463565826416 7.590000152587891 C 12.944635659456253 7.8500001430511475 12.624635845422745 8 12.214635848999023 8 C 11.544635832309723 8 10.994635581970215 7.40999960899353 10.994635581970215 6.689999580383301 L 10.994635581970215 2 Z M 6.484635353088379 6.520000457763672 L 7.034635543823242 2 L 8.994635581970215 2 L 8.994635581970215 6.689999580383301 C 8.994635581970215 7.40999960899353 8.44463562965393 8 7.7046356201171875 8 C 7.364635616540909 8 7.054635271430016 7.8500001430511475 6.814635276794434 7.590000152587891 C 6.564635276794434 7.300000160932541 6.444635353982449 6.910000443458557 6.484635353088379 6.520000457763672 Z M 2.034635543823242 6.359999656677246 L 3.044635772705078 2 L 5.0146355628967285 2 L 4.434635639190674 6.859999656677246 C 4.354635640978813 7.509999632835388 3.834635615348816 8 3.224635601043701 8 C 2.734635591506958 8 2.4246357679367065 7.709999740123749 2.294635772705078 7.529999732971191 C 2.024635761976242 7.209999740123749 1.934635542333126 6.779999643564224 2.034635543823242 6.359999656677246 Z M 2.994635581970215 16 L 2.994635581970215 9.970000267028809 C 3.0746355801820755 9.980000266805291 3.1446356028318405 10 3.224635601043701 10 C 4.094635605812073 10 4.884635388851166 9.64000016450882 5.464635372161865 9.050000190734863 C 6.064635396003723 9.650000214576721 6.8646352887153625 10 7.774635314941406 10 C 8.644635319709778 10 9.424635827541351 9.639999687671661 10.00463581085205 9.069999694824219 C 10.594635784626007 9.639999687671661 11.394635796546936 10 12.294635772705078 10 C 13.134635746479034 10 13.9346364736557 9.650000214576721 14.534636497497559 9.050000190734863 C 15.114636480808258 9.64000016450882 15.904637217521667 10 16.77463722229004 10 C 16.8546372205019 10 16.924636766314507 9.980000266805291 17.004636764526367 9.970000267028809 L 17.004636764526367 16 L 2.994635581970215 16 Z</x:String>
|
||||
</Grid.Resources>
|
||||
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup>
|
||||
<VisualState x:Name="Narrow">
|
||||
|
||||
|
||||
<VisualState.Setters>
|
||||
<Setter Target="Tabs.Visibility"
|
||||
Value="Visible" />
|
||||
|
|
@ -64,29 +60,83 @@
|
|||
IsBackButtonVisible="Collapsed"
|
||||
nav:Region.Attached="true">
|
||||
<muxc:NavigationView.MenuItems>
|
||||
<muxc:NavigationViewItem Icon="{StaticResource Icon_storefront}"
|
||||
Content="Products"
|
||||
nav:Region.Name="Products" />
|
||||
<muxc:NavigationViewItem Icon="{StaticResource Icon_bolt}"
|
||||
Content="Deals"
|
||||
nav:Region.Name="Deals"/>
|
||||
<muxc:NavigationViewItem Icon="{StaticResource Icon_person}"
|
||||
Content="Profile"
|
||||
nav:Region.Name="Profile" />
|
||||
<muxc:NavigationViewItem Icon="{StaticResource Icon_shopping_cart}"
|
||||
Content="Cart"
|
||||
nav:Navigation.Request="!CartDialog" />
|
||||
<muxc:NavigationViewItem Content="Products"
|
||||
nav:Region.Name="Products">
|
||||
<muxc:NavigationViewItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_storefront}" />
|
||||
</muxc:NavigationViewItem.Icon>
|
||||
</muxc:NavigationViewItem>
|
||||
<muxc:NavigationViewItem Content="Deals"
|
||||
nav:Region.Name="Deals">
|
||||
<muxc:NavigationViewItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_bolt}" />
|
||||
</muxc:NavigationViewItem.Icon>
|
||||
</muxc:NavigationViewItem>
|
||||
<muxc:NavigationViewItem Content="Profile"
|
||||
nav:Region.Name="Profile">
|
||||
<muxc:NavigationViewItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_person}" />
|
||||
</muxc:NavigationViewItem.Icon>
|
||||
</muxc:NavigationViewItem>
|
||||
<muxc:NavigationViewItem Content="Cart"
|
||||
nav:Navigation.Request="!CartDialog">
|
||||
<muxc:NavigationViewItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_shopping_cart}" />
|
||||
</muxc:NavigationViewItem.Icon>
|
||||
</muxc:NavigationViewItem>
|
||||
</muxc:NavigationView.MenuItems>
|
||||
<utu:AutoLayout >
|
||||
<Grid uen:Region.Attached="True" uen:Region.Navigator="Visibility" utu:AutoLayout.PrimaryAlignment="Stretch" utu:AutoLayout.CounterAlignment="Stretch" />
|
||||
<utu:TabBar x:Name="Tabs" uen:Region.Attached="True" utu:AutoLayout.CounterAlignment="Stretch" Style="{StaticResource MaterialBottomTabBarStyle}">
|
||||
<utu:TabBarItem uen:Region.Name="Products" IsSelectable="True" AutomationProperties.Name="Products" Icon="{StaticResource Icon_storefront}" utu:AutoLayout.PrimaryAlignment="Stretch" utu:AutoLayout.CounterLength="56" Style="{StaticResource MaterialBottomTabBarItemStyle}" />
|
||||
<utu:TabBarItem uen:Region.Name="Deals" IsSelectable="True" AutomationProperties.Name="Deals" Icon="{StaticResource Icon_bolt}" utu:AutoLayout.PrimaryAlignment="Stretch" utu:AutoLayout.CounterLength="56" Style="{StaticResource MaterialBottomTabBarItemStyle}" />
|
||||
<utu:TabBarItem uen:Region.Name="Profile" IsSelectable="True" AutomationProperties.Name="Profile" Icon="{StaticResource Icon_person}" utu:AutoLayout.PrimaryAlignment="Stretch" utu:AutoLayout.CounterLength="56" Style="{StaticResource MaterialBottomTabBarItemStyle}" />
|
||||
<utu:TabBarItem IsSelectable="False" AutomationProperties.Name="Cart" Icon="{StaticResource Icon_shopping_cart}" utu:AutoLayout.PrimaryAlignment="Stretch" utu:AutoLayout.CounterLength="56" Style="{StaticResource MaterialBottomFabTabBarItemStyle}" nav:Navigation.Request="!CartDialog"/>
|
||||
</utu:TabBar>
|
||||
</utu:AutoLayout>
|
||||
|
||||
</muxc:NavigationView>
|
||||
<utu:AutoLayout>
|
||||
<Grid uen:Region.Attached="True"
|
||||
uen:Region.Navigator="Visibility"
|
||||
utu:AutoLayout.PrimaryAlignment="Stretch"
|
||||
utu:AutoLayout.CounterAlignment="Stretch" />
|
||||
<utu:TabBar x:Name="Tabs"
|
||||
uen:Region.Attached="True"
|
||||
utu:AutoLayout.CounterAlignment="Stretch"
|
||||
Style="{StaticResource MaterialBottomTabBarStyle}">
|
||||
<utu:TabBarItem uen:Region.Name="Products"
|
||||
IsSelectable="True"
|
||||
AutomationProperties.Name="Products"
|
||||
utu:AutoLayout.PrimaryAlignment="Stretch"
|
||||
utu:AutoLayout.CounterLength="56"
|
||||
Style="{StaticResource MaterialBottomTabBarItemStyle}">
|
||||
<utu:TabBarItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_storefront}" />
|
||||
</utu:TabBarItem.Icon>
|
||||
</utu:TabBarItem>
|
||||
<utu:TabBarItem uen:Region.Name="Deals"
|
||||
IsSelectable="True"
|
||||
AutomationProperties.Name="Deals"
|
||||
utu:AutoLayout.PrimaryAlignment="Stretch"
|
||||
utu:AutoLayout.CounterLength="56"
|
||||
Style="{StaticResource MaterialBottomTabBarItemStyle}">
|
||||
<utu:TabBarItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_bolt}" />
|
||||
</utu:TabBarItem.Icon>
|
||||
</utu:TabBarItem>
|
||||
<utu:TabBarItem uen:Region.Name="Profile"
|
||||
IsSelectable="True"
|
||||
AutomationProperties.Name="Profile"
|
||||
utu:AutoLayout.PrimaryAlignment="Stretch"
|
||||
utu:AutoLayout.CounterLength="56"
|
||||
Style="{StaticResource MaterialBottomTabBarItemStyle}">
|
||||
<utu:TabBarItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_person}" />
|
||||
</utu:TabBarItem.Icon>
|
||||
</utu:TabBarItem>
|
||||
<utu:TabBarItem IsSelectable="False"
|
||||
AutomationProperties.Name="Cart"
|
||||
utu:AutoLayout.PrimaryAlignment="Stretch"
|
||||
utu:AutoLayout.CounterLength="56"
|
||||
Style="{StaticResource MaterialBottomTabBarItemFabStyle}"
|
||||
nav:Navigation.Request="!CartDialog">
|
||||
<utu:TabBarItem.Icon>
|
||||
<PathIcon Data="{StaticResource Icon_shopping_cart}" />
|
||||
</utu:TabBarItem.Icon>
|
||||
</utu:TabBarItem>
|
||||
</utu:TabBar>
|
||||
</utu:AutoLayout>
|
||||
|
||||
</muxc:NavigationView>
|
||||
</Grid>
|
||||
</Page>
|
||||
|
|
|
|||
|
|
@ -82,11 +82,11 @@
|
|||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Spacing="16" Padding="0,8,8,8" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundBrush}" TextWrapping="Wrap" Text="Order" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialSubtitle2}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundMediumBrush}" TextAlignment="End" TextWrapping="Wrap" Text="Relevance" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialBody2}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundBrush}" TextAlignment="End" TextWrapping="Wrap" Text="Relevance" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialBody2}" />
|
||||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Spacing="16" Padding="0,8,8,8" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundBrush}" TextWrapping="Wrap" Text="Currency" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialSubtitle2}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundMediumBrush}" TextAlignment="End" TextWrapping="Wrap" Text="CAD" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialBody2}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundBrush}" TextAlignment="End" TextWrapping="Wrap" Text="CAD" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialBody2}" />
|
||||
</utu:AutoLayout>
|
||||
</utu:AutoLayout>
|
||||
</utu:AutoLayout>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Spacing="8" Padding="16,32,16,16" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceBrush}" Text="Product details" Style="{StaticResource MaterialHeadline6}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundMediumBrush}" TextWrapping="Wrap" Text="{Binding Description}" Style="{StaticResource MaterialBody2}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundBrush}" TextWrapping="Wrap" Text="{Binding Description}" Style="{StaticResource MaterialBody2}" />
|
||||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Spacing="8" Padding="16,32,16,8" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceBrush}" Text="Reviews" Style="{StaticResource MaterialHeadline6}" />
|
||||
|
|
@ -89,7 +89,8 @@
|
|||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<utu:AutoLayout Padding="16,0,0,16" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<ToggleButton utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialToggleButtonIconStyle}">
|
||||
<ToggleButton utu:AutoLayout.CounterAlignment="Center">
|
||||
<!--Style="{StaticResource MaterialToggleButtonIconStyle}">-->
|
||||
<ToggleButton.Content>
|
||||
<PathIcon Data="{StaticResource Icon_visibility_off}" />
|
||||
</ToggleButton.Content>
|
||||
|
|
@ -118,7 +119,8 @@
|
|||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<utu:AutoLayout Padding="16,0,0,16" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<ToggleButton utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialToggleButtonIconStyle}">
|
||||
<ToggleButton utu:AutoLayout.CounterAlignment="Center">
|
||||
<!--Style="{StaticResource MaterialToggleButtonIconStyle}">-->
|
||||
<ToggleButton.Content>
|
||||
<PathIcon Data="{StaticResource Icon_visibility_off}" />
|
||||
</ToggleButton.Content>
|
||||
|
|
@ -147,7 +149,8 @@
|
|||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<utu:AutoLayout Padding="16,0,0,16" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<ToggleButton utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialToggleButtonIconStyle}">
|
||||
<ToggleButton utu:AutoLayout.CounterAlignment="Center">
|
||||
<!--Style="{StaticResource MaterialToggleButtonIconStyle}">-->
|
||||
<ToggleButton.Content>
|
||||
<PathIcon Data="{StaticResource Icon_visibility_off}" />
|
||||
</ToggleButton.Content>
|
||||
|
|
|
|||
|
|
@ -54,20 +54,33 @@
|
|||
|
||||
<utu:AutoLayout>
|
||||
<utu:AutoLayout.Resources>
|
||||
<BitmapIcon x:Key="Icon_help_outline" UriSource="ms-appx:///Assets/help_outline.png" ShowAsMonochrome="false" />
|
||||
<BitmapIcon x:Key="Icon_notifications" UriSource="ms-appx:///Assets/notifications.png" ShowAsMonochrome="false" />
|
||||
<PathIcon x:Key="Icon_search" Data="M 12.5 11 L 11.710000038146973 11 L 11.430000305175781 10.729999542236328 C 12.410000324249268 9.589999556541443 13 8.110000014305115 13 6.5 C 13 2.9100000858306885 10.089999914169312 0 6.5 0 C 2.9100000858306885 0 0 2.9100000858306885 0 6.5 C 0 10.089999914169312 2.9100000858306885 13 6.5 13 C 8.110000014305115 13 9.589999556541443 12.410000324249268 10.729999542236328 11.430000305175781 L 11 11.710000038146973 L 11 12.5 L 16 17.489999771118164 L 17.489999771118164 16 L 12.5 11 L 12.5 11 Z M 6.5 11 C 4.009999990463257 11 2 8.990000009536743 2 6.5 C 2 4.009999990463257 4.009999990463257 2 6.5 2 C 8.990000009536743 2 11 4.009999990463257 11 6.5 C 11 8.990000009536743 8.990000009536743 11 6.5 11 Z" />
|
||||
</utu:AutoLayout.Resources>
|
||||
|
||||
<utu:NavigationBar Content="Uno commerce" x:Uid="Page_NavigationBar" utu:AutoLayout.CounterAlignment="Stretch" Style="{StaticResource MaterialNavigationBarStyle}">
|
||||
<utu:NavigationBar.PrimaryCommands>
|
||||
<AppBarButton Foreground="{StaticResource MaterialOnPrimaryMediumBrush}" Icon="{StaticResource Icon_notifications}" />
|
||||
<AppBarButton Foreground="{StaticResource MaterialOnPrimaryMediumBrush}" Icon="{StaticResource Icon_help_outline}" />
|
||||
<AppBarButton Foreground="{StaticResource MaterialOnPrimaryMediumBrush}">
|
||||
<AppBarButton.Icon>
|
||||
<BitmapIcon UriSource="ms-appx:///Assets/BitmapIcons/notifications.png"
|
||||
ShowAsMonochrome="false" />
|
||||
</AppBarButton.Icon>
|
||||
</AppBarButton>
|
||||
<AppBarButton Foreground="{StaticResource MaterialOnPrimaryMediumBrush}">
|
||||
<AppBarButton.Icon>
|
||||
<BitmapIcon UriSource="ms-appx:///Assets/BitmapIcons/help_outline.png"
|
||||
ShowAsMonochrome="false" />
|
||||
</AppBarButton.Icon>
|
||||
</AppBarButton>
|
||||
</utu:NavigationBar.PrimaryCommands>
|
||||
</utu:NavigationBar>
|
||||
<utu:AutoLayout utu:AutoLayout.CounterAlignment="Stretch" utu:AutoLayout.PrimaryAlignment="Stretch">
|
||||
<utu:AutoLayout Spacing="16" Padding="16,16,16,16" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<TextBox Text="{Binding Term, Mode=TwoWay}" um:ControlExtensions.Icon="{StaticResource Icon_search}" utu:AutoLayout.CounterAlignment="Stretch" Style="{StaticResource MaterialOutlinedTextBoxStyle}" />
|
||||
<TextBox Text="{Binding Term, Mode=TwoWay}"
|
||||
utu:AutoLayout.CounterAlignment="Stretch"
|
||||
Style="{StaticResource MaterialOutlinedTextBoxStyle}">
|
||||
<um:ControlExtensions.Icon>
|
||||
<PathIcon Data="M 12.5 11 L 11.710000038146973 11 L 11.430000305175781 10.729999542236328 C 12.410000324249268 9.589999556541443 13 8.110000014305115 13 6.5 C 13 2.9100000858306885 10.089999914169312 0 6.5 0 C 2.9100000858306885 0 0 2.9100000858306885 0 6.5 C 0 10.089999914169312 2.9100000858306885 13 6.5 13 C 8.110000014305115 13 9.589999556541443 12.410000324249268 10.729999542236328 11.430000305175781 L 11 11.710000038146973 L 11 12.5 L 16 17.489999771118164 L 17.489999771118164 16 L 12.5 11 L 12.5 11 Z M 6.5 11 C 4.009999990463257 11 2 8.990000009536743 2 6.5 C 2 4.009999990463257 4.009999990463257 2 6.5 2 C 8.990000009536743 2 11 4.009999990463257 11 6.5 C 11 8.990000009536743 8.990000009536743 11 6.5 11 Z" />
|
||||
</um:ControlExtensions.Icon>
|
||||
</TextBox>
|
||||
<utu:AutoLayout Spacing="10" Justify="SpaceBetween" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch" utu:AutoLayout.PrimaryLength="20">
|
||||
<TextBlock Foreground="{StaticResource MaterialOnBackgroundBrush}" x:Uid="Page_5254 products found!" Text="5254 products found!" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialBody2}" />
|
||||
<HyperlinkButton Content="Filters" x:Uid="Page_Filters" utu:AutoLayout.CounterAlignment="Center" Style="{StaticResource MaterialHyperlinkButtonStyle}" nav:Navigation.Request="!FilterPopup" nav:Navigation.Data="{Binding Filter, Mode=TwoWay}"/>
|
||||
|
|
@ -87,14 +100,14 @@
|
|||
<utu:AutoLayout Padding="16,8,16,0" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<utu:AutoLayout>
|
||||
<utu:AutoLayout Spacing="10" Padding="0,0,16,8">
|
||||
<Image Source="https://loremflickr.com/360/360/flower" Stretch="UniformToFill" utu:AutoLayout.PrimaryLength="56" utu:AutoLayout.CounterLength="56" />
|
||||
<Image Source="{Binding Photo}" Stretch="UniformToFill" utu:AutoLayout.PrimaryLength="56" utu:AutoLayout.CounterLength="56" />
|
||||
</utu:AutoLayout>
|
||||
</utu:AutoLayout>
|
||||
<utu:AutoLayout Padding="0,0,0,8" utu:AutoLayout.PrimaryAlignment="Stretch">
|
||||
<utu:AutoLayout utu:AutoLayout.CounterAlignment="Stretch">
|
||||
<utu:AutoLayout utu:AutoLayout.CounterAlignment="Stretch" utu:AutoLayout.PrimaryAlignment="Stretch">
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceLowBrush}" TextWrapping="Wrap" x:Uid="Page_Subtitle" Text="Ciele" Style="{StaticResource MaterialOverline}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceBrush}" TextWrapping="Wrap" x:Uid="Page_Secondary text" Text="GoCap Century" Style="{StaticResource MaterialSubtitle1}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceLowBrush}" TextWrapping="Wrap" x:Uid="Page_Subtitle" Text="{Binding Brand}" Style="{StaticResource MaterialOverline}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceBrush}" TextWrapping="Wrap" x:Uid="Page_Secondary text" Text="{Binding Name}" Style="{StaticResource MaterialSubtitle1}" />
|
||||
</utu:AutoLayout>
|
||||
</utu:AutoLayout>
|
||||
</utu:AutoLayout>
|
||||
|
|
@ -103,7 +116,7 @@
|
|||
<utu:AutoLayout utu:AutoLayout.CounterAlignment="Center">
|
||||
<utu:AutoLayout Spacing="4" utu:AutoLayout.CounterAlignment="End">
|
||||
<utu:AutoLayout Spacing="10" Orientation="Horizontal" utu:AutoLayout.CounterAlignment="End">
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceBrush}" TextAlignment="End" x:Uid="Page_Label" Text="$44,99" Style="{StaticResource MaterialBody1}" />
|
||||
<TextBlock Foreground="{StaticResource MaterialOnSurfaceBrush}" TextAlignment="End" x:Uid="Page_Label" Text="{Binding Price}" Style="{StaticResource MaterialBody1}" />
|
||||
</utu:AutoLayout>
|
||||
</utu:AutoLayout>
|
||||
</utu:AutoLayout>
|
||||
|
|
|
|||
|
|
@ -1,30 +1,89 @@
|
|||
[
|
||||
{
|
||||
"ProductId": "1",
|
||||
"Name": "ProMaster headphones",
|
||||
"Category": "Technology",
|
||||
"FullPrice": "$130",
|
||||
"Price": "$99",
|
||||
"Brand": "Ciele",
|
||||
"Name": "GoCap Century",
|
||||
"Category": "Accessories",
|
||||
"FullPrice": "$44,99",
|
||||
"Price": "$44,99",
|
||||
"Discount": "Save 25%",
|
||||
"Photo": "ms-appx:///Assets/Photos/stockphoto1.png"
|
||||
"Photo": "ms-appx:///Assets/Products/gocap-century.png"
|
||||
},
|
||||
{
|
||||
"ProductId": "2",
|
||||
"Name": "Ray-gen sunglasses",
|
||||
"Brand": "New Balance",
|
||||
"Name": "Fresh Foam Hierro v6",
|
||||
"LongName": "Fresh Foam Hierro v6 Trail Running Shoes - Men's",
|
||||
"Category": "Accessories",
|
||||
"FullPrice": "$130",
|
||||
"Price": "$99",
|
||||
"FullPrice": "$179,99",
|
||||
"Price": "$179,99",
|
||||
"Discount": "Save 25%",
|
||||
"Photo": "ms-appx:///Assets/Photos/stockphoto2.png"
|
||||
"Photo": "ms-appx:///Assets/Products/fresh-foam-hierro-v6.png",
|
||||
"Description": "Rack up some miles out on the trails in our rugged Fresh Foam Hierro v6. The men’s running shoe features a lightweight Fresh Foam midsole that helps to provide a soft landing on rough terrain. A proven Vibram® outsole provides traction and durability.",
|
||||
"Rating": "4",
|
||||
"Reviews": [
|
||||
{
|
||||
"Name": "Debbie W.",
|
||||
"Message": "True to size and great stability and support on the trails! Certainly won’t disappoint!!"
|
||||
},
|
||||
{
|
||||
"Name": "Mark T.",
|
||||
"Message": "The runners arrived faster than i thought.Fit absolutely true to size. very comfortable"
|
||||
},
|
||||
{
|
||||
"Name": "Eyup G.",
|
||||
"Message": "Super comfortable."
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ProductId": "3",
|
||||
"Name": "Jeffords sneakers",
|
||||
"Brand": "Pit Viper",
|
||||
"Name": "The Absolute Freedom",
|
||||
"Category": "Men's shoes",
|
||||
"FullPrice": "$130",
|
||||
"Price": "$99",
|
||||
"FullPrice": "$125,99",
|
||||
"Price": "$125,99",
|
||||
"Discount": "Save 25%",
|
||||
"Photo": "ms-appx:///Assets/Photos/stockphoto3.png",
|
||||
"Description": "The classic low top silhouette is reinvented with a water-resistant feature. The perfect go-to pair to sport on light rainy days!"
|
||||
"Photo": "ms-appx:///Assets/Products/the-absolute-freedom.png"
|
||||
},
|
||||
{
|
||||
"ProductId": "4",
|
||||
"Brand": "Under Armour",
|
||||
"Name": "Isochill Armourvent Hat",
|
||||
"Category": "Accessories",
|
||||
"FullPrice": "$31,99",
|
||||
"Price": "$31,99",
|
||||
"Discount": "Save 25%",
|
||||
"Photo": "ms-appx:///Assets/Products/isochill-armourvent-hat.png"
|
||||
},
|
||||
{
|
||||
"ProductId": "5",
|
||||
"Brand": "ASICS",
|
||||
"Name": "Gel-Nimbus 23 Running Shoes",
|
||||
"Category": "Accessories",
|
||||
"FullPrice": "$149,99",
|
||||
"Price": "$149,99",
|
||||
"Discount": "Save 25%",
|
||||
"Photo": "ms-appx:///Assets/Products/gel-nimbus-23-running-shoes.png"
|
||||
},
|
||||
{
|
||||
"ProductId": "6",
|
||||
"Brand": "ASICS",
|
||||
"Name": "GT-1000 10 GS Running Shoes",
|
||||
"Category": "Men's shoes",
|
||||
"FullPrice": "$59,99",
|
||||
"Price": "$59,99",
|
||||
"Discount": "Save 25%",
|
||||
"Photo": "ms-appx:///Assets/Products/gt-1000-10-gs-running-shoes.png"
|
||||
},
|
||||
{
|
||||
"ProductId": "7",
|
||||
"Brand": "Hoka",
|
||||
"Name": "Bondi 7 Running Shoes",
|
||||
"Category": "Men's shoes",
|
||||
"FullPrice": "$189,99",
|
||||
"Price": "$189,99",
|
||||
"Discount": "Save 25%",
|
||||
"Photo": "ms-appx:///Assets/Products/bondi-7-running-shoes.png"
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -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.116" />
|
||||
<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
|
||||
<PackageReference Include="Uno.Core" Version="4.0.0-dev.7" />
|
||||
<PackageReference Include="Uno.Material">
|
||||
<Version>1.1.0-dev.13</Version>
|
||||
|
|
|
|||
|
|
@ -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.116" />
|
||||
<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
|
||||
<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" />
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
<Version>1.1.0-dev.13</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.Toolkit.UI.Material">
|
||||
<Version>0.1.0-dev.116</Version>
|
||||
<Version>0.1.0-dev.120</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.116" />
|
||||
<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
|
|
|
|||
|
|
@ -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.116" />
|
||||
<PackageReference Include="Uno.Toolkit.UI.Material" Version="0.1.0-dev.116" />
|
||||
<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.Core" Version="4.0.0-dev.7" />
|
||||
<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -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.116" />
|
||||
<PackageReference Include="Uno.Toolkit.UI" Version="0.1.0-dev.120" />
|
||||
<PackageReference Include="Uno.Material" Version="1.1.0-dev.13" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -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.116</Version>
|
||||
<Version>0.1.0-dev.120</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Uno.Core" Version="4.0.0-dev.7" />
|
||||
<PackageReference Include="Uno.Material">
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ namespace Uno.Extensions.Navigation.Controls
|
|||
var data = element.GetData();
|
||||
var resultType = data?.GetType();
|
||||
var binding = element.GetBindingExpression(Navigation.DataProperty);
|
||||
if (binding is not null)
|
||||
if (binding is not null &&
|
||||
binding.DataItem is not null)
|
||||
{
|
||||
var dataObject = binding.DataItem;
|
||||
var bindingPathSegments = binding.ParentBinding.Path.Path.Split('.').ToArray();
|
||||
|
|
@ -51,6 +52,11 @@ namespace Uno.Extensions.Navigation.Controls
|
|||
{
|
||||
dataObject = prop.GetValue(dataObject);
|
||||
}
|
||||
|
||||
if (dataObject is null)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ public static class ServiceCollectionExtensions
|
|||
|
||||
.AddSingleton<INavigationBindingHandler, ButtonBaseNavigationBindingHandler>()
|
||||
.AddSingleton<INavigationBindingHandler, SelectorNavigationBindingHandler>()
|
||||
.AddSingleton<INavigationBindingHandler, NavigationViewItemNavigationBindingHandler>()
|
||||
|
||||
// Register the navigation mappings repository
|
||||
.AddSingleton<IRouteMappings, RouteMappingsDefault>()
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче