From 432c6d456fc5b35d7608cea8d0555c8064478410 Mon Sep 17 00:00:00 2001 From: "Jim Walker (WINDOWS)" Date: Wed, 17 Jun 2020 19:51:16 +0000 Subject: [PATCH] Merged PR 166: Update to WinUI 2.4 --- PhotoLab/App.xaml | 16 +- PhotoLab/DetailPage.xaml | 478 ++++++++++++++++++--------------------- PhotoLab/MainPage.xaml | 24 +- PhotoLab/PhotoLab.csproj | 6 +- README.md | 14 +- 5 files changed, 247 insertions(+), 291 deletions(-) diff --git a/PhotoLab/App.xaml b/PhotoLab/App.xaml index 3b45103..48151ab 100644 --- a/PhotoLab/App.xaml +++ b/PhotoLab/App.xaml @@ -27,9 +27,17 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> - - 0 - 641 - 1008 + + + 0 + 641 + 1008 + + + + + + + diff --git a/PhotoLab/DetailPage.xaml b/PhotoLab/DetailPage.xaml index d4fa60f..b14c54e 100644 --- a/PhotoLab/DetailPage.xaml +++ b/PhotoLab/DetailPage.xaml @@ -26,7 +26,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:PhotoLab" - xmlns:telerikInput="using:Telerik.UI.Xaml.Controls.Input" + xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" @@ -58,235 +58,193 @@ - + - - - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + + - - + + - - + + + + + + + + + + + Grid.Row="0" + Content="{TemplateBinding Header}" + ContentTemplate="{TemplateBinding HeaderTemplate}" + FontWeight="{ThemeResource SliderHeaderThemeFontWeight}" + Foreground="{ThemeResource SliderHeaderForeground}" + Margin="{ThemeResource SliderTopHeaderMargin}" + TextWrapping="Wrap" + Visibility="Collapsed" + x:DeferLoadStrategy="Lazy"/> - + Grid.Row="1" + Background="{ThemeResource SliderContainerBackground}" + Control.IsTemplateFocusTarget="True"> + + + - + - + + + - + + Height="{ThemeResource SliderTrackThemeHeight}" + Grid.Row="1" + Grid.ColumnSpan="3" + contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" + contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" + contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" + contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" /> + + Visibility="Collapsed" + Fill="{ThemeResource SliderTickBarFill}" + Height="{ThemeResource SliderOutsideTickBarThemeHeight}" + VerticalAlignment="Bottom" + Margin="0,0,0,4" + Grid.ColumnSpan="3" /> + Visibility="Collapsed" + Fill="{ThemeResource SliderInlineTickBarFill}" + Height="{ThemeResource SliderTrackThemeHeight}" + Grid.Row="1" + Grid.ColumnSpan="3" /> + Visibility="Collapsed" + Fill="{ThemeResource SliderTickBarFill}" + Height="{ThemeResource SliderOutsideTickBarThemeHeight}" + VerticalAlignment="Top" + Margin="0,4,0,0" + Grid.Row="2" + Grid.ColumnSpan="3" /> + Style="{StaticResource SliderThumbStyle}" + DataContext="{TemplateBinding Value}" + Height="{ThemeResource SliderHorizontalThumbHeight}" + Width="{ThemeResource SliderHorizontalThumbWidth}" + Grid.Row="0" + Grid.RowSpan="3" + Grid.Column="1" + FocusVisualMargin="-14,-6,-14,-6" + AutomationProperties.AccessibilityView="Raw" /> - + + + - + - + + + Fill="{TemplateBinding Background}" + Width="{ThemeResource SliderTrackThemeHeight}" + Grid.Column="1" + Grid.RowSpan="3" + contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" + contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" + contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" + contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" /> + Fill="{TemplateBinding Foreground}" + Grid.Column="1" + Grid.Row="2" + contract7Present:RadiusX="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" + contract7Present:RadiusY="{Binding CornerRadius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" + contract7NotPresent:RadiusX="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}" + contract7NotPresent:RadiusY="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}" /> + Visibility="Collapsed" + Fill="{ThemeResource SliderTickBarFill}" + Width="{ThemeResource SliderOutsideTickBarThemeHeight}" + HorizontalAlignment="Right" + Margin="0,0,4,0" + Grid.RowSpan="3" /> + Visibility="Collapsed" + Fill="{ThemeResource SliderInlineTickBarFill}" + Width="{ThemeResource SliderTrackThemeHeight}" + Grid.Column="1" + Grid.RowSpan="3" /> + Visibility="Collapsed" + Fill="{ThemeResource SliderTickBarFill}" + Width="{ThemeResource SliderOutsideTickBarThemeHeight}" + HorizontalAlignment="Left" + Margin="4,0,0,0" + Grid.Column="2" + Grid.RowSpan="3" /> + Style="{StaticResource SliderThumbStyle}" + DataContext="{TemplateBinding Value}" + Width="{ThemeResource SliderVerticalThumbWidth}" + Height="{ThemeResource SliderVerticalThumbHeight}" + Grid.Row="1" + Grid.Column="0" + Grid.ColumnSpan="3" + FocusVisualMargin="-6,-14,-6,-14" + AutomationProperties.AccessibilityView="Raw" /> @@ -464,7 +439,8 @@ HorizontalAlignment="Stretch" Margin="24,48,24,24"> - @@ -508,24 +484,14 @@ Text="{x:Bind item.ImageTitle, Mode=TwoWay}" Padding="12" Grid.ColumnSpan="2" /> - - - - - - - - - - - - + + + + + - @@ -96,21 +94,9 @@ Style="{StaticResource CaptionTextBlockStyle}" Margin="8,0,0,0" /> - - - - - - - - - - - - + + diff --git a/PhotoLab/PhotoLab.csproj b/PhotoLab/PhotoLab.csproj index eb1be65..a1c4068 100644 --- a/PhotoLab/PhotoLab.csproj +++ b/PhotoLab/PhotoLab.csproj @@ -11,7 +11,7 @@ PhotoLab en-US UAP - 10.0.19569.0 + 10.0.19041.0 10.0.17763.0 14 512 @@ -159,8 +159,8 @@ 1.5.1 - - 1.0.0.4 + + 2.4.2 diff --git a/README.md b/README.md index c19ea98..468ddb1 100644 --- a/README.md +++ b/README.md @@ -27,18 +27,18 @@ This repo includes the complete sample pictured above, plus separate versions th Each of these starting points is a simplified version of the complete sample, making the code easier to browse around in as you go through each tutorial. > **Note:** The tutorials do not proceed sequentially to build up to the complete sample, so be sure to start each tutorial by opening the correct starting point project. -Also, be sure to check out the complete sample to see additional features such as custom animations and phone support. +Also, be sure to check out the complete sample to see additional features such as custom animations. ## Features PhotoLab demonstrates: - -* XAML layout ranging from basics to adaptive and tailored layouts. + +* XAML layout ranging from basics to adaptive and tailored layouts. * XAML data binding including the [{x:Bind} markup extension](https://docs.microsoft.com/windows/uwp/xaml-platform/x-bind-markup-extension). * XAML styling and UI customization. * Image effects from [Windows.UI.Composition](https://docs.microsoft.com/uwp/api/windows.ui.composition). -* The use of open source libraries including the [UWP Community Toolkit](https://github.com/Microsoft/UWPCommunityToolkit) (for [ReorderGridAnimation](http://docs.uwpcommunitytoolkit.com/en/master/animations/ReorderGrid/) and [Telerik UI for UWP](https://github.com/telerik/UI-For-UWP) (for [RadRating control](http://docs.telerik.com/devtools/universal-windows-platform/controls/radrating/rating-gettingstarted)). -* Loading images from the Pictures library using data virtualization to increase performance when there are numerous files. +* Use of the [Windows UI Library (WinUI)](https://docs.microsoft.com/windows/apps/winui) and the [Windows Community Toolkit](https://docs.microsoft.com/windows/communitytoolkit/) (for [ReorderGridAnimation](https://docs.microsoft.com/windows/communitytoolkit/animations/reordergrid)). +* Loading images from the Pictures library using data virtualization to increase performance when there are numerous files. ## Code at a glance @@ -62,8 +62,8 @@ check out the following files for examples of some highlighted features: ## External libraries used in this sample -* [UWP Community Toolkit](https://github.com/Microsoft/UWPCommunityToolkit) -* [Telerik UI for UWP](https://github.com/telerik/UI-For-UWP) +* [Windows UI Library (WinUI)](https://docs.microsoft.com/windows/apps/winui) +* [Windows Community Toolkit](https://docs.microsoft.com/windows/communitytoolkit/) ## Universal Windows Platform development