chore: Follow up animate in

lib/pages/chat/events/message.dart

@@ -122,7 +122,22 @@ class Message extends StatelessWidget {
           : Theme.of(context).colorScheme.primaryContainer;
     }
 
-    final row = Row(
+    final resetAnimateIn = this.resetAnimateIn;
+    var animateIn = this.animateIn;
+
+    final row = StatefulBuilder(
+      builder: (context, setState) {
+        if (animateIn && resetAnimateIn != null) {
+          WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
+            animateIn = false;
+            setState(resetAnimateIn);
+          });
+        }
+        return AnimatedSlide(
+          offset: Offset(0, animateIn ? 1 : 0),
+          duration: FluffyThemes.animationDuration,
+          curve: FluffyThemes.animationCurve,
+          child: Row(
             crossAxisAlignment: CrossAxisAlignment.start,
             mainAxisAlignment: rowMainAxisAlignment,
             children: [
@@ -133,11 +148,7 @@ class Message extends StatelessWidget {
                     child: SizedBox(
                       width: 16,
                       height: 16,
-                child: event.status == EventStatus.sending
+                      child: event.status == EventStatus.error
-                    ? const CircularProgressIndicator.adaptive(
-                        strokeWidth: 2,
-                      )
-                    : event.status == EventStatus.error
                           ? const Icon(Icons.error, color: Colors.red)
                           : null,
                     ),
@@ -147,7 +158,8 @@ class Message extends StatelessWidget {
                 FutureBuilder<User?>(
                   future: event.fetchSenderUser(),
                   builder: (context, snapshot) {
-              final user = snapshot.data ?? event.senderFromMemoryOrFallback;
+                    final user =
+                        snapshot.data ?? event.senderFromMemoryOrFallback;
                     return Avatar(
                       mxContent: user.avatarUrl,
                       name: user.calcDisplayname(),
@@ -190,6 +202,17 @@ class Message extends StatelessWidget {
                     Container(
                       alignment: alignment,
                       padding: const EdgeInsets.only(left: 8),
+                      child: AnimatedOpacity(
+                        opacity: animateIn
+                            ? 0
+                            : event.redacted ||
+                                    event.messageType ==
+                                        MessageTypes.BadEncrypted ||
+                                    event.status.isSending
+                                ? 0.5
+                                : 1,
+                        duration: FluffyThemes.animationDuration,
+                        curve: FluffyThemes.animationCurve,
                         child: Material(
                           color: noBubble ? Colors.transparent : color,
                           clipBehavior: Clip.antiAlias,
@@ -223,14 +246,16 @@ class Message extends StatelessWidget {
                               mainAxisSize: MainAxisSize.min,
                               crossAxisAlignment: CrossAxisAlignment.start,
                               children: <Widget>[
-                        if (event.relationshipType == RelationshipTypes.reply)
+                                if (event.relationshipType ==
+                                    RelationshipTypes.reply)
                                   FutureBuilder<Event?>(
                                     future: event.getReplyEvent(timeline),
                                     builder: (BuildContext context, snapshot) {
                                       final replyEvent = snapshot.hasData
                                           ? snapshot.data!
                                           : Event(
-                                      eventId: event.relationshipEventId!,
+                                              eventId:
+                                                  event.relationshipEventId!,
                                               content: {
                                                 'msgtype': 'm.text',
                                                 'body': '...',
@@ -242,11 +267,14 @@ class Message extends StatelessWidget {
                                               originServerTs: DateTime.now(),
                                             );
                                       return Padding(
-                                padding: const EdgeInsets.only(bottom: 4.0),
+                                        padding:
+                                            const EdgeInsets.only(bottom: 4.0),
                                         child: InkWell(
-                                  borderRadius: ReplyContent.borderRadius,
+                                          borderRadius:
-                                  onTap: () =>
+                                              ReplyContent.borderRadius,
-                                      scrollToEventId(replyEvent.eventId),
+                                          onTap: () => scrollToEventId(
+                                            replyEvent.eventId,
+                                          ),
                                           child: AbsorbPointer(
                                             child: ReplyContent(
                                               replyEvent,
@@ -295,10 +323,14 @@ class Message extends StatelessWidget {
                           ),
                         ),
                       ),
+                    ),
                   ],
                 ),
               ),
             ],
+          ),
+        );
+      },
     );
     Widget container;
     if (event.hasAggregatedEvents(timeline, RelationshipTypes.reaction) ||
@@ -381,27 +413,9 @@ class Message extends StatelessWidget {
       container = row;
     }
 
-    if (event.messageType == MessageTypes.BadEncrypted) {
-      container = Opacity(opacity: 0.4, child: container);
-    }
-
     TapDownDetails? lastTapDownDetails;
-    final resetAnimateIn = this.resetAnimateIn;
-    var animateIn = this.animateIn;
 
-    return StatefulBuilder(
+    return Center(
-      builder: (context, setState) {
-        if (animateIn && resetAnimateIn != null) {
-          WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-            animateIn = false;
-            setState(resetAnimateIn);
-          });
-        }
-        return AnimatedSlide(
-          offset: Offset(0, animateIn ? 1 : 0),
-          duration: FluffyThemes.animationDuration,
-          curve: FluffyThemes.animationCurve,
-          child: Center(
       child: Swipeable(
         key: ValueKey(event.eventId),
         background: const Padding(
@@ -451,8 +465,7 @@ class Message extends StatelessWidget {
                           4,
                       borderRadius:
                           BorderRadius.circular(AppConfig.borderRadius),
-                            shadowColor:
+                      shadowColor: Theme.of(context).appBarTheme.shadowColor,
-                                Theme.of(context).appBarTheme.shadowColor,
                       child: Row(
                         mainAxisSize: MainAxisSize.min,
                         children: [
@@ -487,9 +500,6 @@ class Message extends StatelessWidget {
           ),
         ),
       ),
-          ),
-        );
-      },
     );
   }
 }