Skip to content

Commit 663d4c8

Browse files
yaira2yaira2
committed
Fixed xaml formatting
1 parent 747dc7e commit 663d4c8

File tree

6 files changed

+103
-101
lines changed

6 files changed

+103
-101
lines changed

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

Lines changed: 85 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:controls="using:Files.App.Controls">
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:controls="using:Files.App.Controls">
45

5-
<Style x:Key="HorizontalGridView"
6-
TargetType="GridView">
6+
<Style x:Key="HorizontalGridView" TargetType="GridView">
77
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
88
<Setter Property="ScrollViewer.HorizontalScrollMode" Value="Enabled" />
99
<Setter Property="ScrollViewer.VerticalScrollMode" Value="Disabled" />
@@ -43,23 +43,25 @@
4343
<Setter Property="Template">
4444
<Setter.Value>
4545
<ControlTemplate TargetType="controls:BladeView">
46-
<Border Background="{TemplateBinding Background}"
47-
BorderBrush="{TemplateBinding BorderBrush}"
48-
BorderThickness="{TemplateBinding BorderThickness}">
49-
<ScrollViewer x:Name="ScrollViewer"
50-
AutomationProperties.AccessibilityView="Raw"
51-
BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
52-
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
53-
HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
54-
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
55-
IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
56-
IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}"
57-
IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
58-
IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}"
59-
TabNavigation="{TemplateBinding TabNavigation}"
60-
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
61-
VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
62-
ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
46+
<Border
47+
Background="{TemplateBinding Background}"
48+
BorderBrush="{TemplateBinding BorderBrush}"
49+
BorderThickness="{TemplateBinding BorderThickness}">
50+
<ScrollViewer
51+
x:Name="ScrollViewer"
52+
AutomationProperties.AccessibilityView="Raw"
53+
BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}"
54+
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
55+
HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
56+
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
57+
IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}"
58+
IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}"
59+
IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}"
60+
IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}"
61+
TabNavigation="{TemplateBinding TabNavigation}"
62+
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
63+
VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
64+
ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
6365
<ItemsPresenter Padding="{TemplateBinding Padding}" />
6466
</ScrollViewer>
6567
<VisualStateManager.VisualStateGroups>
@@ -68,10 +70,8 @@
6870

6971
<VisualState x:Name="FullScreen">
7072
<Storyboard>
71-
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ScrollViewer"
72-
Storyboard.TargetProperty="HorizontalSnapPointsType">
73-
<DiscreteObjectKeyFrame KeyTime="0"
74-
Value="Mandatory" />
73+
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ScrollViewer" Storyboard.TargetProperty="HorizontalSnapPointsType">
74+
<DiscreteObjectKeyFrame KeyTime="0" Value="Mandatory" />
7575
</ObjectAnimationUsingKeyFrames>
7676
</Storyboard>
7777
</VisualState>
@@ -102,84 +102,89 @@
102102
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
103103
<Setter Property="BorderThickness" Value="1" />
104104
<Setter Property="IsTabStop" Value="False" />
105-
<Setter Property="IsExpanded" Value="True"/>
105+
<Setter Property="IsExpanded" Value="True" />
106106
<Setter Property="Width" Value="320" />
107107
<Setter Property="HeaderTemplate">
108108
<Setter.Value>
109109
<DataTemplate>
110110
<TextBlock
111-
Text="{Binding}"
112-
Margin="12,7,0,9"
113-
VerticalAlignment="Center" />
111+
Margin="12,7,0,9"
112+
VerticalAlignment="Center"
113+
Text="{Binding}" />
114114
</DataTemplate>
115115
</Setter.Value>
116116
</Setter>
117117
<Setter Property="Template">
118118
<Setter.Value>
119119
<ControlTemplate TargetType="controls:BladeItem">
120-
<Grid BorderBrush="{TemplateBinding BorderBrush}"
121-
BorderThickness="{TemplateBinding BorderThickness}"
122-
Width="{TemplateBinding Width}">
123-
<VisualStateManager.VisualStateGroups>
124-
<VisualStateGroup x:Name="ExpandedStates">
125-
<VisualState x:Name="Expanded"/>
126-
<VisualState x:Name="Collapsed">
127-
<VisualState.Setters>
128-
<Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
129-
<Setter Target="EnlargeButton.Content" Value="&#xE740;" />
130-
</VisualState.Setters>
131-
</VisualState>
132-
</VisualStateGroup>
133-
</VisualStateManager.VisualStateGroups>
134-
120+
<Grid
121+
Width="{TemplateBinding Width}"
122+
BorderBrush="{TemplateBinding BorderBrush}"
123+
BorderThickness="{TemplateBinding BorderThickness}">
135124
<Grid.RowDefinitions>
136125
<RowDefinition Height="Auto" />
137126
<RowDefinition Height="*" />
138127
</Grid.RowDefinitions>
139128

140-
<Grid Background="{TemplateBinding TitleBarBackground}"
141-
Visibility="{TemplateBinding TitleBarVisibility}"
142-
Height="32">
129+
<Grid
130+
Height="32"
131+
Background="{TemplateBinding TitleBarBackground}"
132+
Visibility="{TemplateBinding TitleBarVisibility}">
143133
<Grid.ColumnDefinitions>
144134
<ColumnDefinition Width="*" />
145135
<ColumnDefinition Width="Auto" />
146136
<ColumnDefinition Width="Auto" />
147137
</Grid.ColumnDefinitions>
148138

149-
<ContentPresenter x:Name="TitleBar"
150-
Content="{TemplateBinding Header}"
151-
ContentTemplate="{TemplateBinding HeaderTemplate}"/>
152-
<Button Name="EnlargeButton"
153-
Grid.Column="1"
154-
TabIndex="0"
155-
HorizontalAlignment="Right"
156-
Background="{TemplateBinding CloseButtonBackground}"
157-
Style="{StaticResource ButtonRevealStyle}"
158-
BorderThickness="1"
159-
VerticalAlignment="Stretch"
160-
Content="&#xE73F;"
161-
FontFamily="Segoe MDL2 Assets"
162-
FontSize="14"
163-
Foreground="{TemplateBinding CloseButtonForeground}" />
164-
<Button Name="CloseButton"
165-
Grid.Column="2"
166-
TabIndex="0"
167-
HorizontalAlignment="Right"
168-
Background="{TemplateBinding CloseButtonBackground}"
169-
Style="{StaticResource ButtonRevealStyle}"
170-
BorderThickness="1"
171-
VerticalAlignment="Stretch"
172-
Content="&#xE711;"
173-
FontFamily="Segoe MDL2 Assets"
174-
FontSize="14"
175-
Foreground="{TemplateBinding CloseButtonForeground}" />
139+
<ContentPresenter
140+
x:Name="TitleBar"
141+
Content="{TemplateBinding Header}"
142+
ContentTemplate="{TemplateBinding HeaderTemplate}" />
143+
<Button
144+
Name="EnlargeButton"
145+
Grid.Column="1"
146+
HorizontalAlignment="Right"
147+
VerticalAlignment="Stretch"
148+
Background="{TemplateBinding CloseButtonBackground}"
149+
BorderThickness="1"
150+
Content="&#xE73F;"
151+
FontFamily="Segoe MDL2 Assets"
152+
FontSize="14"
153+
Foreground="{TemplateBinding CloseButtonForeground}"
154+
Style="{StaticResource ButtonRevealStyle}"
155+
TabIndex="0" />
156+
<Button
157+
Name="CloseButton"
158+
Grid.Column="2"
159+
HorizontalAlignment="Right"
160+
VerticalAlignment="Stretch"
161+
Background="{TemplateBinding CloseButtonBackground}"
162+
BorderThickness="1"
163+
Content="&#xE711;"
164+
FontFamily="Segoe MDL2 Assets"
165+
FontSize="14"
166+
Foreground="{TemplateBinding CloseButtonForeground}"
167+
Style="{StaticResource ButtonRevealStyle}"
168+
TabIndex="0" />
176169
</Grid>
177170

178-
<ContentPresenter x:Name="ContentPresenter"
179-
Grid.Row="1"
180-
VerticalAlignment="Stretch"
181-
Background="{TemplateBinding Background}"
182-
Visibility="{TemplateBinding IsOpen}" />
171+
<ContentPresenter
172+
x:Name="ContentPresenter"
173+
Grid.Row="1"
174+
VerticalAlignment="Stretch"
175+
Background="{TemplateBinding Background}"
176+
Visibility="{TemplateBinding IsOpen}" />
177+
<VisualStateManager.VisualStateGroups>
178+
<VisualStateGroup x:Name="ExpandedStates">
179+
<VisualState x:Name="Expanded" />
180+
<VisualState x:Name="Collapsed">
181+
<VisualState.Setters>
182+
<Setter Target="ContentPresenter.Visibility" Value="Collapsed" />
183+
<Setter Target="EnlargeButton.Content" Value="&#xE740;" />
184+
</VisualState.Setters>
185+
</VisualState>
186+
</VisualStateGroup>
187+
</VisualStateManager.VisualStateGroups>
183188
</Grid>
184189
</ControlTemplate>
185190
</Setter.Value>

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3-
xmlns:local="using:Files.App.Controls">
1+
<ResourceDictionary
2+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:local="using:Files.App.Controls">
45

56
<ResourceDictionary.ThemeDictionaries>
67
<ResourceDictionary x:Key="Default">
7-
<SolidColorBrush x:Key="SystemControlSplitterPointerOver"
8-
Color="{ThemeResource SystemBaseLowColor}" />
9-
<SolidColorBrush x:Key="SystemControlSplitterPressed"
10-
Color="{ThemeResource SystemBaseHighColor}" />
8+
<SolidColorBrush x:Key="SystemControlSplitterPointerOver" Color="{ThemeResource SystemBaseLowColor}" />
9+
<SolidColorBrush x:Key="SystemControlSplitterPressed" Color="{ThemeResource SystemBaseHighColor}" />
1110
</ResourceDictionary>
1211
<ResourceDictionary x:Key="HighContrast">
13-
<SolidColorBrush x:Key="SystemControlSplitterPointerOver"
14-
Color="{ThemeResource SystemColorHighlightColor}" />
15-
<SolidColorBrush x:Key="SystemControlSplitterPressed"
16-
Color="{ThemeResource SystemColorHighlightColor}" />
12+
<SolidColorBrush x:Key="SystemControlSplitterPointerOver" Color="{ThemeResource SystemColorHighlightColor}" />
13+
<SolidColorBrush x:Key="SystemControlSplitterPressed" Color="{ThemeResource SystemColorHighlightColor}" />
1714
</ResourceDictionary>
1815
</ResourceDictionary.ThemeDictionaries>
1916

@@ -30,11 +27,11 @@
3027
<Setter Property="Template">
3128
<Setter.Value>
3229
<ControlTemplate TargetType="local:GridSplitter">
33-
<Grid x:Name="RootGrid"
34-
Background="{TemplateBinding Background}">
35-
<ContentPresenter HorizontalContentAlignment="Stretch"
36-
VerticalContentAlignment="Stretch"
37-
Content="{TemplateBinding Element}" />
30+
<Grid x:Name="RootGrid" Background="{TemplateBinding Background}">
31+
<ContentPresenter
32+
HorizontalContentAlignment="Stretch"
33+
VerticalContentAlignment="Stretch"
34+
Content="{TemplateBinding Element}" />
3835
<VisualStateManager.VisualStateGroups>
3936
<VisualStateGroup x:Name="GridSplitterStates">
4037
<VisualState x:Name="Normal" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@
4646
<ResourceDictionary Source="ms-appx:///Files.App.Controls/ThemedIcon/Styles/Icons.SizeLayout28.xaml" />
4747
<!--#endregion-->
4848

49-
<!--#region BladeView -->
49+
<!--#region BladeView-->
5050
<ResourceDictionary Source="ms-appx:///Files.App.Controls/BladeView/BladeView.xaml" />
5151
<!--#endregion-->
5252

53-
<!--#region GridSplitter -->
53+
<!--#region GridSplitter-->
5454
<ResourceDictionary Source="ms-appx:///Files.App.Controls/GridSplitter/GridSplitter.xaml" />
5555
<!--#endregion-->
5656

‎src/Files.App/Views/MainPage.xaml‎

Lines changed: 1 addition & 1 deletion
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:controls="using:Files.App.Controls"
67
xmlns:converters="using:Files.App.Converters"
78
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
89
xmlns:helpers="using:Files.App.Helpers"
@@ -13,7 +14,6 @@
1314
xmlns:tabbar="using:Files.App.UserControls.TabBar"
1415
xmlns:toolkit="using:CommunityToolkit.WinUI.Controls"
1516
xmlns:uc="using:Files.App.UserControls"
16-
xmlns:controls="using:Files.App.Controls"
1717
xmlns:viewmodels="using:Files.App.ViewModels"
1818
xmlns:wctconverters="using:CommunityToolkit.WinUI.Converters"
1919
AllowDrop="True"

‎src/Files.App/Views/Properties/SecurityAdvancedPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
66
xmlns:behaviors="using:Files.App.Data.Behaviors"
7-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
87
xmlns:controls="using:Files.App.Controls"
8+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
99
xmlns:dataitems="using:Files.App.Data.Items"
1010
xmlns:extensions="using:Files.App.Extensions"
1111
xmlns:helpers="using:Files.App.Helpers"

‎src/Files.App/Views/ShellPanesPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
x:Class="Files.App.Views.ShellPanesPage"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6+
xmlns:controls="using:Files.App.Controls"
67
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
78
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8-
xmlns:controls="using:Files.App.Controls"
99
mc:Ignorable="d">
1010

1111
<Page.Resources>

0 commit comments

Comments
 (0)