Factor: Xaml formatter auto format all xaml

HO-COOH · Oct 1, 2024 · 719a606 · 719a606
1 parent 22c8545
commit 719a606
Show file tree

Hide file tree

Showing 17 changed files with 1,791 additions and 2,208 deletions.
diff --git a/UWPPackage/Glyphs.xaml b/UWPPackage/Glyphs.xaml
@@ -2,7 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:UWPPackage">
-    
+
     <x:String x:Key="GlobalNavButton">&#xE700;</x:String>
     <x:String x:Key="Wifi">&#xE701;</x:String>
     <x:String x:Key="Bluetooth">&#xE702;</x:String>

diff --git a/UWPPackage/GroupBox_Resource.xaml b/UWPPackage/GroupBox_Resource.xaml
@@ -1,37 +1,68 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:UWPPackage">
     <Style TargetType="local:GroupBox">
-        <Setter Property="BorderBrush" Value="#D5DFE5"/>
-        <Setter Property="BorderThickness" Value="1,0,1,1"/>
+        <Setter Property="BorderBrush" Value="#D5DFE5" />
+        <Setter Property="BorderThickness" Value="1,0,1,1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:GroupBox">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="6"/>
-                            <ColumnDefinition Width="Auto"/>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition Width="6"/>
+                            <ColumnDefinition Width="6" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="6" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                            <RowDefinition Height="6"/>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="6" />
                         </Grid.RowDefinitions>
-                        <Border Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="4" Grid.Column="0" Grid.ColumnSpan="4" Grid.RowSpan="3" Grid.Row="1"/>
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="4" Grid.RowSpan="3" Grid.Row="1"/>
+                        <Border
+                            Grid.Row="1"
+                            Grid.RowSpan="3"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="4"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="Transparent"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4" />
+                        <Border
+                            Grid.Row="1"
+                            Grid.RowSpan="3"
+                            Grid.ColumnSpan="4"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}" />
 
-                        <Border BorderThickness="0,1,0,0" BorderBrush="{TemplateBinding BorderBrush}" Grid.Row="1"/>
-                        <Border BorderThickness="0,1,0,0" BorderBrush="{TemplateBinding BorderBrush}" Grid.Column="2" Grid.ColumnSpan="2" Grid.Row="1"/>
+                        <Border
+                            Grid.Row="1"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="0,1,0,0" />
+                        <Border
+                            Grid.Row="1"
+                            Grid.Column="2"
+                            Grid.ColumnSpan="2"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="0,1,0,0" />
 
-                        <Border x:Name="Header" Grid.Column="1" Padding="3,1,3,0" Grid.RowSpan="2" Grid.Row="0">
-                            <ContentPresenter Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header}"/>
+                        <Border
+                            x:Name="Header"
+                            Grid.Row="0"
+                            Grid.RowSpan="2"
+                            Grid.Column="1"
+                            Padding="3,1,3,0">
+                            <ContentPresenter Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Header}" />
                         </Border>
-                        <ContentPresenter Grid.Column="1" Grid.ColumnSpan="2" Margin="{TemplateBinding Padding}" Grid.Row="2" Content="{TemplateBinding Content}"/>
+                        <ContentPresenter
+                            Grid.Row="2"
+                            Grid.Column="1"
+                            Grid.ColumnSpan="2"
+                            Margin="{TemplateBinding Padding}"
+                            Content="{TemplateBinding Content}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/UWPPackage/IconButton_Resource.xaml b/UWPPackage/IconButton_Resource.xaml
@@ -1,13 +1,13 @@
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:UWPPackage">
 
     <Style TargetType="local:IconButton">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:IconButton">
-                    <Grid x:Name="RootGrid"/>
+                    <Grid x:Name="RootGrid" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>

diff --git a/UWPPackage/MarqueeText_Resource.xaml b/UWPPackage/MarqueeText_Resource.xaml
@@ -1,22 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:local="using:UWPPackage">
+    xmlns:local="using:UWPPackage"
+    xmlns:win="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <Style TargetType="local:MarqueeText">
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="VerticalAlignment" Value="Top" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="local:MarqueeText">
-                    <Grid x:Name="RootGrid" Padding="{TemplateBinding Padding}"
+                    <Grid
+                        x:Name="RootGrid"
+                        Padding="{TemplateBinding Padding}"
                         HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                         VerticalAlignment="{TemplateBinding VerticalAlignment}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
                         CornerRadius="{TemplateBinding CornerRadius}">
+                        <Grid x:Name="MarqueeContainer">
+                            <StackPanel x:Name="MarqueePanel" Orientation="Horizontal">
+                                <StackPanel.RenderTransform>
+                                    <TranslateTransform x:Name="MarqueeTransform" />
+                                </StackPanel.RenderTransform>
+                                <TextBlock
+                                    x:Name="Segment1"
+                                    win:FontStretch="{TemplateBinding FontStretch}"
+                                    CharacterSpacing="{TemplateBinding CharacterSpacing}"
+                                    FontFamily="{TemplateBinding FontFamily}"
+                                    FontSize="{TemplateBinding FontSize}"
+                                    FontStyle="{TemplateBinding FontStyle}"
+                                    FontWeight="{TemplateBinding FontWeight}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    Text="{TemplateBinding Text}" />
+                                <TextBlock
+                                    x:Name="Segment2"
+                                    win:FontStretch="{TemplateBinding FontStretch}"
+                                    CharacterSpacing="{TemplateBinding CharacterSpacing}"
+                                    FontFamily="{TemplateBinding FontFamily}"
+                                    FontSize="{TemplateBinding FontSize}"
+                                    FontStyle="{TemplateBinding FontStyle}"
+                                    FontWeight="{TemplateBinding FontWeight}"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    Text="{TemplateBinding Text}" />
+                            </StackPanel>
+                        </Grid>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="MarqueeStateGroup">
                                 <VisualState x:Name="MarqueeActive" />
@@ -50,7 +79,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                             <VisualStateGroup x:Name="BehaviorStateGroup">
-                                <VisualState x:Name="EmptyBehaviorState"/>
+                                <VisualState x:Name="EmptyBehaviorState" />
                                 <VisualState x:Name="Ticker">
                                     <VisualState.Setters>
                                         <Setter Target="Segment1.Padding" Value="0" />
@@ -68,32 +97,6 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-
-                        <Grid x:Name="MarqueeContainer">
-                            <StackPanel x:Name="MarqueePanel" Orientation="Horizontal">
-                                <StackPanel.RenderTransform>
-                                    <TranslateTransform x:Name="MarqueeTransform" />
-                                </StackPanel.RenderTransform>
-                                <TextBlock x:Name="Segment1"
-                             win:FontStretch="{TemplateBinding FontStretch}"
-                             CharacterSpacing="{TemplateBinding CharacterSpacing}"
-                             FontFamily="{TemplateBinding FontFamily}"
-                             FontSize="{TemplateBinding FontSize}"
-                             FontStyle="{TemplateBinding FontStyle}"
-                             FontWeight="{TemplateBinding FontWeight}"
-                             Foreground="{TemplateBinding Foreground}"
-                             Text="{TemplateBinding Text}" />
-                                <TextBlock x:Name="Segment2"
-                             win:FontStretch="{TemplateBinding FontStretch}"
-                             CharacterSpacing="{TemplateBinding CharacterSpacing}"
-                             FontFamily="{TemplateBinding FontFamily}"
-                             FontSize="{TemplateBinding FontSize}"
-                             FontStyle="{TemplateBinding FontStyle}"
-                             FontWeight="{TemplateBinding FontWeight}"
-                             Foreground="{TemplateBinding Foreground}"
-                             Text="{TemplateBinding Text}" />
-                            </StackPanel>
-                        </Grid>
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>

diff --git a/UWPPackage/ProgressBarEx_Resource.xaml b/UWPPackage/ProgressBarEx_Resource.xaml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8" ?>
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,8 +8,8 @@
             <Setter.Value>
                 <ControlTemplate TargetType="local:ProgressBarEx">
                     <Grid CornerRadius="{TemplateBinding CornerRadius}">
-                        <Border x:Name="RootBorder" Background="{TemplateBinding Background}"/>
-                        <ContentPresenter Content="{TemplateBinding Content}"/>
+                        <Border x:Name="RootBorder" Background="{TemplateBinding Background}" />
+                        <ContentPresenter Content="{TemplateBinding Content}" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>