Lemmy
/
lemmur-app-android
mirror of https://github.com/krawieck/lemmur/
1
0
Fork 0
Code Issues Releases Wiki Activity

restructure user profile to work in both contexts: 

- profile tab
- some user profile
This commit is contained in:
shilangyu 2020-09-01 11:55:22 +02:00
parent 1c9848dced
commit 5808ab17a3
2 changed files with 62 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pages/profile_tab.dart
View File

@ -58,7 +58,10 @@ class UserProfileTab extends HookWidget {
)
],
),
body: UserProfile(user),
body: UserProfile(
userId: user.id,
instanceUrl: user.actorId.split('/')[2],
),
);
}
}

96
lib/widgets/user_profile.dart
View File

@ -8,16 +8,16 @@ import 'package:timeago/timeago.dart' as timeago;
import '../util/intl.dart';
class UserProfile extends HookWidget {
final User user;
final int userId;
final Future<UserView> _userView;
final String _instanceUrl;
final String instanceUrl;
UserProfile(this.user)
: _instanceUrl = user.actorId.split('/')[2],
_userView = LemmyApi(user.actorId.split('/')[2])
UserProfile({@required this.userId, @required this.instanceUrl})
: _userView = LemmyApi(instanceUrl)
.v1
.search(q: user.name, type: SearchType.users, sort: SortType.active)
.then((res) => res.users[0]);
.getUserDetails(
userId: userId, savedOnly: true, sort: SortType.active)
.then((res) => res.user);
@override
Widget build(BuildContext context) {
@ -25,7 +25,24 @@ class UserProfile extends HookWidget {
var userViewSnap = useFuture(_userView);
Widget _tabs() => DefaultTabController(
Widget bio;
if (userViewSnap.hasData) {
if (userViewSnap.data.bio != null) {
bio = Text(userViewSnap.data.bio);
} else {
bio = Center(
child: Text(
'no bio',
style: const TextStyle(fontStyle: FontStyle.italic),
),
);
}
} else {
bio = Center(child: CircularProgressIndicator());
}
Widget tabs() => DefaultTabController(
length: 3,
child: Column(
children: [
@ -41,24 +58,18 @@ class UserProfile extends HookWidget {
child: TabBarView(
children: [
Center(
child: Text(
'Posts',
style: const TextStyle(fontSize: 36),
)),
child: Text(
'Posts',
style: const TextStyle(fontSize: 36),
),
),
Center(
child: Text(
'Comments',
style: const TextStyle(fontSize: 36),
)),
if (user.bio == null)
Center(
child: Text(
'no bio',
style: const TextStyle(fontStyle: FontStyle.italic),
),
)
else
Text(user.bio),
child: Text(
'Comments',
style: const TextStyle(fontSize: 36),
),
),
bio,
],
),
)
@ -69,9 +80,9 @@ class UserProfile extends HookWidget {
return Center(
child: Stack(
children: [
if (user.banner != null)
if (userViewSnap.data?.banner != null)
CachedNetworkImage(
imageUrl: user.banner,
imageUrl: userViewSnap.data.banner,
)
else
Container(
@ -87,7 +98,10 @@ class UserProfile extends HookWidget {
height: double.infinity,
child: Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.all(Radius.circular(40)),
borderRadius: BorderRadius.only(
topRight: Radius.circular(40),
topLeft: Radius.circular(40),
),
color: theme.scaffoldBackgroundColor,
),
),
@ -97,7 +111,7 @@ class UserProfile extends HookWidget {
SafeArea(
child: Column(
children: [
if (user.avatar != null)
if (userViewSnap.data?.avatar != null)
SizedBox(
width: 80,
height: 80,
@ -113,24 +127,26 @@ class UserProfile extends HookWidget {
child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(12)),
child: CachedNetworkImage(
imageUrl: user.avatar,
imageUrl: userViewSnap.data.avatar,
),
),
),
),
Padding(
padding: user.avatar == null
? const EdgeInsets.only(top: 70)
: const EdgeInsets.only(top: 8.0),
padding: userViewSnap.data?.avatar != null
? const EdgeInsets.only(top: 8.0)
: const EdgeInsets.only(top: 70),
child: Text(
user.preferredUsername ?? user.name,
userViewSnap.data?.preferredUsername ??
userViewSnap.data?.name ??
'',
style: theme.textTheme.headline6,
),
),
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: Text(
'@${user.name}@$_instanceUrl',
'@${userViewSnap.data?.name ?? ''}@$instanceUrl',
style: theme.textTheme.caption,
),
),
@ -160,7 +176,8 @@ ${compactNumber(userViewSnap.data?.numberOfComments ?? 0)} Comment${pluralS(user
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(
'Joined ${timeago.format(user.published)}',
'''
Joined ${userViewSnap.hasData ? timeago.format(userViewSnap.data.published) : ''}''',
style: theme.textTheme.bodyText1,
),
),
@ -174,13 +191,16 @@ ${compactNumber(userViewSnap.data?.numberOfComments ?? 0)} Comment${pluralS(user
Padding(
padding: const EdgeInsets.only(left: 4.0),
child: Text(
DateFormat('MMM dd, yyyy').format(user.published),
userViewSnap.hasData
? DateFormat('MMM dd, yyyy')
.format(userViewSnap.data.published)
: '',
style: theme.textTheme.bodyText1,
),
),
],
),
Expanded(child: _tabs())
Expanded(child: tabs())
],
),
),