Merge pull request #72 from Jack251970/dev

Improve code quality

Author: Jack251970

Editor/Constants.cs

@@ -7,12 +7,10 @@ public static class Constants
     public const string MathEditor = "MathEditor";
     public const string MathEditorFullName = "Math Editor";
 
-    public static string Version
-    {
-        get => field ??= Design.IsDesignMode ?
+    public static string Version =>
+        field ??= Design.IsDesignMode ?
             "1.0.0" :
             App.UpdateManager.CurrentVersion?.ToString() ?? "1.0.0";
-    }
     public static readonly string Dev = "Dev";
 
     public const string Settings = "Settings";

Editor/Equations/Common/UndoRedo/UndoManager.cs

@@ -11,10 +11,10 @@ public partial class UndoManager : ObservableObject
         private readonly Stack<EquationAction> redoStack = new();
 
         [ObservableProperty]
-        private bool _canUndo;
+        public partial bool CanUndo { get; set; }
 
         [ObservableProperty]
-        private bool _canRedo;
+        public partial bool CanRedo { get; set; }
 
         public void AddUndoAction(EquationAction equationAction)
         {

Editor/Helper/ClipboardHelper.cs

@@ -23,15 +23,11 @@ public class ClipboardHelper : ObservableObject, IDisposable
     private static readonly string ClipboardXmlFormatType =
         $"{typeof(MathEditorData).FullName}.{nameof(MathEditorData.XmlString)}";
 
-    private static ClipboardFormat<string> ClipboardXmlFormat
-    {
-        get => field ??= ClipboardFormat.CreateCustomFormat(ClipboardXmlFormatType, new TextUtf8Converter());
-    }
+    private static ClipboardFormat<string> ClipboardXmlFormat =>
+        field ??= ClipboardFormat.CreateCustomFormat(ClipboardXmlFormatType, new TextUtf8Converter());
 
-    private static DataFormat<string> ClipboardXmlFormatA
-    {
-        get => field ??= DataFormat.CreateStringPlatformFormat(ClipboardXmlFormatType);
-    }
+    private static DataFormat<string> ClipboardXmlFormatA =>
+        field ??= DataFormat.CreateStringPlatformFormat(ClipboardXmlFormatType);
 
     private readonly Timer _timer = new(1000);
 

Editor/Helper/ExceptionFormatter.cs

@@ -556,13 +556,13 @@ private static string GetMacOsMarketingName(string version)
                     12 => "Sierra",
                     11 => "El Capitan",
                     10 => "Yosemite",
-                    9  => "Mavericks",
-                    8  => "Mountain Lion",
-                    7  => "Lion",
-                    6  => "Snow Leopard",
-                    5  => "Leopard",
-                    4  => "Tiger",
-                    _  => "macOS"
+                    9 => "Mavericks",
+                    8 => "Mountain Lion",
+                    7 => "Lion",
+                    6 => "Snow Leopard",
+                    5 => "Leopard",
+                    4 => "Tiger",
+                    _ => "macOS"
                 };
             }
 

Editor/Languages/en.axaml

@@ -232,6 +232,7 @@
     <x:String x:Key="MainWindow_NewVersionAvailable">New version {0} is available. Do you want to update it now?</x:String>
     <x:String x:Key="MainWindow_FailToDownloadUpdates">Failed to download updates</x:String>
     <x:String x:Key="MainWindow_UpdateDownloaded">The update has been downloaded. Do you want to restart the app now to apply the update?</x:String>
+    <x:String x:Key="MainWindow_Unknown">Unknown</x:String>
 
     <!-- Report Window -->
     <x:String x:Key="ReportWindow_AppGotError">App got an error</x:String>

Editor/Models/VelopackLogger.cs

@@ -34,7 +34,7 @@ public void Log(VelopackLogLevel logLevel, string? message, Exception? exception
         {
             if (_logEntries.Count > 0)
             {
-                foreach (LogEntry logEntry in _logEntries)
+                foreach (var logEntry in _logEntries)
                 {
                     LogToEditorLogger(logEntry.LogLevel, logEntry.Message, logEntry.Exception);
                 }

Editor/ViewModels/CodepointWindowViewModel.cs

@@ -15,10 +15,10 @@ public partial class CodepointWindowViewModel : ObservableObject, ICultureInfoCh
     public List<UnicodeFormatLocalized> AllUnicodeFormats { get; } = UnicodeFormatLocalized.GetValues();
 
     [ObservableProperty]
-    private UnicodeFormat _unicodeFormat = UnicodeFormat.Decimal;
+    public partial UnicodeFormat UnicodeFormat { get; set; } = UnicodeFormat.Decimal;
 
     [ObservableProperty]
-    private string? _numberText = null;
+    public partial string? NumberText { get; set; } = null;
 
     public uint? Number { get; private set; } = null;
 

Editor/ViewModels/CustomZoomWindowViewModel.cs

@@ -7,5 +7,5 @@ public partial class CustomZoomWindowViewModel : ObservableObject
     public int MaxPercentage { get; } = 9999;
 
     [ObservableProperty]
-    private int? _number = null;
+    public partial int? Number { get; set; } = null;
 }

Editor/ViewModels/MainWindowViewModel.cs

@@ -31,13 +31,13 @@ public partial class MainWindowViewModel : ObservableObject, ICultureInfoChanged
     private readonly Lock _fullScreenModeLock = new();
 
     [ObservableProperty]
-    private string _mainWindowTitle = null!;
+    public partial string MainWindowTitle { get; set; } = null!;
 
     [ObservableProperty]
-    private string _currentLocalFile = null!;
+    public partial string CurrentLocalFile { get; set; } = null!;
 
     [ObservableProperty]
-    private string _showNestingMenuItemHeader = null!;
+    public partial string ShowNestingMenuItemHeader { get; set; } = null!;
 
     public MainWindowViewModel(Settings settings, UndoManager undoManager, ClipboardHelper clipboardHelper,
         UpdateManager updateManager)
@@ -58,60 +58,60 @@ public MainWindowViewModel(Settings settings, UndoManager undoManager, Clipboard
     public List<EditorModeLocalized> AllEditModes { get; } = EditorModeLocalized.GetValues();
 
     [ObservableProperty]
-    private EditorMode _textEditorMode;
+    public partial EditorMode TextEditorMode { get; set; }
 
     public List<FontTypeLocalized> AllFontTypes { get; } = FontTypeLocalized.GetValues();
 
     [ObservableProperty]
-    private FontType _textFontType;
+    public partial FontType TextFontType { get; set; }
 
     [ObservableProperty]
-    private bool _inputBold;
+    public partial bool InputBold { get; set; }
 
     [ObservableProperty]
-    private bool _inputItalic;
+    public partial bool InputItalic { get; set; }
 
     [ObservableProperty]
-    private bool _inputUnderline;
+    public partial bool InputUnderline { get; set; }
 
     [ObservableProperty]
-    private bool _isSelecting;
+    public partial bool IsSelecting { get; set; }
 
     [ObservableProperty]
-    private bool _useItalicIntergalOnNew;
+    public partial bool UseItalicIntergalOnNew { get; set; }
 
     [ObservableProperty]
-    private bool _showUnderbar = true;
+    public partial bool ShowUnderbar { get; set; } = true;
 
     [ObservableProperty]
-    private string _statusBarLeftMessage = string.Empty;
+    public partial string StatusBarLeftMessage { get; set; } = string.Empty;
 
     [ObservableProperty]
-    private string _statusBarRightMessage = string.Empty;
+    public partial string StatusBarRightMessage { get; set; } = string.Empty;
 
     [ObservableProperty]
-    private int _activeChildSelectionStartIndex = 0;
+    public partial int ActiveChildSelectionStartIndex { get; set; } = 0;
 
     [ObservableProperty]
-    private int _activeChildSelectedItems = 0;
+    public partial int ActiveChildSelectedItems { get; set; } = 0;
 
     [ObservableProperty]
-    private bool _fullScreenMode = false;
+    public partial bool FullScreenMode { get; set; } = false;
 
     [ObservableProperty]
-    private string _fullScreenMenuItemHeader = null!;
+    public partial string FullScreenMenuItemHeader { get; set; } = null!;
 
     [ObservableProperty]
-    private bool _fullScreenButtonVisible = false;
+    public partial bool FullScreenButtonVisible { get; set; } = false;
 
     [ObservableProperty]
-    private int _customZoomPercentage = 0;
+    public partial int CustomZoomPercentage { get; set; } = 0;
 
     [ObservableProperty]
-    private bool _customZoomMenuChecked = false;
+    public partial bool CustomZoomMenuChecked { get; set; } = false;
 
     [ObservableProperty]
-    private string _customZoomMenuHeader = null!;
+    public partial string CustomZoomMenuHeader { get; set; } = null!;
 
     public bool IgnoreTextEditorModeChange { get; set; } = false;
     public bool IgnoreTextFontTypeChange { get; set; } = false;
@@ -450,7 +450,8 @@ await MessageBox.ShowAsync(Localize.MainWindow_UpToDate(), Localize.MainWindow_C
             return;
         }
 
-        var updateResult = await MessageBox.ShowAsync(Localize.MainWindow_NewVersionAvailable(newVersion.BaseRelease?.Version),
+        var updateResult = await MessageBox.ShowAsync(
+            Localize.MainWindow_NewVersionAvailable(newVersion.BaseRelease?.Version.ToString() ?? Localize.MainWindow_Unknown()),
             Localize.MainWindow_CheckForUpdates(), MessageBoxButton.YesNo, MessageBoxImage.Question);
         if (updateResult == MessageBoxResult.Yes)
         {

Editor/ViewModels/MatrixInputWindowViewModel.cs

@@ -5,8 +5,8 @@ namespace Editor;
 public partial class MatrixInputWindowViewModel : ObservableObject
 {
     [ObservableProperty]
-    private int? _rows = 1;
+    public partial int? Rows { get; set; } = 1;
 
     [ObservableProperty]
-    private int? _columns = 1;
+    public partial int? Columns { get; set; } = 1;
 }