diff --git a/lib/models/auth.dart b/lib/models/auth.dart index 7286839..c9e4c0b 100644 --- a/lib/models/auth.dart +++ b/lib/models/auth.dart @@ -356,7 +356,11 @@ class AuthModel with ChangeNotifier { } } - Future fetchBb(String p) async { + Future fetchBb( + String p, { + isPost = false, + Map body = const {}, + }) async { if (p.startsWith('/') && !p.startsWith('/api')) p = '/api/2.0$p'; final input = Uri.parse(p); final uri = Uri.parse(activeAccount.domain).replace( @@ -364,11 +368,26 @@ class AuthModel with ChangeNotifier { path: input.path, query: input.query, ); + if (isPost) { + return http.post( + uri, + headers: {HttpHeaders.contentTypeHeader: 'application/json'}, + body: jsonEncode(body), + ); + } return http.get(uri); } - Future fetchBbJson(String p) async { - final res = await fetchBb(p); + Future fetchBbJson( + String p, { + isPost = false, + Map body = const {}, + }) async { + final res = await fetchBb( + p, + isPost: isPost, + body: body, + ); return json.decode(utf8.decode(res.bodyBytes)); } diff --git a/lib/models/bitbucket.dart b/lib/models/bitbucket.dart index 9f1cdd4..a4896d7 100644 --- a/lib/models/bitbucket.dart +++ b/lib/models/bitbucket.dart @@ -123,3 +123,24 @@ class BbPulls { factory BbPulls.fromJson(Map json) => _$BbPullsFromJson(json); } + +@JsonSerializable(fieldRename: FieldRename.snake) +class BbCommentContent { + String raw; + String markup; + String html; + BbCommentContent(); + factory BbCommentContent.fromJson(Map json) => + _$BbCommentContentFromJson(json); +} + +@JsonSerializable(fieldRename: FieldRename.snake) +class BbComment { + String createdOn; + String updatedOn; + BbCommentContent content; + BbRepoOwner user; + BbComment(); + factory BbComment.fromJson(Map json) => + _$BbCommentFromJson(json); +} diff --git a/lib/models/bitbucket.g.dart b/lib/models/bitbucket.g.dart index 1f34ae3..f403715 100644 --- a/lib/models/bitbucket.g.dart +++ b/lib/models/bitbucket.g.dart @@ -214,3 +214,36 @@ Map _$BbPullsToJson(BbPulls instance) => { 'links': instance.links, 'created_on': instance.createdOn?.toIso8601String(), }; + +BbCommentContent _$BbCommentContentFromJson(Map json) { + return BbCommentContent() + ..raw = json['raw'] as String + ..markup = json['markup'] as String + ..html = json['html'] as String; +} + +Map _$BbCommentContentToJson(BbCommentContent instance) => + { + 'raw': instance.raw, + 'markup': instance.markup, + 'html': instance.html, + }; + +BbComment _$BbCommentFromJson(Map json) { + return BbComment() + ..createdOn = json['created_on'] as String + ..updatedOn = json['updated_on'] as String + ..content = json['content'] == null + ? null + : BbCommentContent.fromJson(json['content'] as Map) + ..user = json['user'] == null + ? null + : BbRepoOwner.fromJson(json['user'] as Map); +} + +Map _$BbCommentToJson(BbComment instance) => { + 'created_on': instance.createdOn, + 'updated_on': instance.updatedOn, + 'content': instance.content, + 'user': instance.user, + }; diff --git a/lib/router.dart b/lib/router.dart index e615a65..e6782fe 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -1,5 +1,8 @@ import 'package:fluro/fluro.dart'; import 'package:git_touch/screens/bb_commits.dart'; +import 'package:git_touch/screens/bb_issue.dart'; +import 'package:git_touch/screens/bb_issue_comment.dart'; +import 'package:git_touch/screens/bb_issue_form.dart'; import 'package:git_touch/screens/bb_object.dart'; import 'package:git_touch/screens/bb_repo.dart'; import 'package:git_touch/screens/bb_issues.dart'; @@ -350,6 +353,9 @@ class BitbucketRouter { BitbucketRouter.repo, BitbucketRouter.object, BitbucketRouter.commits, + BitbucketRouter.issueAdd, + BitbucketRouter.issueComment, + BitbucketRouter.issue, BitbucketRouter.issues, BitbucketRouter.pulls, ]; @@ -371,18 +377,24 @@ class BitbucketRouter { path: params['path']?.first, ), ); - static final issues = RouterScreen( - '/:owner/:name/issues/:ref', - (_, p) => - BbIssuesScreen(p['owner'].first, p['name'].first, p['ref'].first)); + static final issues = RouterScreen('/:owner/:name/issues', + (_, p) => BbIssuesScreen(p['owner'].first, p['name'].first)); static final commits = RouterScreen( '/:owner/:name/commits/:ref', (_, p) => BbCommitsScreen(p['owner'].first, p['name'].first, p['ref'].first)); - static final pulls = RouterScreen( - '/:owner/:name/pulls/:ref', + static final pulls = RouterScreen('/:owner/:name/pulls', + (_, p) => BbPullsScreen(p['owner'].first, p['name'].first)); + static final issueAdd = RouterScreen('/:owner/:name/issues/new', + (_, p) => BbIssueFormScreen(p['owner'].first, p['name'].first)); + static final issue = RouterScreen( + '/:owner/:name/issues/:number', (_, p) => - BbPullsScreen(p['owner'].first, p['name'].first, p['ref'].first)); + BbIssueScreen(p['owner'].first, p['name'].first, p['number'].first)); + static final issueComment = RouterScreen( + '/:owner/:name/issues/:number/comment', + (_, p) => BbIssueCommentScreen( + p['owner'].first, p['name'].first, p['number'].first)); } class GiteeRouter { diff --git a/lib/screens/bb_issue.dart b/lib/screens/bb_issue.dart new file mode 100644 index 0000000..a64567b --- /dev/null +++ b/lib/screens/bb_issue.dart @@ -0,0 +1,113 @@ +import 'package:flutter/material.dart'; +import 'package:git_touch/models/bitbucket.dart'; +import 'package:git_touch/scaffolds/refresh_stateful.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/action_entry.dart'; +import 'package:git_touch/widgets/avatar.dart'; +import 'package:git_touch/widgets/link.dart'; +import 'package:git_touch/widgets/comment_item.dart'; +import 'package:primer/primer.dart'; +import 'package:provider/provider.dart'; +import 'package:git_touch/models/auth.dart'; +import 'package:git_touch/models/theme.dart'; +import 'package:tuple/tuple.dart'; + +class BbIssueScreen extends StatelessWidget { + final String owner; + final String name; + final String number; + final bool isPr; + + BbIssueScreen(this.owner, this.name, this.number, {this.isPr: false}); + + @override + Widget build(BuildContext context) { + return RefreshStatefulScaffold>>( + title: Text("Issue: #$number"), + fetch: () async { + final auth = context.read(); + final items = await Future.wait([ + auth.fetchBbJson('/repositories/$owner/$name/issues/$number'), + auth.fetchBbWithPage( + '/repositories/$owner/$name/issues/$number/comments') + ]); + return Tuple2(BbIssues.fromJson(items[0]), + [for (var v in items[1].data) BbComment.fromJson(v)]); + }, + actionBuilder: (data, _) => ActionEntry( + iconData: Octicons.plus, + url: '/bitbucket/$owner/$name/issues/$number/comment', + ), + bodyBuilder: (data, _) { + final issue = data.item1; + final comments = data.item2; + final theme = context.read(); + return Column(children: [ + Container( + padding: CommonStyle.padding, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Link( + url: '/bitbucket/$owner/$name', + child: Row( + children: [ + Avatar( + url: issue.reporter.avatarUrl, + size: AvatarSize.extraSmall, + ), + SizedBox(width: 4), + Text( + '$owner / $name', + style: TextStyle( + fontSize: 17, + color: theme.palette.secondaryText, + ), + ), + SizedBox(width: 4), + Text( + '#$number', + style: TextStyle( + fontSize: 17, + color: theme.palette.tertiaryText, + ), + ), + ], + ), + ), + SizedBox(height: 8), + Text( + issue.title, + style: TextStyle( + fontSize: 20, + fontWeight: FontWeight.w600, + ), + ), + SizedBox(height: 8), + StateLabel(StateLabelStatus.issueOpened), + SizedBox(height: 16), + CommonStyle.border, + ], + )), + Column(children: [ + for (var comment in comments) ...[ + Padding( + padding: EdgeInsets.only(left: 10), + child: CommentItem( + avatar: Avatar( + url: comment.user.avatarUrl, + linkUrl: '/bitbucket/${comment.user.displayName}', + ), + createdAt: DateTime.parse(comment.createdOn), + body: comment.content.raw, + login: comment.user.displayName, + prefix: 'bitbucket')), + CommonStyle.border, + SizedBox(height: 16), + ], + ]), + ]); + }, + ); + } +} diff --git a/lib/screens/bb_issue_comment.dart b/lib/screens/bb_issue_comment.dart new file mode 100644 index 0000000..e95af19 --- /dev/null +++ b/lib/screens/bb_issue_comment.dart @@ -0,0 +1,65 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:git_touch/models/auth.dart'; +import 'package:git_touch/models/theme.dart'; +import 'package:git_touch/scaffolds/common.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:provider/provider.dart'; + +class BbIssueCommentScreen extends StatefulWidget { + final String owner; + final String name; + final String number; + BbIssueCommentScreen(this.owner, this.name, this.number); + + @override + _BbIssueCommentScreenState createState() => _BbIssueCommentScreenState(); +} + +class _BbIssueCommentScreenState extends State { + var _body = ''; + + @override + Widget build(BuildContext context) { + final theme = Provider.of(context); + final auth = Provider.of(context); + return CommonScaffold( + title: Text('New Comment'), + body: Column( + children: [ + Padding( + padding: CommonStyle.padding, + child: CupertinoTextField( + style: TextStyle(color: theme.palette.text), + placeholder: 'Body', + onChanged: (v) { + setState(() { + _body = v; + }); + }, + maxLines: 10, + ), + ), + CupertinoButton.filled( + child: Text('Comment'), + onPressed: () async { + final res = await auth.fetchBb( + '/repositories/${widget.owner}/${widget.name}/issues/${widget.number}/comments', + isPost: true, + body: { + 'content': {'raw': _body} + }, + ); + Navigator.pop(context, true); + await theme.push( + context, + '/bitbucket/${widget.owner}/${widget.name}/issues/${widget.number}', + replace: true, + ); + }, + ), + ], + ), + ); + } +} diff --git a/lib/screens/bb_issue_form.dart b/lib/screens/bb_issue_form.dart new file mode 100644 index 0000000..eafd150 --- /dev/null +++ b/lib/screens/bb_issue_form.dart @@ -0,0 +1,78 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:git_touch/models/auth.dart'; +import 'package:git_touch/models/bitbucket.dart'; +import 'package:git_touch/models/theme.dart'; +import 'package:git_touch/scaffolds/common.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:provider/provider.dart'; + +class BbIssueFormScreen extends StatefulWidget { + final String owner; + final String name; + BbIssueFormScreen(this.owner, this.name); + + @override + _BbIssueFormScreenState createState() => _BbIssueFormScreenState(); +} + +class _BbIssueFormScreenState extends State { + var _title = ''; + var _body = ''; + + @override + Widget build(BuildContext context) { + final theme = Provider.of(context); + final auth = Provider.of(context); + return CommonScaffold( + title: Text('Submit an issue'), + body: Column( + children: [ + Padding( + padding: CommonStyle.padding, + child: CupertinoTextField( + style: TextStyle(color: theme.palette.text), + placeholder: 'Title', + onChanged: (v) { + setState(() { + _title = v; + }); + }, + ), + ), + Padding( + padding: CommonStyle.padding, + child: CupertinoTextField( + style: TextStyle(color: theme.palette.text), + placeholder: 'Body', + onChanged: (v) { + setState(() { + _body = v; + }); + }, + maxLines: 10, + ), + ), + CupertinoButton.filled( + child: Text('Submit'), + onPressed: () async { + final res = await auth.fetchBbJson( + '/repositories/${widget.owner}/${widget.name}/issues', + isPost: true, + body: {'body': _body, 'title': _title}, + ).then((v) { + return BbIssues.fromJson(v); + }); + Navigator.pop(context, true); + await theme.push( + context, + '/bitbucket/${widget.owner}/${widget.name}/issues', + replace: true, + ); + }, + ), + ], + ), + ); + } +} diff --git a/lib/screens/bb_issues.dart b/lib/screens/bb_issues.dart index a0f3a0c..9455342 100644 --- a/lib/screens/bb_issues.dart +++ b/lib/screens/bb_issues.dart @@ -2,6 +2,8 @@ import 'package:flutter/material.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/bitbucket.dart'; import 'package:git_touch/scaffolds/list_stateful.dart'; +import 'package:git_touch/utils/utils.dart'; +import 'package:git_touch/widgets/action_entry.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/issue_item.dart'; import 'package:provider/provider.dart'; @@ -10,14 +12,17 @@ import '../generated/l10n.dart'; class BbIssuesScreen extends StatelessWidget { final String owner; final String name; - final String ref; - BbIssuesScreen(this.owner, this.name, this.ref); + BbIssuesScreen(this.owner, this.name); @override Widget build(BuildContext context) { final auth = Provider.of(context); return ListStatefulScaffold( title: AppBarTitle(S.of(context).issues), + actionBuilder: () { + return ActionEntry( + iconData: Octicons.plus, url: '/bitbucket/$owner/$name/issues/new'); + }, fetch: (nextUrl) async { final res = await context .read() @@ -40,7 +45,7 @@ class BbIssuesScreen extends StatelessWidget { subtitle: '#' + issueNumber.toString(), commentCount: 0, updatedAt: v.createdOn, - url: '${auth.activeAccount.domain}/$owner/$name/issues/$issueNumber', + url: '/bitbucket/$owner/$name/issues/$issueNumber', ); }, ); diff --git a/lib/screens/bb_pulls.dart b/lib/screens/bb_pulls.dart index e193c1e..765ee2c 100644 --- a/lib/screens/bb_pulls.dart +++ b/lib/screens/bb_pulls.dart @@ -10,8 +10,7 @@ import '../generated/l10n.dart'; class BbPullsScreen extends StatelessWidget { final String owner; final String name; - final String ref; - BbPullsScreen(this.owner, this.name, this.ref); + BbPullsScreen(this.owner, this.name); @override Widget build(BuildContext context) { diff --git a/lib/screens/bb_repo.dart b/lib/screens/bb_repo.dart index 065f41c..da801a7 100644 --- a/lib/screens/bb_repo.dart +++ b/lib/screens/bb_repo.dart @@ -61,12 +61,12 @@ class BbRepoScreen extends StatelessWidget { TableViewItem( leftIconData: Octicons.issue_opened, text: Text('Issues'), - url: '/bitbucket/$owner/$name/issues/${p.mainbranch.name}', + url: '/bitbucket/$owner/$name/issues', ), TableViewItem( leftIconData: Octicons.git_pull_request, text: Text('Pull requests'), - url: '/bitbucket/$owner/$name/pulls/${p.mainbranch.name}', + url: '/bitbucket/$owner/$name/pulls', ), TableViewItem( leftIconData: Octicons.history,