From a5f642d95cda16276248dbb2814aedb69da6e23a Mon Sep 17 00:00:00 2001
From: Antony Male <antony.male@gmail.com>
Date: Sat, 14 Mar 2015 14:53:55 +0000
Subject: [PATCH] Improve Stylet.Samples.Validation, and remove .TryClose

---
 .../Stylet.Samples.HelloDialog/Dialog1ViewModel.cs   |  2 +-
 .../Pages/UserView.xaml                              | 12 ++++++------
 .../Pages/UserViewModel.cs                           |  4 ++++
 .../Pages/PostCommentsViewModel.cs                   |  2 +-
 .../Pages/PostsViewModel.cs                          |  4 ++--
 .../Pages/SubredditViewModel.cs                      |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/Samples/Stylet.Samples.HelloDialog/Dialog1ViewModel.cs b/Samples/Stylet.Samples.HelloDialog/Dialog1ViewModel.cs
index 75b3f8f..b7c73aa 100644
--- a/Samples/Stylet.Samples.HelloDialog/Dialog1ViewModel.cs
+++ b/Samples/Stylet.Samples.HelloDialog/Dialog1ViewModel.cs
@@ -13,7 +13,7 @@ namespace Stylet.Samples.HelloDialog
 
         public void Close()
         {
-            this.TryClose(true);
+            this.RequestClose(true);
         }
     }
 }
diff --git a/Samples/Stylet.Samples.ModelValidation/Pages/UserView.xaml b/Samples/Stylet.Samples.ModelValidation/Pages/UserView.xaml
index 8d8f2f8..e61bb1b 100644
--- a/Samples/Stylet.Samples.ModelValidation/Pages/UserView.xaml
+++ b/Samples/Stylet.Samples.ModelValidation/Pages/UserView.xaml
@@ -21,7 +21,7 @@
                         <DockPanel LastChildFill="False">
                             <TextBlock DockPanel.Dock="Bottom" HorizontalAlignment="Left" Width="{Binding ElementName=CustomAdorner, Path=ActualWidth}"
                                        Foreground="OrangeRed" TextTrimming="WordEllipsis"
-                                       Text="{Binding ElementName=CustomAdorner,Path=AdornedElement.(Validation.Errors)[0].ErrorContent}"/>
+                                       Text="{Binding ElementName=CustomAdorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}"/>
                             <Border Background="OrangeRed" DockPanel.Dock="Right" Margin="5,0,0,0" VerticalAlignment="Top"
                                 Width="20" Height="20" CornerRadius="5">
                                 <TextBlock Text="!" VerticalAlignment="center" HorizontalAlignment="center" FontWeight="Bold" Foreground="white" />
@@ -53,19 +53,19 @@
         </Grid.RowDefinitions>
 
         <Label Grid.Row="0" Grid.Column="0" Target="{Binding ElementName=UserName}">UserName:</Label>
-        <TextBox Grid.Row="0" Grid.Column="1" x:Name="UserName" Text="{Binding UserName}"/>
+        <TextBox Grid.Row="0" Grid.Column="1" x:Name="UserName" Text="{Binding UserName, UpdateSourceTrigger=PropertyChanged}"/>
 
         <Label Grid.Row="1" Grid.Column="0" Target="{Binding ElementName=Email}">Email:</Label>
-        <TextBox Grid.Row="1" Grid.Column="1" x:Name="Email" Text="{Binding Email}"/>
+        <TextBox Grid.Row="1" Grid.Column="1" x:Name="Email" Text="{Binding Email, UpdateSourceTrigger=PropertyChanged}"/>
 
         <Label Grid.Row="2" Grid.Column="0" Target="{Binding ElementName=Age}">Age:</Label>
-        <TextBox Grid.Row="2" Grid.Column="1" x:Name="Age" Text="{Binding Age}"/>
+        <TextBox Grid.Row="2" Grid.Column="1" x:Name="Age" Text="{Binding Age, UpdateSourceTrigger=PropertyChanged}"/>
 
         <Label Grid.Row="3" Grid.Column="0" Target="{Binding ElementName=Password}">Password:</Label>
-        <PasswordBox Grid.Row="3" Grid.Column="1" x:Name="Password" xaml:Secure.Password="{Binding Password}"/>
+        <PasswordBox Grid.Row="3" Grid.Column="1" x:Name="Password" xaml:Secure.Password="{Binding Password, UpdateSourceTrigger=PropertyChanged}"/>
 
         <Label Grid.Row="4" Grid.Column="0" Target="{Binding ElementName=PasswordConfirmation}">Password Confirmation:</Label>
-        <PasswordBox Grid.Row="4" Grid.Column="1" x:Name="PasswordConfirmation" xaml:Secure.Password="{Binding PasswordConfirmation}"/>
+        <PasswordBox Grid.Row="4" Grid.Column="1" x:Name="PasswordConfirmation" xaml:Secure.Password="{Binding PasswordConfirmation, UpdateSourceTrigger=PropertyChanged}"/>
         
         <CheckBox Grid.Row="5" Grid.Column="0" IsChecked="{Binding ShouldAutoValidate}">Auto-Validate</CheckBox>
         <Button Grid.Row="5" Grid.Column="1" Command="{s:Action Submit}" HorizontalAlignment="Left">Submit</Button>
diff --git a/Samples/Stylet.Samples.ModelValidation/Pages/UserViewModel.cs b/Samples/Stylet.Samples.ModelValidation/Pages/UserViewModel.cs
index b5f8e69..93fe583 100644
--- a/Samples/Stylet.Samples.ModelValidation/Pages/UserViewModel.cs
+++ b/Samples/Stylet.Samples.ModelValidation/Pages/UserViewModel.cs
@@ -27,6 +27,10 @@ namespace Stylet.Samples.ModelValidation.Pages
         public UserViewModel(IWindowManager windowManager, IModelValidator<UserViewModel> validator) : base(validator)
         {
             this.windowManager = windowManager;
+            // Force initial validation
+            this.Validate();
+            // Whenever password changes, we need to re-validate PasswordConfirmation
+            this.Bind(x => x.Password, (o, e) => this.ValidateProperty(() => this.PasswordConfirmation));
         }
 
         protected override void OnValidationStateChanged(IEnumerable<string> changedProperties)
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsViewModel.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsViewModel.cs
index ff53ddd..df48acd 100644
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsViewModel.cs
+++ b/Samples/Stylet.Samples.RedditBrowser/Pages/PostCommentsViewModel.cs
@@ -23,7 +23,7 @@ namespace Stylet.Samples.RedditBrowser.Pages
 
         public void GoBack()
         {
-            this.TryClose();
+            this.RequestClose();
         }
     }
 }
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/PostsViewModel.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/PostsViewModel.cs
index 4cc124f..74330f2 100644
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/PostsViewModel.cs
+++ b/Samples/Stylet.Samples.RedditBrowser/Pages/PostsViewModel.cs
@@ -29,13 +29,13 @@ namespace Stylet.Samples.RedditBrowser.Pages
             }
             catch (Exception)
             {
-                this.TryClose();
+                this.RequestClose();
             }
         }
 
         public void Close()
         {
-            this.TryClose();
+            this.RequestClose();
         }
 
         public bool CanNext
diff --git a/Samples/Stylet.Samples.RedditBrowser/Pages/SubredditViewModel.cs b/Samples/Stylet.Samples.RedditBrowser/Pages/SubredditViewModel.cs
index eae98fb..c1a4292 100644
--- a/Samples/Stylet.Samples.RedditBrowser/Pages/SubredditViewModel.cs
+++ b/Samples/Stylet.Samples.RedditBrowser/Pages/SubredditViewModel.cs
@@ -42,7 +42,7 @@ namespace Stylet.Samples.RedditBrowser.Pages
 
             // If we're setting the ActiveItem to null, that means everything's been closed - close ourselves
             if (newItem == null)
-                this.TryClose();
+                this.RequestClose();
         }
     }