From 2a64053a6e0d4ef957d13037d46c53c7d7649ddd Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Fri, 1 Sep 2023 11:31:02 +0200 Subject: [PATCH 1/6] Removing/improving XAML snippets for ConnectedAnimations --- .../Animations/samples/ConnectedAnimations.md | 41 ++++++------------- 1 file changed, 12 insertions(+), 29 deletions(-) diff --git a/components/Animations/samples/ConnectedAnimations.md b/components/Animations/samples/ConnectedAnimations.md index 47b015aa..800bc0ea 100644 --- a/components/Animations/samples/ConnectedAnimations.md +++ b/components/Animations/samples/ConnectedAnimations.md @@ -12,9 +12,6 @@ issue-id: 0 icon: Assets/ConnectedAnimations.png --- - -# Connected Animations XAML Attached Properties - [Connected animations](/windows/uwp/style/connected-animation) let you create a dynamic and compelling navigation experience by animating the transition of an element between two different views. The Connected Animations XAML Attached Properties enable connected animations to be defined directly in your XAML code by simply adding a Key to the element that should animate. There are also attached properties to enable coordinated animations and animations in lists and grids. @@ -27,7 +24,7 @@ The Connected Animations XAML Attached Properties enable connected animations to - + @@ -35,7 +32,7 @@ The Connected Animations XAML Attached Properties enable connected animations to animations:Connected.ListItemKey="listItem"> - + @@ -100,12 +97,6 @@ In those cases, you can use the **SetListDataItemForNextConnectedAnnimation** ex Frame.Navigate(typeof(DetailsPage), dataItemToAnimate.Id); ``` -```vb - ' dataItemToAnimate is an object in the ListViewBase.ItemsSource collection - Frame.SetListDataItemForNextConnectedAnnimation(dataItemToAnimate) - Frame.Navigate(GetType(DetailsPage), dataItemToAnimate.Id) -``` - This method is also helpful when navigating back to an item different from the item it was navigated from. ```csharp @@ -113,11 +104,6 @@ This method is also helpful when navigating back to an item different from the i Frame.GoBack(); ``` -```vb - Frame.SetListDataItemForNextConnectedAnnimation(dataItemToAnimate) - Frame.GoBack() -``` - ## Examples We can create the above connected animations. @@ -128,8 +114,7 @@ We need a set a key for the element to be connected with another element in a di ```xaml - ``` @@ -140,14 +125,13 @@ We need to set the same key for the element to be connected with. Also, You can ```xaml - - - Header - Lorem ipsum ... + + ``` @@ -162,8 +146,8 @@ animations:Connected.ListItemKey="listItem"> - - + + @@ -179,16 +163,15 @@ In this page, you just need to give the same key. - - Lorem ipsum ... + + - Lorem Ipsum ... + ``` From 0413a6078d47fd8b598c5d81e6226e9c6830c53b Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Fri, 1 Sep 2023 11:31:24 +0200 Subject: [PATCH 2/6] Removing old icon reference from FontIconExtension snippet --- components/Extensions/samples/IconMarkupExtensions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Extensions/samples/IconMarkupExtensions.md b/components/Extensions/samples/IconMarkupExtensions.md index b211f8ca..ced75685 100644 --- a/components/Extensions/samples/IconMarkupExtensions.md +++ b/components/Extensions/samples/IconMarkupExtensions.md @@ -57,7 +57,7 @@ The `FontIconExtension` type provides the ability to create `FontIcon` instances - + From 4bffc6e190b9477fa5d556c800cec609d60b5f97 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Fri, 1 Sep 2023 11:47:40 +0200 Subject: [PATCH 3/6] Use FontIconExtension on Segmented samples --- .../samples/Segmented.Samples.csproj | 3 ++ components/Segmented/samples/Segmented.md | 2 +- .../samples/SegmentedBasicSample.xaml | 52 ++++++------------- .../samples/SegmentedStylesSample.xaml | 24 +++------ 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/components/Segmented/samples/Segmented.Samples.csproj b/components/Segmented/samples/Segmented.Samples.csproj index c99ee27d..8a879ef4 100644 --- a/components/Segmented/samples/Segmented.Samples.csproj +++ b/components/Segmented/samples/Segmented.Samples.csproj @@ -5,6 +5,9 @@ + + + diff --git a/components/Segmented/samples/Segmented.md b/components/Segmented/samples/Segmented.md index 39afa292..7f4c8676 100644 --- a/components/Segmented/samples/Segmented.md +++ b/components/Segmented/samples/Segmented.md @@ -23,6 +23,6 @@ The `Segmented` control is best used with 2-5 items and does not support overflo ## Other styles -The `Segmented` control contains various additional styles, to match the look and feel of your application. The `PivotSegmentedStyle` matches a modern `Pivot` style while the `ButtonSegmentedStyle` represents buttons. +The `Segmented` control contains various additional styles, to match the look and feel of your application. The `PivotSegmentedStyle` matches a modern `Pivot` style while the `ButtonSegmentedStyle` represents buttons. To load these styles, make sure to add the `ResourceDictionary` as a resource (see `Page.Resources` sample below). > [!SAMPLE SegmentedStylesSample] diff --git a/components/Segmented/samples/SegmentedBasicSample.xaml b/components/Segmented/samples/SegmentedBasicSample.xaml index 47d31e96..f00f791e 100644 --- a/components/Segmented/samples/SegmentedBasicSample.xaml +++ b/components/Segmented/samples/SegmentedBasicSample.xaml @@ -1,4 +1,4 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - + + + diff --git a/components/Segmented/samples/SegmentedStylesSample.xaml b/components/Segmented/samples/SegmentedStylesSample.xaml index 511c7eb2..72b1b75b 100644 --- a/components/Segmented/samples/SegmentedStylesSample.xaml +++ b/components/Segmented/samples/SegmentedStylesSample.xaml @@ -1,4 +1,4 @@ - + @@ -34,23 +35,14 @@ SelectionMode="{x:Bind local:SegmentedStylesSample.ConvertStringToSelectionMode(SelectionMode), Mode=OneWay}" Style="{StaticResource ButtonSegmentedStyle}"> - - - - + Icon="{ui:FontIcon Glyph=}" + ToolTipService.ToolTip="Day view" /> - - - - + Icon="{ui:FontIcon Glyph=}" + ToolTipService.ToolTip="Week view" /> - - - - + Icon="{ui:FontIcon Glyph=}" + ToolTipService.ToolTip="Month view" /> From 35da314a62c0279dfa6116669ae9e42c52d6858e Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Fri, 1 Sep 2023 11:47:57 +0200 Subject: [PATCH 4/6] Use FontIconExtension on ConnectedAnimation sample --- components/Animations/samples/Animations.Samples.csproj | 5 +++++ .../Animations/samples/ConnectedAnimationsSample.xaml | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/components/Animations/samples/Animations.Samples.csproj b/components/Animations/samples/Animations.Samples.csproj index 549f237c..456f0ee4 100644 --- a/components/Animations/samples/Animations.Samples.csproj +++ b/components/Animations/samples/Animations.Samples.csproj @@ -5,6 +5,11 @@ + + + + + diff --git a/components/Animations/samples/ConnectedAnimationsSample.xaml b/components/Animations/samples/ConnectedAnimationsSample.xaml index 6d2bf0a2..81e58981 100644 --- a/components/Animations/samples/ConnectedAnimationsSample.xaml +++ b/components/Animations/samples/ConnectedAnimationsSample.xaml @@ -1,4 +1,4 @@ - + + Content="{ui:FontIcon Glyph=, + FontSize=14}" + Visibility="Collapsed" /> Date: Fri, 1 Sep 2023 13:10:06 +0200 Subject: [PATCH 5/6] Add missing using --- components/Animations/samples/Animations.Samples.csproj | 2 +- components/Animations/samples/ConnectedAnimationsSample.xaml | 4 ++-- components/Segmented/samples/Segmented.Samples.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/Animations/samples/Animations.Samples.csproj b/components/Animations/samples/Animations.Samples.csproj index 456f0ee4..efca25ab 100644 --- a/components/Animations/samples/Animations.Samples.csproj +++ b/components/Animations/samples/Animations.Samples.csproj @@ -7,7 +7,7 @@ - + diff --git a/components/Animations/samples/ConnectedAnimationsSample.xaml b/components/Animations/samples/ConnectedAnimationsSample.xaml index 81e58981..05e861ee 100644 --- a/components/Animations/samples/ConnectedAnimationsSample.xaml +++ b/components/Animations/samples/ConnectedAnimationsSample.xaml @@ -1,4 +1,4 @@ - + - + From b1da481f86972bed2a91e5872b077b0d0aa2ab53 Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Fri, 1 Sep 2023 20:14:23 +0200 Subject: [PATCH 6/6] Update components/Animations/samples/Animations.Samples.csproj Co-authored-by: Arlo --- components/Animations/samples/Animations.Samples.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/Animations/samples/Animations.Samples.csproj b/components/Animations/samples/Animations.Samples.csproj index efca25ab..c97473ba 100644 --- a/components/Animations/samples/Animations.Samples.csproj +++ b/components/Animations/samples/Animations.Samples.csproj @@ -7,7 +7,7 @@ - +