diff --git a/GSS2/DependencyInjectionHelper.cs b/GSS2/DependencyInjectionHelper.cs index 668d637..8ca4a7d 100644 --- a/GSS2/DependencyInjectionHelper.cs +++ b/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((_) => new NavigationService(Application.Current?.ApplicationLifetime)) - .AddSingleton() - .AddSingleton() + + // Главные .AddSingleton() - .AddSingleton() + .AddSingleton() + // Основные .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton() - .AddSingleton(); + .AddSingleton() + // Core + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + // Общие + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + // AmineContent + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton() + .AddSingleton(); } diff --git a/GSS2/Views/AmineContent/AnalysisView.axaml b/GSS2/Views/AmineContent/AnalysisView.axaml new file mode 100644 index 0000000..1a73a41 --- /dev/null +++ b/GSS2/Views/AmineContent/AnalysisView.axaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/GSS2/Views/AmineContent/AnalysisView.axaml.cs b/GSS2/Views/AmineContent/AnalysisView.axaml.cs new file mode 100644 index 0000000..0fe6bfe --- /dev/null +++ b/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(); + } +} diff --git a/GSS2/Views/AmineContent/ResultsView.axaml b/GSS2/Views/AmineContent/ResultsView.axaml new file mode 100644 index 0000000..6afd1c5 --- /dev/null +++ b/GSS2/Views/AmineContent/ResultsView.axaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/GSS2/Views/AmineContent/ResultsView.axaml.cs b/GSS2/Views/AmineContent/ResultsView.axaml.cs new file mode 100644 index 0000000..3643e38 --- /dev/null +++ b/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(); + } +} diff --git a/GSS2/Views/AmineContent/SampleCalibrationView.axaml b/GSS2/Views/AmineContent/SampleCalibrationView.axaml new file mode 100644 index 0000000..f7304df --- /dev/null +++ b/GSS2/Views/AmineContent/SampleCalibrationView.axaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/GSS2/Views/AmineContent/SampleCalibrationView.axaml.cs b/GSS2/Views/AmineContent/SampleCalibrationView.axaml.cs new file mode 100644 index 0000000..24f3499 --- /dev/null +++ b/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(); + } +} diff --git a/GSS2/Views/AmineContent/SeparatorCalibrationView.axaml b/GSS2/Views/AmineContent/SeparatorCalibrationView.axaml new file mode 100644 index 0000000..1665db3 --- /dev/null +++ b/GSS2/Views/AmineContent/SeparatorCalibrationView.axaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/GSS2/Views/AmineContent/SeparatorCalibrationView.axaml.cs b/GSS2/Views/AmineContent/SeparatorCalibrationView.axaml.cs new file mode 100644 index 0000000..64a6eb7 --- /dev/null +++ b/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(); + } +} diff --git a/GSS2/Views/AmineContent/StartView.axaml b/GSS2/Views/AmineContent/StartView.axaml new file mode 100644 index 0000000..d0aeeb0 --- /dev/null +++ b/GSS2/Views/AmineContent/StartView.axaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/GSS2/Views/AmineContent/StartView.axaml.cs b/GSS2/Views/AmineContent/StartView.axaml.cs new file mode 100644 index 0000000..6ad23a7 --- /dev/null +++ b/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(); + } +} diff --git a/GSS2/Views/Common/SystemView.axaml b/GSS2/Views/Common/SystemView.axaml new file mode 100644 index 0000000..2627143 --- /dev/null +++ b/GSS2/Views/Common/SystemView.axaml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/GSS2/Views/Common/SystemView.axaml.cs b/GSS2/Views/Common/SystemView.axaml.cs new file mode 100644 index 0000000..8cd520c --- /dev/null +++ b/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(); + } +}