Fix all the bindings

A bunch of classes were doing xaml bindings in a very wrong way, relying
on some external code setting the ViewModel property explicitly and not
defining the bindings in xaml.
Make every SimpleUserControl subclass set the ViewModel property via the
DataContextChanged event (DataContext is set for every view in
UIController), and fix the xaml bindings so things work.
Remove useless ReactiveUI code-behind bindings while we're at it, it's
pointless doing it twice.

This should fix #274 and #275

Author: shana

src/GitHub.App/SampleData/SampleViewModels.cs

@@ -40,18 +40,20 @@ public RepositoryCreationViewModelDesigner()
             RepositoryName = "Hello-World";
             Description = "A description";
             KeepPrivate = true;
+            CanKeepPrivate = true;
             Accounts = new ReactiveList<IAccount>
             {
                 new AccountDesigner { Login = "shana" },
                 new AccountDesigner { Login = "GitHub", IsUser = false }
             };
+            SelectedAccount = Accounts[0];
             GitIgnoreTemplates = new ReactiveList<GitIgnoreItem>
             {
                 GitIgnoreItem.Create("VisualStudio"),
                 GitIgnoreItem.Create("Wap"),
                 GitIgnoreItem.Create("WordPress")
             };
-
+            SelectedGitIgnoreTemplate = GitIgnoreTemplates[0];
             Licenses = new ReactiveList<LicenseItem>
             {
                 new LicenseItem("agpl-3.0", "GNU Affero GPL v3.0"),
@@ -60,16 +62,15 @@ public RepositoryCreationViewModelDesigner()
                 new LicenseItem("mit", "MIT License")
             };
 
-            SelectedLicense = LicenseItem.None;
-            SelectedGitIgnoreTemplate = null;
+            SelectedLicense = Licenses[0];
         }
 
         public new string Title { get { return "Create a GitHub Repository"; } } // TODO: this needs to be contextual
 
         public IReadOnlyList<IAccount> Accounts
         {
             get;
-            private set;
+            set;
         }
 
         public string BaseRepositoryPath
@@ -223,7 +224,7 @@ public void Dispose()
 
         public RepositoryPublishViewModelDesigner()
         {
-            Connections = new ReactiveList<IConnection>
+            Connections = new ObservableCollection<IConnection>
             {
                 new Conn() { HostAddress = new HostAddress() },
                 new Conn() { HostAddress = HostAddress.Create("ghe.io") }
@@ -259,7 +260,7 @@ public IReactiveCommand<ProgressState> PublishRepository
             private set;
         }
 
-        public ReactiveList<IConnection> Connections
+        public ObservableCollection<IConnection> Connections
         {
             get;
             private set;

src/GitHub.App/ViewModels/RepositoryPublishViewModel.cs

@@ -52,7 +52,7 @@ public RepositoryPublishViewModel(
             )
             .ToProperty(this, x => x.Title);
 
-            Connections = new ReactiveList<IConnection>(connectionManager.Connections);
+            Connections = connectionManager.Connections;
             this.repositoryPublishService = repositoryPublishService;
 
             if (Connections.Any())
@@ -112,7 +112,7 @@ public RepositoryPublishViewModel(
         public bool IsPublishing { get { return isPublishing.Value; } }
 
         public IReactiveCommand<ProgressState> PublishRepository { get; private set; }
-        public ReactiveList<IConnection> Connections { get; private set; }
+        public ObservableCollection<IConnection> Connections { get; private set; }
 
         IConnection selectedConnection;
         [AllowNull]

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

@@ -1,12 +1,13 @@
 using System.Reactive;
 using GitHub.Models;
 using ReactiveUI;
+using System.Collections.ObjectModel;
 
 namespace GitHub.ViewModels
 {
     public interface IRepositoryPublishViewModel : IRepositoryForm
     {
-        ReactiveList<IConnection> Connections { get; }
+        ObservableCollection<IConnection> Connections { get; }
 
         /// <summary>
         /// Command that creates the repository.

src/GitHub.TeamFoundation.14/Sync/GitHubPublishSection.cs

@@ -15,6 +15,7 @@
 using GitHub.VisualStudio.TeamExplorer;
 using System.Windows.Controls;
 using GitHub.VisualStudio.UI;
+using GitHub.ViewModels;
 
 namespace GitHub.VisualStudio.TeamExplorer.Sync
 {
@@ -126,7 +127,6 @@ void ShowPublish()
             {
                 var c = data.View;
                 SectionContent = c;
-                ((UserControl)c).DataContext = this;
                 c.IsBusy.Subscribe(x => IsBusy = x);
             },
             () =>

src/GitHub.UI.Reactive/Controls/SimpleViewUserControl.cs

@@ -88,19 +88,24 @@ public void Dispose()
         }
     }
 
-    public class SimpleViewUserControl<TViewModel, TImplementor> : SimpleViewUserControl, IViewFor<TViewModel>, IView 
-        where TViewModel : class, IViewModel
+    public class SimpleViewUserControl<TInterface, TImplementor> : SimpleViewUserControl, IViewFor<TInterface>, IView 
+        where TInterface : class, IViewModel
         where TImplementor : class
     {
+        public SimpleViewUserControl()
+        {
+            DataContextChanged += (s, e) => ViewModel = (TInterface)e.NewValue;
+        }
+
         public static readonly DependencyProperty ViewModelProperty = DependencyProperty.Register(
-            "ViewModel", typeof(TViewModel), typeof(TImplementor), new PropertyMetadata(null));
+            "ViewModel", typeof(TInterface), typeof(TImplementor), new PropertyMetadata(null));
 
         [AllowNull]
         object IViewFor.ViewModel
         {
             [return:AllowNull]
             get { return ViewModel; }
-            set { ViewModel = (TViewModel)value; }
+            set { ViewModel = (TInterface)value; }
         }
 
         [AllowNull]
@@ -111,15 +116,15 @@ IViewModel IView.ViewModel
         }
 
         [AllowNull]
-        public TViewModel ViewModel
+        public TInterface ViewModel
         {
             [return: AllowNull]
-            get { return (TViewModel)GetValue(ViewModelProperty); }
+            get { return (TInterface)GetValue(ViewModelProperty); }
             set { SetValue(ViewModelProperty, value); }
         }
 
         [AllowNull]
-        TViewModel IViewFor<TViewModel>.ViewModel
+        TInterface IViewFor<TInterface>.ViewModel
         {
             [return: AllowNull]
             get { return ViewModel; }

…Converters/CountToVisibilityConverter.cs …Converters/CountToVisibilityConverter.cssrc/GitHub.VisualStudio/Converters/CountToVisibilityConverter.cs renamed to src/GitHub.UI/Converters/CountToVisibilityConverter.cs src/GitHub.VisualStudio/Converters/CountToVisibilityConverter.cs renamed to src/GitHub.UI/Converters/CountToVisibilityConverter.cs

@@ -4,24 +4,18 @@
 using System.Windows.Data;
 using NullGuard;
 
-namespace GitHub.VisualStudio.Converters
+namespace GitHub.UI
 {
     /// <summary>
     /// Convert a count to visibility based on the following rule:
     /// * If count == 0, return Visibility.Visible
     /// * If count > 0, return Visibility.Collapsed
     /// </summary>
-    public class CountToVisibilityConverter : IValueConverter
+    public class CountToVisibilityConverter : ValueConverterMarkupExtension<CountToVisibilityConverter>
     {
-        public object Convert(object value, Type targetType, [AllowNull] object parameter, [AllowNull] CultureInfo culture)
+        public override object Convert(object value, Type targetType, [AllowNull] object parameter, [AllowNull] CultureInfo culture)
         {
             return ((int)value == 0) ? Visibility.Visible : Visibility.Collapsed;
         }
-
-        [return: AllowNull]
-        public object ConvertBack(object value, Type targetType, [AllowNull] object parameter, [AllowNull] CultureInfo culture)
-        {
-            return null;
-        }
     }
 }

src/GitHub.UI/GitHub.UI.csproj

@@ -85,6 +85,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>OcticonPaths.resx</DependentUpon>
     </Compile>
+    <Compile Include="Converters\CountToVisibilityConverter.cs" />
     <Compile Include="Converters\DefaultValueConverter.cs" />
     <Compile Include="Converters\StickieListItemConverter.cs" />
     <Compile Include="Resources.Designer.cs">

src/GitHub.VisualStudio/GitHub.VisualStudio.csproj

@@ -204,7 +204,6 @@
       <Link>Properties\SolutionInfo.cs</Link>
     </Compile>
     <Compile Include="Base\MenuBase.cs" />
-    <Compile Include="Converters\CountToVisibilityConverter.cs" />
     <Compile Include="..\common\SharedDictionaryManager.cs">
       <Link>Helpers\SharedDictionaryManager.cs</Link>
     </Compile>

src/GitHub.VisualStudio/UI/Views/Controls/LoginControl.xaml.cs

@@ -26,8 +26,6 @@ public LoginControl()
         {
             InitializeComponent();
 
-            DataContextChanged += (s, e) => ViewModel = (ILoginControlViewModel)e.NewValue;
-
             this.WhenActivated(d =>
             {
                 SetupDotComBindings(d);

src/GitHub.VisualStudio/UI/Views/Controls/RepositoryCloneControl.xaml.cs

@@ -34,8 +34,6 @@ public RepositoryCloneControl()
         {
             InitializeComponent();
 
-            DataContextChanged += (s, e) => ViewModel = e.NewValue as IRepositoryCloneViewModel;
-
             this.WhenActivated(d =>
             {
                 d(this.OneWayBind(ViewModel, vm => vm.IsLoading, v => v.loadingProgressBar.Visibility));