feat!: merge messages by the same author (#27)

* Merge messages by the same author * fix: pr Co-authored-by: teaishealthy <76410798+teaishealthy@users.noreply.github.com> Co-authored-by: teaishealthy <teaishealthy@protonmail.com>
eludris-community · Oct 7, 2022 · 21973d6 · 21973d6
1 parent b2ddf1e
commit 21973d6
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 29 deletions.
diff --git a/lib/routes/loggedin.dart b/lib/routes/loggedin.dart
@@ -156,7 +156,11 @@ class _LoggedInState extends State<LoggedIn> {
                   controller: _scrollController,
                   itemBuilder: (context, index) {
                     final message = _messages[index];
-                    return Message(message: message);
+                    return Message(
+                      message: message,
+                      displayAuthor: index != 0 &&
+                          _messages[index - 1].author != message.author,
+                    );
                   },
                 ),
               ),

diff --git a/lib/widgets/message.dart b/lib/widgets/message.dart
@@ -5,44 +5,48 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:markdown/markdown.dart' as markdown;
 
 class Message extends StatelessWidget {
+  final MessageData message;
+  final bool displayAuthor;
+
   const Message({
     Key? key,
+    required this.displayAuthor,
     required this.message,
   }) : super(key: key);
 
-  final MessageData message;
-
   @override
   Widget build(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 10),
-      child: Padding(
-        padding: const EdgeInsets.symmetric(horizontal: 8.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Text(
-              message.author,
-              style: const TextStyle(
-                fontWeight: FontWeight.bold,
-              ),
-            ),
-            Theme(
-              data: Theme.of(context).copyWith(
-                textTheme: Theme.of(context).textTheme.apply(
-                      bodyColor: message.optimistic ? Colors.grey : null,
+      padding: const EdgeInsets.only(left: 10.0),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: ([
+          displayAuthor
+              ? Padding(
+                  padding: const EdgeInsets.only(top: 10, bottom: 4),
+                  child: Text(
+                    message.author,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
                     ),
-              ),
-              child: MarkdownBody(
-                  data: message.content,
-                  extensionSet: markdown.ExtensionSet(
-                      markdown.ExtensionSet.gitHubFlavored.blockSyntaxes, [
-                    ...markdown.ExtensionSet.gitHubFlavored.inlineSyntaxes,
-                    markdown.EmojiSyntax()
-                  ])),
+                  ),
+                )
+              : Container(),
+          Theme(
+            data: Theme.of(context).copyWith(
+              textTheme: Theme.of(context).textTheme.apply(
+                    bodyColor: message.optimistic ? Colors.grey : null,
+                  ),
             ),
-          ],
-        ),
+            child: MarkdownBody(
+                data: message.content,
+                extensionSet: markdown.ExtensionSet(
+                    markdown.ExtensionSet.gitHubFlavored.blockSyntaxes, [
+                  ...markdown.ExtensionSet.gitHubFlavored.inlineSyntaxes,
+                  markdown.EmojiSyntax()
+                ])),
+          ),
+        ]),
       ),
     );
   }