Skip to content

Commit a94fc0b

Browse files
marticlimentmarticliment
committed
Format all XAML documents
1 parent 16118e9 commit a94fc0b

35 files changed

Lines changed: 3040 additions & 1695 deletions

‎src/UniGetUI/App.xaml‎

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<Application
33
x:Class="UniGetUI.MainApp"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:widgets="using:UniGetUI.Interface.Widgets"
7-
xmlns:local="using:UniGetUI">
6+
xmlns:local="using:UniGetUI"
7+
xmlns:widgets="using:UniGetUI.Interface.Widgets">
88
<Application.Resources>
99
<ResourceDictionary>
1010
<ResourceDictionary.MergedDictionaries>
11-
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
12-
<!-- Other merged dictionaries here -->
11+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
12+
<!-- Other merged dictionaries here -->
1313
</ResourceDictionary.MergedDictionaries>
14-
<!-- Other app resources here -->
14+
<!-- Other app resources here -->
1515

16-
<Style TargetType="MenuFlyoutItem" x:Key="BetterMenuItem" BasedOn="{StaticResource DefaultMenuFlyoutItemStyle}">
17-
<Setter Property="CornerRadius" Value="4"/>
18-
<Setter Property="VerticalContentAlignment" Value="Center"/>
19-
<Setter Property="Height" Value="36"/>
16+
<Style
17+
x:Key="BetterMenuItem"
18+
BasedOn="{StaticResource DefaultMenuFlyoutItemStyle}"
19+
TargetType="MenuFlyoutItem">
20+
<Setter Property="CornerRadius" Value="4" />
21+
<Setter Property="VerticalContentAlignment" Value="Center" />
22+
<Setter Property="Height" Value="36" />
2023
</Style>
2124

2225
<FontFamily x:Key="SymbolFont">/Assets/Symbols/Font/fonts/UniGetUI-Symbols.ttf#UniGetUI-Symbols</FontFamily>
2326

2427

25-
<Style TargetType="MenuFlyoutPresenter" x:Name="BetterContextMenu" BasedOn="{StaticResource DefaultMenuFlyoutPresenterStyle}">
26-
<Setter Property="CornerRadius" Value="8"/>
27-
<Setter Property="Margin" Value="0"/>
28-
<Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}"/>
28+
<Style
29+
x:Name="BetterContextMenu"
30+
BasedOn="{StaticResource DefaultMenuFlyoutPresenterStyle}"
31+
TargetType="MenuFlyoutPresenter">
32+
<Setter Property="CornerRadius" Value="8" />
33+
<Setter Property="Margin" Value="0" />
34+
<Setter Property="BorderBrush" Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
2935
</Style>
3036

3137
</ResourceDictionary>

‎src/UniGetUI/Controls/Announcer.xaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<UserControl
33
x:Class="UniGetUI.Interface.Widgets.Announcer"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:local="using:UniGetUI.Interface.Widgets"
76
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:local="using:UniGetUI.Interface.Widgets"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
1010

1111
<Grid TabIndex="99">
1212
<Grid x:Name="g" ColumnSpacing="8">
1313
<Grid.ColumnDefinitions>
14-
<ColumnDefinition Width="*"/>
15-
<ColumnDefinition Width="80"/>
14+
<ColumnDefinition Width="*" />
15+
<ColumnDefinition Width="80" />
1616
</Grid.ColumnDefinitions>
17-
<RichTextBlock x:Name="_textblock" Grid.Column="0" Grid.Row="0" VerticalAlignment="Center"/>
18-
<Image x:Name="_image" Grid.Column="1" Grid.Row="0" Width="80"/>
17+
<RichTextBlock
18+
x:Name="_textblock"
19+
Grid.Row="0"
20+
Grid.Column="0"
21+
VerticalAlignment="Center" />
22+
<Image
23+
x:Name="_image"
24+
Grid.Row="0"
25+
Grid.Column="1"
26+
Width="80" />
1927
</Grid>
2028
</Grid>
2129
</UserControl>

‎src/UniGetUI/Controls/DialogCloseButton.xaml‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,37 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<UserControl
33
x:Class="UniGetUI.Interface.Widgets.DialogCloseButton"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:widgets="using:UniGetUI.Interface.Widgets"
76
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
87
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
mc:Ignorable="d" HorizontalAlignment="Right" VerticalAlignment="Top"
10-
Width="46" Height="31" Padding="0">
8+
xmlns:widgets="using:UniGetUI.Interface.Widgets"
9+
Width="46"
10+
Height="31"
11+
Padding="0"
12+
HorizontalAlignment="Right"
13+
VerticalAlignment="Top"
14+
mc:Ignorable="d">
1115

12-
<Button VerticalAlignment="Stretch" HorizontalAlignment="Stretch" CornerRadius="0,0,0,0"
13-
BorderThickness="0" Width="46" Height="31" Name="CloseButton"
14-
Click="CloseButton_Click"
15-
Padding="0" Background="Transparent">
16+
<Button
17+
Name="CloseButton"
18+
Width="46"
19+
Height="31"
20+
Padding="0"
21+
HorizontalAlignment="Stretch"
22+
VerticalAlignment="Stretch"
23+
Background="Transparent"
24+
BorderThickness="0"
25+
Click="CloseButton_Click"
26+
CornerRadius="0,0,0,0">
1627
<Button.Resources>
17-
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="Red"/>
18-
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="DarkRed"/>
19-
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="White"/>
28+
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="Red" />
29+
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="DarkRed" />
30+
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="White" />
2031
</Button.Resources>
21-
<widgets:LocalIcon Icon="Cross" FontSize="14" Opacity="1"/>
32+
<widgets:LocalIcon
33+
FontSize="14"
34+
Icon="Cross"
35+
Opacity="1" />
2236
</Button>
2337
</UserControl>

‎src/UniGetUI/Controls/NavButton.xaml‎

Lines changed: 45 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8" ?>
22
<UserControl
33
x:Class="UniGetUI.Interface.Widgets.NavButton"
44
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
55
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
6-
xmlns:local="using:UniGetUI.Interface.Widgets"
6+
xmlns:animations="using:CommunityToolkit.WinUI.Animations"
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
8+
xmlns:local="using:UniGetUI.Interface.Widgets"
89
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
9-
mc:Ignorable="d"
10-
Height="Auto" Width="70"
11-
xmlns:widgets="using:UniGetUI.Interface.Widgets" xmlns:animations="using:CommunityToolkit.WinUI.Animations">
10+
xmlns:widgets="using:UniGetUI.Interface.Widgets"
11+
Width="70"
12+
Height="Auto"
13+
mc:Ignorable="d">
1214

1315

1416
<animations:Implicit.ShowAnimations>
15-
<animations:TranslationAnimation Duration="0:0:0.25" From="-100,0,0" To="0"/>
16-
<animations:OpacityAnimation Duration="0:0:0.25" From="0" To="1"/>
17+
<animations:TranslationAnimation
18+
From="-100,0,0"
19+
To="0"
20+
Duration="0:0:0.25" />
21+
<animations:OpacityAnimation
22+
From="0"
23+
To="1"
24+
Duration="0:0:0.25" />
1725
</animations:Implicit.ShowAnimations>
1826

1927
<Grid>
@@ -22,26 +30,35 @@
2230
<animations:OpacityAnimation Duration="0:0:0.25" From="0" To="1"/>
2331
</animations:Implicit.ShowAnimations>
2432
</Border-->
25-
<Grid Margin="1,0,1,0" Padding="0" Name="VariableGrid">
33+
<Grid
34+
Name="VariableGrid"
35+
Margin="1,0,1,0"
36+
Padding="0">
2637
<Grid.RowDefinitions>
27-
<RowDefinition Height="30"/>
28-
<RowDefinition Height="Auto"/>
38+
<RowDefinition Height="30" />
39+
<RowDefinition Height="Auto" />
2940
</Grid.RowDefinitions>
30-
<FontIcon
31-
Grid.Row="0" x:Name="IconBlock"
32-
FontSize="16" VerticalAlignment="Bottom"/>
41+
<FontIcon
42+
x:Name="IconBlock"
43+
Grid.Row="0"
44+
VerticalAlignment="Bottom"
45+
FontSize="16" />
3346
<TextBlock
3447
x:Name="TextBlock"
35-
FontSize="11" Grid.Row="1"
36-
MinHeight="28" VerticalAlignment="Center"
48+
Grid.Row="1"
49+
MinHeight="28"
50+
Padding="0,4,0,4"
3751
HorizontalAlignment="Center"
52+
VerticalAlignment="Center"
53+
FontSize="11"
3854
TextAlignment="Center"
39-
TextWrapping="Wrap" Padding="0,4,0,4"
40-
/>
55+
TextWrapping="Wrap" />
4156
</Grid>
42-
<ToggleButton x:Name="ToggleButton"
43-
x:FieldModifier="public" Foreground="Transparent"
44-
Click="ToggleButton_Click">
57+
<ToggleButton
58+
x:Name="ToggleButton"
59+
x:FieldModifier="public"
60+
Click="ToggleButton_Click"
61+
Foreground="Transparent">
4562
<ToggleButton.Style>
4663
<Style TargetType="ToggleButton">
4764
<Setter Property="Background" Value="{ThemeResource ControlAltFillColorTransparent}" />
@@ -61,26 +78,27 @@
6178
<Setter Property="Template">
6279
<Setter.Value>
6380
<ControlTemplate TargetType="ToggleButton">
64-
<ContentPresenter x:Name="ContentPresenter"
81+
<ContentPresenter
82+
x:Name="ContentPresenter"
83+
Padding="{TemplateBinding Padding}"
84+
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
85+
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
86+
AutomationProperties.AccessibilityView="Raw"
6587
Background="{TemplateBinding Background}"
6688
BackgroundSizing="{TemplateBinding BackgroundSizing}"
6789
BorderBrush="{TemplateBinding BorderBrush}"
6890
BorderThickness="{TemplateBinding BorderThickness}"
6991
Content="{TemplateBinding Content}"
7092
ContentTemplate="{TemplateBinding ContentTemplate}"
7193
ContentTransitions="{TemplateBinding ContentTransitions}"
72-
CornerRadius="{TemplateBinding CornerRadius}"
73-
Padding="{TemplateBinding Padding}"
74-
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
75-
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
76-
AutomationProperties.AccessibilityView="Raw">
94+
CornerRadius="{TemplateBinding CornerRadius}">
7795
<ContentPresenter.BackgroundTransition>
7896
<BrushTransition Duration="0:0:0.083" />
7997
</ContentPresenter.BackgroundTransition>
8098

8199
<VisualStateManager.VisualStateGroups>
82100
<VisualStateGroup x:Name="CommonStates">
83-
<VisualState x:Name="Normal" >
101+
<VisualState x:Name="Normal">
84102
<Storyboard>
85103
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
86104
<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ControlAltFillColorTransparent}" />

0 commit comments

Comments
 (0)