From a5d64fdb866336f823caad1252af00bb0f7b58ab Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Sat, 17 Oct 2020 18:18:26 +0800 Subject: [PATCH] feat(gitee): users screen --- lib/models/gitee.dart | 11 ++++++++ lib/models/gitee.g.dart | 16 ++++++++++++ lib/router.dart | 9 ++++--- lib/screens/ge_users.dart | 52 ++++++++++++++++++++++++++++++++++++++ lib/widgets/user_item.dart | 7 +++++ 5 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 lib/screens/ge_users.dart diff --git a/lib/models/gitee.dart b/lib/models/gitee.dart index 805dd1d..a016df8 100644 --- a/lib/models/gitee.dart +++ b/lib/models/gitee.dart @@ -21,6 +21,17 @@ class GiteeUser { _$GiteeUserFromJson(json); } +@JsonSerializable(fieldRename: FieldRename.snake) +class GiteeListUser { + String login; + String avatarUrl; + String name; + String htmlUrl; + GiteeListUser(); + factory GiteeListUser.fromJson(Map json) => + _$GiteeListUserFromJson(json); +} + @JsonSerializable(fieldRename: FieldRename.snake) class GiteeRepo { GiteeRepoOwner owner; diff --git a/lib/models/gitee.g.dart b/lib/models/gitee.g.dart index 70884f9..5559ba4 100644 --- a/lib/models/gitee.g.dart +++ b/lib/models/gitee.g.dart @@ -39,6 +39,22 @@ Map _$GiteeUserToJson(GiteeUser instance) => { 'created_at': instance.createdAt?.toIso8601String(), }; +GiteeListUser _$GiteeListUserFromJson(Map json) { + return GiteeListUser() + ..login = json['login'] as String + ..avatarUrl = json['avatar_url'] as String + ..name = json['name'] as String + ..htmlUrl = json['html_url'] as String; +} + +Map _$GiteeListUserToJson(GiteeListUser instance) => + { + 'login': instance.login, + 'avatar_url': instance.avatarUrl, + 'name': instance.name, + 'html_url': instance.htmlUrl, + }; + GiteeRepo _$GiteeRepoFromJson(Map json) { return GiteeRepo() ..owner = json['owner'] == null diff --git a/lib/router.dart b/lib/router.dart index 3955279..6258261 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -8,6 +8,7 @@ import 'package:git_touch/screens/bb_user.dart'; import 'package:git_touch/screens/code_theme.dart'; import 'package:git_touch/screens/ge_repos.dart'; import 'package:git_touch/screens/ge_user.dart'; +import 'package:git_touch/screens/ge_users.dart'; import 'package:git_touch/screens/gh_commits.dart'; import 'package:git_touch/screens/gh_contributors.dart'; import 'package:git_touch/screens/gh_events.dart'; @@ -383,9 +384,11 @@ class GiteeRouter { final login = p['login'].first; final tab = p['tab']?.first; switch (tab) { - case 'followers': // - case 'following': // - case 'people': // + case 'followers': + return GeUsersScreen.followers(login); + case 'following': + return GeUsersScreen.following(login); + // case 'people': case 'stars': return GeReposScreen.star(login); case 'repositories': diff --git a/lib/screens/ge_users.dart b/lib/screens/ge_users.dart new file mode 100644 index 0000000..4136b98 --- /dev/null +++ b/lib/screens/ge_users.dart @@ -0,0 +1,52 @@ +import 'package:flutter/material.dart'; +import 'package:git_touch/models/gitee.dart'; +import 'package:git_touch/scaffolds/list_stateful.dart'; +import 'package:git_touch/widgets/app_bar_title.dart'; +import 'package:git_touch/widgets/user_item.dart'; +import 'package:git_touch/models/auth.dart'; +import 'package:provider/provider.dart'; + +class GeUsersScreen extends StatelessWidget { + final String api; + final String title; + + GeUsersScreen.followers(String login) + : api = '/users/$login/followers', + title = 'Followers'; + GeUsersScreen.following(String login) + : api = '/users/$login/following', + title = "Following"; + // GeUsersScreen.member(String login) + // : api = '/orgs/$login/members', + // title = "Members"; + GeUsersScreen.stargazers(String owner, String repo) + : api = '/repos/$owner/$repo/stargazers', + title = 'Stargazers'; + GeUsersScreen.watchers(String owner, String repo) + : api = '/repos/$owner/$repo/subscribers', + title = 'Watchers'; + + @override + Widget build(BuildContext context) { + return ListStatefulScaffold( + title: AppBarTitle(title), + fetch: (page) async { + final res = + await context.read().fetchGiteeWithPage(api, page: page); + return ListPayload( + cursor: res.cursor, + hasMore: res.hasMore, + items: [for (var v in res.data) GiteeListUser.fromJson(v)], + ); + }, + itemBuilder: (p) { + return UserItem.gitee( + login: p.login, + name: p.name, + avatarUrl: p.avatarUrl, + bio: Text(p.htmlUrl), + ); + }, + ); + } +} diff --git a/lib/widgets/user_item.dart b/lib/widgets/user_item.dart index dd43487..37a2dc4 100644 --- a/lib/widgets/user_item.dart +++ b/lib/widgets/user_item.dart @@ -49,6 +49,13 @@ class UserItem extends StatelessWidget { @required this.bio, }) : url = '/gitea/$login'; + UserItem.gitee({ + @required this.login, + @required this.name, + @required this.avatarUrl, + @required this.bio, + }) : url = '/gitee/$login'; + UserItem.bitbucket({ @required this.login, @required this.name,