Merge feature/pr/views into don/stub-ui

Author: shana

src/DesignTimeStyleHelper/WindowController.xaml.cs

@@ -12,11 +12,11 @@ public partial class WindowController : Window
     {
         IDisposable disposable;
 
-        public WindowController(IObservable<IView> controls)
+        public WindowController(IObservable<LoadData> controls)
         {
             InitializeComponent();
 
-            disposable = controls.Subscribe(c => Load(c),
+            disposable = controls.Subscribe(c => Load(c.View),
             Close
             );
         }

src/GitHub.App/Controllers/UIController.cs

@@ -2,6 +2,7 @@
 using Akavache.Sqlite3;
 using NLog;
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 
 namespace GitHub.Factories
@@ -11,14 +12,19 @@ namespace GitHub.Factories
     public class SqlitePersistentBlobCacheFactory : IBlobCacheFactory
     {
         static readonly Logger log = LogManager.GetCurrentClassLogger();
+        Dictionary<string, IBlobCache> cache = new Dictionary<string, IBlobCache>();
 
         public IBlobCache CreateBlobCache(string path)
         {
             Guard.ArgumentNotEmptyString(path, nameof(path));
+            if (cache.ContainsKey(path))
+                return cache[path];
 
             try
             {
-                return new SQLitePersistentBlobCache(path);
+                var c = new SQLitePersistentBlobCache(path);
+                cache.Add(path, c);
+                return c;
             }
             catch(Exception ex)
             {

src/GitHub.App/Factories/SqlitePersistentBlobCacheFactory.cs

@@ -33,9 +33,7 @@ public UIFactory(IExportFactoryProvider factory)
         /// <returns>true if the View/ViewModel didn't exist and had to be created</returns>
         public IUIPair CreateViewAndViewModel(UIViewType viewType)
         {
-            var d = new UIPair(viewType, factory.GetView(viewType), factory.GetViewModel(viewType));
-            d.View.ViewModel = d.ViewModel;
-            return d;
+            return new UIPair(viewType, factory.GetView(viewType), factory.GetViewModel(viewType));
         }
     }
 
@@ -45,10 +43,10 @@ public IUIPair CreateViewAndViewModel(UIViewType viewType)
     /// </summary>
     public class UIPair : IUIPair
     {
-        ExportLifetimeContext<IView> view;
-        ExportLifetimeContext<IViewModel> viewModel;
-        CompositeDisposable handlers = new CompositeDisposable();
-        UIViewType viewType;
+        readonly ExportLifetimeContext<IView> view;
+        readonly ExportLifetimeContext<IViewModel> viewModel;
+        readonly CompositeDisposable handlers = new CompositeDisposable();
+        readonly UIViewType viewType;
 
         public UIViewType ViewType => viewType;
         public IView View => view.Value;
@@ -90,9 +88,7 @@ void Dispose(bool disposing)
                 if (!handlers.IsDisposed)
                     handlers.Dispose();
                 view?.Dispose();
-                view = null;
                 viewModel?.Dispose();
-                viewModel = null;
                 disposed = true;
             }
         }

src/GitHub.App/Factories/UIFactory.cs

@@ -128,8 +128,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="SampleData\AccountDesigner.cs" />
     <Compile Include="SampleData\PullRequestCreationViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestDetailViewModelDesigner.cs" />
+    <Compile Include="SampleData\LoggedOutViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestListViewModelDesigner.cs" />
     <Compile Include="Services\AvatarProvider.cs" />
     <Compile Include="Services\GitHubCredentialProvider.cs" />

src/GitHub.App/GitHub.App.csproj

@@ -11,7 +11,7 @@ namespace GitHub.Models
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public class Account : ReactiveObject, IAccount
     {
-        readonly ObservableAsPropertyHelper<BitmapSource> avatar;
+        BitmapSource avatar;
 
         public Account(
             string login,
@@ -29,8 +29,8 @@ public Account(
             IsOnFreePlan = privateRepositoryInPlanCount == 0;
             HasMaximumPrivateRepositories = OwnedPrivateRepos >= PrivateReposInPlan;
 
-            avatar = bitmapSource.ObserveOn(RxApp.MainThreadScheduler)
-                .ToProperty(this, a => a.Avatar);
+            bitmapSource.ObserveOn(RxApp.MainThreadScheduler)
+                .Subscribe(x => avatar = x);
         }
 
         public bool IsOnFreePlan { get; private set; }
@@ -47,13 +47,80 @@ public Account(
 
         public long PrivateReposInPlan { get; private set; }
 
+        [AllowNull]
         public BitmapSource Avatar
         {
             [return: AllowNull]
-            get
-            {
-                return avatar.Value;
-            }
+            get { return avatar; }
+            set { avatar = value; this.RaisePropertyChanged(); }
+        }
+
+#region Equality things
+        public void CopyFrom(IAccount other)
+        {
+            if (!Equals(other))
+                throw new ArgumentException("Instance to copy from doesn't match this instance. this:(" + this + ") other:(" + other + ")", nameof(other));
+            OwnedPrivateRepos = other.OwnedPrivateRepos;
+            PrivateReposInPlan = other.PrivateReposInPlan;
+            IsOnFreePlan = other.IsOnFreePlan;
+            HasMaximumPrivateRepositories = other.HasMaximumPrivateRepositories;
+            Avatar = other.Avatar;
+        }
+
+        public override bool Equals([AllowNull]object obj)
+        {
+            if (ReferenceEquals(this, obj))
+                return true;
+            var other = obj as Account;
+            return other != null && Login == other.Login && IsUser == other.IsUser && IsEnterprise == other.IsEnterprise;
+        }
+
+        public override int GetHashCode()
+        {
+            return (Login?.GetHashCode() ?? 0) ^ IsUser .GetHashCode() ^ IsEnterprise.GetHashCode();
+        }
+
+        bool IEquatable<IAccount>.Equals([AllowNull]IAccount other)
+        {
+            if (ReferenceEquals(this, other))
+                return true;
+            return other != null && Login == other.Login && IsUser == other.IsUser && IsEnterprise == other.IsEnterprise;
+        }
+
+        public int CompareTo([AllowNull]IAccount other)
+        {
+            return other != null ? String.Compare(Login, other.Login, StringComparison.CurrentCulture) : 1;
+        }
+
+        public static bool operator >([AllowNull]Account lhs, [AllowNull]Account rhs)
+        {
+            if (ReferenceEquals(lhs, rhs))
+                return false;
+            return lhs?.CompareTo(rhs) > 0;
+        }
+
+        public static bool operator <([AllowNull]Account lhs, [AllowNull]Account rhs)
+        {
+            if (ReferenceEquals(lhs, rhs))
+                return false;
+            return (object)lhs == null || lhs.CompareTo(rhs) < 0;
+        }
+
+        public static bool operator ==([AllowNull]Account lhs, [AllowNull]Account rhs)
+        {
+            return Equals(lhs, rhs) && ((object)lhs == null || lhs.CompareTo(rhs) == 0);
+        }
+
+        public static bool operator !=([AllowNull]Account lhs, [AllowNull]Account rhs)
+        {
+            return !(lhs == rhs);
+        }
+        #endregion
+
+        [return: AllowNull]
+        public override string ToString()
+        {
+            return Login;
         }
 
         internal string DebuggerDisplay

src/GitHub.App/Models/Account.cs

@@ -3,16 +3,21 @@
 using GitHub.Primitives;
 using GitHub.VisualStudio.Helpers;
 using NullGuard;
+using System.Diagnostics;
 
 namespace GitHub.Models
 {
+    [DebuggerDisplay("{DebuggerDisplay,nq}")]
     public sealed class PullRequestModel : NotificationAwareObject, IPullRequestModel
     {
-        public PullRequestModel(int number, string title, IAccount author, DateTimeOffset createdAt, DateTimeOffset? updatedAt = null)
+        public PullRequestModel(int number, string title,
+            IAccount author, [AllowNull]IAccount assignee,
+            DateTimeOffset createdAt, DateTimeOffset? updatedAt = null)
         {
             Number = number;
             Title = title;
             Author = author;
+            Assignee = assignee;
             CreatedAt = createdAt;
             UpdatedAt = updatedAt ?? CreatedAt;
         }
@@ -26,6 +31,7 @@ public void CopyFrom(IPullRequestModel other)
             CommentCount = other.CommentCount;
             HasNewComments = other.HasNewComments;
             IsOpen = other.IsOpen;
+            Assignee = other.Assignee;
         }
 
         public override bool Equals([AllowNull]object obj)
@@ -111,10 +117,28 @@ public bool HasNewComments
         public DateTimeOffset UpdatedAt { get; set; }
         public IAccount Author { get; set; }
 
+        IAccount assignee;
+        [AllowNull]
+        public IAccount Assignee
+        {
+            [return: AllowNull]
+            get { return assignee; }
+            set { assignee = value; this.RaisePropertyChange(); }
+        }
+
+
         [return: AllowNull] // nullguard thinks a string.Format can return null. sigh.
         public override string ToString()
         {
             return string.Format(CultureInfo.InvariantCulture, "id:{0} title:{1} created:{2:u} updated:{3:u}", Number, Title, CreatedAt, UpdatedAt);
         }
+
+        internal string DebuggerDisplay
+        {
+            get
+            {
+                return string.Format(CultureInfo.InvariantCulture, "id:{0} title:{1} created:{2:u} updated:{3:u}", Number, Title, CreatedAt, UpdatedAt);
+            }
+        }
     }
 }

src/GitHub.App/Models/PullRequestModel.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Windows.Media.Imaging;
+using GitHub.Models;
+using GitHub.Services;
+
+namespace GitHub.SampleData
+{
+    [ExcludeFromCodeCoverage]
+    public sealed class AccountDesigner : IAccount
+    {
+        public AccountDesigner()
+        {
+            Login = "octocat";
+            IsUser = true;
+        }
+
+        public BitmapSource Avatar
+        {
+            get
+            {
+                return IsUser
+                    ? AvatarProvider.CreateBitmapImage("pack://application:,,,/GitHub.App;component/Images/default_user_avatar.png")
+                    : AvatarProvider.CreateBitmapImage("pack://application:,,,/GitHub.App;component/Images/default_org_avatar.png");
+            }
+        }
+
+        public bool HasMaximumPrivateRepositories { get; set; }
+        public bool IsEnterprise { get; set; }
+        public bool IsOnFreePlan { get; set; }
+        public bool IsUser { get; set; }
+        public string Login { get; set; }
+        public int OwnedPrivateRepos { get; set; }
+        public long PrivateReposInPlan { get; set; }
+
+        public override string ToString()
+        {
+            return Login;
+        }
+
+        #region Equality things
+        public void CopyFrom(IAccount other)
+        {
+            if (!Equals(other))
+                throw new ArgumentException("Instance to copy from doesn't match this instance. this:(" + this + ") other:(" + other + ")", nameof(other));
+            OwnedPrivateRepos = other.OwnedPrivateRepos;
+            PrivateReposInPlan = other.PrivateReposInPlan;
+            IsOnFreePlan = other.IsOnFreePlan;
+            HasMaximumPrivateRepositories = other.HasMaximumPrivateRepositories;
+        }
+
+        public override bool Equals(object obj)
+        {
+            if (ReferenceEquals(this, obj))
+                return true;
+            var other = obj as Account;
+            return other != null && Login == other.Login && IsUser == other.IsUser && IsEnterprise == other.IsEnterprise;
+        }
+
+        public override int GetHashCode()
+        {
+            return (Login?.GetHashCode() ?? 0) ^ IsUser.GetHashCode() ^ IsEnterprise.GetHashCode();
+        }
+
+        bool IEquatable<IAccount>.Equals(IAccount other)
+        {
+            if (ReferenceEquals(this, other))
+                return true;
+            return other != null && Login == other.Login && IsUser == other.IsUser && IsEnterprise == other.IsEnterprise;
+        }
+
+        public int CompareTo(IAccount other)
+        {
+            return other != null ? String.Compare(Login, other.Login, StringComparison.CurrentCulture) : 1;
+        }
+
+        public static bool operator >(AccountDesigner lhs, AccountDesigner rhs)
+        {
+            if (ReferenceEquals(lhs, rhs))
+                return false;
+            return lhs?.CompareTo(rhs) > 0;
+        }
+
+        public static bool operator <(AccountDesigner lhs, AccountDesigner rhs)
+        {
+            if (ReferenceEquals(lhs, rhs))
+                return false;
+            return (object)lhs == null || lhs.CompareTo(rhs) < 0;
+        }
+
+        public static bool operator ==(AccountDesigner lhs, AccountDesigner rhs)
+        {
+            return Equals(lhs, rhs) && ((object)lhs == null || lhs.CompareTo(rhs) == 0);
+        }
+
+        public static bool operator !=(AccountDesigner lhs, AccountDesigner rhs)
+        {
+            return !(lhs == rhs);
+        }
+        #endregion
+
+    }
+}

src/GitHub.App/SampleData/AccountDesigner.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Reactive.Linq;
+using System.Windows.Input;
+using GitHub.Collections;
+using GitHub.Models;
+using GitHub.ViewModels;
+
+namespace GitHub.SampleData
+{
+    [ExcludeFromCodeCoverage]
+    public class LoggedOutViewModelDesigner : BaseViewModelDesigner, IViewModel
+    {
+        public LoggedOutViewModelDesigner()
+        {
+        }
+    }
+}