Apply new C# features

Author: Invvard

src/InvvardDev.EZLayoutDisplay.Desktop/Service/Implementation/LayoutService.cs

@@ -19,7 +19,7 @@ public class LayoutService : ILayoutService
         /// <summary>
         /// Supported keyboards and their layout definition resources.
         /// </summary>
-        private static readonly Dictionary<string, byte[]> LayoutDefinitions = new Dictionary<string, byte[]>()
+        private static readonly Dictionary<string, byte[]> LayoutDefinitions = new()
         {
             { "ergodox-ez", Resources.layoutDefinition_ergodox },
             { "moonlander", Resources.layoutDefinition_moonlander }
@@ -45,7 +45,7 @@ public async Task<ErgodoxLayout> GetLayoutInfo(string layoutHashId, string geome
             ValidateLayoutHashId(layoutHashId);
 
             var info = await QueryData(layoutHashId, geometry, layoutRevisionId, GetLayoutInfoRequestBody);
-            
+
             return info;
         }
 
@@ -123,19 +123,18 @@ private async Task<DataRoot> HttpClientCall(string requestBody)
         {
             DataRoot layout;
 
-            using (HttpClient client = new HttpClient())
-            {
-                Logger.Debug("Request body : {@body}", requestBody);
+            using var client = new HttpClient();
 
-                var response = await client.PostAsync(GetLayoutRequestUri, new StringContent(requestBody, Encoding.UTF8, "application/json"));
-                Logger.Debug("Response : {@response}", response);
+            Logger.Debug("Request body : {@body}", requestBody);
 
-                var result = await response.Content.ReadAsStringAsync();
-                Logger.Debug("Content result : {@result}", result);
+            var response = await client.PostAsync(GetLayoutRequestUri, new StringContent(requestBody, Encoding.UTF8, "application/json"));
+            Logger.Debug("Response : {@response}", response);
 
-                layout = JsonConvert.DeserializeObject<DataRoot>(result);
-                Logger.Debug("Deserialized layout : {@layout}", layout);
-            }
+            var result = await response.Content.ReadAsStringAsync();
+            Logger.Debug("Content result : {@result}", result);
+
+            layout = JsonConvert.DeserializeObject<DataRoot>(result);
+            Logger.Debug("Deserialized layout : {@layout}", layout);
 
             return layout;
         }
@@ -144,9 +143,7 @@ private async Task<IEnumerable<KeyTemplate>> ReadLayoutDefinition(string geometr
         {
             Logger.TraceMethod();
 
-            byte[] layoutDefinitionJson;
-
-            if (!LayoutDefinitions.TryGetValue(geometry, out layoutDefinitionJson))
+            if (!LayoutDefinitions.TryGetValue(geometry, out byte[] layoutDefinitionJson))
             {
                 layoutDefinitionJson = Resources.layoutDefinition;
             }
@@ -158,13 +155,14 @@ private async Task<IEnumerable<KeyTemplate>> ReadLayoutDefinition(string geometr
                 return new List<KeyTemplate>();
             }
 
-            var layoutTemplate = await Task.Run(() => {
-                                                    var json = Encoding.Default.GetString(layoutDefinitionJson);
+            var layoutTemplate = await Task.Run(() =>
+            {
+                var json = Encoding.Default.GetString(layoutDefinitionJson);
 
-                                                    var layoutDefinition = JsonConvert.DeserializeObject<IEnumerable<KeyTemplate>>(json);
+                var layoutDefinition = JsonConvert.DeserializeObject<IEnumerable<KeyTemplate>>(json);
 
-                                                    return layoutDefinition;
-                                                });
+                return layoutDefinition;
+            });
 
             Logger.DebugOutputParam(nameof(layoutTemplate), layoutTemplate);
 

src/InvvardDev.EZLayoutDisplay.Desktop/ViewModel/SettingsViewModel.cs

@@ -70,50 +70,43 @@ public class SettingsViewModel : ViewModelBase
         /// Open tag search command.
         /// </summary>
         public ICommand OpenTagSearchCommand =>
-            _openTagSearchCommand
-            ?? (_openTagSearchCommand = new RelayCommand<string>(OpenTagSearchUrl));
+            _openTagSearchCommand ??= new RelayCommand<string>(OpenTagSearchUrl);
 
         /// <summary>
         /// Download HEX file.
         /// </summary>
         public ICommand DownloadHexFileCommand =>
-            _downloadHexFileCommand
-            ?? (_downloadHexFileCommand = new RelayCommand(DownloadHexFile, LayoutIsCompiled));
+            _downloadHexFileCommand ??= new RelayCommand(DownloadHexFile, LayoutIsCompiled);
 
         /// <summary>
         /// Download Sources ZIP.
         /// </summary>
         public ICommand DownloadSourcesCommand =>
-            _downloadSourcesCommand
-            ?? (_downloadSourcesCommand = new RelayCommand(DownloadSources, LayoutIsCompiled));
+            _downloadSourcesCommand ??= new RelayCommand(DownloadSources, LayoutIsCompiled);
 
         /// <summary>
         /// Cancel settings edition.
         /// </summary>
         public ICommand CancelSettingsCommand =>
-            _cancelSettingsCommand
-            ?? (_cancelSettingsCommand = new RelayCommand(CancelSettings, IsDirty));
+            _cancelSettingsCommand ??= new RelayCommand(CancelSettings, IsDirty);
 
         /// <summary>
         /// Applies the settings.
         /// </summary>
         public ICommand ApplySettingsCommand =>
-            _applySettingsCommand
-            ?? (_applySettingsCommand = new RelayCommand(SaveSettings, IsDirty));
+            _applySettingsCommand ??= new RelayCommand(SaveSettings, IsDirty);
 
         /// <summary>
         /// Update the layout from Ergodox website.
         /// </summary>
         public ICommand UpdateLayoutCommand =>
-            _updateLayoutCommand
-            ?? (_updateLayoutCommand = new RelayCommand(SaveSettings));
+            _updateLayoutCommand ??= new RelayCommand(SaveSettings);
 
         /// <summary>
         /// Closes the settings window.
         /// </summary>
         public ICommand CloseSettingsCommand =>
-            _closeSettingsCommand
-            ?? (_closeSettingsCommand = new RelayCommand(CloseSettingsWindow));
+            _closeSettingsCommand ??= new RelayCommand(CloseSettingsWindow);
 
         #endregion
 
@@ -179,13 +172,13 @@ public string LayoutStatus
 
         public ObservableCollection<string> Tags
         {
-            get => _tags ?? (_tags = new ObservableCollection<string>());
+            get => _tags ??= new ObservableCollection<string>();
             private set => Set(ref _tags, value);
         }
 
         public ObservableCollection<string> Layers
         {
-            get => _layers ?? (_layers = new ObservableCollection<string>());
+            get => _layers ??= new ObservableCollection<string>();
             private set => Set(ref _layers, value);
         }
 
@@ -382,8 +375,8 @@ private void UpdateButtonCanExecute()
         {
             Logger.TraceMethod();
 
-            ((RelayCommand) ApplySettingsCommand).RaiseCanExecuteChanged();
-            ((RelayCommand) CancelSettingsCommand).RaiseCanExecuteChanged();
+            ((RelayCommand)ApplySettingsCommand).RaiseCanExecuteChanged();
+            ((RelayCommand)CancelSettingsCommand).RaiseCanExecuteChanged();
         }
 
         private bool IsDirty()
@@ -451,7 +444,7 @@ private void ClearLayoutInfo()
             LayoutTitle = "";
             KeyboardModel = "";
             LayoutStatus = "";
-            
+
             _layoutIsCompiled = false;
         }
 
@@ -478,27 +471,13 @@ private void UpdateLayoutInfo(ErgodoxLayout layoutInfo)
 
         private string GetKeyBoardDescription(string keyboardGeometry, string revisionModel)
         {
-            string keyboardDescription;
-
-            switch (keyboardGeometry)
+            string keyboardDescription = keyboardGeometry switch
             {
-                case "ergodox-ez":
-                    keyboardDescription = "ErgoDox EZ ";
-
-                    break;
-                case "planck-ez":
-                    keyboardDescription = "Planck EZ ";
-
-                    break;
-                case "moonlander":
-                    keyboardDescription = "Moonlander ";
-                    break;
-                default:
-                    keyboardDescription = $"{keyboardGeometry} ";
-
-                    break;
-            }
-
+                "ergodox-ez" => "ErgoDox EZ ",
+                "planck-ez" => "Planck EZ ",
+                "moonlander" => "Moonlander ",
+                _ => $"{keyboardGeometry} ",
+            };
             keyboardDescription += char.ToUpper(revisionModel[0]) + revisionModel.Substring(1);
 
             return keyboardDescription;
@@ -510,8 +489,8 @@ private void UpdateLayoutButtons(Revision revision)
 
             _layoutIsCompiled = Uri.IsWellFormedUriString(revision.HexUrl, UriKind.Absolute) && Uri.IsWellFormedUriString(revision.SourcesUrl, UriKind.Absolute);
 
-            ((RelayCommand) DownloadHexFileCommand).RaiseCanExecuteChanged();
-            ((RelayCommand) DownloadSourcesCommand).RaiseCanExecuteChanged();
+            ((RelayCommand)DownloadHexFileCommand).RaiseCanExecuteChanged();
+            ((RelayCommand)DownloadSourcesCommand).RaiseCanExecuteChanged();
 
             _hexFileUri = revision.HexUrl;
             _sourcesZipUri = revision.SourcesUrl;
@@ -568,7 +547,7 @@ private void ExtractLayoutUrlIds(string layoutUrl)
             }
 
             Logger.Debug($"Layout URL = {layoutUrl}");
-            Logger.Debug($"Layout URL has {(match.Success ? "": "NOT ")}been matched");
+            Logger.Debug($"Layout URL has {(match.Success ? "" : "NOT ")}been matched");
             Logger.Debug($"Layout Hash ID = {CurrentLayoutHashId}");
             Logger.Debug($"Keyboard geometry = {CurrentGeometry}");
             Logger.Debug($"Layout Revision ID = {CurrentLayoutRevisionId}");