Skip to content

Commit

Permalink
Move Shimmer controls into individual namespace
Browse files Browse the repository at this point in the history
  • Loading branch information
Lamparter committed Dec 26, 2024
1 parent e7be5a2 commit a504c06
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;

namespace FluentHub.App.UserControls
namespace FluentHub.App.Controls
{
public partial class Shimmer : Control
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using System.Numerics;
using Windows.UI;

namespace FluentHub.App.UserControls
namespace FluentHub.App.Controls
{
/// <summary>
/// A generic shimmer control that can be used to construct a beautiful loading effect.
Expand Down
6 changes: 3 additions & 3 deletions src/FluentHub.App/Styles/ShimmerStyles.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:uc="using:FluentHub.App.UserControls">
xmlns:fhctl="using:FluentHub.App.Controls">

<Style TargetType="uc:Shimmer">
<Style TargetType="fhctl:Shimmer">
<Setter Property="CornerRadius" Value="4" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="uc:Shimmer">
<ControlTemplate TargetType="fhctl:Shimmer">
<Border
x:Name="Shape"
Background="{TemplateBinding Background}"
Expand Down
12 changes: 6 additions & 6 deletions src/FluentHub.App/UserControls/Overview/PullRequestOverview.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:primer="using:FluentHub.App.UserControls.PrimerControls"
xmlns:toolkit="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:uc="using:FluentHub.App.UserControls"
xmlns:fhctl="using:FluentHub.App.Controls"
xmlns:wctconverters="using:CommunityToolkit.WinUI.UI.Converters"
DataContext="{x:Bind ViewModel, Mode=OneWay}"
mc:Ignorable="d">
Expand Down Expand Up @@ -44,7 +44,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<uc:Shimmer
<fhctl:Shimmer
x:Name="TitleBoxShimmer"
MinHeight="40"
HorizontalAlignment="Stretch"
Expand All @@ -70,7 +70,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<uc:Shimmer
<fhctl:Shimmer
x:Name="PullRequestStateBoxShimmer"
Grid.Column="0"
MinWidth="64"
Expand Down Expand Up @@ -117,7 +117,7 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>

<uc:Shimmer
<fhctl:Shimmer
x:Name="HeadRefBranchBoxShimmer"
Grid.Column="0"
MinWidth="64"
Expand Down Expand Up @@ -153,7 +153,7 @@

</Grid>

<uc:Shimmer
<fhctl:Shimmer
x:Name="BranchMergeDirectionIndicatorFontIconShimmer"
Grid.Column="1"
MinWidth="24"
Expand All @@ -170,7 +170,7 @@
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
Glyph="&#xE72A;" />

<uc:Shimmer
<fhctl:Shimmer
x:Name="BaseRefBranchBoxShimmer"
Grid.Column="2"
MinWidth="64"
Expand Down

0 comments on commit a504c06

Please sign in to comment.