Moved delete and saved events to ViewModel instead of View

AJLeuer · AJLeuer · commit 84bcedad1ead · 2021-03-04T23:06:04.000-08:00
diff --git a/GHelper/GHelper/View/ApplicationView.xaml.cs b/GHelper/GHelper/View/ApplicationView.xaml.cs
@@ -5,7 +5,6 @@
 using Windows.Storage;
 using Windows.Storage.Pickers;
 using GHelper.Annotations;
-using GHelper.Event;
 using GHelper.View.Dialog;
 using GHelper.ViewModel;
 using GHelperLogic.IO;
@@ -36,25 +35,23 @@ public ApplicationViewModel Application
 		    }
 	    }
 
-	    public GHubRecordViewModel GHubRecord
+	    public GHubRecordViewModel GHubRecordViewModel
 	    {
 		    get { return Application; }
 	    }
-
-	    public event UserSavedEvent?              UserSaved;
-	    public event UserDeletedRecordEvent?      UserDeletedRecord;
+	    
 	    public event PropertyChangedEventHandler? PropertyChanged;
 
 	    public ApplicationView()
         {
 	        InitializeComponent();
-	        RecordViewControls.UserClickedSaveButton += () => { UserSaved?.Invoke(); };
-	        RecordViewControls.UserClickedDeleteButton += () => { UserDeletedRecord?.Invoke(GHubRecord); };
+	        RecordViewControls.UserClickedSaveButton += () => { GHubRecordViewModel.FireSaveEvent(); };
+	        RecordViewControls.UserClickedDeleteButton += () => { GHubRecordViewModel.FireDeletedEvent(); };
         }
 
 	    void RecordView.SendRecordChangedNotification()
 	    {
-		    OnPropertyChanged(nameof(GHubRecord));
+		    OnPropertyChanged(nameof(GHubRecordViewModel));
 	    }
 
 	    protected void HandleNameChange(object sender, RoutedEventArgs routedEventInfo)
diff --git a/GHelper/GHelper/View/DesktopApplicationView.xaml.cs b/GHelper/GHelper/View/DesktopApplicationView.xaml.cs
@@ -1,7 +1,6 @@
 ﻿using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using GHelper.Annotations;
-using GHelper.Event;
 using GHelper.ViewModel;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -28,27 +27,25 @@ public ApplicationViewModel Application
             }
         }
         
-        public GHubRecordViewModel GHubRecord
+        public GHubRecordViewModel GHubRecordViewModel
         {
             get { return Application; }
         }
 
-        public event UserSavedEvent?         UserSaved;
-        public event UserDeletedRecordEvent? UserDeletedRecord;
-
         public event PropertyChangedEventHandler? PropertyChanged;
         
         public DesktopApplicationView()
         {
             this.InitializeComponent();
-            RecordViewControls.UserClickedSaveButton += () => { UserSaved?.Invoke(); };
-            RecordViewControls.UserClickedDeleteButton += () => { UserDeletedRecord?.Invoke(GHubRecord); };
+            RecordViewControls.UserClickedSaveButton += () => { GHubRecordViewModel.FireSaveEvent(); };
+            RecordViewControls.UserClickedDeleteButton += () => { GHubRecordViewModel.FireDeletedEvent(); };
+            
             RecordViewControls.DeleteButton.Visibility = Visibility.Collapsed;
         }
 
         void RecordView.SendRecordChangedNotification()
         {
-            OnPropertyChanged(nameof(GHubRecord));
+            OnPropertyChanged(nameof(GHubRecordViewModel));
         }
 
         public void ResetAppearance()
diff --git a/GHelper/GHelper/View/MainWindow.xaml.cs b/GHelper/GHelper/View/MainWindow.xaml.cs
@@ -144,8 +144,11 @@ private void ChangeDisplayedRecord(GHubRecordViewModel gHubRecord, TreeViewNode
 			LastSelectedRecord = selectedNode;
 
 			RecordView view = RecordView.CreateViewForViewModel(gHubRecord);
-			view.UserSaved += this.UserSaved;
-			view.UserDeletedRecord += this.UserPressedDelete;
+			if (view.GHubRecordViewModel is GHubRecordViewModel viewModel)
+			{
+				viewModel.UserSaved += this.UserSaved;
+				viewModel.UserDeletedRecord += this.UserPressedDelete;
+			}
 			GHubDataDisplay.Content = view;
 		}
 		
diff --git a/GHelper/GHelper/View/ProfileView.xaml.cs b/GHelper/GHelper/View/ProfileView.xaml.cs
@@ -1,7 +1,6 @@
 ﻿using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using GHelper.Annotations;
-using GHelper.Event;
 using GHelper.ViewModel;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
@@ -29,25 +28,23 @@ public ProfileViewModel Profile
 			}
 		}
 
-		public GHubRecordViewModel GHubRecord
+		public GHubRecordViewModel GHubRecordViewModel
 		{
 			get { return Profile; }
-		}
-
-		public event UserSavedEvent?              UserSaved;
-		public event UserDeletedRecordEvent?      UserDeletedRecord;
+		} 
+		
 		public event PropertyChangedEventHandler? PropertyChanged;
 		
 		public ProfileView( )
         {
             InitializeComponent();
-	        RecordViewControls.UserClickedSaveButton += () => { UserSaved?.Invoke(); };
-	        RecordViewControls.UserClickedDeleteButton += () => { UserDeletedRecord?.Invoke(GHubRecord); };
+            RecordViewControls.UserClickedSaveButton += () => { GHubRecordViewModel.FireSaveEvent(); };
+	        RecordViewControls.UserClickedDeleteButton += () => { GHubRecordViewModel.FireDeletedEvent(); };
         }
 
 		void RecordView.SendRecordChangedNotification()
 	    {
-		    OnPropertyChanged(nameof(GHubRecord));
+		    OnPropertyChanged(nameof(GHubRecordViewModel));
 	    }
 
 	    private void HandleNameChange(object sender, RoutedEventArgs routedEventInfo)
diff --git a/GHelper/GHelper/View/RecordView.cs b/GHelper/GHelper/View/RecordView.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using GHelper.Event;
 using GHelper.ViewModel;
 using GHelperLogic.Model;
 using Microsoft.UI.Xaml.Controls;
@@ -29,9 +28,7 @@ public static RecordView CreateViewForViewModel(GHubRecordViewModel gHubRecordVi
 			}
 		}
 		
-		public GHubRecordViewModel?          GHubRecord { get; }
-		public event UserSavedEvent?         UserSaved;
-		public event UserDeletedRecordEvent? UserDeletedRecord;
+		public GHubRecordViewModel? GHubRecordViewModel { get; }
 
 		protected void SendRecordChangedNotification();
 
@@ -45,11 +42,11 @@ public static void ChangeName(RecordView recordView, object sender)
 
 		protected static void ChangeName(RecordView recordView, TextBox textBox)
 		{
-			if (textBox.Text != recordView.GHubRecord?.DisplayName)
+			if (textBox.Text != recordView.GHubRecordViewModel?.DisplayName)
 			{
-				if (recordView.GHubRecord != null)
+				if (recordView.GHubRecordViewModel != null)
 				{
-					recordView.GHubRecord.Name = textBox.Text;
+					recordView.GHubRecordViewModel.Name = textBox.Text;
 					recordView.SendRecordChangedNotification();
 				}
 			}
diff --git a/GHelper/GHelper/View/Utility/GHubItemTemplateSelector.cs b/GHelper/GHelper/View/Utility/GHubItemTemplateSelector.cs
@@ -12,17 +12,14 @@ public class GHubItemTemplateSelector : DataTemplateSelector
 
 		protected override DataTemplate? SelectTemplateCore(object item)
 		{
-			if (item is ApplicationViewModel)
+			switch (item)
 			{
-				return ApplicationTemplate;
-			}
-			else if (item is ProfileViewModel)
-			{
-				return ProfileTemplate;
-			}
-			else
-			{
-				throw new ArgumentException("Unknown type of item passed to GHubItemTemplateSelector");
+				case ApplicationViewModel:
+					return ApplicationTemplate;
+				case ProfileViewModel:
+					return ProfileTemplate;
+				default:
+					throw new ArgumentException("Unknown type of item passed to GHubItemTemplateSelector");
 			}
 		}
 	}
diff --git a/GHelper/GHelper/ViewModel/GHubRecordViewModel.cs b/GHelper/GHelper/ViewModel/GHubRecordViewModel.cs
@@ -1,6 +1,7 @@
 ﻿using System.ComponentModel;
 using System.Reflection;
 using System.Runtime.CompilerServices;
+using GHelper.Event;
 using GHelperLogic.Model;
 
 namespace GHelper.ViewModel
@@ -32,6 +33,9 @@ public State State
 			}
 		}
 		
+		public event UserSavedEvent?         UserSaved;
+		public event UserDeletedRecordEvent? UserDeletedRecord;
+		
 		public abstract event PropertyChangedEventHandler? PropertyChanged;
 
 		public void SaveBackup()
@@ -51,6 +55,16 @@ public virtual void RestoreInitialState()
 			}
 		}
 
+		public void FireSaveEvent()
+		{
+			UserSaved?.Invoke();
+		}
+		
+		public void FireDeletedEvent()
+		{
+			UserDeletedRecord?.Invoke(this);
+		}
+
 		protected abstract void OnPropertyChanged([CallerMemberName] string? propertyName = null);
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`using Windows.Storage;`
`6`	`6`	`using Windows.Storage.Pickers;`
`7`	`7`	`using GHelper.Annotations;`
`8`		`-using GHelper.Event;`
`9`	`8`	`using GHelper.View.Dialog;`
`10`	`9`	`using GHelper.ViewModel;`
`11`	`10`	`using GHelperLogic.IO;`
`@@ -36,25 +35,23 @@ public ApplicationViewModel Application`
`36`	`35`	`}`
`37`	`36`	`}`
`38`	`37`
`39`		`- public GHubRecordViewModel GHubRecord`
	`38`	`+ public GHubRecordViewModel GHubRecordViewModel`
`40`	`39`	`{`
`41`	`40`	`get { return Application; }`
`42`	`41`	`}`
`43`		`-`
`44`		`- public event UserSavedEvent? UserSaved;`
`45`		`- public event UserDeletedRecordEvent? UserDeletedRecord;`
	`42`	`+`
`46`	`43`	`public event PropertyChangedEventHandler? PropertyChanged;`
`47`	`44`
`48`	`45`	`public ApplicationView()`
`49`	`46`	`{`
`50`	`47`	`InitializeComponent();`
`51`		`- RecordViewControls.UserClickedSaveButton += () => { UserSaved?.Invoke(); };`
`52`		`- RecordViewControls.UserClickedDeleteButton += () => { UserDeletedRecord?.Invoke(GHubRecord); };`
	`48`	`+ RecordViewControls.UserClickedSaveButton += () => { GHubRecordViewModel.FireSaveEvent(); };`
	`49`	`+ RecordViewControls.UserClickedDeleteButton += () => { GHubRecordViewModel.FireDeletedEvent(); };`
`53`	`50`	`}`
`54`	`51`
`55`	`52`	`void RecordView.SendRecordChangedNotification()`
`56`	`53`	`{`
`57`		`- OnPropertyChanged(nameof(GHubRecord));`
	`54`	`+ OnPropertyChanged(nameof(GHubRecordViewModel));`
`58`	`55`	`}`
`59`	`56`
`60`	`57`	`protected void HandleNameChange(object sender, RoutedEventArgs routedEventInfo)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System.ComponentModel;`
`2`	`2`	`using System.Runtime.CompilerServices;`
`3`	`3`	`using GHelper.Annotations;`
`4`		`-using GHelper.Event;`
`5`	`4`	`using GHelper.ViewModel;`
`6`	`5`	`using Microsoft.UI.Xaml;`
`7`	`6`	`using Microsoft.UI.Xaml.Controls;`
`@@ -28,27 +27,25 @@ public ApplicationViewModel Application`
`28`	`27`	`}`
`29`	`28`	`}`
`30`	`29`
`31`		`- public GHubRecordViewModel GHubRecord`
	`30`	`+ public GHubRecordViewModel GHubRecordViewModel`
`32`	`31`	`{`
`33`	`32`	`get { return Application; }`
`34`	`33`	`}`
`35`	`34`
`36`		`- public event UserSavedEvent? UserSaved;`
`37`		`- public event UserDeletedRecordEvent? UserDeletedRecord;`
`38`		`-`
`39`	`35`	`public event PropertyChangedEventHandler? PropertyChanged;`
`40`	`36`
`41`	`37`	`public DesktopApplicationView()`
`42`	`38`	`{`
`43`	`39`	`this.InitializeComponent();`
`44`		`- RecordViewControls.UserClickedSaveButton += () => { UserSaved?.Invoke(); };`
`45`		`- RecordViewControls.UserClickedDeleteButton += () => { UserDeletedRecord?.Invoke(GHubRecord); };`
	`40`	`+ RecordViewControls.UserClickedSaveButton += () => { GHubRecordViewModel.FireSaveEvent(); };`
	`41`	`+ RecordViewControls.UserClickedDeleteButton += () => { GHubRecordViewModel.FireDeletedEvent(); };`
	`42`	`+`
`46`	`43`	`RecordViewControls.DeleteButton.Visibility = Visibility.Collapsed;`
`47`	`44`	`}`
`48`	`45`
`49`	`46`	`void RecordView.SendRecordChangedNotification()`
`50`	`47`	`{`
`51`		`- OnPropertyChanged(nameof(GHubRecord));`
	`48`	`+ OnPropertyChanged(nameof(GHubRecordViewModel));`
`52`	`49`	`}`
`53`	`50`
`54`	`51`	`public void ResetAppearance()`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System;`
`2`		`-using GHelper.Event;`
`3`	`2`	`using GHelper.ViewModel;`
`4`	`3`	`using GHelperLogic.Model;`
`5`	`4`	`using Microsoft.UI.Xaml.Controls;`
`@@ -29,9 +28,7 @@ public static RecordView CreateViewForViewModel(GHubRecordViewModel gHubRecordVi`
`29`	`28`	`}`
`30`	`29`	`}`
`31`	`30`
`32`		`- public GHubRecordViewModel? GHubRecord { get; }`
`33`		`- public event UserSavedEvent? UserSaved;`
`34`		`- public event UserDeletedRecordEvent? UserDeletedRecord;`
	`31`	`+ public GHubRecordViewModel? GHubRecordViewModel { get; }`
`35`	`32`
`36`	`33`	`protected void SendRecordChangedNotification();`
`37`	`34`
`@@ -45,11 +42,11 @@ public static void ChangeName(RecordView recordView, object sender)`
`45`	`42`
`46`	`43`	`protected static void ChangeName(RecordView recordView, TextBox textBox)`
`47`	`44`	`{`
`48`		`- if (textBox.Text != recordView.GHubRecord?.DisplayName)`
	`45`	`+ if (textBox.Text != recordView.GHubRecordViewModel?.DisplayName)`
`49`	`46`	`{`
`50`		`- if (recordView.GHubRecord != null)`
	`47`	`+ if (recordView.GHubRecordViewModel != null)`
`51`	`48`	`{`
`52`		`- recordView.GHubRecord.Name = textBox.Text;`
	`49`	`+ recordView.GHubRecordViewModel.Name = textBox.Text;`
`53`	`50`	`recordView.SendRecordChangedNotification();`
`54`	`51`	`}`
`55`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,17 +12,14 @@ public class GHubItemTemplateSelector : DataTemplateSelector`
`12`	`12`
`13`	`13`	`protected override DataTemplate? SelectTemplateCore(object item)`
`14`	`14`	`{`
`15`		`- if (item is ApplicationViewModel)`
	`15`	`+ switch (item)`
`16`	`16`	`{`
`17`		`- return ApplicationTemplate;`
`18`		`- }`
`19`		`- else if (item is ProfileViewModel)`
`20`		`- {`
`21`		`- return ProfileTemplate;`
`22`		`- }`
`23`		`- else`
`24`		`- {`
`25`		`- throw new ArgumentException("Unknown type of item passed to GHubItemTemplateSelector");`
	`17`	`+ case ApplicationViewModel:`
	`18`	`+ return ApplicationTemplate;`
	`19`	`+ case ProfileViewModel:`
	`20`	`+ return ProfileTemplate;`
	`21`	`+ default:`
	`22`	`+ throw new ArgumentException("Unknown type of item passed to GHubItemTemplateSelector");`
`26`	`23`	`}`
`27`	`24`	`}`
`28`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.ComponentModel;`
`2`	`2`	`using System.Reflection;`
`3`	`3`	`using System.Runtime.CompilerServices;`
	`4`	`+using GHelper.Event;`
`4`	`5`	`using GHelperLogic.Model;`
`5`	`6`
`6`	`7`	`namespace GHelper.ViewModel`
`@@ -32,6 +33,9 @@ public State State`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`
	`36`	`+ public event UserSavedEvent? UserSaved;`
	`37`	`+ public event UserDeletedRecordEvent? UserDeletedRecord;`
	`38`	`+`
`35`	`39`	`public abstract event PropertyChangedEventHandler? PropertyChanged;`
`36`	`40`
`37`	`41`	`public void SaveBackup()`
`@@ -51,6 +55,16 @@ public virtual void RestoreInitialState()`
`51`	`55`	`}`
`52`	`56`	`}`
`53`	`57`
	`58`	`+ public void FireSaveEvent()`
	`59`	`+ {`
	`60`	`+ UserSaved?.Invoke();`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ public void FireDeletedEvent()`
	`64`	`+ {`
	`65`	`+ UserDeletedRecord?.Invoke(this);`
	`66`	`+ }`
	`67`	`+`
`54`	`68`	`protected abstract void OnPropertyChanged([CallerMemberName] string? propertyName = null);`
`55`	`69`	`}`
`56`	`70`