retr0volkov/GazpromApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code clean up

Browse Source
This commit is contained in:
retr0volkov
2025-07-10 09:19:06 +03:00 Unverified
parent 2a8f8d2714
commit 915c7a7c5e
36 changed files with 116 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Views/EditEquipmentDialog.axaml
+3 -2
View File
@@ -18,7 +18,7 @@
<vm:EditEquipmentDialogViewModel/>
</Design.DataContext>
<Window.Resources>
<!-- ReSharper disable once Xaml.RedundantResource -->
<!-- ReSharper disable Xaml.RedundantResource -->
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
@@ -31,6 +31,7 @@
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<!-- ReSharper restore Xaml.RedundantResource -->
<enums:PeriodConverter x:Key="PeriodConverter"/>
</Window.Resources>
<Grid RowDefinitions="70,150,*,Auto" ColumnDefinitions="*,100,220" x:Name="Root">
@@ -116,7 +117,7 @@
<NumericUpDown Grid.Column="3" AllowSpin="True" Width="120" VerticalAlignment="Center"
Value="{Binding PeriodValue}"/>
<ComboBox Grid.Column="4" Width="100" VerticalAlignment="Center" Margin="4,0,0,0"
ItemsSource="{Binding #Root.((vm:EditEquipmentDialogViewModel)DataContext).AllPeriods}"
ItemsSource="{Binding (vm:EditEquipmentDialogViewModel).AllPeriods}"
SelectedItem="{Binding PeriodType, Mode=TwoWay}"
DisplayMemberBinding="{Binding ., Converter={StaticResource PeriodConverter}}"/>
<Button Grid.Column="5" Margin="0,0,12,0" HorizontalAlignment="Right" VerticalAlignment="Center"
Views/EditEquipmentDialog.axaml.cs
+2 -7
View File
@@ -1,18 +1,13 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using CommunityToolkit.Mvvm.Messaging;
using GazpromApp.Messages;
using GazpromApp.Models;
using GazpromApp.ViewModels;
namespace GazpromApp.Views;
public partial class EditEquipmentDialog : Window
{
public Equipment? Equipment;
public EditEquipmentDialog()
{
InitializeComponent();
@@ -23,7 +18,7 @@ public partial class EditEquipmentDialog : Window
// view image
WeakReferenceMessenger.Default.Register<EditEquipmentDialog, ViewImageMessage>(this, static (w, m) =>
{
ImageView dialog = new ImageView()
var dialog = new ImageView
{
DataContext = m.Image
};
@@ -33,7 +28,7 @@ public partial class EditEquipmentDialog : Window
// error handling
WeakReferenceMessenger.Default.Register<EditEquipmentDialog, ErrorMessage>(this, static (w, m) =>
{
ErrorView dialog = new ErrorView()
var dialog = new ErrorView
{
DataContext = m.Error
};
Views/EditPointDialog.axaml
+2
View File
@@ -24,7 +24,9 @@
<SolidColorBrush x:Key="BorderBrush" Color="#d3d3d3"/>
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<!-- ReSharper disable once Xaml.RedundantResource -->
<SolidColorBrush x:Key="BackgroundBrush" Color="#101010"/>
<!-- ReSharper disable once Xaml.RedundantResource -->
<SolidColorBrush x:Key="BorderBrush" Color="#303030"/>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
Views/EditPointDialog.axaml.cs
+7 -10
View File
@@ -2,15 +2,12 @@
using Avalonia.Controls;
using CommunityToolkit.Mvvm.Messaging;
using GazpromApp.Messages;
using GazpromApp.Models;
using GazpromApp.ViewModels;
namespace GazpromApp.Views;
public partial class EditPointDialog : Window
{
public Point? Point;
public EditPointDialog()
{
InitializeComponent();
@@ -21,7 +18,7 @@ public partial class EditPointDialog : Window
// view image
WeakReferenceMessenger.Default.Register<EditPointDialog, ViewImageMessage>(this, static (w, m) =>
{
ImageView dialog = new ImageView()
var dialog = new ImageView
{
DataContext = m.Image
};
@@ -31,7 +28,7 @@ public partial class EditPointDialog : Window
// error
WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
{
ErrorView dialog = new ErrorView()
var dialog = new ErrorView
{
DataContext = m.Error
};
@@ -42,7 +39,7 @@ public partial class EditPointDialog : Window
WeakReferenceMessenger.Default.Register<EditPointDialog, NewEquipmentMessage>(this, (w, m) =>
{
WeakReferenceMessenger.Default.Unregister<ErrorMessage>(this);
NewEquipmentDialog dialog = new NewEquipmentDialog()
var dialog = new NewEquipmentDialog
{
DataContext = new NewEquipmentDialogViewModel()
};
@@ -54,7 +51,7 @@ public partial class EditPointDialog : Window
{
WeakReferenceMessenger.Default.Unregister<ViewImageMessage>(this);
WeakReferenceMessenger.Default.Unregister<ErrorMessage>(this);
EditEquipmentDialog dialog = new EditEquipmentDialog()
var dialog = new EditEquipmentDialog
{
DataContext = new EditEquipmentDialogViewModel(m.Equipment)
};
@@ -66,7 +63,7 @@ public partial class EditPointDialog : Window
{
WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
{
ErrorView dialog = new ErrorView()
var dialog = new ErrorView
{
DataContext = m.Error
};
@@ -79,7 +76,7 @@ public partial class EditPointDialog : Window
{
WeakReferenceMessenger.Default.Register<EditPointDialog, ViewImageMessage>(this, static (w, m) =>
{
ImageView dialog = new ImageView()
var dialog = new ImageView
{
DataContext = m.Image
};
@@ -88,7 +85,7 @@ public partial class EditPointDialog : Window
WeakReferenceMessenger.Default.Register<EditPointDialog, ErrorMessage>(this, static (w, m) =>
{
ErrorView dialog = new ErrorView()
var dialog = new ErrorView
{
DataContext = m.Error
};
Views/ErrorView.axaml.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using System;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
namespace GazpromApp.Views;
@@ -11,8 +9,8 @@ public partial class ErrorView : Window
{
InitializeComponent();
if (Design.IsDesignMode)
return;
// if (Design.IsDesignMode)
// return;
}
Views/ImageView.axaml.cs
+2 -4
View File
@@ -1,6 +1,4 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;
using Avalonia.Controls;
namespace GazpromApp.Views;
@@ -13,6 +11,6 @@ public partial class ImageView : Window
if (Design.IsDesignMode)
return;
this.ExtendClientAreaToDecorationsHint = true;
ExtendClientAreaToDecorationsHint = true;
}
}
Views/MainWindow.axaml
+2
View File
@@ -23,7 +23,9 @@
<SolidColorBrush x:Key="BorderBrush" Color="#d3d3d3"/>
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<!-- ReSharper disable once Xaml.RedundantResource -->
<SolidColorBrush x:Key="BackgroundBrush" Color="#101010"/>
<!-- ReSharper disable once Xaml.RedundantResource -->
<SolidColorBrush x:Key="BorderBrush" Color="#303030"/>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
Views/MainWindow.axaml.cs
+4 -5
View File
@@ -1,7 +1,7 @@
using Avalonia.Controls;
using CommunityToolkit.Mvvm.Messaging;
using GazpromApp.Messages;
using GazpromApp.ViewModels;
using CommunityToolkit.Mvvm.Messaging;
namespace GazpromApp.Views;
@@ -16,7 +16,7 @@ public partial class MainWindow : Window
WeakReferenceMessenger.Default.Register<MainWindow, NewPointMessage>(this, static (w, m) =>
{
NewPointDialog dialog = new NewPointDialog()
var dialog = new NewPointDialog
{
DataContext = new NewPointDialogViewModel()
};
@@ -25,10 +25,9 @@ public partial class MainWindow : Window
WeakReferenceMessenger.Default.Register<MainWindow, EditPointMessage>(this, static (w, m) =>
{
EditPointDialog dialog = new EditPointDialog()
var dialog = new EditPointDialog
{
DataContext = new EditPointDialogViewModel(m.Point),
Point = m.Point.GetPoint()
DataContext = new EditPointDialogViewModel(m.Point)
};
m.Reply(dialog.ShowDialog<PointViewModel?>(w));
});
Views/NewEquipmentDialog.axaml.cs
+1 -1
View File
@@ -21,7 +21,7 @@ public partial class NewEquipmentDialog : Window
// register to work with errors
WeakReferenceMessenger.Default.Register<NewEquipmentDialog, ErrorMessage>(this, static (w, m) =>
{
ErrorView dialog = new ErrorView()
var dialog = new ErrorView
{
DataContext = m.Error
};
Views/NewPointDialog.axaml.cs
+1 -1
View File
@@ -21,7 +21,7 @@ public partial class NewPointDialog : Window
// register to work with errors
WeakReferenceMessenger.Default.Register<NewPointDialog, ErrorMessage>(this, static (w, m) =>
{
ErrorView dialog = new ErrorView()
var dialog = new ErrorView
{
DataContext = m.Error
};