Merge pull request #611 from unoplatform/pj/update-code-on-mvvm-samples

Update code on mvvm samples for SimpleCalc

Author: nickrandolph

reference/SimpleCalc/MVVM-CSharp/Directory.Packages.props

@@ -16,7 +16,7 @@
     <PackageVersion Include="Uno.Extensions.Core.WinUI" Version="3.0.9" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
     <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
-    <PackageVersion Include="Uno.Material.WinUI" Version="4.0.3" />
+    <PackageVersion Include="Uno.Material.WinUI" Version="4.0.6" />
     <PackageVersion Include="Uno.Toolkit.WinUI" Version="5.0.13" />
     <PackageVersion Include="Uno.Toolkit.WinUI.Material" Version="5.0.13" />
     <PackageVersion Include="Uno.Resizetizer" Version="1.2.1" />

reference/SimpleCalc/MVVM-CSharp/SimpleCalculator/App.cs

@@ -1,39 +1,39 @@
-using Application = Microsoft.UI.Xaml.Application;
+using Application = Microsoft.UI.Xaml.Application;
 
 namespace SimpleCalculator;
 
 public class App : Application
 {
-    public static Window? _window;
+	public static Window? _window;
 
-    protected override void OnLaunched(LaunchActivatedEventArgs args)
-    {
+	protected override void OnLaunched(LaunchActivatedEventArgs args)
+	{
 #if NET6_0_OR_GREATER && WINDOWS && !HAS_UNO
 		_window = new Window();
 #else
-        _window = Microsoft.UI.Xaml.Window.Current;
+		_window = Microsoft.UI.Xaml.Window.Current;
 #endif
 
-        // Do not repeat app initialization when the Window already has content,
-        // just ensure that the window is active
-        if (_window.Content is not Frame rootFrame)
-        {
-            // Create a Frame to act as the navigation context and navigate to the first page
-            rootFrame = new Frame();
+		// Do not repeat app initialization when the Window already has content,
+		// just ensure that the window is active
+		if (_window.Content is not Frame rootFrame)
+		{
+			// Create a Frame to act as the navigation context and navigate to the first page
+			rootFrame = new Frame();
 
-            // Place the frame in the current Window
-            _window.Content = rootFrame;
-        }
+			// Place the frame in the current Window
+			_window.Content = rootFrame;
+		}
 
-        if (rootFrame.Content == null)
-        {
-            // When the navigation stack isn't restored navigate to the first page,
-            // configuring the new page by passing required information as a navigation
-            // parameter
-            rootFrame.Navigate(typeof(MainPage), args.Arguments);
-        }
+		if (rootFrame.Content == null)
+		{
+			// When the navigation stack isn't restored navigate to the first page,
+			// configuring the new page by passing required information as a navigation
+			// parameter
+			rootFrame.Navigate(typeof(MainPage), args.Arguments);
+		}
 
-        // Ensure the current window is active
-        _window.Activate();
-    }
-}
+		// Ensure the current window is active
+		_window.Activate();
+	}
+}

reference/SimpleCalc/MVVM-CSharp/SimpleCalculator/AppResources.cs

@@ -1,5 +1,5 @@
-using Uno.Toolkit.UI;
 using Uno.Material;
+using Uno.Toolkit.UI;
 
 namespace SimpleCalculator;
 
@@ -19,5 +19,5 @@ public AppResources()
 		// Load Uno.UI.Toolkit Resources
 		this.Build(r => r.Merged(
 			new ToolkitResources()));
-    }
-}
+	}
+}