Updated to .NET MAUI GA Release

naweed · Jun 10, 2022 · cf2af99 · cf2af99
1 parent 5e068cc
commit cf2af99
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,7 @@
+# UPDATED TO MAUI GA RELEASE
+## (Not tested on iOS)
+
+
 # MauiScientificCalculator
 A simple scientific calculator built uisng .NET MAUI Preview 14. Based ont his [Behance Concept](https://www.behance.net/gallery/79810231/UIUX-Challenge-04-05-Calculator-App-Icon). 
 

diff --git a/src/GlobalUsings.cs b/src/GlobalUsings.cs
@@ -6,7 +6,6 @@
 global using Microsoft.Maui;
 global using Microsoft.Maui.Controls;
 global using Microsoft.Maui.Controls.Hosting;
-global using Microsoft.Maui.Essentials;
 global using Microsoft.Maui.Hosting;
 
 //Toolkit Specific

diff --git a/src/MauiScientificCalculator.csproj b/src/MauiScientificCalculator.csproj
@@ -40,9 +40,6 @@
 
 		<!-- Images -->
 		<MauiImage Include="Resources\Images\*" />
-		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
-
-		<!-- Custom Fonts -->
 		<MauiFont Include="Resources\Fonts\*" />
 
 		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
@@ -61,8 +58,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview2" />
-	  <PackageReference Include="NCalcSync" Version="3.0.0" />
+	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview4" />
+	  <PackageReference Include="NCalcSync" Version="3.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/ViewModels/CalculatorPageViewModel.cs b/src/ViewModels/CalculatorPageViewModel.cs
@@ -15,15 +15,15 @@ public CalculatorPageViewModel()
     {
     }
 
-    [ICommand]
+    [RelayCommand]
     private void Reset()
     {
         CalculatedResult = "0";
         InputText = "";
         isSciOpWaiting = false;
     }
 
-    [ICommand]
+    [RelayCommand]
     private void Calculate()
     {
         if (InputText.Length == 0)
@@ -79,20 +79,20 @@ private string NormalizeInputString()
         return retString;
     }
 
-    [ICommand]
+    [RelayCommand]
     private void Backspace()
     {
         if (InputText.Length > 0)
             InputText = InputText.Substring(0, InputText.Length - 1);
     }
 
-    [ICommand]
+    [RelayCommand]
     private void NumberInput(string key)
     {
         InputText += key;
     }
 
-    [ICommand]
+    [RelayCommand]
     private void MathOperator(string op)
     {
         if (isSciOpWaiting)
@@ -104,7 +104,7 @@ private void MathOperator(string op)
         InputText += $" {op} ";
     }
 
-    [ICommand]
+    [RelayCommand]
     private void RegionOperator(string op)
     {
         if (op == ")")
@@ -113,7 +113,7 @@ private void RegionOperator(string op)
         InputText += op;
     }
 
-    [ICommand]
+    [RelayCommand]
     private void ScientificOperator(string op)
     {
         InputText += $"{op}(";