Merge pull request #365 from GetStream/fix/accessibility-text-size-scaling

packages/stream_chat_flutter/lib/src/extension.dart

@@ -97,3 +97,8 @@ extension InputDecorationX on InputDecoration {
     );
   }
 }
+
+extension BuildContextX on BuildContext {
+  double get textScaleFactor =>
+      MediaQuery.maybeOf(this)?.textScaleFactor ?? 1.0;
+}

packages/stream_chat_flutter/lib/src/message_input.dart

@@ -319,7 +319,11 @@ class MessageInputState extends State<MessageInput> {
               ),
               if (widget.parentMessage != null && !widget.hideSendAsDm)
                 Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 8.0),
+                  padding: const EdgeInsets.only(
+                    right: 12.0,
+                    left: 12.0,
+                    bottom: 12.0,
+                  ),
                   child: _buildDmCheckbox(),
                 ),
               _buildFilePickerSection(),
@@ -354,14 +358,7 @@ class MessageInputState extends State<MessageInput> {
   }
 
   Widget _buildDmCheckbox() {
-    return Container(
+    return Row(
-      height: 36,
-      padding: const EdgeInsets.only(
-        left: 12,
-        bottom: 12,
-        top: 8,
-      ),
-      child: Row(
       crossAxisAlignment: CrossAxisAlignment.center,
       children: [
         Container(
@@ -411,11 +408,18 @@ class MessageInputState extends State<MessageInput> {
           ),
         ),
         Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16.0),
+          padding: const EdgeInsets.symmetric(horizontal: 12.0),
-            child: Text('Also send as direct message'),
+          child: Text(
+            'Also send as direct message',
+            style: StreamChatTheme.of(context).textTheme.footnote.copyWith(
+                  color: StreamChatTheme.of(context)
+                      .colorTheme
+                      .black
+                      .withOpacity(0.5),
+                ),
+          ),
         ),
       ],
-      ),
     );
   }
 

packages/stream_chat_flutter/lib/src/message_search_list_view.dart

@@ -268,9 +268,7 @@ class _MessageSearchListViewState extends State<MessageSearchListView> {
     }
 
     child = LazyLoadScrollView(
-      onEndOfPage: () async {
+      onEndOfPage: () => _messageSearchListController.paginateData(),
-        return _messageSearchListController.paginateData();
-      },
       child: child,
     );
 

packages/stream_chat_flutter/lib/src/message_widget.dart

@@ -585,7 +585,8 @@ class _MessageWidgetState extends State<MessageWidget>
                                 ),
                               ],
                             ),
-                            if (showBottomRow) SizedBox(height: 20.0),
+                            if (showBottomRow)
+                              SizedBox(height: context.textScaleFactor * 18.0),
                           ],
                         ),
                         if (showBottomRow)
@@ -682,6 +683,8 @@ class _MessageWidgetState extends State<MessageWidget>
       }
     };
 
+    const usernameKey = Key('username');
+
     children.addAll([
       if (showInChannel || showThreadReplyIndicator) ...[
         if (showThreadParticipants)
@@ -697,7 +700,10 @@ class _MessageWidgetState extends State<MessageWidget>
       if (showUsername)
         Text(
           widget.message.user.name,
+          maxLines: 1,
+          key: usernameKey,
           style: widget.messageTheme.messageAuthor,
+          overflow: TextOverflow.ellipsis,
         ),
       if (showTimeStamp)
         Text(
@@ -710,18 +716,17 @@ class _MessageWidgetState extends State<MessageWidget>
     final showThreadTail = !(hasUrlAttachments || isGiphy || isOnlyEmoji) &&
         (showThreadReplyIndicator || showInChannel);
 
-    return Flex(
+    return Row(
-      direction: Axis.horizontal,
-      clipBehavior: Clip.none,
       crossAxisAlignment: CrossAxisAlignment.end,
       children: [
         if (showThreadTail)
           Container(
             margin: EdgeInsets.only(
-              bottom: widget.messageTheme.replies.fontSize / 2,
+              bottom: context.textScaleFactor *
+                  (widget.messageTheme.replies.fontSize / 2),
             ),
             child: CustomPaint(
-              size: const Size(16, 32),
+              size: Size(16, 32) * context.textScaleFactor,
               painter: _ThreadReplyPainter(
                 context: context,
                 color: widget.messageTheme.messageBorderColor,
@@ -729,16 +734,20 @@ class _MessageWidgetState extends State<MessageWidget>
             ),
           ),
         ...children.map(
-          (child) => Transform(
+          (child) {
+            Widget mappedChild = Transform(
               transform: Matrix4.rotationY(widget.reverse ? pi : 0),
               alignment: Alignment.center,
               child: Container(
-              height: 16,
+                height: context.textScaleFactor * 14,
-              child: Center(
                 child: child,
               ),
-            ),
+            );
-          ),
+            if (child.key == usernameKey) {
+              mappedChild = Flexible(child: mappedChild);
+            }
+            return mappedChild;
+          },
         ),
       ].insertBetween(const SizedBox(width: 8.0)),
     );

packages/stream_chat_flutter/lib/src/user_list_view.dart

@@ -241,9 +241,7 @@ class _UserListViewState extends State<UserListView>
             child: Text(message),
           ),
           TextButton(
-            onPressed: () {
+            onPressed: () => _userListController.loadData(),
-              _userListController.loadData();
-            },
             child: Text('Retry'),
           ),
         ],
@@ -298,9 +296,7 @@ class _UserListViewState extends State<UserListView>
           );
 
     return LazyLoadScrollView(
-      onEndOfPage: () async {
+      onEndOfPage: () => _userListController.paginateData(),
-        return _userListController.paginateData();
-      },
       child: child,
     );
   }