Finish off display of commit list w/caption.

Author: grokys

src/GitHub.App/SampleData/Documents/PullRequestPageViewModelDesigner.cs

@@ -56,7 +56,7 @@ Depends on #1993
 Fixes #1905";
             Timeline = new IViewModel[]
             {
-                new CommitSummariesViewModel(
+                new CommitListViewModel(
                     new CommitSummaryViewModel(new CommitModel
                     {
                         Author = new ActorModel { Login = "grokys" },
@@ -65,7 +65,7 @@ Depends on #1993
                     }),
                     new CommitSummaryViewModel(new CommitModel
                     {
-                        Author = new ActorModel { Login = "grokys" },
+                        Author = new ActorModel { Login = "shana" },
                         AbbreviatedOid = "04e6a90",
                         MessageHeadline = "Refactor comment view models.",
                     })),

src/GitHub.App/ViewModels/Documents/CommitListViewModel.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace GitHub.ViewModels.Documents
+{
+    /// <summary>
+    /// Displays a list of commit summaries in a pull request timeline.
+    /// </summary>
+    public class CommitListViewModel : ViewModelBase, ICommitListViewModel
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommitListViewModel"/> class.
+        /// </summary>
+        /// <param name="commits">The commits to display.</param>
+        public CommitListViewModel(params ICommitSummaryViewModel[] commits)
+        {
+            if (commits.Length == 0)
+            {
+                throw new NotSupportedException("Cannot create a CommitListViewModel with 0 commits.");
+            }
+
+            Commits = commits;
+            Author = Commits[0].Author;
+            AuthorCaption = BuildAuthorCaption();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommitListViewModel"/> class.
+        /// </summary>
+        /// <param name="commits">The commits to display.</param>
+        public CommitListViewModel(IEnumerable<ICommitSummaryViewModel> commits)
+        {
+            Commits = commits.ToList();
+
+            if (Commits.Count == 0)
+            {
+                throw new NotSupportedException("Cannot create a CommitListViewModel with 0 commits.");
+            }
+
+            Author = Commits[0].Author;
+            AuthorCaption = BuildAuthorCaption();
+        }
+
+        /// <inheritdoc/>
+        public IActorViewModel Author { get; }
+
+        /// <inheritdoc/>
+        public string AuthorCaption { get; }
+
+        /// <inheritdoc/>
+        public IReadOnlyList<ICommitSummaryViewModel> Commits { get; }
+
+        string BuildAuthorCaption()
+        {
+            var result = new StringBuilder();
+
+            if (Commits.Any(x => x.Author.Login != Author.Login))
+            {
+                result.Append(Resources.AndOthers);
+                result.Append(' ');
+            }
+
+            result.Append(Resources.AddedSomeCommits);
+            return result.ToString();
+        }
+    }
+}

src/GitHub.App/ViewModels/Documents/CommitSummariesViewModel.cs

@@ -2,7 +2,10 @@
 
 namespace GitHub.ViewModels.Documents
 {
-    public class CommitSummaryViewModel : ViewModelBase
+    /// <summary>
+    /// Displays a one-line summary of a commit in a pull request timeline.
+    /// </summary>
+    public class CommitSummaryViewModel : ViewModelBase, ICommitSummaryViewModel
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="CommitSummaryViewModel"/> class.

src/GitHub.App/ViewModels/Documents/CommitSummaryViewModel.cs

@@ -84,7 +84,7 @@ public async Task InitializeAsync(
             {
                 if (!(i is CommitModel) && commits.Count > 0)
                 {
-                    timeline.Add(new CommitSummariesViewModel(commits));
+                    timeline.Add(new CommitListViewModel(commits));
                     commits.Clear();
                 }
 
@@ -102,7 +102,7 @@ public async Task InitializeAsync(
 
             if (commits.Count > 0)
             {
-                timeline.Add(new CommitSummariesViewModel(commits));
+                timeline.Add(new CommitListViewModel(commits));
             }
 
             await AddPlaceholder().ConfigureAwait(true);

src/GitHub.App/ViewModels/Documents/PullRequestPageViewModel.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace GitHub.ViewModels.Documents
+{
+    /// <summary>
+    /// Displays a list of commit summaries in a pull request timeline.
+    /// </summary>
+    public interface ICommitListViewModel : IViewModel
+    {
+        /// <summary>
+        /// Gets the first author of the commits in the list.
+        /// </summary>
+        IActorViewModel Author { get; }
+
+        /// <summary>
+        /// Gets a string to display next to the author in the view.
+        /// </summary>
+        string AuthorCaption { get; }
+
+        /// <summary>
+        /// Gets the commits.
+        /// </summary>
+        IReadOnlyList<ICommitSummaryViewModel> Commits { get; }
+    }
+}

src/GitHub.Exports.Reactive/ViewModels/Documents/ICommitListViewModel.cs

@@ -0,0 +1,28 @@
+namespace GitHub.ViewModels.Documents
+{
+    /// <summary>
+    /// Displays a one-line summary of a commit in a pull request timeline.
+    /// </summary>
+    public interface ICommitSummaryViewModel : IViewModel
+    {
+        /// <summary>
+        /// Gets the abbreviated OID (SHA) of the commit.
+        /// </summary>
+        string AbbreviatedOid { get; }
+
+        /// <summary>
+        /// Gets the commit author.
+        /// </summary>
+        IActorViewModel Author { get; }
+
+        /// <summary>
+        /// Gets the commit message header.
+        /// </summary>
+        string Header { get; }
+
+        /// <summary>
+        /// Gets the OID (SHA) of the commit.
+        /// </summary>
+        string Oid { get; }
+    }
+}

src/GitHub.Exports.Reactive/ViewModels/Documents/ICommitSummaryViewModel.cs

@@ -863,4 +863,10 @@ https://git-scm.com/download/win</value>
   <data name="CommitCountFormat" xml:space="preserve">
     <value>{0} commits</value>
   </data>
+  <data name="AddedSomeCommits" xml:space="preserve">
+    <value>added some commits</value>
+  </data>
+  <data name="AndOthers" xml:space="preserve">
+    <value>and others</value>
+  </data>
 </root>

src/GitHub.Resources/Resources.Designer.cs

@@ -0,0 +1,79 @@
+<UserControl x:Class="GitHub.VisualStudio.Views.Documents.CommitListView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:ghfvs="https://github.com/github/VisualStudio"
+             xmlns:v="clr-namespace:GitHub.VisualStudio.Views"
+             mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800">
+    <Control.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio.UI;component/SharedDictionary.xaml" />
+                <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
+                <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
+                <ghfvs:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/Assets/Markdown.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Control.Resources>
+
+    <StackPanel Orientation="Vertical">
+        <StackPanel Orientation="Horizontal" Margin="0,8">
+            <ghfvs:OcticonImage DockPanel.Dock="Left"
+                                Margin="2 0 4 0"
+                                Width="16"
+                                Icon="repo_push"
+                                Grid.Column="0"
+                                HorizontalAlignment="Center" />
+
+            <v:ActorAvatarView Width="16" 
+                               Height="16" 
+                               Grid.Column="1"
+                               ViewModel="{Binding Author}"/>
+
+            <TextBlock Margin="4 0" Grid.Column="2">
+                <Run FontWeight="Bold" Text="{Binding Author.Login, Mode=OneWay}" />
+                <Run Text="{Binding AuthorCaption, Mode=OneWay}" />
+            </TextBlock>
+        </StackPanel>
+
+        <ItemsControl ItemsSource="{Binding Commits}">
+            <Control.Resources>
+                <DataTemplate DataType="{x:Type ghfvs:CommitSummaryViewModel}">
+                    <Border Padding="24 0 8 0">
+                        <DockPanel>
+                            <ghfvs:OcticonImage DockPanel.Dock="Left"
+                                            Foreground="{DynamicResource VsBrush.GrayText}"
+                                            Margin="0,0,2,0"
+                                            Icon="git_commit"/>
+                            <v:ActorAvatarView DockPanel.Dock="Left"
+                                           Width="16"
+                                           Height="16"
+                                           Margin="2"
+                                           ViewModel="{Binding Author}"/>
+                            <TextBlock DockPanel.Dock="Right"
+                                   FontFamily="Consolas"
+                                   Margin="0,0,0,2"
+                                   VerticalAlignment="Center">
+                                <Hyperlink Command="{Binding DataContext.ShowCommit, ElementName=timeline}"
+                                           CommandParameter="{Binding Oid}">
+                                    <Run Text="{Binding AbbreviatedOid, Mode=OneWay}"/>
+                                </Hyperlink>
+                            </TextBlock>
+                            <TextBlock Margin="0,0,0,2"
+                                   Foreground="{DynamicResource VsBrush.WindowText}"
+                                   Text="{Binding Header}" 
+                                   VerticalAlignment="Center"/>
+                        </DockPanel>
+                    </Border>
+                </DataTemplate>
+            </Control.Resources>
+        </ItemsControl>
+
+        <Border BorderThickness="0,1,0,0"
+                BorderBrush="{DynamicResource GitHubHeaderSeparatorBrush}"
+                DockPanel.Dock="Bottom"
+                Margin="0,8,0,0"
+                Padding="0,4,0,0" />
+    </StackPanel>
+</UserControl>