Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 6e9bcae

Browse files
Removing status and check avatars
1 parent 9cbc9ff commit 6e9bcae

File tree

7 files changed

+8
-33
lines changed

7 files changed

+8
-33
lines changed

src/GitHub.App/SampleData/PullRequestCheckViewModelDesigner.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Reactive;
3-
using System.Windows.Media.Imaging;
43
using GitHub.Models;
54
using GitHub.ViewModels;
65
using GitHub.ViewModels.GitHubPane;
@@ -18,10 +17,6 @@ public sealed class PullRequestCheckViewModelDesigner : ViewModelBase, IPullRequ
1817

1918
public Uri DetailsUrl { get; set; } = new Uri("http://github.com");
2019

21-
public string AvatarUrl { get; set; } = "https://avatars1.githubusercontent.com/u/417571?s=88&v=4";
22-
23-
public BitmapImage Avatar { get; set; } = null;
24-
2520
public ReactiveCommand<Unit, Unit> OpenDetailsUrl { get; set; } = null;
2621

2722
public PullRequestCheckType CheckType { get; set; } = PullRequestCheckType.ChecksApi;

src/GitHub.App/ViewModels/GitHubPane/PullRequestCheckViewModel.cs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using System.Linq;
55
using System.Linq.Expressions;
66
using System.Reactive;
7-
using System.Windows.Media.Imaging;
87
using GitHub.Extensions;
98
using GitHub.Factories;
109
using GitHub.Models;
10+
using GitHub.Primitives;
1111
using GitHub.Services;
1212
using ReactiveUI;
1313

@@ -55,10 +55,6 @@ public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactor
5555
pullRequestCheckViewModel.Description = statusModel.Description;
5656
pullRequestCheckViewModel.Status = checkStatus;
5757
pullRequestCheckViewModel.DetailsUrl = !string.IsNullOrEmpty(statusModel.TargetUrl) ? new Uri(statusModel.TargetUrl) : null;
58-
pullRequestCheckViewModel.AvatarUrl = statusModel.AvatarUrl ?? DefaultAvatar;
59-
pullRequestCheckViewModel.Avatar = statusModel.AvatarUrl != null
60-
? new BitmapImage(new Uri(statusModel.AvatarUrl))
61-
: AvatarProvider.CreateBitmapImage(DefaultAvatar);
6258

6359
return pullRequestCheckViewModel;
6460
}) ?? Array.Empty<PullRequestCheckViewModel>();
@@ -110,9 +106,6 @@ public static IEnumerable<IPullRequestCheckViewModel> Build(IViewViewModelFactor
110106
pullRequestCheckViewModel.Description = arg.checkRun.Summary;
111107
pullRequestCheckViewModel.Status = checkStatus;
112108
pullRequestCheckViewModel.DetailsUrl = new Uri(arg.checkRun.DetailsUrl);
113-
pullRequestCheckViewModel.AvatarUrl = DefaultAvatar;
114-
pullRequestCheckViewModel.Avatar = AvatarProvider.CreateBitmapImage(DefaultAvatar);
115-
116109
return pullRequestCheckViewModel;
117110
}) ?? Array.Empty<PullRequestCheckViewModel>();
118111

@@ -168,9 +161,5 @@ private void DoOpenDetailsUrl()
168161

169162
/// <inheritdoc/>
170163
public ReactiveCommand<Unit, Unit> OpenDetailsUrl { get; }
171-
172-
public string AvatarUrl { get; private set; }
173-
174-
public BitmapImage Avatar { get; private set; }
175164
}
176165
}

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestCheckViewModel.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Reactive;
3-
using System.Windows.Media.Imaging;
43
using GitHub.Models;
54
using ReactiveUI;
65

@@ -50,10 +49,6 @@ public interface IPullRequestCheckViewModel: IViewModel
5049
/// Gets a flag to show this check run has annotations.
5150
/// </summary>
5251
bool HasAnnotations { get; }
53-
54-
string AvatarUrl { get; }
55-
56-
BitmapImage Avatar { get; }
5752
}
5853

5954
public enum PullRequestCheckStatus

src/GitHub.Exports/Models/CheckSuiteModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,5 @@ public class CheckSuiteModel
2020

2121
public string ApplicationName { get; set; }
2222
public string ApplicationSlug { get; set; }
23-
public string ApplicationLogoUrl { get; set; }
2423
}
2524
}

src/GitHub.Exports/Models/StatusModel.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,5 @@ public class StatusModel
2424
/// The descritption for the Status
2525
/// </summary>
2626
public string Description { get; set; }
27-
28-
/// <summary>
29-
/// The avatar url of the Status.
30-
/// </summary>
31-
public string AvatarUrl { get; set; }
3227
}
3328
}

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -810,8 +810,7 @@ async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress addres
810810
}).ToList()
811811
}).ToList(),
812812
ApplicationName = suite.App != null ? suite.App.Name : "Private App",
813-
ApplicationSlug = suite.App != null ? suite.App.Slug : "private-app",
814-
ApplicationLogoUrl = suite.App != null ? suite.App.LogoUrl(null) : null,
813+
ApplicationSlug = suite.App != null ? suite.App.Slug : "private-app"
815814
}).ToList(),
816815
Statuses = commit.Commit.Status
817816
.Select(context =>
@@ -820,8 +819,7 @@ async Task<LastCommitAdapter> GetPullRequestLastCommitAdapter(HostAddress addres
820819
State = statusContext.State.FromGraphQl(),
821820
Context = statusContext.Context,
822821
TargetUrl = statusContext.TargetUrl,
823-
Description = statusContext.Description,
824-
AvatarUrl = statusContext.Creator.AvatarUrl(null)
822+
Description = statusContext.Description
825823
}).ToList()
826824
).SingleOrDefault()
827825
}

src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,11 @@
3939
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="check" Foreground="#2cbe4e" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Success}}"/>
4040
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="x" Foreground="#cb2431" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
4141
<ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="primitive_dot" Foreground="#f1c647" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Pending}}"/>
42-
<Image Grid.Column="1" Source="{Binding Avatar}" Height="16" Width="16" />
42+
43+
<!--
44+
<Image Grid.Column="1" Source="{Binding AvatarUrl}" Height="16" Width="16" />
45+
-->
46+
4347
<Label Grid.Column="2" Foreground="{DynamicResource VsBrush.WindowText}" Content="{Binding Title}"/>
4448
<!--
4549
<Label Grid.Column="3" HorizontalAlignment="Right" Content="{Binding Description}" ToolTip="{Binding Description}" />

0 commit comments

Comments
 (0)