From 43c71e0c7ecb7108afca5c138fa90e029205a494 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 21 Apr 2020 21:46:34 +0200
Subject: [PATCH] add sending indicator widget

---
 lib/src/message_widget.dart    | 56 ++-------------------------
 lib/src/sending_indicator.dart | 69 ++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+), 52 deletions(-)
 create mode 100644 lib/src/sending_indicator.dart

diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 2d37a05a..56579f79 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -13,6 +13,7 @@ import 'package:stream_chat_flutter/src/full_screen_image.dart';
 import 'package:stream_chat_flutter/src/message_input.dart';
 import 'package:stream_chat_flutter/src/message_list_view.dart';
 import 'package:stream_chat_flutter/src/reaction_picker.dart';
+import 'package:stream_chat_flutter/src/sending_indicator.dart';
 import 'package:stream_chat_flutter/src/stream_channel.dart';
 import 'package:stream_chat_flutter/src/stream_chat_theme.dart';
 import 'package:stream_chat_flutter/src/user_avatar.dart';
@@ -157,58 +158,9 @@ class _MessageWidgetState extends State<MessageWidget>
       child: Row(
         children: <Widget>[
           UserAvatar(user: widget.message.user),
-          if (_isMyMessage &&
-              widget.nextMessage == null &&
-              (widget.message.status == MessageSendingStatus.SENT ||
-                  widget.message.status == null))
-            Padding(
-              padding: const EdgeInsets.symmetric(
-                horizontal: 1.0,
-              ),
-              child: CircleAvatar(
-                radius: 4,
-                backgroundColor: StreamChatTheme.of(context).accentColor,
-                child: Icon(
-                  Icons.done,
-                  color: Colors.white,
-                  size: 4,
-                ),
-              ),
-            ),
-          if (_isMyMessage &&
-              (widget.message.status == MessageSendingStatus.SENDING ||
-                  widget.message.status == MessageSendingStatus.UPDATING))
-            Padding(
-              padding: const EdgeInsets.symmetric(
-                horizontal: 1.0,
-              ),
-              child: CircleAvatar(
-                radius: 4,
-                backgroundColor: Colors.grey,
-                child: Icon(
-                  Icons.access_time,
-                  size: 4,
-                  color: Colors.white,
-                ),
-              ),
-            ),
-          if (_isMyMessage &&
-              (widget.message.status == MessageSendingStatus.FAILED ||
-                  widget.message.status == MessageSendingStatus.FAILED_UPDATE ||
-                  widget.message.status == MessageSendingStatus.FAILED_DELETE))
-            Padding(
-              padding: const EdgeInsets.symmetric(
-                horizontal: 1.0,
-              ),
-              child: CircleAvatar(
-                radius: 4,
-                backgroundColor: Color(0xffd0021B).withOpacity(.1),
-                child: Icon(
-                  Icons.error_outline,
-                  size: 4,
-                  color: Colors.white,
-                ),
-              ),
+          if (_isMyMessage && widget.nextMessage == null)
+            SendingIndicator(
+              message: widget.message,
             ),
         ],
       ),
diff --git a/lib/src/sending_indicator.dart b/lib/src/sending_indicator.dart
new file mode 100644
index 00000000..6a36eae4
--- /dev/null
+++ b/lib/src/sending_indicator.dart
@@ -0,0 +1,69 @@
+import 'package:flutter/material.dart';
+import 'package:stream_chat_flutter/stream_chat_flutter.dart';
+
+/// Used to show the sending status of the message
+class SendingIndicator extends StatelessWidget {
+  final Message message;
+
+  const SendingIndicator({
+    Key key,
+    this.message,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    if (message.status == MessageSendingStatus.SENT || message.status == null) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: 1.0,
+        ),
+        child: CircleAvatar(
+          radius: 4,
+          backgroundColor: Theme.of(context).accentColor,
+          child: Icon(
+            Icons.done,
+            color: Colors.white,
+            size: 4,
+          ),
+        ),
+      );
+    }
+    if (message.status == MessageSendingStatus.SENDING ||
+        message.status == MessageSendingStatus.UPDATING) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: 1.0,
+        ),
+        child: CircleAvatar(
+          radius: 4,
+          backgroundColor: Colors.grey,
+          child: Icon(
+            Icons.access_time,
+            size: 4,
+            color: Colors.white,
+          ),
+        ),
+      );
+    }
+    if (message.status == MessageSendingStatus.FAILED ||
+        message.status == MessageSendingStatus.FAILED_UPDATE ||
+        message.status == MessageSendingStatus.FAILED_DELETE) {
+      return Padding(
+        padding: const EdgeInsets.symmetric(
+          horizontal: 1.0,
+        ),
+        child: CircleAvatar(
+          radius: 4,
+          backgroundColor: Color(0xffd0021B).withOpacity(.1),
+          child: Icon(
+            Icons.error_outline,
+            size: 4,
+            color: Colors.white,
+          ),
+        ),
+      );
+    }
+
+    return SizedBox();
+  }
+}