Use interface instead of class for cancel commands

Author: shana

src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs

@@ -5,6 +5,7 @@
 using GitHub.Validation;
 using System;
 using System.Windows.Input;
+using ReactiveUI;
 
 namespace GitHub.SampleData
 {
@@ -39,7 +40,7 @@ public PullRequestCreationViewModelDesigner()
         public string SelectedAssignee { get; set; }
         public List<string> Users { get; set; }
 
-        public ICommand CreatePullRequest { get; }
+        public IReactiveCommand<IPullRequestModel> CreatePullRequest { get; }
 
         public string PRTitle { get; set; }
 

src/GitHub.App/ViewModels/BaseViewModel.cs

@@ -14,7 +14,7 @@ public BaseViewModel()
             CancelCommand = ReactiveCommand.Create();
         }
 
-        public ReactiveCommand<object> CancelCommand { get; protected set; }
+        public IReactiveCommand<object> CancelCommand { get; protected set; }
         public ICommand Cancel { get { return CancelCommand; } }
 
         public string Title {[return: AllowNull] get; protected set; }

src/GitHub.App/ViewModels/LogoutRequiredViewModel.cs

@@ -33,7 +33,6 @@ public LogoutRequiredViewModel(IRepositoryHosts repositoryHosts, INotificationSe
 
             Title = Resources.LogoutRequiredTitle;
             Logout = ReactiveCommand.CreateAsyncObservable(OnLogout);
-            CancelCommand = ReactiveCommand.Create();
             Icon = Octicon.mark_github;
         }
 

src/GitHub.Exports.Reactive/ViewModels/ILogoutRequiredViewModel.cs

@@ -7,12 +7,9 @@ namespace GitHub.ViewModels
     /// <summary>
     /// Represents a view model for the "Log out Required" dialog..
     /// </summary>
-    public interface ILogoutRequiredViewModel : IViewModel
+    public interface ILogoutRequiredViewModel : IReactiveViewModel
     {
         IReactiveCommand<ProgressState> Logout { get; }
-
-        ReactiveCommand<object> CancelCommand { get; }
-
         string LogoutRequiredMessage { get; set; }
         Octicon Icon { get; set; }
     }

src/GitHub.Exports.Reactive/ViewModels/IPullRequestCreationViewModel.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Windows.Input;
 using GitHub.Validation;
+using ReactiveUI;
 
 namespace GitHub.ViewModels
 {
@@ -11,9 +12,8 @@ public interface IPullRequestCreationViewModel : IReactiveViewModel
         IBranch SourceBranch { get; set; }
         IBranch TargetBranch { get; set; }
         IReadOnlyList<IBranch> Branches { get; }
-        ICommand CreatePullRequest { get; }
+        IReactiveCommand<IPullRequestModel> CreatePullRequest { get; }
         string PRTitle { get; set; }
         ReactivePropertyValidator TitleValidator { get; }
-        ReactivePropertyValidator BranchValidator { get; }
     }
 }

src/GitHub.Exports.Reactive/ViewModels/IReactiveViewModel.cs

@@ -4,6 +4,6 @@ namespace GitHub.ViewModels
 {
     public interface IReactiveViewModel : IViewModel
     {
-        ReactiveCommand<object> CancelCommand { get; }
+        IReactiveCommand<object> CancelCommand { get; }
     }
 }

src/GitHub.Exports.Reactive/ViewModels/ITwoFactorDialogViewModel.cs

@@ -4,10 +4,9 @@
 
 namespace GitHub.ViewModels
 {
-    public interface ITwoFactorDialogViewModel : IViewModel
+    public interface ITwoFactorDialogViewModel : IReactiveViewModel
     {
         ReactiveCommand<object> OkCommand { get; }
-        ReactiveCommand<object> CancelCommand { get; }
         ReactiveCommand<object> NavigateLearnMore { get; }
         ReactiveCommand<object> ResendCodeCommand { get; }