Gitea
/
git-touch-android-ios-app
mirror of https://github.com/git-touch/git-touch
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(bb): username get

This commit is contained in:
Rongjian Zhang 2020-02-02 19:06:48 +08:00
parent 7f2649c691
commit 376b8724a4
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/models/bitbucket.dart
View File

@ -50,6 +50,7 @@ class BbRepo {
String slug; String slug;
BbRepoMainbranch mainbranch; BbRepoMainbranch mainbranch;
Map<String, dynamic> links; Map<String, dynamic> links;
String get ownerLogin => fullName.split('/')[0]; // owner has no username
String get avatarUrl => links['avatar']['href']; String get avatarUrl => links['avatar']['href'];
BbRepo(); BbRepo();
factory BbRepo.fromJson(Map<String, dynamic> json) => _$BbRepoFromJson(json); factory BbRepo.fromJson(Map<String, dynamic> json) => _$BbRepoFromJson(json);

2
lib/screens/bb_repo.dart
View File

@ -38,7 +38,7 @@ class BbRepoScreen extends StatelessWidget {
RepoHeader( RepoHeader(
avatarUrl: p.avatarUrl, avatarUrl: p.avatarUrl,
avatarLink: null, avatarLink: null,
owner: p.owner.displayName, // TODO: owner: p.ownerLogin,
name: p.slug, name: p.slug,
description: p.description, description: p.description,
homepageUrl: p.website, homepageUrl: p.website,

8
lib/screens/bb_user.dart
View File

@ -17,11 +17,11 @@ class BbUserScreen extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final auth = Provider.of<AuthModel>(context);
final _login = login ?? auth.activeAccount.login;
return RefreshStatefulScaffold<Tuple2<BbUser, Iterable<BbRepo>>>( return RefreshStatefulScaffold<Tuple2<BbUser, Iterable<BbRepo>>>(
title: Text(isViewer ? 'Me' : 'User'), title: Text(isViewer ? 'Me' : 'User'),
fetchData: () async { fetchData: () async {
final auth = Provider.of<AuthModel>(context);
final _login = login ?? auth.activeAccount.login;
final res = await Future.wait([ final res = await Future.wait([
auth.fetchBb('/users/$_login'), auth.fetchBb('/users/$_login'),
auth.fetchBbWithPage('/repositories/$_login'), auth.fetchBbWithPage('/repositories/$_login'),
@ -46,9 +46,9 @@ class BbUserScreen extends StatelessWidget {
return Column( return Column(
children: <Widget>[ children: <Widget>[
UserHeader( UserHeader(
login: user.displayName, login: _login,
avatarUrl: user.avatarUrl, avatarUrl: user.avatarUrl,
name: user.nickname, name: user.displayName,
createdAt: user.createdOn, createdAt: user.createdOn,
bio: null, bio: null,
), ),

2
lib/widgets/repository_item.dart
View File

@ -42,7 +42,7 @@ class RepositoryItem extends StatelessWidget {
@required BbRepo payload, @required BbRepo payload,
this.primaryLanguageName, this.primaryLanguageName,
this.primaryLanguageColor, this.primaryLanguageColor,
}) : owner = payload.owner.displayName, }) : owner = payload.ownerLogin,
name = payload.name, name = payload.name,
url = '/bitbucket/${payload.fullName}', url = '/bitbucket/${payload.fullName}',
avatarUrl = payload.avatarUrl, avatarUrl = payload.avatarUrl,