Merge branches 'develop' and 'rfac/transform' of https://github.com/GetStream/stream-chat-flutter into rfac/transform

Conflicts: packages/stream_chat_flutter/lib/src/deleted_message.dart packages/stream_chat_flutter/lib/src/message_widget.dart
2021-05-14 12:33:42 +05:30
parent 1767200c39 7b1790a198
commit a49ba26855
51 changed files with 1843 additions and 1839 deletions
@@ -31,36 +31,33 @@ class DeletedMessage extends StatelessWidget {
  final bool reverse;

  @override
-  Widget build(BuildContext context) => Material(
-        color: messageTheme.messageBackgroundColor,
-        shape: shape ??
-            RoundedRectangleBorder(
-              borderRadius: borderRadiusGeometry ?? BorderRadius.zero,
-              side: borderSide ??
-                  BorderSide(
-                    color: Theme.of(context).brightness == Brightness.dark
-                        ? StreamChatTheme.of(context)
-                            .colorTheme
-                            .white
-                            .withAlpha(24)
-                        : StreamChatTheme.of(context)
-                            .colorTheme
-                            .black
-                            .withAlpha(24),
-                  ),
-            ),
-        child: Padding(
-          padding: const EdgeInsets.symmetric(
-            vertical: 8,
-            horizontal: 16,
+  Widget build(BuildContext context) {
+    final chatThemeData = StreamChatTheme.of(context);
+    return Material(
+      color: messageTheme.messageBackgroundColor,
+      shape: shape ??
+          RoundedRectangleBorder(
+            borderRadius: borderRadiusGeometry ?? BorderRadius.zero,
+            side: borderSide ??
+                BorderSide(
+                  color: Theme.of(context).brightness == Brightness.dark
+                      ? chatThemeData.colorTheme.white.withAlpha(24)
+                      : chatThemeData.colorTheme.black.withAlpha(24),
+                ),
          ),
-          child: Text(
-            'Message deleted',
-            style: messageTheme.messageText?.copyWith(
-              fontStyle: FontStyle.italic,
-              color: messageTheme.createdAt?.color,
-            ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(
+          vertical: 8,
+          horizontal: 16,
+        ),
+        child: Text(
+          'Message deleted',
+          style: messageTheme.messageText?.copyWith(
+            fontStyle: FontStyle.italic,
+            color: messageTheme.createdAt?.color,
          ),
        ),
-      );
+      ),
+    );
+  }
 }