Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2025-02-20 21:40:44 +01:00
Code Issues Releases Wiki Activity

refactor: extract all avatar to one widget

Browse Source
This commit is contained in:
Rongjian Zhang 2019-03-09 17:03:33 +08:00
parent 549ef0fa15
commit 3de4ead6b2
6 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/screens/login.dart
View File

@ -6,7 +6,8 @@ import '../utils/constants.dart';
import '../widgets/link.dart';
import '../widgets/loading.dart';
import '../models/account.dart';
import 'login_gitlab.dart';
import '../widgets/avatar.dart';
// import 'login_gitlab.dart';
class LoginScreen extends StatefulWidget {
@override
@ -29,11 +30,7 @@ class _LoginScreenState extends State<LoginScreen> {
border: Border(bottom: BorderSide(color: Colors.black12)),
),
child: Row(children: <Widget>[
CircleAvatar(
backgroundColor: Colors.transparent,
backgroundImage: NetworkImage(account.avatarUrl),
radius: 24,
),
Avatar(url: account.avatarUrl, size: 24),
Padding(padding: EdgeInsets.only(left: 10)),
Expanded(
child: Column(

6
lib/screens/user.dart
View File

@ -209,11 +209,7 @@ class _UserScreenState extends State<UserScreen> {
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Avatar(
login: widget.login,
url: payload['avatarUrl'],
size: 28,
),
Avatar(url: payload['avatarUrl'], size: 28),
Padding(padding: EdgeInsets.only(left: 10)),
Expanded(
child: Column(

7
lib/screens/users.dart
View File

@ -4,6 +4,7 @@ import '../providers/settings.dart';
import '../utils/utils.dart';
import '../widgets/link.dart';
import '../screens/user.dart';
import '../widgets/avatar.dart';
class UsersScreen extends StatefulWidget {
final String login;
@ -54,11 +55,7 @@ class _UsersScreenState extends State<UsersScreen> {
padding: EdgeInsets.all(10),
child: Row(
children: <Widget>[
CircleAvatar(
backgroundColor: Colors.transparent,
backgroundImage: NetworkImage(payload['avatarUrl']),
radius: 18,
),
Avatar(url: payload['avatarUrl']),
Padding(padding: EdgeInsets.only(left: 10)),
Text(payload['login'], style: TextStyle(fontSize: 18))
],

36
lib/widgets/avatar.dart
View File

@ -4,32 +4,38 @@ import '../screens/user.dart';
import 'link.dart';
class Avatar extends StatelessWidget {
final String login;
final String url;
final String login;
final double size;
Avatar({
@required this.login,
@required this.url,
this.size = 18,
this.login,
});
@override
Widget build(BuildContext context) {
return Link(
screenBuilder: (_) => UserScreen(login),
child: ClipRRect(
borderRadius: BorderRadius.circular(size),
child: FadeInImage.assetNetwork(
placeholder: 'images/octoface.png',
image: url,
width: 2 * size,
height: 2 * size,
fadeInDuration: Duration(milliseconds: 200),
fadeOutDuration: Duration(milliseconds: 100),
),
var avatar = ClipRRect(
borderRadius: BorderRadius.circular(size),
child: FadeInImage.assetNetwork(
placeholder: 'images/octoface.png',
image: url,
width: 2 * size,
height: 2 * size,
fadeInDuration: Duration(milliseconds: 200),
fadeOutDuration: Duration(milliseconds: 100),
),
material: false,
);
if (login == null) {
return avatar;
} else {
return Link(
screenBuilder: (_) => UserScreen(login),
child: avatar,
material: false,
);
}
}
}

2
lib/widgets/comment_item.dart
View File

@ -14,9 +14,9 @@ class CommentItem extends StatelessWidget {
return Column(children: <Widget>[
Row(children: <Widget>[
Avatar(
login: payload['author']['login'],
url: payload['author']['avatarUrl'],
size: 16,
login: payload['author']['login'],
),
Padding(padding: EdgeInsets.only(left: 6)),
Expanded(

2
lib/widgets/event_item.dart
View File

@ -66,7 +66,7 @@ class EventItem extends StatelessWidget {
children: <Widget>[
Row(
children: <Widget>[
Avatar(login: event.actorLogin, url: event.actorAvatarUrl),
Avatar(url: event.actorAvatarUrl, login: event.actorLogin),
Padding(padding: EdgeInsets.only(left: 10)),
Expanded(
child: RichText(