From e12d36d6d39adea917ac48a2a2fd1310809268d6 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Thu, 12 Mar 2020 21:24:53 +0000 Subject: [PATCH 1/2] Show GitHub repository on status bar --- .../Services/PullRequestStatusBarManager.cs | 6 ++-- .../ViewModels/PullRequestStatusViewModel.cs | 28 +++++++++++++++++++ .../Views/PullRequestStatusView.xaml | 5 +++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs b/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs index 9f40e3df34..265814e98e 100644 --- a/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs +++ b/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs @@ -98,7 +98,7 @@ async Task RefreshCurrentSession(LocalRepositoryModel repository, IPullRequestSe return; } - var viewModel = CreatePullRequestStatusViewModel(session); + var viewModel = CreatePullRequestStatusViewModel(repository, session); ShowStatus(viewModel); } @@ -155,12 +155,14 @@ async Task IsDotComOrEnterpriseRepository(LocalRepositoryModel repository) return false; } - PullRequestStatusViewModel CreatePullRequestStatusViewModel(IPullRequestSession session) + PullRequestStatusViewModel CreatePullRequestStatusViewModel(LocalRepositoryModel repository, IPullRequestSession session) { var pullRequestStatusViewModel = new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand); var pullRequest = session?.PullRequest; pullRequestStatusViewModel.Number = pullRequest?.Number; pullRequestStatusViewModel.Title = pullRequest?.Title; + pullRequestStatusViewModel.RepositoryName = repository?.Name; + pullRequestStatusViewModel.RepositoryOwner = repository?.Owner; return pullRequestStatusViewModel; } diff --git a/src/GitHub.InlineReviews/ViewModels/PullRequestStatusViewModel.cs b/src/GitHub.InlineReviews/ViewModels/PullRequestStatusViewModel.cs index 9c59ad2379..6e4db9f6db 100644 --- a/src/GitHub.InlineReviews/ViewModels/PullRequestStatusViewModel.cs +++ b/src/GitHub.InlineReviews/ViewModels/PullRequestStatusViewModel.cs @@ -8,6 +8,8 @@ public class PullRequestStatusViewModel : INotifyPropertyChanged { int? number; string title; + string repositoryName; + string repositoryOwner; public PullRequestStatusViewModel(ICommand openPullRequestsCommand, ICommand showCurrentPullRequestCommand) { @@ -41,6 +43,32 @@ public string Title } } + public string RepositoryOwner + { + get { return repositoryOwner; } + set + { + if (repositoryOwner != value) + { + repositoryOwner = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RepositoryOwner))); + } + } + } + + public string RepositoryName + { + get { return repositoryName; } + set + { + if (repositoryName != value) + { + repositoryName = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(RepositoryName))); + } + } + } + public ICommand OpenPullRequestsCommand { get; } public ICommand ShowCurrentPullRequestCommand { get; } diff --git a/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml b/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml index 4d73324803..884ba67fed 100644 --- a/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml +++ b/src/GitHub.InlineReviews/Views/PullRequestStatusView.xaml @@ -49,7 +49,10 @@ Fill="White" VerticalAlignment="Bottom" Margin="0 0 4 0 " - Icon="git_pull_request" /> + Icon="mark_github" /> + + / + From 699eaa0292e39a2821653e179e52288fd1591f39 Mon Sep 17 00:00:00 2001 From: Jamie Cansdale Date: Thu, 12 Mar 2020 21:27:38 +0000 Subject: [PATCH 2/2] Modernize constructor --- .../Services/PullRequestStatusBarManager.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs b/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs index 265814e98e..0c5b4acf7f 100644 --- a/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs +++ b/src/GitHub.InlineReviews/Services/PullRequestStatusBarManager.cs @@ -157,13 +157,13 @@ async Task IsDotComOrEnterpriseRepository(LocalRepositoryModel repository) PullRequestStatusViewModel CreatePullRequestStatusViewModel(LocalRepositoryModel repository, IPullRequestSession session) { - var pullRequestStatusViewModel = new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand); - var pullRequest = session?.PullRequest; - pullRequestStatusViewModel.Number = pullRequest?.Number; - pullRequestStatusViewModel.Title = pullRequest?.Title; - pullRequestStatusViewModel.RepositoryName = repository?.Name; - pullRequestStatusViewModel.RepositoryOwner = repository?.Owner; - return pullRequestStatusViewModel; + return new PullRequestStatusViewModel(openPullRequestsCommand, showCurrentPullRequestCommand) + { + Number = session?.PullRequest?.Number, + Title = session?.PullRequest?.Title, + RepositoryName = repository?.Name, + RepositoryOwner = repository?.Owner, + }; } PullRequestStatusView ShowStatus(PullRequestStatusViewModel pullRequestStatusViewModel = null)