Fix not full screen layout

yegobox · Aug 29, 2021 · 4f72e77 · 4f72e77
1 parent d93cab9
commit 4f72e77
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 62 deletions.
diff --git a/doc/advanced-usage.md b/doc/advanced-usage.md
@@ -44,9 +44,12 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        // ...
-        onAttachmentPressed: _handleImageSelection,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          // ...
+          onAttachmentPressed: _handleImageSelection,
+        ),
       ),
     );
   }
@@ -97,9 +100,12 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        // ...
-        onAttachmentPressed: _handleFileSelection,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          // ...
+          onAttachmentPressed: _handleFileSelection,
+        ),
       ),
     );
   }
@@ -127,9 +133,12 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        // ...
-        onMessageTap: _handleMessageTap,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          // ...
+          onMessageTap: _handleMessageTap,
+        ),
       ),
     );
   }
@@ -160,9 +169,12 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        // ...
-        onPreviewDataFetched: _handlePreviewDataFetched,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          // ...
+          onPreviewDataFetched: _handlePreviewDataFetched,
+        ),
       ),
     );
   }
@@ -346,13 +358,16 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        messages: _messages,
-        onAttachmentPressed: _handleAtachmentPressed,
-        onMessageTap: _handleMessageTap,
-        onPreviewDataFetched: _handlePreviewDataFetched,
-        onSendPressed: _handleSendPressed,
-        user: _user,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          messages: _messages,
+          onAttachmentPressed: _handleAtachmentPressed,
+          onMessageTap: _handleMessageTap,
+          onPreviewDataFetched: _handlePreviewDataFetched,
+          onSendPressed: _handleSendPressed,
+          user: _user,
+        ),
       ),
     );
   }
@@ -405,9 +420,12 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        // ...
-        onEndReached: _handleEndReached,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          // ...
+          onEndReached: _handleEndReached,
+        ),
       ),
     );
   }

diff --git a/doc/basic-usage.md b/doc/basic-usage.md
@@ -77,10 +77,13 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        messages: _messages,
-        onSendPressed: _handleSendPressed,
-        user: _user,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          messages: _messages,
+          onSendPressed: _handleSendPressed,
+          user: _user,
+        ),
       ),
     );
   }

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -184,13 +184,16 @@ class _ChatPageState extends State<ChatPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      body: Chat(
-        messages: _messages,
-        onAttachmentPressed: _handleAtachmentPressed,
-        onMessageTap: _handleMessageTap,
-        onPreviewDataFetched: _handlePreviewDataFetched,
-        onSendPressed: _handleSendPressed,
-        user: _user,
+      body: SafeArea(
+        bottom: false,
+        child: Chat(
+          messages: _messages,
+          onAttachmentPressed: _handleAtachmentPressed,
+          onMessageTap: _handleMessageTap,
+          onPreviewDataFetched: _handlePreviewDataFetched,
+          onSendPressed: _handleSendPressed,
+          user: _user,
+        ),
       ),
     );
   }

diff --git a/lib/src/widgets/chat.dart b/lib/src/widgets/chat.dart
@@ -18,7 +18,8 @@ import 'inherited_user.dart';
 import 'input.dart';
 import 'message.dart';
 
-/// Entry widget, represents the complete chat
+/// Entry widget, represents the complete chat. If you wrap it in [SafeArea] and
+/// it should be full screen, set [SafeArea]'s `bottom` to `false`.
 class Chat extends StatefulWidget {
   /// Creates a chat widget
   const Chat({
@@ -234,7 +235,7 @@ class _ChatState extends State<Chat> {
     );
   }
 
-  Widget _buildMessage(Object object) {
+  Widget _buildMessage(Object object, BoxConstraints constraints) {
     if (object is DateHeader) {
       return Container(
         alignment: Alignment.center,
@@ -256,8 +257,8 @@ class _ChatState extends State<Chat> {
       final message = map['message']! as types.Message;
       final _messageWidth =
           widget.showUserAvatars && message.author.id != widget.user.id
-              ? min(MediaQuery.of(context).size.width * 0.72, 440).floor()
-              : min(MediaQuery.of(context).size.width * 0.78, 440).floor();
+              ? min(constraints.maxWidth * 0.72, 440).floor()
+              : min(constraints.maxWidth * 0.78, 440).floor();
 
       return Message(
         key: ValueKey(message.id),
@@ -341,39 +342,39 @@ class _ChatState extends State<Chat> {
             children: [
               Container(
                 color: widget.theme.backgroundColor,
-                child: SafeArea(
-                  bottom: false,
-                  child: Column(
-                    children: [
-                      Flexible(
-                        child: widget.messages.isEmpty
-                            ? SizedBox.expand(
-                                child: _buildEmptyState(),
-                              )
-                            : GestureDetector(
-                                onTap: () => FocusManager.instance.primaryFocus
-                                    ?.unfocus(),
-                                child: ChatList(
+                child: Column(
+                  children: [
+                    Flexible(
+                      child: widget.messages.isEmpty
+                          ? SizedBox.expand(
+                              child: _buildEmptyState(),
+                            )
+                          : GestureDetector(
+                              onTap: () =>
+                                  FocusManager.instance.primaryFocus?.unfocus(),
+                              child: LayoutBuilder(
+                                builder: (BuildContext context,
+                                        BoxConstraints constraints) =>
+                                    ChatList(
                                   isLastPage: widget.isLastPage,
                                   itemBuilder: (item, index) =>
-                                      _buildMessage(item),
+                                      _buildMessage(item, constraints),
                                   items: _chatMessages,
                                   onEndReached: widget.onEndReached,
                                   onEndReachedThreshold:
                                       widget.onEndReachedThreshold,
                                 ),
                               ),
-                      ),
-                      Input(
-                        isAttachmentUploading: widget.isAttachmentUploading,
-                        onAttachmentPressed: widget.onAttachmentPressed,
-                        onSendPressed: widget.onSendPressed,
-                        onTextChanged: widget.onTextChanged,
-                        sendButtonVisibilityMode:
-                            widget.sendButtonVisibilityMode,
-                      ),
-                    ],
-                  ),
+                            ),
+                    ),
+                    Input(
+                      isAttachmentUploading: widget.isAttachmentUploading,
+                      onAttachmentPressed: widget.onAttachmentPressed,
+                      onSendPressed: widget.onSendPressed,
+                      onTextChanged: widget.onTextChanged,
+                      sendButtonVisibilityMode: widget.sendButtonVisibilityMode,
+                    ),
+                  ],
                 ),
               ),
               if (_isImageViewVisible) _buildImageGallery(),