removed tinycommand for maui

TinyStuff · Aug 25, 2022 · 4cc5f74 · 4cc5f74
1 parent 410dfc4
commit 4cc5f74
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 100 deletions.
diff --git a/src/MAUI/TinyMvvm.Maui/TinyCommand.cs b/src/MAUI/TinyMvvm.Maui/TinyCommand.cs
diff --git a/src/MAUI/TinyMvvm.Maui/TinyMvvm.Maui.csproj b/src/MAUI/TinyMvvm.Maui/TinyMvvm.Maui.csproj
@@ -32,6 +32,6 @@
 	  <None Remove="CommunityToolkit.Mvvm" />
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="CommunityToolkit.Mvvm" Version="7.1.2" />
+	  <PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
 	</ItemGroup>
 </Project>
diff --git a/src/MAUI/TinyMvvm.Maui/TinyViewModel.cs b/src/MAUI/TinyMvvm.Maui/TinyViewModel.cs
@@ -88,7 +88,7 @@ public INavigation Navigation
     }
 
     [ObservableProperty]
-    [AlsoNotifyChangeFor(nameof(IsNotBusy))]
+    [NotifyPropertyChangedFor(nameof(IsNotBusy))]
     private bool _isBusy;
 
 
@@ -102,7 +102,7 @@ public bool IsNotBusy
     }
 
     [ObservableProperty]
-    [AlsoNotifyChangeFor(nameof(IsNotInitialized))]
+    [NotifyPropertyChangedFor(nameof(IsNotInitialized))]
     private bool _isInitialized;
 
 

diff --git a/src/MAUI/TinyMvvm.Sample/ViewModels/ListViewModel.cs b/src/MAUI/TinyMvvm.Sample/ViewModels/ListViewModel.cs
@@ -1,6 +1,7 @@
 using System.Collections.ObjectModel;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using TinyMvvm.Sample.Models;
 using TinyMvvm.Sample.Services;
 
@@ -29,7 +30,7 @@ public override async Task Initialize()
         private ObservableCollection<City> cities = new ObservableCollection<City>();
 
         private ICommand show;
-        public ICommand Show => show ??= new TinyCommand<City>(async (city) =>
+        public ICommand Show => show ??= new RelayCommand<City>(async (city) =>
         {
             await Navigation.NavigateTo($"{nameof(DetailsViewModel)}?city={city.Name}");
         });

diff --git a/src/MAUI/TinyMvvm.Sample/ViewModels/MainViewModel.cs b/src/MAUI/TinyMvvm.Sample/ViewModels/MainViewModel.cs
@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using TinyMvvm.Sample.Models;
 using TinyMvvm.Sample.Services;
 
@@ -20,7 +21,7 @@ public MainViewModel(ICityService cityService)
     private string text;
 
     private ICommand search;
-    public ICommand Search => search ??= new TinyCommand(async () =>
+    public ICommand Search => search ??= new RelayCommand(async () =>
     {
         IsBusy = true;
 
@@ -34,9 +35,9 @@ public MainViewModel(ICityService cityService)
     });
 
     private ICommand show;
-    public ICommand Show => show ??= new TinyCommand<City>(async (city) =>
+    public ICommand Show => show ??= new RelayCommand<City>(async (city) =>
     {
-        await Navigation.NavigateTo($"{nameof(DetailsViewModel)}?id=1", city);
+        await Navigation.NavigateTo($"{nameof(DetailsViewModel)}", city.Country);
     });
 
     [ObservableProperty]