diff --git a/lib/main.dart b/lib/main.dart index fc94010..d408e27 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -12,8 +12,6 @@ import 'package:git_touch/screens/issue_form.dart'; import 'package:git_touch/screens/issues.dart'; import 'package:git_touch/screens/notification.dart'; import 'package:git_touch/screens/object.dart'; -import 'package:git_touch/screens/pull.dart'; -import 'package:git_touch/screens/pulls.dart'; import 'package:git_touch/screens/repository.dart'; import 'package:git_touch/screens/settings.dart'; import 'package:git_touch/screens/stargazers.dart'; diff --git a/lib/screens/issue.dart b/lib/screens/issue.dart index e6d919c..6517b21 100644 --- a/lib/screens/issue.dart +++ b/lib/screens/issue.dart @@ -14,6 +14,12 @@ final issueRouter = RouterScreen( (context, params) => IssueScreen(params['owner'].first, params['name'].first, int.parse(params['number'].first))); +final pullRouter = RouterScreen( + '/:owner/:name/pulls/:number', + (context, params) => IssueScreen(params['owner'].first, + params['name'].first, int.parse(params['number'].first), + isPullRequest: true)); + final reactionChunk = emojiMap.entries.map((entry) { var key = entry.key; return ''' diff --git a/lib/screens/issues.dart b/lib/screens/issues.dart index aba9fc3..7a0b4e4 100644 --- a/lib/screens/issues.dart +++ b/lib/screens/issues.dart @@ -13,6 +13,12 @@ final issuesRouter = RouterScreen( (context, params) => IssuesScreen(params['owner'].first, params['name'].first)); +final pullsRouter = RouterScreen( + '/:owner/:name/pulls', + (context, params) => IssuesScreen( + params['owner'].first, params['name'].first, + isPullRequest: true)); + class IssuesScreen extends StatelessWidget { final String owner; final String name; diff --git a/lib/screens/pull.dart b/lib/screens/pull.dart deleted file mode 100644 index 14dec6d..0000000 --- a/lib/screens/pull.dart +++ /dev/null @@ -1,21 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:git_touch/screens/issue.dart'; -import 'package:git_touch/utils/utils.dart'; - -final pullRouter = RouterScreen( - '/:owner/:name/pulls/:number', - (context, params) => PullScreen(params['owner'].first, params['name'].first, - int.parse(params['number'].first))); - -class PullScreen extends StatelessWidget { - final String owner; - final String name; - final int number; - - PullScreen(this.owner, this.name, this.number); - - @override - Widget build(BuildContext context) { - return IssueScreen(owner, name, number, isPullRequest: true); - } -} diff --git a/lib/screens/pulls.dart b/lib/screens/pulls.dart deleted file mode 100644 index 0e5a039..0000000 --- a/lib/screens/pulls.dart +++ /dev/null @@ -1,20 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:git_touch/screens/issues.dart'; -import 'package:git_touch/utils/utils.dart'; - -final pullsRouter = RouterScreen( - '/:owner/:name/pulls', - (context, params) => - PullsScreen(params['owner'].first, params['name'].first)); - -class PullsScreen extends StatelessWidget { - final String owner; - final String name; - - PullsScreen(this.owner, this.name); - - @override - Widget build(BuildContext context) { - return IssuesScreen(owner, name, isPullRequest: true); - } -}