Skip to content

Commit b06eb1e

Browse files
agneszitteagneszitte
committed
chore: Final fixes for single project migration for Commerce sample app
1 parent 78d37a0 commit b06eb1e

File tree

9 files changed

+43
-17
lines changed

9 files changed

+43
-17
lines changed

‎reference/Commerce/src/Commerce/App.xaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
<ResourceDictionary.MergedDictionaries>
1212
<!-- Load WinUI resources -->
1313
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
14+
15+
<!-- Load Material Toolkit resources -->
1416
<utum:MaterialToolkitTheme ColorOverrideSource="ms-appx:///Styles/ColorPaletteOverride.xaml">
1517
<!-- NOTE: You can override the default Roboto font by providing your font assets here. -->
1618
<!-- <utum:MaterialToolkitTheme.FontOverrideDictionary>
@@ -21,9 +23,13 @@
2123
</ResourceDictionary>
2224
</utum:MaterialToolkitTheme.FontOverrideDictionary> -->
2325
</utum:MaterialToolkitTheme>
26+
27+
<!-- Application's custom styles -->
2428
<ResourceDictionary Source="ms-appx:///Styles/NavigationBar.xaml" />
2529
</ResourceDictionary.MergedDictionaries>
30+
2631
<x:Double x:Key="LandscapeMaxPageWidth">500</x:Double>
32+
2733
</ResourceDictionary>
2834
</Application.Resources>
2935

‎reference/Commerce/src/Commerce/Commerce.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
Mvvm;
4545
Configuration;
4646
Http;
47+
Skia;
4748
Serialization;
4849
Localization;
4950
Navigation;
@@ -64,8 +65,4 @@
6465
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
6566
</EmbeddedResource>
6667
</ItemGroup>
67-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows10.0.19041'">
68-
<PackageReference Include="SkiaSharp.Views.WinUI" />
69-
</ItemGroup>
70-
7168
</Project>

‎reference/Commerce/src/Commerce/Styles/NavigationBar.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
TargetType="utu:NavigationBar">
1515
<Setter Property="Background" Value="{ThemeResource PrimaryBrush}" />
1616
<Setter Property="Foreground" Value="{ThemeResource OnPrimaryBrush}" />
17-
</Style>
17+
<Setter Property="MainCommandStyle" Value="{StaticResource PrimaryAppBarButtonStyle}" />
18+
</Style>
1819

1920
<Style TargetType="utu:NavigationBar"
2021
BasedOn="{StaticResource PrimaryNavigationBarStyle}" />

‎reference/Commerce/src/Commerce/Views/CartPage.xaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,18 @@
1818
<x:String x:Key="Icon_Remove">F1 M 14 2 L 0 2 L 0 0 L 14 0 L 14 2 Z</x:String>
1919
</Page.Resources>
2020

21-
<utu:AutoLayout Background="{ThemeResource BackgroundBrush}">
21+
<utu:AutoLayout Background="{ThemeResource BackgroundBrush}">
2222
<utu:NavigationBar Content="Your Cart"
23-
x:Uid="Cart_Navigation_Bar" />
23+
x:Uid="Cart_Navigation_Bar">
24+
<utu:NavigationBar.MainCommand>
25+
<AppBarButton>
26+
<AppBarButton.Icon>
27+
<BitmapIcon UriSource="ms-appx:///Assets/Icons/close.png" />
28+
</AppBarButton.Icon>
29+
</AppBarButton>
30+
</utu:NavigationBar.MainCommand>
31+
</utu:NavigationBar>
32+
2433
<uer:FeedView Source="{Binding Cart}"
2534
utu:AutoLayout.PrimaryAlignment="Stretch">
2635
<DataTemplate>
@@ -200,7 +209,7 @@
200209
</utu:AutoLayout>
201210
</utu:AutoLayout>
202211
<utu:AutoLayout Padding="16,16,16,16">
203-
<Button Content="checkout"
212+
<Button Content="Checkout"
204213
uen:Navigation.Request="Checkout"
205214
utu:AutoLayout.PrimaryLength="40"
206215
Style="{StaticResource FilledButtonStyle}"

‎reference/Commerce/src/Commerce/Views/CheckoutPage.xaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,15 @@
1515
<RowDefinition Height="Auto" />
1616
<RowDefinition />
1717
</Grid.RowDefinitions>
18-
<utu:NavigationBar Content="Checkout" />
18+
<utu:NavigationBar Content="Checkout">
19+
<utu:NavigationBar.MainCommand>
20+
<AppBarButton>
21+
<AppBarButton.Icon>
22+
<BitmapIcon UriSource="ms-appx:///Assets/Icons/back.png" />
23+
</AppBarButton.Icon>
24+
</AppBarButton>
25+
</utu:NavigationBar.MainCommand>
26+
</utu:NavigationBar>
1927
<StackPanel Grid.Row="1">
2028
<TextBlock Text="Checkout"
2129
FontSize="32"

‎reference/Commerce/src/Commerce/Views/ProductControl.xaml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@
2424
<utu:AutoLayout utu:AutoLayout.PrimaryAlignment="Stretch">
2525

2626
<utu:NavigationBar Content="Uno Commerce"
27-
x:Uid="Product_Detail_Navigation_Bar" />
27+
x:Uid="Product_Detail_Navigation_Bar">
28+
<utu:NavigationBar.MainCommand>
29+
<AppBarButton>
30+
<AppBarButton.Icon>
31+
<BitmapIcon UriSource="ms-appx:///Assets/Icons/back.png" />
32+
</AppBarButton.Icon>
33+
</AppBarButton>
34+
</utu:NavigationBar.MainCommand>
35+
</utu:NavigationBar>
2836
<ScrollViewer utu:AutoLayout.CounterAlignment="Stretch"
2937
utu:AutoLayout.PrimaryAlignment="Stretch">
3038
<utu:AutoLayout Background="{StaticResource SurfaceBrush}">
@@ -79,7 +87,7 @@
7987
<utu:Divider Style="{StaticResource DividerStyle}" />
8088
<utu:AutoLayout Spacing="10"
8189
Padding="16,32,16,32">
82-
<Button Content="add to cart"
90+
<Button Content="Add to cart"
8391
Command="{utu:AncestorBinding Path=DataContext.AddToCart,
8492
AncestorType=uer:FeedView}"
8593
utu:AutoLayout.PrimaryLength="40"
@@ -89,7 +97,7 @@
8997
<PathIcon Data="{StaticResource Icon_Shopping_Cart}" />
9098
</ut:ControlExtensions.Icon>
9199
</Button>
92-
<Button Content="save for later"
100+
<Button Content="Save for later"
93101
utu:AutoLayout.PrimaryLength="40"
94102
Style="{StaticResource OutlinedButtonStyle}"
95103
x:Uid="Product_Detail_Button" />

‎reference/Commerce/src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<UnoExtensionsVersion>4.1.23</UnoExtensionsVersion>
17+
<UnoExtensionsVersion>4.1.24</UnoExtensionsVersion>
1818
<UnoToolkitVersion>6.0.24</UnoToolkitVersion>
1919
<UnoThemesVersion>5.0.13</UnoThemesVersion>
2020
<UnoCSharpMarkupVersion>5.2.14</UnoCSharpMarkupVersion>

‎reference/Commerce/src/Directory.Packages.props

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,4 @@
44
55
See https://aka.platform.uno/using-uno-sdk for more information.
66
-->
7-
<ItemGroup>
8-
<PackageVersion Include="SkiaSharp.Views.WinUI" Version="2.88.8" />
9-
</ItemGroup>
107
</Project>

‎reference/Commerce/src/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
// To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
33
"msbuild-sdks": {
4-
"Uno.Sdk": "5.2.139"
4+
"Uno.Sdk": "5.2.161"
55
}
66
}

0 commit comments

Comments
 (0)