Skip to content

Commit 3225946

Browse files
ArlodotexeArlodotexe
committed
Refactor namespaces to use CommunityToolkit.WinUI across TransitionHelper components
1 parent 93d73b9 commit 3225946

17 files changed

+48
-48
lines changed

‎components/TransitionHelper/samples/CustomTextScalingCalculator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System.Numerics;
6-
using CommunityToolkit.Labs.WinUI;
6+
using CommunityToolkit.WinUI;
77
using CommunityToolkit.WinUI;
88

99
namespace TransitionHelperExperiment.Samples;

‎components/TransitionHelper/samples/TransitionHelperFullExample.xaml‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
55
xmlns:i="using:Microsoft.Xaml.Interactivity"
6-
xmlns:labs="using:CommunityToolkit.Labs.WinUI"
6+
xmlns:wct="using:CommunityToolkit.WinUI"
77
xmlns:local="using:TransitionHelperExperiment.Samples"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
1010

1111
<Page.Resources>
12-
<labs:TransitionHelper x:Key="MyTransitionHelper">
13-
<labs:TransitionConfig Id="background"
12+
<wct:TransitionHelper x:Key="MyTransitionHelper">
13+
<wct:TransitionConfig Id="background"
1414
ScaleMode="Scale" />
15-
<labs:TransitionConfig Id="image"
15+
<wct:TransitionConfig Id="image"
1616
ScaleMode="Scale" />
17-
<labs:TransitionConfig Id="name"
17+
<wct:TransitionConfig Id="name"
1818
ScaleMode="Custom">
19-
<labs:TransitionConfig.CustomScalingCalculator>
19+
<wct:TransitionConfig.CustomScalingCalculator>
2020
<local:CustomTextScalingCalculator />
21-
</labs:TransitionConfig.CustomScalingCalculator>
22-
</labs:TransitionConfig>
23-
<labs:TransitionConfig EnableClipAnimation="true"
21+
</wct:TransitionConfig.CustomScalingCalculator>
22+
</wct:TransitionConfig>
23+
<wct:TransitionConfig EnableClipAnimation="true"
2424
Id="desc" />
25-
</labs:TransitionHelper>
25+
</wct:TransitionHelper>
2626

2727
<ImageBrush x:Key="ImageBackgroundBrush"
2828
ImageSource="ms-appx:///Assets/Owl2.jpg" />
@@ -36,23 +36,23 @@
3636
Spacing="10">
3737
<Grid Width="50"
3838
Height="50">
39-
<Border labs:TransitionHelper.Id="background"
39+
<Border wct:TransitionHelper.Id="background"
4040
Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
4141
CornerRadius="4" />
4242
<Border Width="36"
4343
Height="36"
44-
labs:TransitionHelper.Id="image"
44+
wct:TransitionHelper.Id="image"
4545
Background="{StaticResource ImageBackgroundBrush}"
4646
CornerRadius="18" />
4747
</Grid>
48-
<StackPanel labs:TransitionHelper.Id="guide"
48+
<StackPanel wct:TransitionHelper.Id="guide"
4949
Spacing="2">
5050
<Button x:Name="MinToMidButton"
5151
Content="&#xEA62;"
5252
Style="{StaticResource NavigationBackButtonNormalStyle}">
5353
<i:Interaction.Behaviors>
5454
<i:EventTriggerBehavior EventName="Click">
55-
<labs:StartTransitionAction Source="{Binding ElementName=FirstControl}"
55+
<wct:StartTransitionAction Source="{Binding ElementName=FirstControl}"
5656
Target="{Binding ElementName=SecondControl}"
5757
Transition="{StaticResource MyTransitionHelper}" />
5858
</i:EventTriggerBehavior>
@@ -63,7 +63,7 @@
6363
Style="{StaticResource NavigationBackButtonNormalStyle}">
6464
<i:Interaction.Behaviors>
6565
<i:EventTriggerBehavior EventName="Click">
66-
<labs:StartTransitionAction Source="{Binding ElementName=FirstControl}"
66+
<wct:StartTransitionAction Source="{Binding ElementName=FirstControl}"
6767
Target="{Binding ElementName=ThirdControl}"
6868
Transition="{StaticResource MyTransitionHelper}" />
6969
</i:EventTriggerBehavior>
@@ -76,31 +76,31 @@
7676
HorizontalAlignment="Center"
7777
VerticalAlignment="Top"
7878
Visibility="Collapsed">
79-
<Border labs:TransitionHelper.Id="background"
79+
<Border wct:TransitionHelper.Id="background"
8080
Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
8181
CornerRadius="8" />
8282
<StackPanel Padding="20"
8383
Orientation="Horizontal"
8484
Spacing="20">
8585
<Border Width="50"
8686
Height="50"
87-
labs:TransitionHelper.Id="image"
87+
wct:TransitionHelper.Id="image"
8888
Background="{StaticResource ImageBackgroundBrush}"
8989
CornerRadius="25" />
9090
<StackPanel Width="400"
9191
VerticalAlignment="Center"
9292
Spacing="5">
93-
<TextBlock labs:TransitionHelper.Id="name">Magic</TextBlock>
94-
<TextBlock labs:TransitionHelper.Id="desc">Magic is a cute 😺.</TextBlock>
93+
<TextBlock wct:TransitionHelper.Id="name">Magic</TextBlock>
94+
<TextBlock wct:TransitionHelper.Id="desc">Magic is a cute 😺.</TextBlock>
9595
</StackPanel>
96-
<StackPanel labs:TransitionHelper.Id="guide"
96+
<StackPanel wct:TransitionHelper.Id="guide"
9797
Orientation="Horizontal"
9898
Spacing="2">
9999
<Button Content="&#xE845;"
100100
Style="{StaticResource NavigationBackButtonNormalStyle}">
101101
<i:Interaction.Behaviors>
102102
<i:EventTriggerBehavior EventName="Click">
103-
<labs:ReverseTransitionAction Transition="{StaticResource MyTransitionHelper}" />
103+
<wct:ReverseTransitionAction Transition="{StaticResource MyTransitionHelper}" />
104104
</i:EventTriggerBehavior>
105105
</i:Interaction.Behaviors>
106106
</Button>
@@ -109,7 +109,7 @@
109109
Style="{StaticResource NavigationBackButtonNormalStyle}">
110110
<i:Interaction.Behaviors>
111111
<i:EventTriggerBehavior EventName="Click">
112-
<labs:StartTransitionAction Source="{Binding ElementName=SecondControl}"
112+
<wct:StartTransitionAction Source="{Binding ElementName=SecondControl}"
113113
Target="{Binding ElementName=FirstControl}"
114114
Transition="{StaticResource MyTransitionHelper}" />
115115
</i:EventTriggerBehavior>
@@ -120,7 +120,7 @@
120120
Style="{StaticResource NavigationBackButtonNormalStyle}">
121121
<i:Interaction.Behaviors>
122122
<i:EventTriggerBehavior EventName="Click">
123-
<labs:StartTransitionAction Source="{Binding ElementName=SecondControl}"
123+
<wct:StartTransitionAction Source="{Binding ElementName=SecondControl}"
124124
Target="{Binding ElementName=ThirdControl}"
125125
Transition="{StaticResource MyTransitionHelper}" />
126126
</i:EventTriggerBehavior>
@@ -133,33 +133,33 @@
133133
HorizontalAlignment="Center"
134134
VerticalAlignment="Center"
135135
Visibility="Collapsed">
136-
<Border labs:TransitionHelper.Id="background"
136+
<Border wct:TransitionHelper.Id="background"
137137
Background="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
138138
CornerRadius="8" />
139139
<StackPanel Padding="20"
140140
HorizontalAlignment="Center"
141141
Spacing="20">
142142
<Border Width="80"
143143
Height="80"
144-
labs:TransitionHelper.Id="image"
144+
wct:TransitionHelper.Id="image"
145145
Background="{StaticResource ImageBackgroundBrush}"
146146
CornerRadius="40" />
147147
<StackPanel Spacing="5">
148148
<TextBlock MaxWidth="200"
149149
HorizontalAlignment="Center"
150-
labs:TransitionHelper.Id="name"
150+
wct:TransitionHelper.Id="name"
151151
FontSize="24"
152152
TextAlignment="Center"
153153
TextWrapping="Wrap">
154154
Magic is my cat's name
155155
</TextBlock>
156156
<TextBlock HorizontalAlignment="Center"
157-
labs:TransitionHelper.Id="desc">
157+
wct:TransitionHelper.Id="desc">
158158
Magic is a cute 😺, but sometimes very naughty.
159159
</TextBlock>
160160
</StackPanel>
161161
<StackPanel Padding="50,100"
162-
labs:TransitionHelper.IsIndependent="True">
162+
wct:TransitionHelper.IsIndependent="True">
163163
<Rectangle Width="200"
164164
Height="20"
165165
Margin="10"
@@ -197,14 +197,14 @@
197197
<StackPanel Margin="10"
198198
HorizontalAlignment="Right"
199199
VerticalAlignment="Top"
200-
labs:TransitionHelper.Id="guide"
200+
wct:TransitionHelper.Id="guide"
201201
Orientation="Horizontal"
202202
Spacing="2">
203203
<Button Content="&#xE845;"
204204
Style="{StaticResource NavigationBackButtonNormalStyle}">
205205
<i:Interaction.Behaviors>
206206
<i:EventTriggerBehavior EventName="Click">
207-
<labs:ReverseTransitionAction Transition="{StaticResource MyTransitionHelper}" />
207+
<wct:ReverseTransitionAction Transition="{StaticResource MyTransitionHelper}" />
208208
</i:EventTriggerBehavior>
209209
</i:Interaction.Behaviors>
210210
</Button>
@@ -213,7 +213,7 @@
213213
Style="{StaticResource NavigationBackButtonNormalStyle}">
214214
<i:Interaction.Behaviors>
215215
<i:EventTriggerBehavior EventName="Click">
216-
<labs:StartTransitionAction Source="{Binding ElementName=ThirdControl}"
216+
<wct:StartTransitionAction Source="{Binding ElementName=ThirdControl}"
217217
Target="{Binding ElementName=FirstControl}"
218218
Transition="{StaticResource MyTransitionHelper}" />
219219
</i:EventTriggerBehavior>
@@ -224,7 +224,7 @@
224224
Style="{StaticResource NavigationBackButtonNormalStyle}">
225225
<i:Interaction.Behaviors>
226226
<i:EventTriggerBehavior EventName="Click">
227-
<labs:StartTransitionAction Source="{Binding ElementName=ThirdControl}"
227+
<wct:StartTransitionAction Source="{Binding ElementName=ThirdControl}"
228228
Target="{Binding ElementName=SecondControl}"
229229
Transition="{StaticResource MyTransitionHelper}" />
230230
</i:EventTriggerBehavior>

‎components/TransitionHelper/src/Behaviors/ReverseTransitionAction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using CommunityToolkit.WinUI.Animations;
88

9-
namespace CommunityToolkit.Labs.WinUI;
9+
namespace CommunityToolkit.WinUI;
1010

1111
/// <summary>
1212
/// An <see cref="IAction"/> implementation that can trigger a target <see cref="TransitionHelper"/> instance.

‎components/TransitionHelper/src/Behaviors/StartTransitionAction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using CommunityToolkit.WinUI.Animations;
88

9-
namespace CommunityToolkit.Labs.WinUI;
9+
namespace CommunityToolkit.WinUI;
1010

1111
/// <summary>
1212
/// An <see cref="IAction"/> implementation that can trigger a target <see cref="TransitionHelper"/> instance.

‎components/TransitionHelper/src/CommunityToolkit.Labs.WinUI.TransitionHelper.csproj‎ renamed to ‎components/TransitionHelper/src/CommunityToolkit.WinUI.TransitionHelper.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>This package contains a TransitionHelper.</Description>
66

77
<!-- Rns suffix is required for namespaces shared across projects. See https://github.com/CommunityToolkit/Labs-Windows/issues/152 -->
8-
<RootNamespace>CommunityToolkit.Labs.WinUI.TransitionHelperRns</RootNamespace>
8+
<RootNamespace>CommunityToolkit.WinUI.TransitionHelperRns</RootNamespace>
99

1010
<!-- TODO: Putting here as seems to get flagged on different partials, need to deal with TokenSource being disposible -->
1111
<!-- See: https://github.com/CommunityToolkit/Labs-Windows/issues/407 -->

‎components/TransitionHelper/src/Enums/ScaleMode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace CommunityToolkit.Labs.WinUI;
5+
namespace CommunityToolkit.WinUI;
66

77
/// <summary>
88
/// Indicates the strategy when the scale property of a UI element is animated.

‎components/TransitionHelper/src/Enums/VisualStateToggleMethod.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
namespace CommunityToolkit.Labs.WinUI;
5+
namespace CommunityToolkit.WinUI;
66

77
/// <summary>
88
/// Indicates the method of changing the visibility of UI elements.

‎components/TransitionHelper/src/IScalingCalculator.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System.Numerics;
66

7-
namespace CommunityToolkit.Labs.WinUI;
7+
namespace CommunityToolkit.WinUI;
88

99
/// <summary>
1010
/// Defines methods to support calculating scaling changes.

‎components/TransitionHelper/src/Toolkit/AnimationExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
using Windows.UI.Xaml.Media.Animation;
1313
#endif
1414

15-
namespace CommunityToolkit.Labs.WinUI;
15+
namespace CommunityToolkit.WinUI;
1616

1717
/// <summary>
1818
/// Common properties related to extensions. (Copied from internal of Toolkit)

‎components/TransitionHelper/src/TransitionConfig.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using Windows.UI.Xaml.Media.Animation;
1111
#endif
1212

13-
namespace CommunityToolkit.Labs.WinUI;
13+
namespace CommunityToolkit.WinUI;
1414

1515
/// <summary>
1616
/// Configuration used for the transition between UI elements.

0 commit comments

Comments
 (0)