Skip to content

Commit 71cc642

Browse files
0x5bfa0x5bfa
committed
Fixed namespacing
1 parent 8ad604f commit 71cc642

File tree

7 files changed

+63
-67
lines changed

7 files changed

+63
-67
lines changed

‎src/Files.App.Controls/SamplePanel/SamplePanel.Properties.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.UI.Xaml;
66
using Microsoft.UI.Xaml.Controls;
77

8-
namespace Files.App.UITests.Controls
8+
namespace Files.App.Controls
99
{
1010
public sealed partial class SamplePanel
1111
{

‎src/Files.App.Controls/SamplePanel/SamplePanel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using Microsoft.UI.Xaml.Controls;
66
using Microsoft.UI.Xaml.Markup;
77

8-
namespace Files.App.UITests.Controls
8+
namespace Files.App.Controls
99
{
1010
// Visual states
1111
[TemplateVisualState(GroupName = "SideContentVisibilityStates", Name = "NothingToShowTextCollapsed")]

‎src/Files.App.Controls/SamplePanel/SamplePanel.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ResourceDictionary
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5-
xmlns:local="using:Files.App.UITests.Controls">
5+
xmlns:local="using:Files.App.Controls">
66

77
<x:Double x:Key="SamplePanelSideContentWidth">360</x:Double>
88
<Thickness x:Key="SamplePanelPadding">24</Thickness>

‎tests/Files.App.UITests/Views/OmnibarPage.xaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:controls="using:Files.App.Controls"
7-
xmlns:controls2="using:Files.App.UITests.Controls"
87
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
98
xmlns:data="using:Files.App.UITests.Data"
109
xmlns:local="using:Files.App.UITests.Views"
@@ -13,8 +12,8 @@
1312

1413
<StackPanel Padding="36" Spacing="24">
1514

16-
<controls2:SamplePanel Header="Default usage">
17-
<controls2:SamplePanel.MainContent>
15+
<controls:SamplePanel Header="Default usage">
16+
<controls:SamplePanel.MainContent>
1817
<controls:Omnibar HorizontalAlignment="Stretch" VerticalAlignment="Center">
1918

2019
<controls:OmnibarMode
@@ -107,8 +106,8 @@
107106
</controls:OmnibarMode>
108107

109108
</controls:Omnibar>
110-
</controls2:SamplePanel.MainContent>
111-
</controls2:SamplePanel>
109+
</controls:SamplePanel.MainContent>
110+
</controls:SamplePanel>
112111

113112
</StackPanel>
114113
</Page>

‎tests/Files.App.UITests/Views/StorageControlsPage.xaml‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:controls="using:Files.App.Controls"
7-
xmlns:controls2="using:Files.App.UITests.Controls"
87
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
98
xmlns:local="using:Files.App.UITests.Views"
109
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,8 +12,8 @@
1312
<StackPanel Padding="36" Spacing="24">
1413

1514
<!-- Storage Ring -->
16-
<controls2:SamplePanel Header="Storage Ring">
17-
<controls2:SamplePanel.MainContent>
15+
<controls:SamplePanel Header="Storage Ring">
16+
<controls:SamplePanel.MainContent>
1817
<Grid>
1918
<Grid.ColumnDefinitions>
2019
<ColumnDefinition Width="Auto" />
@@ -165,8 +164,8 @@
165164
</Grid>
166165

167166
</Grid>
168-
</controls2:SamplePanel.MainContent>
169-
<controls2:SamplePanel.SideContent>
167+
</controls:SamplePanel.MainContent>
168+
<controls:SamplePanel.SideContent>
170169
<StackPanel Spacing="12">
171170

172171
<NumberBox
@@ -240,12 +239,12 @@
240239
Value="4" />
241240
</Grid>
242241
</StackPanel>
243-
</controls2:SamplePanel.SideContent>
244-
</controls2:SamplePanel>
242+
</controls:SamplePanel.SideContent>
243+
</controls:SamplePanel>
245244

246245
<!-- Storage Bar -->
247-
<controls2:SamplePanel Header="Storage Bar">
248-
<controls2:SamplePanel.MainContent>
246+
<controls:SamplePanel Header="Storage Bar">
247+
<controls:SamplePanel.MainContent>
249248
<Grid>
250249
<Grid.ColumnDefinitions>
251250
<ColumnDefinition Width="Auto" />
@@ -401,8 +400,8 @@
401400
</Grid>
402401

403402
</Grid>
404-
</controls2:SamplePanel.MainContent>
405-
<controls2:SamplePanel.SideContent>
403+
</controls:SamplePanel.MainContent>
404+
<controls:SamplePanel.SideContent>
406405
<StackPanel Spacing="12">
407406

408407
<Slider
@@ -452,8 +451,8 @@
452451

453452
</Grid>
454453
</StackPanel>
455-
</controls2:SamplePanel.SideContent>
456-
</controls2:SamplePanel>
454+
</controls:SamplePanel.SideContent>
455+
</controls:SamplePanel>
457456

458457
</StackPanel>
459458
</Page>

‎tests/Files.App.UITests/Views/ThemedIconPage.xaml‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:controls="using:Files.App.Controls"
7-
xmlns:controls2="using:Files.App.UITests.Controls"
87
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
98
xmlns:local="using:Files.App.UITests.Views"
109
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -22,8 +21,8 @@
2221
<StackPanel Padding="36" Spacing="24">
2322

2423
<!-- Icon Types and Colors -->
25-
<controls2:SamplePanel Header="Icon Types and Colors">
26-
<controls2:SamplePanel.MainContent>
24+
<controls:SamplePanel Header="Icon Types and Colors">
25+
<controls:SamplePanel.MainContent>
2726
<Grid ColumnSpacing="16" RowSpacing="12">
2827
<Grid.RowDefinitions>
2928
<RowDefinition Height="Auto" />
@@ -299,12 +298,12 @@
299298
</controls:ThemedIcon>
300299

301300
</Grid>
302-
</controls2:SamplePanel.MainContent>
303-
</controls2:SamplePanel>
301+
</controls:SamplePanel.MainContent>
302+
</controls:SamplePanel>
304303

305304
<!-- Toggled usages -->
306-
<controls2:SamplePanel Header="Toggled usages">
307-
<controls2:SamplePanel.MainContent>
305+
<controls:SamplePanel Header="Toggled usages">
306+
<controls:SamplePanel.MainContent>
308307
<Grid ColumnSpacing="24" RowSpacing="24">
309308
<Grid.RowDefinitions>
310309
<RowDefinition />
@@ -433,8 +432,8 @@
433432
</StackPanel>
434433

435434
</Grid>
436-
</controls2:SamplePanel.MainContent>
437-
<controls2:SamplePanel.SideContent>
435+
</controls:SamplePanel.MainContent>
436+
<controls:SamplePanel.SideContent>
438437
<StackPanel>
439438

440439
<ToggleSwitch
@@ -450,12 +449,12 @@
450449
OnContent="Filled" />
451450

452451
</StackPanel>
453-
</controls2:SamplePanel.SideContent>
454-
</controls2:SamplePanel>
452+
</controls:SamplePanel.SideContent>
453+
</controls:SamplePanel>
455454

456455
<!-- ToggleBehaviour Auto -->
457-
<controls2:SamplePanel Header="ToggleBehaviour Auto">
458-
<controls2:SamplePanel.MainContent>
456+
<controls:SamplePanel Header="ToggleBehaviour Auto">
457+
<controls:SamplePanel.MainContent>
459458
<Grid ColumnSpacing="24" RowSpacing="24">
460459
<Grid.RowDefinitions>
461460
<RowDefinition />
@@ -630,8 +629,8 @@
630629
</StackPanel>
631630

632631
</Grid>
633-
</controls2:SamplePanel.MainContent>
634-
<controls2:SamplePanel.SideContent>
632+
</controls:SamplePanel.MainContent>
633+
<controls:SamplePanel.SideContent>
635634
<StackPanel>
636635

637636
<ToggleSwitch
@@ -647,12 +646,12 @@
647646
OnContent="Enabled" />
648647

649648
</StackPanel>
650-
</controls2:SamplePanel.SideContent>
651-
</controls2:SamplePanel>
649+
</controls:SamplePanel.SideContent>
650+
</controls:SamplePanel>
652651

653652
<!-- ToggleBehaviour Off -->
654-
<controls2:SamplePanel Header="ToggleBehaviour Off">
655-
<controls2:SamplePanel.MainContent>
653+
<controls:SamplePanel Header="ToggleBehaviour Off">
654+
<controls:SamplePanel.MainContent>
656655
<Grid ColumnSpacing="24" RowSpacing="24">
657656
<Grid.RowDefinitions>
658657
<RowDefinition />
@@ -849,8 +848,8 @@
849848
</StackPanel>
850849

851850
</Grid>
852-
</controls2:SamplePanel.MainContent>
853-
<controls2:SamplePanel.SideContent>
851+
</controls:SamplePanel.MainContent>
852+
<controls:SamplePanel.SideContent>
854853
<StackPanel>
855854

856855
<ToggleSwitch
@@ -866,12 +865,12 @@
866865
OnContent="Enabled" />
867866

868867
</StackPanel>
869-
</controls2:SamplePanel.SideContent>
870-
</controls2:SamplePanel>
868+
</controls:SamplePanel.SideContent>
869+
</controls:SamplePanel>
871870

872871
<!-- Resizing -->
873-
<controls2:SamplePanel Header="">
874-
<controls2:SamplePanel.MainContent>
872+
<controls:SamplePanel Header="">
873+
<controls:SamplePanel.MainContent>
875874
<Grid ColumnSpacing="24" RowSpacing="24">
876875

877876
<Grid.RowDefinitions>
@@ -937,8 +936,8 @@
937936
</controls:ThemedIcon>
938937

939938
</Grid>
940-
</controls2:SamplePanel.MainContent>
941-
<controls2:SamplePanel.SideContent>
939+
</controls:SamplePanel.MainContent>
940+
<controls:SamplePanel.SideContent>
942941
<StackPanel>
943942

944943
<NumberBox
@@ -952,8 +951,8 @@
952951
Value="40" />
953952

954953
</StackPanel>
955-
</controls2:SamplePanel.SideContent>
956-
</controls2:SamplePanel>
954+
</controls:SamplePanel.SideContent>
955+
</controls:SamplePanel>
957956

958957
</StackPanel>
959958
</Page>

‎tests/Files.App.UITests/Views/ToolbarPage.xaml‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
77
xmlns:controls="using:Files.App.Controls"
8-
xmlns:controls2="using:Files.App.UITests.Controls"
98
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
109
xmlns:local="using:Files.App.UITests.Views"
1110
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -14,8 +13,8 @@
1413
<StackPanel Padding="36" Spacing="24">
1514

1615
<!-- CommandBar -->
17-
<controls2:SamplePanel Header="CommandBar (for comparison)">
18-
<controls2:SamplePanel.MainContent>
16+
<controls:SamplePanel Header="CommandBar (for comparison)">
17+
<controls:SamplePanel.MainContent>
1918
<CommandBar
2019
Width="Auto"
2120
DefaultLabelPosition="Collapsed"
@@ -37,12 +36,12 @@
3736
</AppBarButton>
3837
</CommandBar.SecondaryCommands>
3938
</CommandBar>
40-
</controls2:SamplePanel.MainContent>
41-
</controls2:SamplePanel>
39+
</controls:SamplePanel.MainContent>
40+
</controls:SamplePanel>
4241

4342
<!-- Toolbar -->
44-
<controls2:SamplePanel Header="Toolbar">
45-
<controls2:SamplePanel.MainContent>
43+
<controls:SamplePanel Header="Toolbar">
44+
<controls:SamplePanel.MainContent>
4645
<controls:Toolbar x:Name="testToolbar" ToolbarSize="Medium">
4746
<controls:Toolbar.Items>
4847
<controls:ToolbarItem
@@ -87,12 +86,12 @@
8786
</DataTemplate>
8887
</controls:Toolbar.ItemTemplate>
8988
</controls:Toolbar>
90-
</controls2:SamplePanel.MainContent>
91-
</controls2:SamplePanel>
89+
</controls:SamplePanel.MainContent>
90+
</controls:SamplePanel>
9291

9392
<!-- Toolbar Button -->
94-
<controls2:SamplePanel Header="Toolbar Button">
95-
<controls2:SamplePanel.MainContent>
93+
<controls:SamplePanel Header="Toolbar Button">
94+
<controls:SamplePanel.MainContent>
9695
<StackPanel Orientation="Horizontal" Spacing="4">
9796

9897
<controls:ToolbarButton
@@ -130,12 +129,12 @@
130129
</controls:ToolbarButton>
131130

132131
</StackPanel>
133-
</controls2:SamplePanel.MainContent>
134-
</controls2:SamplePanel>
132+
</controls:SamplePanel.MainContent>
133+
</controls:SamplePanel>
135134

136135
<!-- Toolbar ToggleButton -->
137-
<controls2:SamplePanel Header="">
138-
<controls2:SamplePanel.MainContent>
136+
<controls:SamplePanel Header="">
137+
<controls:SamplePanel.MainContent>
139138
<StackPanel Orientation="Horizontal" Spacing="4">
140139

141140
<controls:ToolbarToggleButton
@@ -210,8 +209,8 @@
210209
</controls:ToolbarToggleButton>
211210

212211
</StackPanel>
213-
</controls2:SamplePanel.MainContent>
214-
</controls2:SamplePanel>
212+
</controls:SamplePanel.MainContent>
213+
</controls:SamplePanel>
215214

216215
</StackPanel>
217216
</Page>

0 commit comments

Comments
 (0)