From 3542c36dcce758e98dbc8bc8b667a2e8a0734e64 Mon Sep 17 00:00:00 2001 From: Rongjian Zhang Date: Sun, 2 Feb 2020 17:47:05 +0800 Subject: [PATCH] feat(bb): teams screen --- lib/home.dart | 9 ++++++++- lib/screens/bb_explore.dart | 2 +- lib/screens/bb_teams.dart | 40 +++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 lib/screens/bb_teams.dart diff --git a/lib/home.dart b/lib/home.dart index 9be1ba5..4009271 100644 --- a/lib/home.dart +++ b/lib/home.dart @@ -4,6 +4,7 @@ import 'package:git_touch/models/auth.dart'; import 'package:git_touch/models/notification.dart'; import 'package:git_touch/models/theme.dart'; import 'package:git_touch/screens/bb_explore.dart'; +import 'package:git_touch/screens/bb_teams.dart'; import 'package:git_touch/screens/bb_user.dart'; import 'package:git_touch/screens/gitea_orgs.dart'; import 'package:git_touch/screens/gitea_user.dart'; @@ -65,8 +66,10 @@ class _HomeState extends State { case PlatformType.bitbucket: switch (index) { case 0: - return BbExplore(); + return BbExploreScreen(); case 1: + return BbTeamsScreen(); + case 2: return BbUserScreen(null); } break; @@ -150,6 +153,10 @@ class _HomeState extends State { icon: Icon(Icons.explore), title: Text('Explore'), ), + BottomNavigationBarItem( + icon: Icon(Icons.group), + title: Text('Teams'), + ), BottomNavigationBarItem( icon: Icon(Icons.person), title: Text('Me'), diff --git a/lib/screens/bb_explore.dart b/lib/screens/bb_explore.dart index ef36357..0da63a7 100644 --- a/lib/screens/bb_explore.dart +++ b/lib/screens/bb_explore.dart @@ -6,7 +6,7 @@ import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/repository_item.dart'; import 'package:provider/provider.dart'; -class BbExplore extends StatelessWidget { +class BbExploreScreen extends StatelessWidget { Future> _query(BuildContext context, [String nextUrl]) async { final auth = Provider.of(context); diff --git a/lib/screens/bb_teams.dart b/lib/screens/bb_teams.dart new file mode 100644 index 0000000..f7ef4e1 --- /dev/null +++ b/lib/screens/bb_teams.dart @@ -0,0 +1,40 @@ +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/widgets/app_bar_title.dart'; +import 'package:git_touch/widgets/user_item.dart'; +import 'package:provider/provider.dart'; +import 'package:timeago/timeago.dart' as timeago; + +class BbTeamsScreen extends StatelessWidget { + Future> _query(BuildContext context, + [String nextUrl]) async { + final auth = Provider.of(context); + final res = await auth.fetchBbWithPage(nextUrl ?? '/teams?role=member'); + return ListPayload( + cursor: res.cursor, + hasMore: res.hasMore, + items: [ + for (var v in res.data) BbUser.fromJson(v), + ], + ); + } + + @override + Widget build(BuildContext context) { + return ListStatefulScaffold( + title: AppBarTitle('Teams'), + onRefresh: () => _query(context), + onLoadMore: (page) => _query(context, page), + itemBuilder: (v) { + return UserItem( + login: v.username, + url: '/bitbucket/${v.username}?team=1', + avatarUrl: v.avatarUrl, + bio: Text('Created ${timeago.format(v.createdOn)}'), + ); + }, + ); + } +}