From c3cf25bcf35db750104c0de771dfd42f1d5a8994 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Fri, 31 Jan 2020 13:35:49 +0800 Subject: [PATCH] fix(github): pull screen router --- lib/screens/pulls.dart | 2 +- lib/widgets/event_item.dart | 4 ++-- lib/widgets/notification_item.dart | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/screens/pulls.dart b/lib/screens/pulls.dart index de857f8..bccb9d7 100644 --- a/lib/screens/pulls.dart +++ b/lib/screens/pulls.dart @@ -57,7 +57,7 @@ class PullsScreen extends StatelessWidget { MyLabel(name: label.name, cssColor: label.color) ]), url: - '/${p.repository.owner.login}/${p.repository.name}/pulls/${p.number}', + '/${p.repository.owner.login}/${p.repository.name}/pull/${p.number}', ), ); } diff --git a/lib/widgets/event_item.dart b/lib/widgets/event_item.dart index 3292c9b..0a29408 100644 --- a/lib/widgets/event_item.dart +++ b/lib/widgets/event_item.dart @@ -35,7 +35,7 @@ class EventItem extends StatelessWidget { InlineSpan _buildIssue(BuildContext context, int number, {bool isPullRequest = false}) { return _buildLinkSpan(context, '#$number', - '/${e.repoOwner}/${e.repoName}/${isPullRequest ? 'pulls' : 'issues'}/$number'); + '/${e.repoOwner}/${e.repoName}/${isPullRequest ? 'pull' : 'issues'}/$number'); } Widget _buildItem({ @@ -186,7 +186,7 @@ class EventItem extends StatelessWidget { return Link( url: - '/${e.repoOwner}/${e.repoName}/${isPullRequest ? 'pulls' : 'issues'}/${issue.number}', + '/${e.repoOwner}/${e.repoName}/${isPullRequest ? 'pull' : 'issues'}/${issue.number}', child: Container( padding: EdgeInsets.all(12), decoration: BoxDecoration( diff --git a/lib/widgets/notification_item.dart b/lib/widgets/notification_item.dart index eeed269..686232b 100644 --- a/lib/widgets/notification_item.dart +++ b/lib/widgets/notification_item.dart @@ -102,7 +102,7 @@ class _NotificationItemState extends State { case 'Issue': return '/$fullName/issues/${payload.subject.number}'; case 'PullRequest': - return '/$fullName/pulls/${payload.subject.number}'; + return '/$fullName/pull/${payload.subject.number}'; case 'Release': return 'https://github.com/$fullName/releases'; case 'Commit':