From e5a871c9135dc28ef393fa49505d3f9e1b2a0105 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Mon, 24 May 2021 11:22:03 +0200
Subject: [PATCH] fix: Chat layout

---
 lib/pages/views/chat_view.dart         | 11 -----------
 lib/widgets/event_content/message.dart | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart
index 604f1a65..ff0935ac 100644
--- a/lib/pages/views/chat_view.dart
+++ b/lib/pages/views/chat_view.dart
@@ -1,4 +1,3 @@
-import 'dart:math';
 import 'dart:ui';
 
 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
@@ -9,7 +8,6 @@ import 'package:fluffychat/widgets/chat_settings_popup_menu.dart';
 import 'package:fluffychat/widgets/connection_status_header.dart';
 import 'package:fluffychat/widgets/input_bar.dart';
 import 'package:fluffychat/widgets/unread_badge_back_button.dart';
-import 'package:fluffychat/config/themes.dart';
 
 import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:fluffychat/widgets/encryption_button.dart';
@@ -250,19 +248,10 @@ class ChatView extends StatelessWidget {
                             i;
                       }
 
-                      final horizontalPadding = max(
-                              0,
-                              (MediaQuery.of(context).size.width -
-                                      FluffyThemes.columnWidth * (3.5)) /
-                                  2)
-                          .toDouble();
-
                       return ListView.custom(
                         padding: EdgeInsets.only(
                           top: 16,
                           bottom: 4,
-                          left: horizontalPadding,
-                          right: horizontalPadding,
                         ),
                         reverse: true,
                         controller: controller.scrollController,
diff --git a/lib/widgets/event_content/message.dart b/lib/widgets/event_content/message.dart
index c1183f8f..75cbee96 100644
--- a/lib/widgets/event_content/message.dart
+++ b/lib/widgets/event_content/message.dart
@@ -210,13 +210,17 @@ class Message extends StatelessWidget {
       container = row;
     }
 
-    return Container(
-      color: selected
-          ? Theme.of(context).primaryColor.withAlpha(100)
-          : Theme.of(context).primaryColor.withAlpha(0),
-      child: Padding(
-        padding: EdgeInsets.only(left: 8.0, right: 8.0, bottom: 4.0, top: 4.0),
-        child: container,
+    return Center(
+      child: Container(
+        color: selected
+            ? Theme.of(context).primaryColor.withAlpha(100)
+            : Theme.of(context).primaryColor.withAlpha(0),
+        constraints: BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5),
+        child: Padding(
+          padding:
+              EdgeInsets.only(left: 8.0, right: 8.0, bottom: 4.0, top: 4.0),
+          child: container,
+        ),
       ),
     );
   }