Moved Done and Cancel into view models.

Moved the `Done` and `Cancel` observables out of the views and into the
view models. In doing so, moved `IDialogViewModel` into
`GitHub.Exports.Reactive` and removed `IReactiveDialogViewModel`.

Author: grokys

src/GitHub.App/Controllers/UIController.cs

@@ -525,15 +525,15 @@ void RunView(UIViewType viewType, ViewWithData arg = null)
             if (!firstTime)
                 return;
 
-            SetupView(viewType, view);
+            SetupView(viewType, view.ViewModel);
         }
 
-        void SetupView(UIViewType viewType, IView view)
+        void SetupView(UIViewType viewType, IViewModel viewModel)
         {
             var list = GetObjectsForFlow(activeFlow);
             var pair = list[viewType];
-            var hasDone = view as IHasDone;
-            var hasCancel = view as IHasCancel;
+            var hasDone = viewModel as IHasDone;
+            var hasCancel = viewModel as IHasCancel;
 
             // 2FA is set up when login is set up, so nothing to do
             if (viewType == UIViewType.TwoFactor)
@@ -551,7 +551,7 @@ void SetupView(UIViewType viewType, IView view)
                     .ObserveOn(RxApp.MainThreadScheduler)
                     .Subscribe(_ => Fire(Trigger.Next)));
 
-                pair2fa.AddHandler(((IHasCancel)pair2fa.View).Cancel
+                pair2fa.AddHandler(((IHasCancel)pair2fa.ViewModel).Cancel
                     .ObserveOn(RxApp.MainThreadScheduler)
                     .Subscribe(_ => Fire(uiStateMachine.CanFire(Trigger.Cancel) ? Trigger.Cancel : Trigger.Finish)));
 

src/GitHub.App/SampleData/LoggedOutViewModelDesigner.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
+using System.Reactive;
 using System.Reactive.Linq;
-using System.Windows.Input;
-using GitHub.Collections;
-using GitHub.Models;
 using GitHub.ViewModels;
 
 namespace GitHub.SampleData

src/GitHub.App/SampleData/PullRequestCreationViewModelDesigner.cs

@@ -4,6 +4,8 @@
 using GitHub.Models;
 using GitHub.Validation;
 using ReactiveUI;
+using System;
+using System.Reactive;
 
 namespace GitHub.SampleData
 {
@@ -46,5 +48,6 @@ public PullRequestCreationViewModelDesigner()
 
         public ReactivePropertyValidator BranchValidator { get; }
 
+        public override IObservable<Unit> Done { get; }
     }
 }

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -186,6 +186,8 @@ public LicenseItem SelectedLicense
             get;
             set;
         }
+
+        public override IObservable<Unit> Done { get; }
     }
 
     [ExcludeFromCodeCoverage]
@@ -230,12 +232,6 @@ public bool IsHostComboBoxVisible
             }
         }
 
-        public bool IsPublishing
-        {
-            get;
-            private set;
-        }
-
         public IReactiveCommand<ProgressState> PublishRepository
         {
             get;
@@ -423,6 +419,8 @@ public ReactivePropertyValidator<string> BaseRepositoryPathValidator
             get;
             private set;
         }
+
+        public override IObservable<Unit> Done { get; }
     }
 
     public class GitHubHomeSectionDesigner : IGitHubHomeSection

src/GitHub.App/SampleData/StartPageCloneViewModelDesigner.cs

@@ -15,5 +15,6 @@ public class StartPageCloneViewModelDesigner : DialogViewModelBase, IBaseCloneVi
         public ICommand BrowseForDirectory { get; }
         public IReactiveCommand<object> CloneCommand { get; }
         public IRepositoryModel SelectedRepository { get; set; }
+        public override IObservable<Unit> Done { get; }
     }
 }

src/GitHub.App/Services/DialogService.cs

@@ -30,7 +30,7 @@ public Task<CloneDialogResult> ShowCloneDialog([AllowNull] IConnection connectio
             {
                 var vm = x.View.ViewModel as IBaseCloneViewModel;
 
-                ((IHasDone)x.View).Done.Subscribe(_ =>
+                ((IDialogViewModel)x.View.ViewModel).Done.Subscribe(_ =>
                 {
                     basePath = vm?.BaseRepositoryPath;
                     repository = vm?.SelectedRepository;
@@ -58,7 +58,7 @@ public Task<string> ShowReCloneDialog(IRepositoryModel repository)
                     vm.SelectedRepository = repository;
                 }
 
-                ((IHasDone)x.View).Done.Subscribe(_ =>
+                ((IDialogViewModel)x.View.ViewModel).Done.Subscribe(_ =>
                 {
                     basePath = vm?.BaseRepositoryPath;
                 });

src/GitHub.App/ViewModels/DialogViewModelBase.cs

@@ -2,13 +2,16 @@
 using ReactiveUI;
 using NullGuard;
 using GitHub.UI;
+using System;
+using System.Reactive;
+using GitHub.Extensions.Reactive;
 
 namespace GitHub.ViewModels
 {
     /// <summary>
     /// Base class for view models that can be dismissed, such as dialogs.
     /// </summary>
-    public class DialogViewModelBase : ReactiveObject, IReactiveDialogViewModel, IHasBusy
+    public abstract class DialogViewModelBase : ReactiveObject, IDialogViewModel, IHasBusy
     {
         protected ObservableAsPropertyHelper<bool> isShowing;
         string title;
@@ -19,14 +22,14 @@ public class DialogViewModelBase : ReactiveObject, IReactiveDialogViewModel, IHa
         /// </summary>
         protected DialogViewModelBase()
         {
-            CancelCommand = ReactiveCommand.Create();
+            Cancel = ReactiveCommand.Create();
         }
 
         /// <inheritdoc/>
-        public IReactiveCommand<object> CancelCommand { get; protected set; }
+        public abstract IObservable<Unit> Done { get; }
 
         /// <inheritdoc/>
-        public ICommand Cancel { get { return CancelCommand; } }
+        public ReactiveCommand<object> Cancel { get; }
 
         /// <inheritdoc/>
         public string Title
@@ -46,6 +49,9 @@ public bool IsBusy
             set { this.RaiseAndSetIfChanged(ref isBusy, value); }
         }
 
+        /// <inheritdoc/>
+        IObservable<Unit> IHasCancel.Cancel => Cancel.SelectUnit();
+
         /// <inheritdoc/>
         public virtual void Initialize([AllowNull] ViewWithData data)
         {

src/GitHub.App/ViewModels/GistCreationViewModel.cs

@@ -1,11 +1,13 @@
 using System;
 using System.ComponentModel.Composition;
 using System.Linq;
+using System.Reactive;
 using System.Reactive.Linq;
 using GitHub.Api;
 using GitHub.App;
 using GitHub.Exports;
 using GitHub.Extensions;
+using GitHub.Extensions.Reactive;
 using GitHub.Models;
 using GitHub.Services;
 using NLog;
@@ -132,5 +134,7 @@ public string FileName
             get { return fileName; }
             set { this.RaiseAndSetIfChanged(ref fileName, value); }
         }
+
+        public override IObservable<Unit> Done => CreateGist.Where(x => x != null).SelectUnit();
     }
 }

src/GitHub.App/ViewModels/LoginControlViewModel.cs

@@ -1,9 +1,11 @@
 using System;
 using System.ComponentModel.Composition;
+using System.Reactive;
 using System.Reactive.Linq;
 using GitHub.App;
 using GitHub.Authentication;
 using GitHub.Exports;
+using GitHub.Extensions.Reactive;
 using GitHub.Models;
 using ReactiveUI;
 
@@ -78,6 +80,11 @@ public IRepositoryHosts RepositoryHosts
         public bool IsLoginInProgress { get { return isLoginInProgress.Value; } }
 
         public IObservable<AuthenticationResult> AuthenticationResults { get; private set; }
+
+        public override IObservable<Unit> Done
+        {
+            get { return AuthenticationResults.Where(x => x == AuthenticationResult.Success).SelectUnit(); }
+        }
     }
 
     public enum LoginTarget

src/GitHub.App/ViewModels/LogoutRequiredViewModel.cs

@@ -14,6 +14,8 @@
 using ReactiveUI;
 using System.Diagnostics;
 using System.Globalization;
+using System.Reactive;
+using GitHub.Extensions.Reactive;
 
 namespace GitHub.ViewModels
 {
@@ -53,6 +55,11 @@ public override void Initialize([AllowNull] ViewWithData data)
 
         public IReactiveCommand<ProgressState> Logout { get; }
 
+        public override IObservable<Unit> Done
+        {
+            get { return Logout.Where(x => x == ProgressState.Success).SelectUnit(); }
+        }
+
         IObservable<ProgressState> OnLogout(object unused)
         {
             return DoLogout().ToObservable()