From 89543e3e42ba835b0f760222ec1a98d6cfe7c4c7 Mon Sep 17 00:00:00 2001
From: Sudharshan <solderneer@gmail.com>
Date: Fri, 17 May 2019 22:08:12 +0800
Subject: [PATCH] fixed some basic mistakes

---
 .../widgets/conversation_inactive_view.dart   | 30 ++++++++++---------
 lib/src/ui/home/home.dart                     |  5 +++-
 .../ui/home/widgets/conversation_item.dart    |  5 +++-
 lib/src/ui/widgets/user_avatar.dart           |  5 +++-
 4 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/lib/src/ui/bottom_bar/widgets/conversation_inactive_view.dart b/lib/src/ui/bottom_bar/widgets/conversation_inactive_view.dart
index bea837e..b57eabd 100644
--- a/lib/src/ui/bottom_bar/widgets/conversation_inactive_view.dart
+++ b/lib/src/ui/bottom_bar/widgets/conversation_inactive_view.dart
@@ -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"))
+          ])
+    ]));
   }
 }
diff --git a/lib/src/ui/home/home.dart b/lib/src/ui/home/home.dart
index 5e60192..7054678 100644
--- a/lib/src/ui/home/home.dart
+++ b/lib/src/ui/home/home.dart
@@ -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());
   }
diff --git a/lib/src/ui/home/widgets/conversation_item.dart b/lib/src/ui/home/widgets/conversation_item.dart
index c97774f..799cfed 100644
--- a/lib/src/ui/home/widgets/conversation_item.dart
+++ b/lib/src/ui/home/widgets/conversation_item.dart
@@ -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());
   }
 }
diff --git a/lib/src/ui/widgets/user_avatar.dart b/lib/src/ui/widgets/user_avatar.dart
index ad93cb4..5a67a76 100644
--- a/lib/src/ui/widgets/user_avatar.dart
+++ b/lib/src/ui/widgets/user_avatar.dart
@@ -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(