4
2
Fork 0

fixed some basic mistakes

pull/43/head
Sudharshan S. 2019-05-17 22:08:12 +08:00
parent 5b9ae529fc
commit 89543e3e42
Signed by: sudharshan
GPG Key ID: C861C97AAF3D9559
4 changed files with 28 additions and 17 deletions

View File

@ -7,19 +7,21 @@ class ConversationInactiveView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
child: Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
UserAvatar(
padding: EdgeInsets.only(right: 5.0),
user: User("1", "Isaac", "Tay", "+65 91043593")),
UserAvatar(
padding: EdgeInsets.only(right: 5.0),
user: User("1", "Isaac", "Tay", "+65 91043593")),
UserAvatar(
padding: EdgeInsets.only(right: 5.0),
user: User("1", "Isaac", "Tay", "+65 91043593"))
]));
child: Column(mainAxisSize: MainAxisSize.min, children: [
Row(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
UserAvatar(
padding: EdgeInsets.only(right: 5.0),
user: User("1", "Isaac", "Tay", "+65 91043593")),
UserAvatar(
padding: EdgeInsets.only(right: 5.0),
user: User("1", "Isaac", "Tay", "+65 91043593")),
UserAvatar(
padding: EdgeInsets.only(right: 5.0),
user: User("1", "Isaac", "Tay", "+65 91043593"))
])
]));
}
}

View File

@ -6,6 +6,8 @@ import "./widgets/contact_list.dart";
import "../bottom_bar/bottom_bar.dart";
class Home extends StatefulWidget {
final GlobalKey<ScaffoldState> _scaffoldKey = new GlobalKey<ScaffoldState>();
@override
_HomeState createState() => _HomeState();
}
@ -37,13 +39,14 @@ class _HomeState extends State<Home> {
@override
Widget build(BuildContext context) {
return Scaffold(
key: widget._scaffoldKey,
body: Column(children: <Widget>[
TopBar(title: titleList[_pageNumber], pageNumber: _pageNumber),
Expanded(
child: PageView(controller: controller, children: <Widget>[
ConversationList(),
ContactList(),
]))
])),
]),
bottomSheet: BottomBar());
}

View File

@ -61,6 +61,7 @@ class _ConversationItemState extends State<ConversationItem> {
StreamBuilder(
stream: bloc.members,
builder: (context, AsyncSnapshot<List<User>> snapshot) {
print(snapshot.data);
if (snapshot.hasData) {
return membersBuilder(snapshot.data);
} else if (snapshot.hasError) {
@ -79,7 +80,9 @@ class _ConversationItemState extends State<ConversationItem> {
crossAxisAlignment: CrossAxisAlignment.end,
children: data
.map((user) => UserAvatar(
padding: EdgeInsets.only(top: 10.0, left: 5.0), user: user))
radius: 15.0,
padding: EdgeInsets.only(top: 10.0, left: 5.0),
user: user))
.toList());
}
}

View File

@ -49,7 +49,10 @@ class _UserAvatarState extends State<UserAvatar> {
backgroundColor: _stringToColor(widget.user.lastName),
child: Text(
firstName.toUpperCase() + lastName.toUpperCase(),
style: Theme.of(context).accentTextTheme.title,
style: Theme.of(context)
.accentTextTheme
.title
.copyWith(fontSize: widget.radius / 1.2),
),
radius: widget.radius),
StreamBuilder(