From f8bc61327c1dab4f08d037fb40bc7dc117b5da3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tommy=20=C3=96man?= <tommy.oman@gmail.com>
Date: Mon, 8 Aug 2022 09:05:30 +0200
Subject: [PATCH] Easier workings with Haley MVVM

---
 QuickMVVMSetup/ChangeNotifier.cs     | 20 ----------------
 QuickMVVMSetup/MainVM.cs             | 17 +++++++++++---
 QuickMVVMSetup/MainWindow.xaml       |  9 +++++--
 QuickMVVMSetup/Person.cs             |  5 +++-
 QuickMVVMSetup/QuickMVVMSetup.csproj |  4 ++++
 QuickMVVMSetup/RelayCommand.cs       | 35 ----------------------------
 6 files changed, 29 insertions(+), 61 deletions(-)
 delete mode 100644 QuickMVVMSetup/ChangeNotifier.cs
 delete mode 100644 QuickMVVMSetup/RelayCommand.cs

diff --git a/QuickMVVMSetup/ChangeNotifier.cs b/QuickMVVMSetup/ChangeNotifier.cs
deleted file mode 100644
index 7c51a4f..0000000
--- a/QuickMVVMSetup/ChangeNotifier.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.ComponentModel;
-using System.Windows.Input;
-using System.Collections.ObjectModel;
-
-namespace QuickMVVMSetup
-{
-    public class ChangeNotifier : INotifyPropertyChanged
-    {
-        public event PropertyChangedEventHandler? PropertyChanged;
-        protected void OnPropertyChanged(string propName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propName));
-        }
-    }
-}
diff --git a/QuickMVVMSetup/MainVM.cs b/QuickMVVMSetup/MainVM.cs
index 2112f06..e53d692 100644
--- a/QuickMVVMSetup/MainVM.cs
+++ b/QuickMVVMSetup/MainVM.cs
@@ -6,6 +6,9 @@ using System.Threading.Tasks;
 using System.ComponentModel;
 using System.Windows.Input;
 using System.Collections.ObjectModel;
+using Haley.Models;
+using Haley.Abstractions;
+using Haley.MVVM;
 
 namespace QuickMVVMSetup;
 
@@ -28,7 +31,7 @@ public class MainVM : ChangeNotifier
         set { _persons = value; }
     }
 
-    public void AddPerson(object person)
+    public void AddPerson()
     {
         Persons.Add(TargetPerson);  // Adding to collection
         TargetPerson = new Person(); //Resetting it
@@ -36,12 +39,20 @@ public class MainVM : ChangeNotifier
 
 
     //public ICommand CMDAdd { get; set; }
-    public ICommand CMDAdd => new RelayCommand(AddPerson,null);
+    public ICommand CMDAdd => new DelegateCommand(AddPerson);
+    public ICommand CMDDelete => new DelegateCommand<Person>(DeletePerson);
+
+    private void DeletePerson(Person obj)
+    {
+        if (obj == null) return;
+        if (!Persons.Contains(obj)) return;
+        Persons.Remove(obj);
+    }
 
     public MainVM()
     {
         //CMDAdd = new AddCommand(this);
-        //TargetPerson = new Person();
         Persons = new ObservableCollection<Person>();
+        TargetPerson = new Person();
     }
 }    
diff --git a/QuickMVVMSetup/MainWindow.xaml b/QuickMVVMSetup/MainWindow.xaml
index c0107c0..9cde7b2 100644
--- a/QuickMVVMSetup/MainWindow.xaml
+++ b/QuickMVVMSetup/MainWindow.xaml
@@ -43,9 +43,14 @@
                 <TextBlock Text="Age" />
                 <TextBox Grid.Column="1" Text="{Binding TargetPerson.Age}"/>
             </ItemsControl>
-            <Button Content="Add" Height="30" Width="120" Margin="5, 20" HorizontalAlignment="Right" Command="{Binding CMDAdd}"/>
+            <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="5,20">
+                <Button Content="Add" Height="30" Width="120" Margin="5" HorizontalAlignment="Right" Command="{Binding CMDAdd}"/>
+                <Button Content="Delete" Height="30" Width="120" Margin="5" HorizontalAlignment="Right" 
+                    CommandParameter="{Binding ElementName=lstView,Path=SelectedItem}"  Command="{Binding CMDDelete}"/>
+            </StackPanel>
         </StackPanel>
-        <ListView Grid.Row="1"  Background="#FFDBEFCA" ItemsSource="{Binding Persons}">
+        <ListView x:Name="lstView" Grid.Row="1"  Background="#FFDBEFCA" ItemsSource="{Binding Persons}"
+                  SelectionMode="Single">
             <ListView.ItemTemplate>
                 <DataTemplate>
                     <StackPanel Orientation="Horizontal">
diff --git a/QuickMVVMSetup/Person.cs b/QuickMVVMSetup/Person.cs
index e4efa7e..62b7ca5 100644
--- a/QuickMVVMSetup/Person.cs
+++ b/QuickMVVMSetup/Person.cs
@@ -1,4 +1,7 @@
-using System;
+using Haley.Models;
+using Haley.Abstractions;
+using Haley.MVVM;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
diff --git a/QuickMVVMSetup/QuickMVVMSetup.csproj b/QuickMVVMSetup/QuickMVVMSetup.csproj
index e0786ed..5ad63f0 100644
--- a/QuickMVVMSetup/QuickMVVMSetup.csproj
+++ b/QuickMVVMSetup/QuickMVVMSetup.csproj
@@ -11,4 +11,8 @@
     <Compile Remove="AddCommand.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Haley.MVVM" Version="6.2.20" />
+  </ItemGroup>
+
 </Project>
diff --git a/QuickMVVMSetup/RelayCommand.cs b/QuickMVVMSetup/RelayCommand.cs
deleted file mode 100644
index f5baf1e..0000000
--- a/QuickMVVMSetup/RelayCommand.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
-
-namespace QuickMVVMSetup
-{
-    public class RelayCommand : ICommand
-    {
-        public event EventHandler? CanExecuteChanged;
-        private Action<object> _executeAction;
-        private Func<object, bool> _canExecuteAction;
-        public bool CanExecute(object? parameter)
-        {
-            if (_canExecuteAction == null)
-            {
-                return true;
-            }
-            return _canExecuteAction.Invoke(parameter);
-        }
-
-        public void Execute(object? parameter)
-        {
-            _executeAction.Invoke(parameter);
-        }
-
-        public RelayCommand(Action<object> executeAction, Func<object, bool> canExecuteFunc)
-        {
-            _executeAction = executeAction;
-            _canExecuteAction = canExecuteFunc;
-        }
-    }
-}