From e9d02336e19dff762de33f0e3c86a4494c22101f Mon Sep 17 00:00:00 2001
From: Krille Fear <christian-pauly@posteo.de>
Date: Fri, 30 Dec 2022 10:36:54 +0100
Subject: [PATCH] fix: File event design

---
 lib/pages/chat/events/audio_player.dart       |  4 ++-
 lib/pages/chat/events/message.dart            |  8 +++--
 .../chat/events/message_download_content.dart | 29 ++++++++++---------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart
index 9243e0f4..9ba75ef8 100644
--- a/lib/pages/chat/events/audio_player.dart
+++ b/lib/pages/chat/events/audio_player.dart
@@ -8,6 +8,7 @@ import 'package:just_audio/just_audio.dart';
 import 'package:matrix/matrix.dart';
 import 'package:path_provider/path_provider.dart';
 
+import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
 import '../../../utils/matrix_sdk_extensions.dart/event_extension.dart';
 
@@ -169,10 +170,11 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
   Widget build(BuildContext context) {
     final statusText = this.statusText ??= _durationString ?? '00:00';
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 6.0),
+      padding: EdgeInsets.all(16 * AppConfig.bubbleSizeFactor),
       child: Row(
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
+          const SizedBox(width: 4),
           SizedBox(
             width: buttonSize,
             height: buttonSize,
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 1a9ad1da..2e57e0e9 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -100,9 +100,13 @@ class Message extends StatelessWidget {
     final noBubble = {
           MessageTypes.Video,
           MessageTypes.Image,
-          MessageTypes.Sticker,
+          MessageTypes.Sticker
         }.contains(event.messageType) &&
         !event.redacted;
+    final noPadding = {
+      MessageTypes.File,
+      MessageTypes.Audio,
+    }.contains(event.messageType);
 
     if (ownMessage) {
       color = displayEvent.status.isError
@@ -187,7 +191,7 @@ class Message extends StatelessWidget {
                       borderRadius:
                           BorderRadius.circular(AppConfig.borderRadius),
                     ),
-                    padding: noBubble
+                    padding: noBubble || noPadding
                         ? EdgeInsets.zero
                         : EdgeInsets.all(16 * AppConfig.bubbleSizeFactor),
                     constraints: const BoxConstraints(
diff --git a/lib/pages/chat/events/message_download_content.dart b/lib/pages/chat/events/message_download_content.dart
index 28f86953..809d634c 100644
--- a/lib/pages/chat/events/message_download_content.dart
+++ b/lib/pages/chat/events/message_download_content.dart
@@ -51,24 +51,27 @@ class MessageDownloadContent extends StatelessWidget {
                   )
                 : null,
           ),
-          const Divider(),
-          Row(
-            children: [
-              Text(
-                filetype,
-                style: TextStyle(
-                  color: textColor.withAlpha(150),
-                ),
-              ),
-              const Spacer(),
-              if (sizeString != null)
+          const Divider(height: 1),
+          Padding(
+            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
+            child: Row(
+              children: [
                 Text(
-                  sizeString,
+                  filetype,
                   style: TextStyle(
                     color: textColor.withAlpha(150),
                   ),
                 ),
-            ],
+                const Spacer(),
+                if (sizeString != null)
+                  Text(
+                    sizeString,
+                    style: TextStyle(
+                      color: textColor.withAlpha(150),
+                    ),
+                  ),
+              ],
+            ),
           ),
         ],
       ),