Skip to content

Commit bfa84db

Browse files
committed
Refactor Shimmer component to use CommunityToolkit.WinUI.Controls namespace
1 parent 0efab47 commit bfa84db

File tree

8 files changed

+17
-17
lines changed

8 files changed

+17
-17
lines changed

components/Shimmer/samples/ShimmerSample.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:labs="using:CommunityToolkit.Labs.WinUI"
6+
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
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-
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Picture.Visibility), Mode=OneWay}" />
29+
<controls: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-
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Title.Visibility), Mode=OneWay}" />
39+
<controls: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-
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Description.Visibility), Mode=OneWay}" />
48+
<controls: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-
<labs:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Install.Visibility), Mode=OneWay}" />
57+
<controls:Shimmer Visibility="{x:Bind local:ShimmerSample.ReverseVisibility(Install.Visibility), Mode=OneWay}" />
5858
</Grid>
5959
</StackPanel>
6060
</StackPanel>

components/Shimmer/src/CommunityToolkit.Labs.WinUI.Controls.Shimmer.csproj renamed to components/Shimmer/src/CommunityToolkit.WinUI.Controls.Shimmer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Description>This package contains Shimmer.</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.ShimmerRns</RootNamespace>
8+
<RootNamespace>CommunityToolkit.WinUI.Controls.ShimmerRns</RootNamespace>
99
</PropertyGroup>
1010

1111
<!-- Sets this up as a toolkit component's source project -->

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.Labs.WinUI;
5+
namespace CommunityToolkit.WinUI.Controls;
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
@@ -19,7 +19,7 @@
1919
using Windows.UI.Xaml.Shapes;
2020
#endif
2121

22-
namespace CommunityToolkit.Labs.WinUI;
22+
namespace CommunityToolkit.WinUI.Controls;
2323

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

components/Shimmer/src/Shimmer/Shimmer.xaml

Lines changed: 4 additions & 4 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:labs="using:CommunityToolkit.Labs.WinUI">
4+
xmlns:controls="using:CommunityToolkit.WinUI.Controls">
55

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

2323
<Style BasedOn="{StaticResource DefaultShimmerStyle}"
24-
TargetType="labs:Shimmer" />
24+
TargetType="controls:Shimmer" />
2525

2626
<Style x:Key="DefaultShimmerStyle"
27-
TargetType="labs:Shimmer">
27+
TargetType="controls:Shimmer">
2828
<Setter Property="Background" Value="{ThemeResource ShimmerBackground}" />
2929
<Setter Property="CornerRadius" Value="4" />
3030
<Setter Property="MinWidth" Value="40" />
3131
<Setter Property="MinHeight" Value="8" />
3232
<Setter Property="Template">
3333
<Setter.Value>
34-
<ControlTemplate TargetType="labs:Shimmer">
34+
<ControlTemplate TargetType="controls:Shimmer">
3535
<Border x:Name="Shape"
3636
Background="{TemplateBinding Background}"
3737
CornerRadius="{TemplateBinding CornerRadius}" />
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:labs="using:CommunityToolkit.Labs.WinUI">
3+
xmlns:controls="using:CommunityToolkit.WinUI.Controls">
44

55
<ResourceDictionary.MergedDictionaries>
6-
<ResourceDictionary Source="ms-appx:///CommunityToolkit.Labs.WinUI.Shimmer/Shimmer/Shimmer.xaml" />
6+
<ResourceDictionary Source="ms-appx:///CommunityToolkit.WinUI.Controls.Shimmer/Shimmer/Shimmer.xaml" />
77
</ResourceDictionary.MergedDictionaries>
88
</ResourceDictionary>

components/Shimmer/tests/ExampleShimmerTestClass.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-
using CommunityToolkit.Labs.WinUI;
5+
using CommunityToolkit.WinUI.Controls;
66
using CommunityToolkit.Tooling.TestGen;
77
using CommunityToolkit.Tests;
88

components/Shimmer/tests/ExampleShimmerTestPage.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6-
xmlns:labs="using:CommunityToolkit.Labs.WinUI"
6+
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
99
mc:Ignorable="d">
1010

1111
<Grid>
12-
<labs:Shimmer x:Name="ShimmerControl" />
12+
<controls:Shimmer x:Name="ShimmerControl" />
1313
</Grid>
1414
</Page>

0 commit comments

Comments
 (0)