refactor: format axamls

2026-02-19 08:58:46 +03:00
parent 41e34e05e8
commit 14832e14c5
9 changed files with 289 additions and 172 deletions
@@ -1,13 +1,13 @@
-<Control xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:vm="using:GSS2.UI.Core.ViewModels"
-        x:DataType="vm:CameraViewModel"
-        x:Class="GSS2.UI.Core.Views.CameraView"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        Background="{Binding Background}"
-        StretchMode="{Binding StretchMode}"
-        TileMode="{Binding TileMode}">
-</Control>
+<Control
+    x:Class="GSS2.UI.Core.Views.CameraView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:vm="using:GSS2.UI.Core.ViewModels"
+    HorizontalAlignment="Stretch"
+    VerticalAlignment="Stretch"
+    x:DataType="vm:CameraViewModel"
+    Background="{Binding Background}"
+    StretchMode="{Binding StretchMode}"
+    TileMode="{Binding TileMode}" />
@@ -1,80 +1,89 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:layout="using:Avalonia.Layout"
-             xmlns:local="using:GSS2.UI.Core.Views"
-             xmlns:vm="using:GSS2.UI.Core.ViewModels"
-             xmlns:behaviors="using:GSS2.UI.Core.Behaviors"
-             xmlns:converters="using:GSS2.UI.Core.Converters"
-             xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
-             x:Class="GSS2.UI.Core.Views.IlluminatorControllerView"
-             x:DataType="vm:IlluminatorControllerViewModel">
-  <Grid>
-    <Grid x:Name="HorizontalLayout" IsVisible="{Binding Orientation, Converter={x:Static converters:OrientationToBoolConverter.IsHorizontal}}">
-      <Grid.RowDefinitions>
-          <RowDefinition Height="*" />
-          <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-      <StackPanel Orientation="Horizontal"
-                  HorizontalAlignment="Center"
-                  Spacing="20">
-        <Slider Orientation="Vertical"
-                Minimum="0" Maximum="1"
-                Value="{Binding WhiteIntencity}"
-                VerticalAlignment="Stretch"/>
-        <Slider Orientation="Vertical"
-                Minimum="0" Maximum="1"
-                Value="{Binding Uv365Intencity}"
-                VerticalAlignment="Stretch"/>
-        <Slider Orientation="Vertical"
-                Minimum="0" Maximum="1"
-                Value="{Binding Uv254Intencity}"
-                VerticalAlignment="Stretch"/>
-      </StackPanel>
+<UserControl
+    x:Class="GSS2.UI.Core.Views.IlluminatorControllerView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:behaviors="using:GSS2.UI.Core.Behaviors"
+    xmlns:converters="using:GSS2.UI.Core.Converters"
+    xmlns:layout="using:Avalonia.Layout"
+    xmlns:local="using:GSS2.UI.Core.Views"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
+    xmlns:vm="using:GSS2.UI.Core.ViewModels"
+    x:DataType="vm:IlluminatorControllerViewModel">

-      <ToggleButton Grid.Row="1"
-                    Content="Включить"
-                    IsChecked="{Binding Enabled}"
-                    HorizontalAlignment="Stretch"
-                    HorizontalContentAlignment="Center"
-                    Margin="0,10,0,0"/>
-    </Grid>
+    <UserControl.Styles>
+        <Style Selector="Slider.horizontal">
+            <Setter Property="VerticalAlignment" Value="Stretch" />
+            <Setter Property="Maximum" Value="1" />
+            <Setter Property="Minimum" Value="0" />
+            <Setter Property="Orientation" Value="Vertical" />
+        </Style>
+        <Style Selector="Slider.vertical">
+            <Setter Property="HorizontalAlignment" Value="Stretch" />
+            <Setter Property="Maximum" Value="1" />
+            <Setter Property="Minimum" Value="0" />
+            <Setter Property="Orientation" Value="Horizontal" />
+        </Style>
+    </UserControl.Styles>

+    <Grid>

-    <Grid x:Name="VerticalLayout" IsVisible="{Binding Orientation, Converter={x:Static converters:OrientationToBoolConverter.IsVertical}}">
+        <Grid IsVisible="{Binding Orientation, Converter={x:Static converters:OrientationToBoolConverter.IsHorizontal}}">
        
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="Auto"/>
-        </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>

-        <StackPanel Grid.Column="0"
-                    Orientation="Vertical"
-                    VerticalAlignment="Center"
-                    Spacing="20">
+            <StackPanel
+                HorizontalAlignment="Center"
+                Orientation="Horizontal"
+                Spacing="20">

-            <Slider Orientation="Horizontal"
-                    Minimum="0" Maximum="1"
-                    Value="{Binding WhiteIntencity}"
-                    HorizontalAlignment="Stretch"/>
+                <Slider Classes="horizontal" Value="{Binding WhiteIntencity}" />
+                <Slider Classes="horizontal" Value="{Binding Uv365Intencity}" />
+                <Slider Classes="horizontal" Value="{Binding Uv254Intencity}" />

-            <Slider Orientation="Horizontal"
-                    Minimum="0" Maximum="1"
-                    Value="{Binding Uv365Intencity}"
-                    HorizontalAlignment="Stretch"/>
+            </StackPanel>

-            <Slider Orientation="Horizontal"
-                    Minimum="0" Maximum="1"
-                    Value="{Binding Uv254Intencity}"
-                    HorizontalAlignment="Stretch"/>
+            <ToggleButton
+                Grid.Row="1"
+                Margin="0,10,0,0"
+                HorizontalAlignment="Stretch"
+                HorizontalContentAlignment="Center"
+                Content="Включить"
+                IsChecked="{Binding Enabled}" />

-        </StackPanel>
+        </Grid>
+
+        <Grid IsVisible="{Binding Orientation, Converter={x:Static converters:OrientationToBoolConverter.IsVertical}}">
+
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <StackPanel
+                Grid.Column="0"
+                VerticalAlignment="Center"
+                Orientation="Vertical"
+                Spacing="20">
+
+                <Slider Classes="vertical" Value="{Binding WhiteIntencity}" />
+                <Slider Classes="vertical" Value="{Binding Uv365Intencity}" />
+                <Slider Classes="vertical" Value="{Binding Uv254Intencity}" />
+
+            </StackPanel>
+
+            <ToggleButton
+                Grid.Column="1"
+                Margin="0,0,10,0"
+                VerticalAlignment="Stretch"
+                HorizontalContentAlignment="Center"
+                Content="Включить"
+                IsChecked="{Binding Enabled}" />
+
+        </Grid>

-        <ToggleButton Grid.Column="1"
-                      Content="Включить"
-                      IsChecked="{Binding Enabled}"
-                      VerticalAlignment="Stretch"
-                      HorizontalContentAlignment="Center"
-                      Margin="0,0,10,0"/>
    </Grid>
-  </Grid>
+
 </UserControl>
@@ -1,9 +1,9 @@
-<lvc:PieChart xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:GSS2.UI.Core.ViewModels"
-             xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
-             x:Class="GSS2.UI.Core.Views.ResourceBarView"
-             x:DataType="vm:ResourceBarViewModel"
-             Series="{Binding Series}"
-             Bounds="{Binding Bounds, Mode=OneWayToSource}">
-</lvc:PieChart>
+<lvc:PieChart
+    x:Class="GSS2.UI.Core.Views.ResourceBarView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
+    xmlns:vm="using:GSS2.UI.Core.ViewModels"
+    x:DataType="vm:ResourceBarViewModel"
+    Bounds="{Binding Bounds, Mode=OneWayToSource}"
+    Series="{Binding Series}" />
@@ -1,13 +1,13 @@
-<lvc:CartesianChart xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:vm="using:GSS2.UI.Core.ViewModels"
-             xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
-             x:Class="GSS2.UI.Core.Views.ResourceChartView"
-             x:DataType="vm:ResourceChartViewModel"
-             Series="{Binding Series}" 
-             YAxes="{Binding YAxes}" 
-             XAxes="{Binding XAxes}" 
-             ZoomMode="None" 
-             EasingFunction="{x:Null}"
-             Bounds="{Binding Bounds, Mode=OneWayToSource}">
-</lvc:CartesianChart>
+<lvc:CartesianChart
+    x:Class="GSS2.UI.Core.Views.ResourceChartView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
+    xmlns:vm="using:GSS2.UI.Core.ViewModels"
+    x:DataType="vm:ResourceChartViewModel"
+    Bounds="{Binding Bounds, Mode=OneWayToSource}"
+    EasingFunction="{x:Null}"
+    Series="{Binding Series}"
+    XAxes="{Binding XAxes}"
+    YAxes="{Binding YAxes}"
+    ZoomMode="None" />
@@ -1,27 +1,53 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:GSS2.UI.Core.Views"
-             xmlns:vm="using:GSS2.UI.Core.ViewModels"
-             xmlns:behaviors="using:GSS2.UI.Core.Behaviors"
-             xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
-             x:Class="GSS2.UI.Core.Views.ResourceCpuUsageBarsView"
-             x:DataType="vm:ResourceCpuUsageBarsViewModel"
-             Bounds="{Binding Bounds, Mode=OneWayToSource}">
+<UserControl
+    x:Class="GSS2.UI.Core.Views.ResourceCpuUsageBarsView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:behaviors="using:GSS2.UI.Core.Behaviors"
+    xmlns:local="using:GSS2.UI.Core.Views"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
+    xmlns:vm="using:GSS2.UI.Core.ViewModels"
+    x:DataType="vm:ResourceCpuUsageBarsViewModel"
+    Bounds="{Binding Bounds, Mode=OneWayToSource}">

    <Grid>
+
        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="2*"/>
+            <ColumnDefinition Width="2*" />
            <ColumnDefinition Width="*" behaviors:GridColumnHideBehavior.IsVisible="{Binding IsCoresColumnVisible}" />
            <ColumnDefinition Width="*" behaviors:GridColumnHideBehavior.IsVisible="{Binding IsCoresColumnVisible}" />
        </Grid.ColumnDefinitions>
+
        <Grid.RowDefinitions>
            <RowDefinition Height="*" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>
-        <local:ResourceBarView Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" DataContext="{Binding Cpu}" />
-        <local:ResourceBarView Grid.Row="0" Grid.Column="1" DataContext="{Binding Cpu0}" />
-        <local:ResourceBarView Grid.Row="0" Grid.Column="2" DataContext="{Binding Cpu1}" />
-        <local:ResourceBarView Grid.Row="1" Grid.Column="1" DataContext="{Binding Cpu2}" />
-        <local:ResourceBarView Grid.Row="1" Grid.Column="2" DataContext="{Binding Cpu3}" />
+
+        <local:ResourceBarView
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Grid.Column="0"
+            DataContext="{Binding Cpu}" />
+
+        <local:ResourceBarView
+            Grid.Row="0"
+            Grid.Column="1"
+            DataContext="{Binding Cpu0}" />
+
+        <local:ResourceBarView
+            Grid.Row="0"
+            Grid.Column="2"
+            DataContext="{Binding Cpu1}" />
+
+        <local:ResourceBarView
+            Grid.Row="1"
+            Grid.Column="1"
+            DataContext="{Binding Cpu2}" />
+
+        <local:ResourceBarView
+            Grid.Row="1"
+            Grid.Column="2"
+            DataContext="{Binding Cpu3}" />
+
    </Grid>
+
 </UserControl>
@@ -1,28 +1,33 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="using:GSS2.UI.Core.Views"
-             xmlns:vm="using:GSS2.UI.Core.ViewModels"
-             xmlns:behaviors="using:GSS2.UI.Core.Behaviors"
-             xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
-             x:Class="GSS2.UI.Core.Views.ResourcesView"
-             x:DataType="vm:ResourcesViewModel"
-             Bounds="{Binding Bounds, Mode=OneWayToSource}">
-    <Grid>
-      <Grid.ColumnDefinitions>
-        <ColumnDefinition Width="3*" behaviors:GridColumnHideBehavior.IsVisible="{Binding IsChartsColumnVisible}" />
-        <ColumnDefinition Width="*" behaviors:GridColumnHideBehavior.IsVisible="{Binding IsBarsColumnVisible}" />
-      </Grid.ColumnDefinitions>
+<UserControl
+    x:Class="GSS2.UI.Core.Views.ResourcesView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:behaviors="using:GSS2.UI.Core.Behaviors"
+    xmlns:local="using:GSS2.UI.Core.Views"
+    xmlns:lvc="using:LiveChartsCore.SkiaSharpView.Avalonia"
+    xmlns:vm="using:GSS2.UI.Core.ViewModels"
+    x:DataType="vm:ResourcesViewModel"
+    Bounds="{Binding Bounds, Mode=OneWayToSource}">

-        <Grid RowDefinitions="*,*,*" Column="0">
+    <Grid>
+
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="3*" behaviors:GridColumnHideBehavior.IsVisible="{Binding IsChartsColumnVisible}" />
+            <ColumnDefinition Width="*" behaviors:GridColumnHideBehavior.IsVisible="{Binding IsBarsColumnVisible}" />
+        </Grid.ColumnDefinitions>
+
+        <Grid Column="0" RowDefinitions="*,*,*">
            <local:ResourceChartView Grid.Row="0" DataContext="{Binding CpuUsageChartViewModel}" />
            <local:ResourceChartView Grid.Row="1" DataContext="{Binding CpuTemperatureChartViewModel}" />
            <local:ResourceChartView Grid.Row="2" DataContext="{Binding MemoryUsageChartViewModel}" />
        </Grid>

-        <Grid RowDefinitions="*,*,*" Column="1">
+        <Grid Column="1" RowDefinitions="*,*,*">
            <local:ResourceCpuUsageBarsView Grid.Row="0" DataContext="{Binding CpuUsageBarsViewModel}" />
            <local:ResourceBarView Grid.Row="1" DataContext="{Binding CpuTemperatureBarViewModel}" />
            <local:ResourceBarView Grid.Row="2" DataContext="{Binding MemoryUsageBarViewModel}" />
        </Grid>
+
    </Grid>
+
 </UserControl>