From fec7cfa572bf79a33fefed167eed30ef56b5f987 Mon Sep 17 00:00:00 2001
From: Sahil Kumar <xdsahil@gmail.com>
Date: Wed, 31 Mar 2021 12:50:41 +0530
Subject: [PATCH] fix(ui-kit): fix accessibility text size scaling in message
 widget

Signed-off-by: Sahil Kumar <xdsahil@gmail.com>
---
 packages/stream_chat_flutter/lib/src/extension.dart    |  5 +++++
 .../lib/src/message_search_list_view.dart              |  6 ++----
 .../stream_chat_flutter/lib/src/message_widget.dart    |  7 +++++--
 .../stream_chat_flutter/lib/src/user_list_view.dart    | 10 +++-------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/stream_chat_flutter/lib/src/extension.dart b/packages/stream_chat_flutter/lib/src/extension.dart
index 65b1b100..daa8a69c 100644
--- a/packages/stream_chat_flutter/lib/src/extension.dart
+++ b/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;
+}
diff --git a/packages/stream_chat_flutter/lib/src/message_search_list_view.dart b/packages/stream_chat_flutter/lib/src/message_search_list_view.dart
index 50131b87..f9dd0fa1 100644
--- a/packages/stream_chat_flutter/lib/src/message_search_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/message_search_list_view.dart
@@ -262,15 +262,13 @@ class _MessageSearchListViewState extends State<MessageSearchListView> {
     );
     if (widget.pullToRefresh) {
       child = RefreshIndicator(
-        onRefresh: () => _messageSearchListController.loadData(),
+        onRefresh: _messageSearchListController.loadData,
         child: child,
       );
     }
 
     child = LazyLoadScrollView(
-      onEndOfPage: () async {
-        return _messageSearchListController.paginateData();
-      },
+      onEndOfPage: _messageSearchListController.paginateData,
       child: child,
     );
 
diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index a0c1201a..f3c25c3d 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -585,7 +585,10 @@ class _MessageWidgetState extends State<MessageWidget>
                                 ),
                               ],
                             ),
-                            if (showBottomRow) SizedBox(height: 20.0),
+                            if (showBottomRow)
+                              SizedBox(
+                                height: context.textScaleFactor * 20.0,
+                              ),
                           ],
                         ),
                         if (showBottomRow)
@@ -733,7 +736,7 @@ class _MessageWidgetState extends State<MessageWidget>
             transform: Matrix4.rotationY(widget.reverse ? pi : 0),
             alignment: Alignment.center,
             child: Container(
-              height: 16,
+              height: context.textScaleFactor * 16,
               child: Center(
                 child: child,
               ),
diff --git a/packages/stream_chat_flutter/lib/src/user_list_view.dart b/packages/stream_chat_flutter/lib/src/user_list_view.dart
index 5559f67e..ac211c68 100644
--- a/packages/stream_chat_flutter/lib/src/user_list_view.dart
+++ b/packages/stream_chat_flutter/lib/src/user_list_view.dart
@@ -193,7 +193,7 @@ class _UserListViewState extends State<UserListView>
       return child;
     } else {
       return RefreshIndicator(
-        onRefresh: () => _userListController.loadData(),
+        onRefresh: _userListController.loadData,
         child: child,
       );
     }
@@ -241,9 +241,7 @@ class _UserListViewState extends State<UserListView>
             child: Text(message),
           ),
           TextButton(
-            onPressed: () {
-              _userListController.loadData();
-            },
+            onPressed: () => _userListController.loadData(),
             child: Text('Retry'),
           ),
         ],
@@ -298,9 +296,7 @@ class _UserListViewState extends State<UserListView>
           );
 
     return LazyLoadScrollView(
-      onEndOfPage: () async {
-        return _userListController.paginateData();
-      },
+      onEndOfPage: _userListController.paginateData,
       child: child,
     );
   }