Skip to content

Commit 9d5e2d5

Browse files
committed
Revert "Changing namespace"
This reverts commit ac4eadb.
1 parent ac4eadb commit 9d5e2d5

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

common/GlobalUsings_WinUI.cs

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

88
global using System.Runtime.InteropServices.WindowsRuntime;
99

10-
global using CommunityToolkit.Controls.WinUI;
10+
global using CommunityToolkit.Labs.WinUI;
1111

1212
global using Windows.Foundation;
1313
global using Windows.Foundation.Collections;

components/Shimmer/samples/ShimmerSample.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<Page x:Class="ShimmerExperiment.Samples.ShimmerSample"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
65
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:labs="using:CommunityToolkit.Labs.WinUI"
77
xmlns:local="using:ShimmerExperiment.Samples"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
@@ -26,7 +26,7 @@
2626
<ImageBrush ImageSource="ms-appx:///Assets/Owl.jpg" />
2727
</Border.Background>
2828
</Border>
29-
<controls:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Picture.Visibility), Mode=OneWay}" />
29+
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Picture.Visibility), Mode=OneWay}" />
3030
</Grid>
3131

3232
<Grid Width="80"
@@ -36,7 +36,7 @@
3636
FontWeight="SemiBold"
3737
Text="This is a title"
3838
Visibility="{x:Bind HasLoaded, Mode=OneWay}" />
39-
<controls:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Title.Visibility), Mode=OneWay}" />
39+
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Title.Visibility), Mode=OneWay}" />
4040
</Grid>
4141
<Grid Width="120"
4242
Height="20"
@@ -45,7 +45,7 @@
4545
HorizontalAlignment="Center"
4646
Text="This is a description"
4747
Visibility="{x:Bind HasLoaded, Mode=OneWay}" />
48-
<controls:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Description.Visibility), Mode=OneWay}" />
48+
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Description.Visibility), Mode=OneWay}" />
4949
</Grid>
5050
<Grid Width="60"
5151
Height="32"
@@ -54,7 +54,7 @@
5454
Content="Install"
5555
Style="{StaticResource AccentButtonStyle}"
5656
Visibility="{x:Bind HasLoaded, Mode=OneWay}" />
57-
<controls:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Install.Visibility), Mode=OneWay}" />
57+
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Install.Visibility), Mode=OneWay}" />
5858
</Grid>
5959
</StackPanel>
6060
</StackPanel>

components/Shimmer/src/Shimmer/Shimmer.Properties.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.WinUI.Controls;
5+
namespace CommunityToolkit.Labs.WinUI;
66

77
public partial class Shimmer : Control
88
{

components/Shimmer/src/Shimmer/Shimmer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
using Microsoft.Toolkit.Uwp.UI.Animations;
2222
#endif
2323

24-
namespace CommunityToolkit.WinUI.Controls;
24+
namespace CommunityToolkit.Labs.WinUI;
2525

2626
/// <summary>
2727
/// A generic shimmer control that can be used to construct a beautiful loading effect.

components/Shimmer/src/Shimmer/Shimmer.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
22
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:controls="using:CommunityToolkit.WinUI.Controls">
4+
xmlns:labs="using:CommunityToolkit.Labs.WinUI">
55

66
<ResourceDictionary.ThemeDictionaries>
77
<ResourceDictionary x:Key="Dark">
@@ -20,14 +20,14 @@
2020
</ResourceDictionary>
2121
</ResourceDictionary.ThemeDictionaries>
2222

23-
<Style TargetType="controls:Shimmer">
23+
<Style TargetType="labs:Shimmer">
2424
<Setter Property="Background" Value="{ThemeResource ShimmerBackground}" />
2525
<Setter Property="CornerRadius" Value="4" />
2626
<Setter Property="MinWidth" Value="40" />
2727
<Setter Property="MinHeight" Value="8" />
2828
<Setter Property="Template">
2929
<Setter.Value>
30-
<ControlTemplate TargetType="controls:Shimmer">
30+
<ControlTemplate TargetType="labs:Shimmer">
3131
<Border x:Name="Shape"
3232
Background="{TemplateBinding Background}"
3333
CornerRadius="{TemplateBinding CornerRadius}" />

0 commit comments

Comments
 (0)