Skip to content

Commit 1935d2c

Browse files
committed
Fix formatting
1 parent c717742 commit 1935d2c

File tree

3 files changed

+30
-27
lines changed

3 files changed

+30
-27
lines changed

src/Files.App.Controls/Themes/Generic.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<ResourceDictionary Source="ms-appx:///Files.App.Controls/GridSplitter/GridSplitter.xaml" />
5555
<!--#endregion-->
5656

57-
<ResourceDictionary Source="ms-appx:///Files.App.Controls/Sidebar/SidebarStyles.xaml"/>
57+
<ResourceDictionary Source="ms-appx:///Files.App.Controls/Sidebar/SidebarStyles.xaml" />
5858

5959
</ResourceDictionary.MergedDictionaries>
6060

src/Files.App/Views/MainPage.xaml

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
x:Class="Files.App.Views.MainPage"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6+
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
67
xmlns:controls="using:Files.App.Controls"
78
xmlns:converters="using:Files.App.Converters"
89
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -13,8 +14,7 @@
1314
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
1415
xmlns:uc="using:Files.App.UserControls"
1516
xmlns:viewmodels="using:Files.App.ViewModels"
16-
xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
17-
xmlns:animatedvisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
17+
xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
1818
AllowDrop="True"
1919
Background="{ThemeResource App.Theme.BackgroundBrush}"
2020
DataContext="{x:Bind ViewModel, Mode=OneWay}"
@@ -259,29 +259,34 @@
259259
</controls:SidebarView.InnerContent>
260260

261261
<controls:SidebarView.Footer>
262-
<StackPanel
263-
Padding="4"
264-
Spacing="4">
265-
<Border HorizontalAlignment="Stretch" Height="1" BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}" BorderThickness="1"/>
262+
<StackPanel Padding="4" Spacing="4">
263+
<Border
264+
Height="1"
265+
HorizontalAlignment="Stretch"
266+
BorderBrush="{ThemeResource ControlStrokeColorDefaultBrush}"
267+
BorderThickness="1" />
266268
<!-- Open the Settings dialog -->
267269
<Button
268270
x:Name="SettingsButton"
271+
Height="32"
272+
HorizontalAlignment="Stretch"
273+
HorizontalContentAlignment="Stretch"
269274
AccessKey="I"
270275
AccessKeyInvoked="SettingsButton_AccessKeyInvoked"
271276
AutomationProperties.AutomationId="SettingsButton"
272277
AutomationProperties.Name="{x:Bind Commands.OpenSettings.Label, Mode=OneWay}"
273278
Command="{x:Bind Commands.OpenSettings, Mode=OneWay}"
274-
Height="32"
275-
HorizontalAlignment="Stretch"
276-
HorizontalContentAlignment="Stretch"
277279
ToolTipService.Placement="Bottom"
278280
ToolTipService.ToolTip="{x:Bind Commands.OpenSettings.LabelWithHotKey, Mode=OneWay}">
279281
<Grid HorizontalAlignment="Stretch">
280282
<Grid.ColumnDefinitions>
281283
<ColumnDefinition Width="Auto" />
282284
<ColumnDefinition Width="*" />
283285
</Grid.ColumnDefinitions>
284-
<AnimatedIcon x:Name="SettingAnimatedIcon" Height="16" Margin="4,0,0,0">
286+
<AnimatedIcon
287+
x:Name="SettingAnimatedIcon"
288+
Height="16"
289+
Margin="4,0,0,0">
285290
<AnimatedIcon.Source>
286291
<animatedvisuals:AnimatedSettingsVisualSource />
287292
</AnimatedIcon.Source>
@@ -290,10 +295,10 @@
290295
</AnimatedIcon.FallbackIconSource>
291296
</AnimatedIcon>
292297

293-
<TextBlock
294-
Grid.Column="1"
298+
<TextBlock
299+
Grid.Column="1"
295300
Margin="16,0,0,0"
296-
Text="{x:Bind Commands.OpenSettings.Label, Mode=OneWay}"/>
301+
Text="{x:Bind Commands.OpenSettings.Label, Mode=OneWay}" />
297302
</Grid>
298303
</Button>
299304
</StackPanel>
Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<Page
3-
x:Class="Files.App.UITests.Views.SidebarViewPage"
4-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
5-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:local="using:Files.App.UITests.Views"
7-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:Files.App.Controls"
9-
mc:Ignorable="d"
10-
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
3+
x:Class="Files.App.UITests.Views.SidebarViewPage"
4+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
5+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6+
xmlns:controls="using:Files.App.Controls"
7+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8+
xmlns:local="using:Files.App.UITests.Views"
9+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
10+
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
11+
mc:Ignorable="d">
1112

12-
13-
<controls:SidebarView x:Name="Sidebar" MenuItemsSource="{x:Bind sidebarModels}">
14-
15-
</controls:SidebarView>
13+
<controls:SidebarView x:Name="Sidebar" MenuItemsSource="{x:Bind sidebarModels}" />
1614
</Page>

0 commit comments

Comments
 (0)