Merge pull request #39 from egvijayanand/working

Updated MVVM NuGet package to latest preview version (v8.0.0-preview4)
egvijayanand · Jun 7, 2022 · e353cac · e353cac
2 parents c5d4b97 + 633177b
commit e353cac
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 35 deletions.
diff --git a/src/DateCalculator/DateCalculator.Shared/DateCalculator.Shared.csproj b/src/DateCalculator/DateCalculator.Shared/DateCalculator.Shared.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<RootNamespace>DateCalculator</RootNamespace>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview3" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview4" />
 	</ItemGroup>
 
 </Project>
diff --git a/src/DateCalculator/DateCalculator.Shared/ViewModels/BaseViewModel.cs b/src/DateCalculator/DateCalculator.Shared/ViewModels/BaseViewModel.cs
@@ -7,7 +7,7 @@ namespace VijayAnand.Toolkit.ObjectModel
     public partial class BaseViewModel : ObservableValidator, IDisposable
     {
         [ObservableProperty]
-        [AlsoNotifyChangeFor(nameof(IsNotBusy))]
+        [NotifyPropertyChangedFor(nameof(IsNotBusy))]
         private bool isBusy;
 
         [ObservableProperty]
@@ -32,7 +32,7 @@ public partial class BaseViewModel : ObservableValidator, IDisposable
         private bool isValid = true;
 
         [ObservableProperty]
-        private List<string?> errors = new();
+        private List<string> errors = new();
 
         public BaseViewModel()
         {

diff --git a/src/DateCalculator/DateCalculator.Shared/ViewModels/DateViewModel.cs b/src/DateCalculator/DateCalculator.Shared/ViewModels/DateViewModel.cs
@@ -16,7 +16,7 @@ public partial class DateViewModel : BaseViewModel
         private DateTime endDate;
 
         [ObservableProperty]
-        [AlsoNotifyChangeFor(nameof(DiffModeInverse))]
+        [NotifyPropertyChangedFor(nameof(DiffModeInverse))]
         private bool diffMode;
 
         [ObservableProperty]
@@ -177,7 +177,7 @@ partial void OnDiffModeChanged(bool value)
 
         partial void OnSelectedDayChanged(int value) => FindTheDate();
 
-        [ICommand]
+        [RelayCommand]
         private void DateDiff() => FindTheDate();
 
         private void FindTheDate()

diff --git a/src/MauiAppCS/MauiAppCS/App.cs b/src/MauiAppCS/MauiAppCS/App.cs
@@ -1,12 +1,13 @@
-namespace MauiAppCS
+using VijayAnand.MauiToolkit.Services;
+
+namespace MauiAppCS
 {
     public partial class App : Application
     {
         public App()
         {
             Build();
-
-            MainPage = new MainPage();
+            MainPage = AppService.GetService<MainPage>();
         }
 
         private void Build()

diff --git a/src/MauiAppCS/MauiAppCS/Imports.cs b/src/MauiAppCS/MauiAppCS/Imports.cs
@@ -4,4 +4,4 @@
 global using static CommunityToolkit.Maui.Markup.GridRowsColumns;
 // Static
 global using static Microsoft.Maui.Graphics.Colors;
-global using static VijayAnand.MauiToolkit.Markup.Utility;
+global using static VijayAnand.MauiToolkit.Markup.Utility;
diff --git a/src/MauiAppCS/MauiAppCS/MainPage.cs b/src/MauiAppCS/MauiAppCS/MainPage.cs
@@ -2,12 +2,10 @@
 {
     public partial class MainPage : ContentPage
     {
-        int count;
-        Label counter;
-
-        public MainPage()
+        public MainPage(MainViewModel viewModel)
         {
             Build();
+            BindingContext = viewModel;
         }
 
         private void Build()
@@ -23,38 +21,41 @@ private void Build()
                         {
                             Style = AppResource<Style>("MauiLabel"),
                             Text = "Hello, World!",
-                        }.FontSize(32).CenterHorizontal().SemanticHeading(SemanticHeadingLevel.Level1),
+                        }.FontSize(32)
+                         .CenterHorizontal()
+                         .SemanticHeading(SemanticHeadingLevel.Level1),
                         new Label()
                         {
                             Style = AppResource<Style>("MauiLabel"),
                             Text = "Welcome to .NET Multi-platform App UI",
-                        }.FontSize(18).CenterHorizontal().SemanticDesc("Welcome to dot net Multi platform App U I").SemanticHeading(SemanticHeadingLevel.Level1),
+                        }.FontSize(18)
+                         .CenterHorizontal()
+                         .SemanticDesc("Welcome to dot net Multi platform App U I")
+                         .SemanticHeading(SemanticHeadingLevel.Level1),
                         new Label()
                         {
                             FontAttributes = FontAttributes.Bold,
                             Style = AppResource<Style>("MauiLabel"),
-                            Text = "Current count: 0",
-                        }.FontSize(18).CenterHorizontal().Assign(out counter),
+                        }.FontSize(18)
+                         .CenterHorizontal()
+                         .Bind(nameof(MainViewModel.Counter)),
                         new Button()
                         {
                             Style = AppResource<Style>("PrimaryAction"),
-                            Text = "Click me",
-                        }.CenterHorizontal().Invoke(btn => btn.Clicked += OnCounterClicked).SemanticHint("Counts the number of times you click"),
+                            Text = "Click Me",
+                        }.CenterHorizontal()
+                         .BindCommand(nameof(MainViewModel.ClickCommand))
+                         .SemanticHint("Counts the number of times you click"),
                         new Image()
                         {
                             Source = "dotnet_bot.png",
-                        }.Height(310).Width(250).CenterHorizontal().SemanticDesc("Cute dot net bot waving hi to you!"),
+                        }.Height(310)
+                         .Width(250)
+                         .CenterHorizontal()
+                         .SemanticDesc("Cute dot net bot waving hi to you!"),
                     }
                 }.Padding(30)
             };
         }
-
-        private void OnCounterClicked(object? sender, EventArgs e)
-        {
-            count++;
-            counter.Text = $"Current count: {count}";
-
-            SemanticScreenReader.Announce(counter.Text);
-        }
     }
 }
diff --git a/src/MauiAppCS/MauiAppCS/MainViewModel.cs b/src/MauiAppCS/MauiAppCS/MainViewModel.cs
@@ -0,0 +1,27 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+
+namespace MauiAppCS
+{
+    public partial class MainViewModel : ObservableObject
+    {
+        private int count;
+        private readonly ISemanticScreenReader semanticScreenReader;
+
+        public MainViewModel(ISemanticScreenReader semanticScreenReader)
+        {
+            this.semanticScreenReader = semanticScreenReader;
+        }
+
+        [ObservableProperty]
+        private string counter = "Current count: 0";
+
+        [RelayCommand]
+        private void OnClick()
+        {
+            count++;
+            Counter = $"Current count: {count}";
+            semanticScreenReader.Announce(Counter);
+        }
+    }
+}
diff --git a/src/MauiAppCS/MauiAppCS/MauiAppCS.csproj b/src/MauiAppCS/MauiAppCS/MauiAppCS.csproj
@@ -59,6 +59,6 @@
     <ItemGroup>
         <PackageReference Include="CommunityToolkit.Maui.Markup" Version="1.0.0"/>
         <PackageReference Include="VijayAnand.MauiToolkit" Version="1.0.0"/>
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview3"/>
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview4"/>
     </ItemGroup>
 </Project>
diff --git a/src/MauiAppCS/MauiAppCS/MauiProgram.cs b/src/MauiAppCS/MauiAppCS/MauiProgram.cs
@@ -13,7 +13,10 @@ public static MauiApp CreateMauiApp()
                        fonts.AddFont("OpenSans-SemiBold.ttf", "OpenSansSemiBold");
                    });
 
+            builder.Services.AddSingleton<MainPage>();
+            builder.Services.AddSingleton<MainViewModel>();
+            builder.Services.AddSingleton(SemanticScreenReader.Default);
             return builder.Build();
         }
     }
-}
+}
diff --git a/...edDateCalculator/UnifiedDateCalculator/DateCalculator.Shared/DateCalculator.Shared.csproj b/...edDateCalculator/UnifiedDateCalculator/DateCalculator.Shared/DateCalculator.Shared.csproj
@@ -9,7 +9,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview3" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0-preview4" />
 	</ItemGroup>
 
 </Project>
diff --git a/...iedDateCalculator/UnifiedDateCalculator/DateCalculator.Shared/ViewModels/BaseViewModel.cs b/...iedDateCalculator/UnifiedDateCalculator/DateCalculator.Shared/ViewModels/BaseViewModel.cs
@@ -7,7 +7,7 @@ namespace VijayAnand.Toolkit.ObjectModel
     public partial class BaseViewModel : ObservableValidator, IDisposable
     {
         [ObservableProperty]
-        [AlsoNotifyChangeFor(nameof(IsNotBusy))]
+        [NotifyPropertyChangedFor(nameof(IsNotBusy))]
         private bool isBusy;
 
         [ObservableProperty]

diff --git a/...iedDateCalculator/UnifiedDateCalculator/DateCalculator.Shared/ViewModels/DateViewModel.cs b/...iedDateCalculator/UnifiedDateCalculator/DateCalculator.Shared/ViewModels/DateViewModel.cs
@@ -16,7 +16,7 @@ public partial class DateViewModel : BaseViewModel
         private DateTime endDate;
 
         [ObservableProperty]
-        [AlsoNotifyChangeFor(nameof(DiffModeInverse))]
+        [NotifyPropertyChangedFor(nameof(DiffModeInverse))]
         private bool diffMode;
 
         [ObservableProperty]
@@ -177,7 +177,7 @@ partial void OnDiffModeChanged(bool value)
 
         partial void OnSelectedDayChanged(int value) => FindTheDate();
 
-        [ICommand]
+        [RelayCommand]
         private void DateDiff() => FindTheDate();
 
         private void FindTheDate()