feat: AmineContentView pages placeholders

GSS2/DependencyInjectionHelper.cs

@@ -1,12 +1,9 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-using GSS2.UI.Core.ViewModels;
 using GSS2.UI.Core.Services;
 using GSS2.Views;
 using GSS2.ViewModels;
-using GSS2.ViewModels.Common;
-using GSS2.ViewModels.AmineContent;
 
 namespace GSS2;
 
@@ -21,15 +18,33 @@ public static class DependencyInjectionHelper
                 )
             )
             .AddSingleton<NavigationService>((_) => new NavigationService(Application.Current?.ApplicationLifetime))
-            .AddSingleton<MainWindowViewModel>()
+
-            .AddSingleton<MainView>()
+            // Главные
             .AddSingleton<MainViewModel>()
-            .AddSingleton<AmineContentView>()
+            .AddSingleton<MainView>()
+            // Основные
             .AddSingleton<AmineContentViewModel>()
-            .AddSingleton<SystemViewModel>()
+            .AddSingleton<AmineContentView>()
-            .AddSingleton<StartViewModel>()
+            // Core
-            .AddSingleton<AnalysisViewModel>()
+            .AddSingleton<GSS2.UI.Core.ViewModels.MainWindowViewModel>()
-            .AddSingleton<ResultsViewModel>()
+            .AddSingleton<GSS2.UI.Core.ViewModels.CameraViewModel>()
-            .AddSingleton<SampleCalibrationViewModel>()
+            .AddSingleton<GSS2.UI.Core.ViewModels.IlluminatorControllerViewModel>()
-            .AddSingleton<SeparatorCalibrationViewModel>();
+            .AddSingleton<GSS2.UI.Core.Views.CameraView>()
+            .AddSingleton<GSS2.UI.Core.Views.IlluminatorControllerView>()
+            // Общие
+            .AddSingleton<ViewModels.Common.SystemViewModel>()
+            .AddSingleton<ViewModels.Common.CameraViewModel>()
+            .AddSingleton<Views.Common.SystemView>()
+            .AddSingleton<Views.Common.CameraView>()
+            // AmineContent
+            .AddSingleton<ViewModels.AmineContent.StartViewModel>()
+            .AddSingleton<ViewModels.AmineContent.AnalysisViewModel>()
+            .AddSingleton<ViewModels.AmineContent.ResultsViewModel>()
+            .AddSingleton<ViewModels.AmineContent.SampleCalibrationViewModel>()
+            .AddSingleton<ViewModels.AmineContent.SeparatorCalibrationViewModel>()
+            .AddSingleton<Views.AmineContent.StartView>()
+            .AddSingleton<Views.AmineContent.AnalysisView>()
+            .AddSingleton<Views.AmineContent.ResultsView>()
+            .AddSingleton<Views.AmineContent.SampleCalibrationView>()
+            .AddSingleton<Views.AmineContent.SeparatorCalibrationView>();
 }

GSS2/Views/AmineContent/AnalysisView.axaml

@@ -0,0 +1,13 @@
+<UserControl
+    x:Class="GSS2.Views.AmineContent.AnalysisView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:GSS2.ViewModels.AmineContent"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:DataType="vm:AnalysisViewModel">
+
+    <Grid>
+        <TextBlock Text="Анализ" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+
+</UserControl>

GSS2/Views/AmineContent/AnalysisView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace GSS2.Views.AmineContent;
+
+public partial class AnalysisView : UserControl
+{
+    public AnalysisView()
+    {
+        InitializeComponent();
+    }
+}

GSS2/Views/AmineContent/ResultsView.axaml

@@ -0,0 +1,13 @@
+<UserControl
+    x:Class="GSS2.Views.AmineContent.ResultsView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:GSS2.ViewModels.AmineContent"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:DataType="vm:ResultsViewModel">
+
+    <Grid>
+        <TextBlock Text="Результаты" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+
+</UserControl>

GSS2/Views/AmineContent/ResultsView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace GSS2.Views.AmineContent;
+
+public partial class ResultsView : UserControl
+{
+    public ResultsView()
+    {
+        InitializeComponent();
+    }
+}

GSS2/Views/AmineContent/SampleCalibrationView.axaml

@@ -0,0 +1,13 @@
+<UserControl
+    x:Class="GSS2.Views.AmineContent.SampleCalibrationView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:GSS2.ViewModels.AmineContent"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:DataType="vm:SampleCalibrationViewModel">
+
+    <Grid>
+        <TextBlock Text="Калибровка проб" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+
+</UserControl>

GSS2/Views/AmineContent/SampleCalibrationView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace GSS2.Views.AmineContent;
+
+public partial class SampleCalibrationView : UserControl
+{
+    public SampleCalibrationView()
+    {
+        InitializeComponent();
+    }
+}

GSS2/Views/AmineContent/SeparatorCalibrationView.axaml

@@ -0,0 +1,13 @@
+<UserControl
+    x:Class="GSS2.Views.AmineContent.SeparatorCalibrationView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:GSS2.ViewModels.AmineContent"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:DataType="vm:SeparatorCalibrationViewModel">
+
+    <Grid>
+        <TextBlock Text="Калибровка сепаратора" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+
+</UserControl>

GSS2/Views/AmineContent/SeparatorCalibrationView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace GSS2.Views.AmineContent;
+
+public partial class SeparatorCalibrationView : UserControl
+{
+    public SeparatorCalibrationView()
+    {
+        InitializeComponent();
+    }
+}

GSS2/Views/AmineContent/StartView.axaml

@@ -0,0 +1,13 @@
+<UserControl
+    x:Class="GSS2.Views.AmineContent.StartView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:GSS2.ViewModels.AmineContent"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:DataType="vm:StartViewModel">
+
+    <Grid>
+        <TextBlock Text="Начальная страница" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+
+</UserControl>

GSS2/Views/AmineContent/StartView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace GSS2.Views.AmineContent;
+
+public partial class StartView : UserControl
+{
+    public StartView()
+    {
+        InitializeComponent();
+    }
+}

GSS2/Views/Common/SystemView.axaml

@@ -0,0 +1,13 @@
+<UserControl
+    x:Class="GSS2.Views.Common.SystemView"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:vm="using:GSS2.ViewModels.Common"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:DataType="vm:SystemViewModel">
+
+    <Grid>
+        <TextBlock Text="Системная страница" FontSize="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </Grid>
+
+</UserControl>

GSS2/Views/Common/SystemView.axaml.cs

@@ -0,0 +1,11 @@
+using Avalonia.Controls;
+
+namespace GSS2.Views.Common;
+
+public partial class SystemView : UserControl
+{
+    public SystemView()
+    {
+        InitializeComponent();
+    }
+}