Skip to content

Code Quality: Replaced Shimmer control with official version from WCT #16926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2025
Merged

Code Quality: Replaced Shimmer control with official version from WCT #16926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<PackageVersion Include="ColorCode.WinUI" Version="2.0.15" />
<PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.250206-build.2040" />
<PackageVersion Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" Version="0.1.250206-build.2040" />
<PackageVersion Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.250206-build.2040" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageVersion Include="CommunityToolkit.WinUI.Behaviors" Version="8.2.250129-preview2" />
<PackageVersion Include="CommunityToolkit.WinUI.Controls.ColorPicker" Version="8.2.250129-preview2" />
Expand Down
1 change: 1 addition & 0 deletions src/Files.App/Files.App.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
<PackageReference Include="ColorCode.WinUI" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.DependencyPropertyGenerator" />
<PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" />
<PackageReference Include="CommunityToolkit.Mvvm" />
<PackageReference Include="CommunityToolkit.WinUI.Behaviors" />
<PackageReference Include="CommunityToolkit.WinUI.Controls.ColorPicker" />
Expand Down
10 changes: 5 additions & 5 deletions src/Files.App/Styles/ShimmerStyles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
<!-- Copyright (c) Files Community. Licensed under the MIT License. -->
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uc="using:Files.App.UserControls">
xmlns:wctlabs="using:CommunityToolkit.Labs.WinUI">

<Style TargetType="uc:Shimmer">
<Style TargetType="wctlabs:Shimmer">
<Setter Property="CornerRadius" Value="4" />
<Setter Property="MinWidth" Value="8" />
<Setter Property="MinHeight" Value="8" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="uc:Shimmer">
<ControlTemplate TargetType="wctlabs:Shimmer">
<Border
x:Name="Shape"
Background="{TemplateBinding Background}"
Expand All @@ -20,4 +20,4 @@
</Setter>
</Style>

</ResourceDictionary>
</ResourceDictionary>
63 changes: 0 additions & 63 deletions src/Files.App/UserControls/Shimmer/Shimmer.Properties.cs
View file
Open in desktop

This file was deleted.

215 changes: 0 additions & 215 deletions src/Files.App/UserControls/Shimmer/Shimmer.cs
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion src/Files.App/Views/Layouts/ColumnLayoutPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
xmlns:uc="using:Files.App.UserControls"
xmlns:wct="using:CommunityToolkit.WinUI"
xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
xmlns:wctlabs="using:CommunityToolkit.Labs.WinUI"
x:Name="PageRoot"
HighContrastAdjustment="None"
mc:Ignorable="d">
Expand Down Expand Up @@ -242,7 +243,7 @@
</ContentPresenter>

<!-- Loading indicator -->
<uc:Shimmer
<wctlabs:Shimmer
x:Name="TypeUnknownGlyph"
Margin="2"
x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
Expand Down
3 changes: 2 additions & 1 deletion src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
xmlns:uc="using:Files.App.UserControls"
xmlns:wct="using:CommunityToolkit.WinUI"
xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
xmlns:wctlabs="using:CommunityToolkit.Labs.WinUI"
x:Name="PageRoot"
NavigationCacheMode="Enabled"
mc:Ignorable="d">
Expand Down Expand Up @@ -931,7 +932,7 @@
</ContentPresenter>

<!-- Loading indicator -->
<uc:Shimmer
<wctlabs:Shimmer
x:Name="TypeUnknownGlyph"
Margin="2"
x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
Expand Down
7 changes: 4 additions & 3 deletions src/Files.App/Views/Layouts/GridLayoutPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
xmlns:uc="using:Files.App.UserControls"
xmlns:wctanimations="using:CommunityToolkit.WinUI.Animations"
xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
xmlns:wctlabs="using:CommunityToolkit.Labs.WinUI"
x:Name="PageRoot"
NavigationCacheMode="Enabled"
mc:Ignorable="d">
Expand Down Expand Up @@ -127,7 +128,7 @@
</ContentPresenter>

<!-- Loading indicator -->
<uc:Shimmer
<wctlabs:Shimmer
x:Name="TypeUnknownGlyph"
Margin="12"
x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
Expand Down Expand Up @@ -319,7 +320,7 @@
</ContentPresenter>

<!-- Loading indicator -->
<uc:Shimmer
<wctlabs:Shimmer
x:Name="TypeUnknownGlyph"
Margin="2"
x:Load="{x:Bind NeedsPlaceholderGlyph, Mode=OneWay}" />
Expand Down Expand Up @@ -467,7 +468,7 @@
</ContentPresenter>

<!-- Loading indicator -->
<uc:Shimmer
<wctlabs:Shimmer
x:Name="TypeUnknownGlyph"
Width="{Binding ElementName=PageRoot, Path=CardsViewIconSize, Mode=OneWay}"
Height="{Binding ElementName=PageRoot, Path=CardsViewIconSize, Mode=OneWay}"
Expand Down
Loading