diff --git a/PcgsInvUi/ViewModels/MainWindowViewModel.cs b/PcgsInvUi/ViewModels/MainWindowViewModel.cs index c73261c..da18a23 100644 --- a/PcgsInvUi/ViewModels/MainWindowViewModel.cs +++ b/PcgsInvUi/ViewModels/MainWindowViewModel.cs @@ -1,7 +1,8 @@ using System; using System.Collections.ObjectModel; +using System.Linq; +using System.Reactive; using System.Reactive.Linq; -using System.Windows.Input; using PcgsInvUi.Models; using PcgsInvUi.Services; using ReactiveUI; @@ -16,7 +17,7 @@ public class MainWindowViewModel : ViewModelBase private set => this.RaiseAndSetIfChanged(ref _sideContent, value); } public ObservableCollection CoinCollection { get; set; } - public Coin SelectedCoin + public Coin? SelectedCoin { get => _selectedCoin; set => this.RaiseAndSetIfChanged(ref _selectedCoin, value); @@ -26,10 +27,10 @@ public class MainWindowViewModel : ViewModelBase get => _totalValue; set => this.RaiseAndSetIfChanged(ref _totalValue, value); } - public ICommand DeleteCommand { get; } + public ReactiveCommand DeleteCommand { get; } public Interaction ShowDeleteWindow { get; } - private ViewModelBase? _sideContent; + private ViewModelBase _sideContent; private Coin? _selectedCoin; private double _totalValue; private PcgsClient _pcgsClient; @@ -37,7 +38,7 @@ public class MainWindowViewModel : ViewModelBase public MainWindowViewModel(CoinCollection coins) { var newViewModel = new NewViewModel(); - SidebarContent = newViewModel; + _sideContent = newViewModel; CoinCollection = new ObservableCollection(coins.GetItems()); _pcgsClient = new PcgsClient("eAb8gS0I2XAvT_5gJeiGJaglMia1Tk-oB4kJUK6kuafyrny_S61vIJY-Ikl4nCQM67wrdxzUqLVWTV2kBSxD3d5XNBHxHnYBhcSS6dOPug0hZaF3qAv56df3gYSzOGh9Tif5y0eP3Iw0LrqKDr1Hj-dk6SV6GKog2IIqCPQhhHH8FMTWBTYO-_O8cx7qLdM5GM8KlTsic6g3VRUhM8EA_4OO04dCfmNLGhqINRl3jGZ0Q4ziI8fng2bVWsIyteqiPzUn10rIQ3-OPpqVZG_DxeOmOejj4GzbUNyqUOajy-nr5rYY"); @@ -46,7 +47,7 @@ public class MainWindowViewModel : ViewModelBase { var deleteViewModel = new DeleteWindowViewModel(); var result = await ShowDeleteWindow.Handle(deleteViewModel); - if (result) CoinCollection.Remove(SelectedCoin); + if (result && SelectedCoin != null) CoinCollection.Remove(SelectedCoin); }); // Subscribe to SidebarContent.OkCommand, which is an IObservable<(int, string, int)> @@ -59,10 +60,10 @@ public class MainWindowViewModel : ViewModelBase CoinCollection.Add(newCoin); TotalValue += newCoin.Quantity * newCoin.PriceGuideValue; }); - } - - public void FindItem() - { + // Change TotalValue anytime SelectedCoin.TotalPrice changes. This does work properly with the DeleteCommand. + this.WhenAnyValue(x => x.SelectedCoin.TotalPrice) + .Where(x => x != null) + .Subscribe(_ => TotalValue = CoinCollection.Sum(x => x.TotalPrice) ); } } diff --git a/PcgsInvUi/Views/CoinListView.axaml b/PcgsInvUi/Views/CoinListView.axaml deleted file mode 100644 index 1f8bd8b..0000000 --- a/PcgsInvUi/Views/CoinListView.axaml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/PcgsInvUi/Views/CoinListView.axaml.cs b/PcgsInvUi/Views/CoinListView.axaml.cs deleted file mode 100644 index f6b3521..0000000 --- a/PcgsInvUi/Views/CoinListView.axaml.cs +++ /dev/null @@ -1,13 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Markup.Xaml; - -namespace PcgsInvUi.Views; - -public partial class CoinListView : UserControl -{ - public CoinListView() - { - InitializeComponent(); - } -} \ No newline at end of file diff --git a/PcgsInvUi/Views/MainWindow.axaml b/PcgsInvUi/Views/MainWindow.axaml index e7874b6..b796068 100644 --- a/PcgsInvUi/Views/MainWindow.axaml +++ b/PcgsInvUi/Views/MainWindow.axaml @@ -16,7 +16,7 @@ - +