Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-02-01 08:26:53 +01:00
Code Issues Releases Wiki Activity

refactor: merge pull and issue screens

Browse Source
This commit is contained in:
Rongjian Zhang 2019-12-14 22:36:02 +08:00
parent 6b08ceae9e
commit 5ca9f98978
5 changed files with 12 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/main.dart
View File

@ -12,8 +12,6 @@ import 'package:git_touch/screens/issue_form.dart';
import 'package:git_touch/screens/issues.dart'; import 'package:git_touch/screens/issues.dart';
import 'package:git_touch/screens/notification.dart'; import 'package:git_touch/screens/notification.dart';
import 'package:git_touch/screens/object.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/repository.dart';
import 'package:git_touch/screens/settings.dart'; import 'package:git_touch/screens/settings.dart';
import 'package:git_touch/screens/stargazers.dart'; import 'package:git_touch/screens/stargazers.dart';

6
lib/screens/issue.dart
View File

@ -14,6 +14,12 @@ final issueRouter = RouterScreen(
(context, params) => IssueScreen(params['owner'].first, (context, params) => IssueScreen(params['owner'].first,
params['name'].first, int.parse(params['number'].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) { final reactionChunk = emojiMap.entries.map((entry) {
var key = entry.key; var key = entry.key;
return ''' return '''

6
lib/screens/issues.dart
View File

@ -13,6 +13,12 @@ final issuesRouter = RouterScreen(
(context, params) => (context, params) =>
IssuesScreen(params['owner'].first, params['name'].first)); 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 { class IssuesScreen extends StatelessWidget {
final String owner; final String owner;
final String name; final String name;

21
lib/screens/pull.dart
View File

@ -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);
}
}

20
lib/screens/pulls.dart
View File

@ -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);
}
}