From 1ec09bac639f665d490f073b5035f01c03a73690 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 3 Mar 2020 18:23:54 +0100
Subject: [PATCH] fix reaction layout

---
 example/android/settings_aar.gradle |  1 +
 lib/src/message_widget.dart         | 11 ++++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 example/android/settings_aar.gradle

diff --git a/example/android/settings_aar.gradle b/example/android/settings_aar.gradle
new file mode 100644
index 00000000..e7b4def4
--- /dev/null
+++ b/example/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 1e3d7d02..b1f51ef0 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -367,7 +367,8 @@ class _MessageWidgetState extends State<MessageWidget>
             crossAxisAlignment:
                 isMyMessage ? CrossAxisAlignment.end : CrossAxisAlignment.start,
             children: <Widget>[
-              streamChannel.channel.config.reactions
+              (streamChannel.channel.config.reactions &&
+                      nOfAttachmentWidgets == 0)
                   ? Align(
                       child: _buildReactions(),
                       alignment: isMyMessage
@@ -378,7 +379,9 @@ class _MessageWidgetState extends State<MessageWidget>
               Stack(
                 overflow: Overflow.visible,
                 children: <Widget>[
-                  _buildReactionPaint(),
+                  nOfAttachmentWidgets == 0
+                      ? _buildReactionPaint()
+                      : SizedBox(),
                   Padding(
                     padding: EdgeInsets.only(
                       right: isMyMessage ? 0.0 : 8.0,
@@ -420,7 +423,9 @@ class _MessageWidgetState extends State<MessageWidget>
           ),
         ],
       );
-    } else {
+    }
+
+    if (nOfAttachmentWidgets > 0) {
       column.children.insert(
         0,
         streamChannel.channel.config.reactions