Skip to content

Commit

Permalink
feat(gitee): updates (#148)
Browse files Browse the repository at this point in the history
* feat: gitee pull screen (with posting comment)

* feat: GeFilesScreen, remove 'changes' prop

* feat: commitScreen, commits in pullScreen

* fix: commit text formatting
  • Loading branch information
shreyas1599 committed Jan 8, 2021
1 parent fde136b commit 92bcdaa
Show file tree
Hide file tree
Showing 12 changed files with 546 additions and 21 deletions.
41 changes: 41 additions & 0 deletions lib/models/gitee.dart
Expand Up @@ -79,6 +79,7 @@ class GiteeCommit {
GiteeCommitDetail commit;
String sha;
String htmlUrl;
List<GiteeCommitFile> files;
GiteeCommit();
factory GiteeCommit.fromJson(Map<String, dynamic> json) =>
_$GiteeCommitFromJson(json);
Expand Down Expand Up @@ -152,6 +153,7 @@ class GiteePull {
String body;
String bodyHtml;
String title;
String state;
GiteeRepoOwner user;
int number;
int id;
Expand All @@ -169,3 +171,42 @@ class GiteeComment {
factory GiteeComment.fromJson(Map<String, dynamic> json) =>
_$GiteeCommentFromJson(json);
}

@JsonSerializable(fieldRename: FieldRename.snake)
class GiteePatch {
String diff;
GiteePatch();
factory GiteePatch.fromJson(Map<String, dynamic> json) =>
_$GiteePatchFromJson(json);
}

// Two different classes because of variable type mismatch
// for additions, deletions, patch
@JsonSerializable(fieldRename: FieldRename.snake)
class GiteePullFile {
String additions;
String deletions;
String blobUrl;
String filename;
String sha;
String status;
GiteePatch patch;
GiteePullFile();
factory GiteePullFile.fromJson(Map<String, dynamic> json) =>
_$GiteePullFileFromJson(json);
}

@JsonSerializable(fieldRename: FieldRename.snake)
class GiteeCommitFile {
int additions;
int deletions;
int changes;
String blobUrl;
String filename;
String sha;
String status;
String patch;
GiteeCommitFile();
factory GiteeCommitFile.fromJson(Map<String, dynamic> json) =>
_$GiteeCommitFileFromJson(json);
}
67 changes: 66 additions & 1 deletion lib/models/gitee.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

34 changes: 33 additions & 1 deletion lib/router.dart
Expand Up @@ -10,11 +10,14 @@ import 'package:git_touch/screens/bb_pulls.dart';
import 'package:git_touch/screens/bb_user.dart';
import 'package:git_touch/screens/code_theme.dart';
import 'package:git_touch/screens/ge_blob.dart';
import 'package:git_touch/screens/ge_commit.dart';
import 'package:git_touch/screens/ge_commits.dart';
import 'package:git_touch/screens/ge_files.dart';
import 'package:git_touch/screens/ge_issue.dart';
import 'package:git_touch/screens/ge_issue_comment.dart';
import 'package:git_touch/screens/ge_issue_form.dart';
import 'package:git_touch/screens/ge_issues.dart';
import 'package:git_touch/screens/ge_pull.dart';
import 'package:git_touch/screens/ge_pulls.dart';
import 'package:git_touch/screens/ge_repo.dart';
import 'package:git_touch/screens/ge_repos.dart';
Expand Down Expand Up @@ -414,6 +417,10 @@ class GiteeRouter {
GiteeRouter.issueAdd, // issueAdd should be above issue
GiteeRouter.issue, // Due to similarity of uris
GiteeRouter.issueComment,
GiteeRouter.pull,
GiteeRouter.pullComment,
GiteeRouter.files,
GiteeRouter.commit,
];
static final search = RouterScreen('/search', (context, parameters) {
return GeSearchScreen();
Expand Down Expand Up @@ -499,6 +506,31 @@ class GiteeRouter {
static final issueComment = RouterScreen(
'/:owner/:name/issues/:number/comment', (context, parameters) {
return GeIssueCommentScreen(parameters['owner'].first,
parameters['name'].first, parameters['number'].first);
parameters['name'].first, parameters['number'].first,
isPr: false);
});
static final pull = RouterScreen(
'/:owner/:name/pulls/:number',
(context, parameters) {
return GePullScreen(parameters['owner'].first, parameters['name'].first,
parameters['number'].first,
isPr: true);
},
);
static final pullComment = RouterScreen('/:owner/:name/pulls/:number/comment',
(context, parameters) {
return GeIssueCommentScreen(parameters['owner'].first,
parameters['name'].first, parameters['number'].first,
isPr: true);
});
static final files =
RouterScreen('/:owner/:name/pulls/:number/files', (context, parameters) {
return GeFilesScreen(parameters['owner'].first, parameters['name'].first,
parameters['number'].first);
});
static final commit = RouterScreen(
'/:owner/:name/commits/:sha',
(context, parameters) => GeCommitScreen(parameters['owner'].first,
parameters['name'].first, parameters['sha'].first),
);
}
91 changes: 91 additions & 0 deletions lib/screens/ge_commit.dart
@@ -0,0 +1,91 @@
import 'package:flutter/material.dart';
import 'package:git_touch/models/gitee.dart';
import 'package:git_touch/scaffolds/refresh_stateful.dart';
import 'package:git_touch/utils/utils.dart';
import 'package:git_touch/widgets/action_button.dart';
import 'package:git_touch/widgets/avatar.dart';
import 'package:git_touch/widgets/files_item.dart';
import 'package:git_touch/widgets/link.dart';
import 'package:provider/provider.dart';
import 'package:git_touch/models/auth.dart';
import 'package:git_touch/models/theme.dart';

class GeCommitScreen extends StatelessWidget {
final String owner;
final String name;
final String sha;
GeCommitScreen(this.owner, this.name, this.sha);

@override
Widget build(BuildContext context) {
final theme = context.watch<ThemeModel>();
return RefreshStatefulScaffold<GiteeCommit>(
title: Text("Commit: ${sha.substring(0, 7)}"),
fetch: () async {
final auth = context.read<AuthModel>();
final items = await auth.fetchGitee('/repos/$owner/$name/commits/$sha');
print(GiteeCommit.fromJson(items));
return GiteeCommit.fromJson(items);
},
actionBuilder: (data, _) => ActionButton(
title: 'Actions', items: [...ActionItem.getUrlActions(data.htmlUrl)]),
bodyBuilder: (data, _) {
return Column(children: <Widget>[
Container(
padding: CommonStyle.padding,
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Link(
url: '/gitee/$owner/$name',
child: Row(
children: <Widget>[
Avatar(
url: data.author.avatarUrl,
size: AvatarSize.extraSmall,
),
SizedBox(width: 4),
Text(
'$owner / $name',
style: TextStyle(
fontSize: 17,
color: theme.palette.secondaryText,
),
),
SizedBox(width: 4),
Text(
'${sha.substring(0, 7)}',
style: TextStyle(
fontSize: 17,
color: theme.palette.tertiaryText,
),
),
],
),
),
SizedBox(height: 8),
Text(
data.commit.message,
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w600,
),
),
],
)),
Wrap(
children: data.files
.map<Widget>((file) => FilesItem(
filename: file.filename,
additions: file.additions,
deletions: file.deletions,
status: file.status,
patch: file.patch,
))
.toList(),
)
]);
},
);
}
}
2 changes: 1 addition & 1 deletion lib/screens/ge_commits.dart
Expand Up @@ -34,7 +34,7 @@ class GeCommitsScreen extends StatelessWidget {
avatarLink: '/gitee/${c.author.login}',
createdAt: c.commit.author.date,
message: c.commit.message,
url: c.htmlUrl,
url: '/gitee/$owner/$name/commits/${c.sha}',
);
},
);
Expand Down
57 changes: 57 additions & 0 deletions lib/screens/ge_files.dart
@@ -0,0 +1,57 @@
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';
import 'package:git_touch/models/gitee.dart';
import 'package:git_touch/scaffolds/list_stateful.dart';
import 'package:git_touch/widgets/action_button.dart';
import 'package:git_touch/widgets/app_bar_title.dart';
import 'package:provider/provider.dart';
import 'package:git_touch/widgets/files_item.dart';
import 'package:git_touch/models/auth.dart';
import '../generated/l10n.dart';

class GeFilesScreen extends StatelessWidget {
final String owner;
final String name;
final String pullNumber;
GeFilesScreen(this.owner, this.name, this.pullNumber);

Widget build(BuildContext context) {
return ListStatefulScaffold<GiteePullFile, int>(
title: AppBarTitle(S.of(context).files),
actionBuilder: () {
return ActionButton(
title: 'Actions',
items: [
...ActionItem.getUrlActions(
'https://gitee.com/$owner/$name/pulls/$pullNumber/files'),
],
);
},
fetch: (page) async {
page = page ?? 1;
final res = await context
.read<AuthModel>()
.fetchGiteeWithPage(
'/repos/$owner/$name/pulls/$pullNumber/files?page=$page',
)
.then((v) {
return [for (var file in v.data) GiteePullFile.fromJson(file)];
});
return ListPayload(
cursor: page + 1,
items: res,
hasMore: res.isNotEmpty,
);
},
itemBuilder: (v) {
return FilesItem(
filename: v.filename,
additions: int.parse(v.additions),
deletions: int.parse(v.deletions),
status: v.status,
patch: v.patch.diff,
);
},
);
}
}

0 comments on commit 92bcdaa

Please sign in to comment.