TracyP/WpfViewModelFirst
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged MainWindowViewModel changes

Browse Source
This commit is contained in:
Tracy Pearson
2022-08-27 11:59:50 -04:00
parent 42c192d849 eb86543e4a
commit b58a74709e
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
WpfViewModelFirst/MainWindow.xaml
View File

@@ -9,10 +9,11 @@
mc:Ignorable="d" mc:Ignorable="d"
d:DataContext="{d:DesignInstance Type={x:Type local:MainWindowViewModel}}" d:DataContext="{d:DesignInstance Type={x:Type local:MainWindowViewModel}}"
Title="MainWindow" Height="450" Width="800"> Title="MainWindow" Height="450" Width="800">
<Grid Background="DarkRed"> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition Height="auto"/> <RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ContentControl Grid.Row="0" <ContentControl Grid.Row="0"
Visibility="Visible" Visibility="Visible"
@@ -26,7 +27,9 @@
</DataTemplate> </DataTemplate>
</ContentControl.Resources> </ContentControl.Resources>
</ContentControl> </ContentControl>
<Button Grid.Row="1" <ListView Grid.Row="1"
ItemsSource="{Binding Strings}"/>
<Button Grid.Row="2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Command="{Binding StartCommand}" Command="{Binding StartCommand}"
Content="Start"/> Content="Start"/>

18
WpfViewModelFirst/MainWindowViewModel.cs
View File

@@ -1,7 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Input; using System.Windows.Input;
using System.Windows.Threading; using System.Windows.Threading;
@@ -29,17 +31,18 @@ namespace WpfViewModelFirst
} }
private void Part1Action() private void Part1Action()
{ {
var currentDispatcher = Dispatcher.CurrentDispatcher;
CurrentViewModel = null; CurrentViewModel = null;
Task delay = Task.Run(LongDelay).ContinueWith(c => LongDelay().ContinueWith(c =>
{ {
System.Diagnostics.Debug.WriteLine(c.Result); System.Diagnostics.Debug.WriteLine(c.Result);
CurrentViewModel = _viewModelFactory.GetPart2ViewModel(); CurrentViewModel = _viewModelFactory.GetPart2ViewModel();
currentDispatcher.Invoke(() =>
{
Strings.Add($"{DateTime.Now}");
}
);
}, TaskContinuationOptions.OnlyOnRanToCompletion); }, TaskContinuationOptions.OnlyOnRanToCompletion);
//Task.Run(async () => await LongDelay()).ContinueWith(c =>
// {
// System.Diagnostics.Debug.WriteLine(c.Result);
//CurrentViewModel = new Part2ViewModel();
//}, TaskContinuationOptions.OnlyOnRanToCompletion);
} }
private async Task<string> LongDelay() private async Task<string> LongDelay()
@@ -51,5 +54,8 @@ namespace WpfViewModelFirst
private ViewModelBase? _mainFrameViewModel; private ViewModelBase? _mainFrameViewModel;
public ViewModelBase? CurrentViewModel { get => _mainFrameViewModel; set => SetProperty(ref _mainFrameViewModel, value); } public ViewModelBase? CurrentViewModel { get => _mainFrameViewModel; set => SetProperty(ref _mainFrameViewModel, value); }
private ObservableCollection<string> _strings = new();
public ObservableCollection<string> Strings { get => _strings; set => SetProperty(ref _strings, value); }
} }
} }