Improved toggle layout mode command

Author: Yair Aichenbaum

Files/App.xaml.cs

@@ -150,8 +150,6 @@ public static void Clipboard_ContentChanged(object sender, object e)
         public static Windows.UI.Xaml.UnhandledExceptionEventArgs exceptionInfo { get; set; }
         public static string exceptionStackTrace { get; set; }
 
-
-
         private async void App_UnhandledException(object sender, Windows.UI.Xaml.UnhandledExceptionEventArgs e)
         {
             e.Handled = true;

Files/View Models/SettingsViewModel.cs

@@ -522,22 +522,25 @@ public string ToggleLayoutModeIcon
             get => Get(""); // List View;
             set => Set(value);
         }
+
         public event EventHandler LayoutModeChangeRequested;
         private RelayCommand toggleLayoutMode;
         public RelayCommand ToggleLayoutMode => toggleLayoutMode = new RelayCommand(() =>
         {
-            if (LayoutMode == 0) // List View
-            {
-                LayoutMode = 1; // Grid View
-                LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
-                ToggleLayoutModeIcon = "";
-            }
-            else //Grid View
+            switch (LayoutMode)
             {
-                LayoutMode = 0; // List View
-                LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
-                ToggleLayoutModeIcon = "";
+                case 0:
+                    LayoutMode = 1; // Grid View
+                    ToggleLayoutModeIcon = "";
+                    break;
+                case 1:
+                    LayoutMode = 0; // List View
+                    ToggleLayoutModeIcon = "";
+                    break;
             }
+
+            LayoutModeChangeRequested?.Invoke(this, EventArgs.Empty);
+
         });
 
         [Obsolete]