MVVM

*actual* mvvm this time

Author: Lamparter

src/Files.App/ViewModels/Properties/HashesViewModel.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using Files.Shared.Helpers;
+using Microsoft.UI.Xaml.Controls;
 using System.IO;
 using System.Security.Cryptography;
 using System.Windows.Input;
@@ -25,11 +26,41 @@ public HashInfoItem SelectedItem
 		public Dictionary<string, bool> ShowHashes { get; private set; }
 
 		public ICommand ToggleIsEnabledCommand { get; private set; }
+		public ICommand HashInputTextChangedCommand { get; private set; }
+		public ICommand CompareFileCommand { get; private set; }
 
 		private ListedItem _item;
 
 		private CancellationTokenSource _cancellationTokenSource;
 
+		private string _hashInput;
+		public string HashInput
+		{
+			get => _hashInput;
+			set => SetProperty(ref _hashInput, value);
+		}
+
+		private InfoBarSeverity _infoBarSeverity;
+		public InfoBarSeverity InfoBarSeverity
+		{
+			get => _infoBarSeverity;
+			set => SetProperty(ref _infoBarSeverity, value);
+		}
+
+		private string _infoBarTitle;
+		public string InfoBarTitle
+		{
+			get => _infoBarTitle;
+			set => SetProperty(ref _infoBarTitle, value);
+		}
+
+		private bool _isInfoBarOpen;
+		public bool IsInfoBarOpen
+		{
+			get => _isInfoBarOpen;
+			set => SetProperty(ref _isInfoBarOpen, value);
+		}
+
 		public HashesViewModel(ListedItem item)
 		{
 			ToggleIsEnabledCommand = new RelayCommand<string>(ToggleIsEnabled);
@@ -57,6 +88,9 @@ public HashesViewModel(ListedItem item)
 			ShowHashes.TryAdd("SHA512", false);
 
 			Hashes.Where(x => ShowHashes[x.Algorithm]).ForEach(x => ToggleIsEnabledCommand.Execute(x.Algorithm));
+
+			HashInputTextChangedCommand = new RelayCommand(OnHashInputTextChanged);
+			CompareFileCommand = new RelayCommand(async () => await OnCompareFileAsync());
 		}
 
 		private void ToggleIsEnabled(string? algorithm)
@@ -183,6 +217,51 @@ public async Task<string> CalculateFileHashAsync(string filePath)
 			}
 		}
 
+		private void OnHashInputTextChanged()
+		{
+			string? matchingAlgorithm = null;
+
+			try
+			{
+				matchingAlgorithm = FindMatchingAlgorithm(HashInput);
+			}
+			catch (ArgumentNullException)
+			{
+				return;
+			}
+
+			if (string.IsNullOrEmpty(matchingAlgorithm))
+			{
+				InfoBarSeverity = InfoBarSeverity.Error;
+				InfoBarTitle = Strings.HashesDoNotMatch.GetLocalizedResource();
+				IsInfoBarOpen = true;
+			}
+			else
+			{
+				InfoBarSeverity = InfoBarSeverity.Success;
+				InfoBarTitle = string.Format(Strings.HashesMatch.GetLocalizedResource(), matchingAlgorithm);
+				IsInfoBarOpen = true;
+			}
+		}
+
+		private async Task OnCompareFileAsync()
+		{
+			var result = await CompareFileAsync();
+
+			if (result)
+			{
+				InfoBarSeverity = InfoBarSeverity.Success; // Check mark
+				InfoBarTitle = Strings.HashesMatch.GetLocalizedResource();
+			}
+			else
+			{
+				InfoBarSeverity = InfoBarSeverity.Error; // Cross mark
+				InfoBarTitle = Strings.HashesDoNotMatch.GetLocalizedResource();
+			}
+
+			IsInfoBarOpen = true;
+		}
+
 		public void Dispose()
 		{
 			_cancellationTokenSource.Cancel();

src/Files.App/Views/Properties/HashesPage.xaml

@@ -6,6 +6,7 @@
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:datamodels="using:Files.App.Data.Models"
 	xmlns:helpers="using:Files.App.Helpers"
+	xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:toolkitconverters="using:CommunityToolkit.WinUI.Converters"
 	xmlns:vm="using:Files.App.ViewModels.Properties"
@@ -57,7 +58,13 @@
 					x:Name="HashInputTextBox"
 					Grid.Column="0"
 					PlaceholderText="{helpers:ResourceString Name=EnterHashToCompare}"
-					TextChanged="HashInputTextBox_TextChanged" />
+					Text="{x:Bind HashesViewModel.HashInput, Mode=TwoWay}">
+					<interactivity:Interaction.Behaviors>
+						<interactivity:EventTriggerBehavior EventName="TextChanged">
+							<interactivity:InvokeCommandAction Command="{x:Bind HashesViewModel.HashInputTextChangedCommand}" />
+						</interactivity:EventTriggerBehavior>
+					</interactivity:Interaction.Behaviors>
+				</TextBox>
 			</Grid>
 
 			<!--  Compare File Button  -->
@@ -66,7 +73,7 @@
 				Grid.Row="0"
 				Grid.Column="1"
 				Margin="12"
-				Click="CompareFileButton_Click"
+				Command="{x:Bind HashesViewModel.CompareFileCommand}"
 				Content="{helpers:ResourceString Name=CompareFile}" />
 		</Grid>
 
@@ -76,9 +83,9 @@
 			Grid.Column="0"
 			Margin="12,75,12,12"
 			IsClosable="False"
-			IsOpen="False"
-			Message="No hashes match the provided hash."
-			Severity="Informational" />
+			IsOpen="{x:Bind HashesViewModel.IsInfoBarOpen, Mode=TwoWay}"
+			Message="{x:Bind HashesViewModel.InfoBarTitle, Mode=TwoWay}"
+			Severity="{x:Bind HashesViewModel.InfoBarSeverity, Mode=TwoWay}" />
 
 		<Grid
 			x:Name="HashesListGrid"

src/Files.App/Views/Properties/HashesPage.xaml.cs

@@ -48,54 +48,6 @@ private void ToggleMenuFlyoutItem_Click(object sender, RoutedEventArgs e)
 			_cancel = true;
 		}
 
-		private void HashInputTextBox_TextChanged(object sender, TextChangedEventArgs e)
-		{
-			string? matchingAlgorithm = null;
-
-			try
-			{
-				matchingAlgorithm = HashesViewModel.FindMatchingAlgorithm(HashInputTextBox.Text);
-			}
-			catch (ArgumentNullException)
-			{
-				return;
-			}
-
-			if (string.IsNullOrEmpty(matchingAlgorithm))
-			{
-				HashMatchInfoBar.Severity = InfoBarSeverity.Error;
-				HashMatchInfoBar.Title = Strings.HashesDoNotMatch.GetLocalizedResource();
-				HashMatchInfoBar.IsOpen = true;
-				return;
-			}
-			else
-			{
-				HashMatchInfoBar.Severity = InfoBarSeverity.Success;
-				HashMatchInfoBar.Title = string.Format(Strings.HashesMatch.GetLocalizedResource(), matchingAlgorithm);
-				HashMatchInfoBar.IsOpen = true;
-				return;
-			}
-		}
-
-
-		private async void CompareFileButton_Click(object sender, RoutedEventArgs e)
-		{
-			var result = await HashesViewModel.CompareFileAsync();
-
-			if (result)
-			{
-				HashMatchInfoBar.Severity = InfoBarSeverity.Success; // Check mark
-				HashMatchInfoBar.Title = Strings.HashesMatch.GetLocalizedResource();
-			}
-			else
-			{
-				HashMatchInfoBar.Severity = InfoBarSeverity.Error; // Cross mark
-				HashMatchInfoBar.Title = "no";
-			}
-
-			HashMatchInfoBar.IsOpen = true;
-		}
-
 		private void MenuFlyout_Closing(FlyoutBase sender, FlyoutBaseClosingEventArgs e)
 		{
 			e.Cancel = _cancel;