feat: redesign reply content style

linagora · Oct 3, 2023 · 2a15cc1 · 2a15cc1
1 parent 56942b2
commit 2a15cc1
Show file tree

Hide file tree

Showing 2 changed files with 100 additions and 62 deletions.
diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart
@@ -1,4 +1,5 @@
 import 'package:fluffychat/pages/chat/chat.dart';
+import 'package:fluffychat/pages/chat/events/reply_content_style.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:flutter/material.dart';
 
@@ -29,8 +30,6 @@ class ReplyContent extends StatelessWidget {
     final timeline = this.timeline;
     final displayEvent =
         timeline != null ? replyEvent.getDisplayEvent(timeline) : replyEvent;
-    const fontSizeDisplayName = AppConfig.messageFontSize * 0.76;
-    const fontSizeDisplayContent = AppConfig.messageFontSize * 0.88;
     if (AppConfig.renderHtml &&
         [EventTypes.Message, EventTypes.Encrypted]
             .contains(displayEvent.type) &&
@@ -45,14 +44,10 @@ class ReplyContent extends StatelessWidget {
       }
       replyBody = HtmlMessage(
         html: html!,
-        defaultTextStyle: Theme.of(context).textTheme.bodyLarge?.copyWith(
-              color: Theme.of(context).colorScheme.onBackground,
-              fontSize: fontSizeDisplayContent,
-              overflow: TextOverflow.ellipsis,
-            ),
+        defaultTextStyle: ReplyContentStyle.replyBodyTextStyle(context),
         maxLines: 1,
         room: displayEvent.room,
-        emoteSize: fontSizeDisplayContent * 1.5,
+        emoteSize: ReplyContentStyle.fontSizeDisplayContent * 1.5,
         event: timeline!.events.first,
         chatController: chatController,
       );
@@ -65,65 +60,53 @@ class ReplyContent extends StatelessWidget {
         ),
         overflow: TextOverflow.ellipsis,
         maxLines: 1,
-        style: TextStyle(
-          color: Theme.of(context).colorScheme.onBackground,
-          fontSize: fontSizeDisplayContent,
-        ),
+        style: ReplyContentStyle.replyBodyTextStyle(context),
       );
     }
     final user = displayEvent.getUser();
-    return Row(
-      mainAxisSize: MainAxisSize.min,
-      children: <Widget>[
-        Container(
-          width: 3,
-          height: fontSizeDisplayContent * 2 + 6,
-          color: ownMessage
-              ? Theme.of(context).colorScheme.onPrimaryContainer
-              : Theme.of(context).colorScheme.primary,
-        ),
-        const SizedBox(width: 6),
-        Flexible(
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: <Widget>[
-              if (user != null)
-                Text(
-                  '${user.calcDisplayname()}:',
-                  maxLines: 1,
-                  overflow: TextOverflow.ellipsis,
-                  style: TextStyle(
-                    fontWeight: FontWeight.bold,
-                    color: ownMessage
-                        ? Theme.of(context).colorScheme.onPrimaryContainer
-                        : Theme.of(context).colorScheme.primary,
-                    fontSize: fontSizeDisplayName,
+    return Container(
+      padding: ReplyContentStyle.replyParentContainerPadding(context),
+      decoration:
+          ReplyContentStyle.replyParentContainerDecoration(context, ownMessage),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: <Widget>[
+          Container(
+            width: ReplyContentStyle.prefixBarWidth,
+            height: ReplyContentStyle.fontSizeDisplayContent * 2,
+            decoration: ReplyContentStyle.prefixBarDecoration(context),
+          ),
+          const SizedBox(width: ReplyContentStyle.prefixAndDisplayNameSpacing),
+          Flexible(
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: <Widget>[
+                if (user != null)
+                  Text(
+                    user.calcDisplayname(),
+                    maxLines: 1,
+                    overflow: TextOverflow.ellipsis,
+                    style: ReplyContentStyle.displayNameTextStyle(context),
                   ),
-                ),
-              if (displayEvent.getUser() == null)
-                FutureBuilder<User?>(
-                  future: displayEvent.fetchSenderUser(),
-                  builder: (context, snapshot) {
-                    return Text(
-                      '${snapshot.data?.calcDisplayname() ?? displayEvent.senderFromMemoryOrFallback.calcDisplayname()}:',
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        color: ownMessage
-                            ? Theme.of(context).colorScheme.onPrimaryContainer
-                            : Theme.of(context).colorScheme.primary,
-                        fontSize: fontSizeDisplayName,
-                      ),
-                    );
-                  },
-                ),
-              replyBody,
-            ],
+                if (displayEvent.getUser() == null)
+                  FutureBuilder<User?>(
+                    future: displayEvent.fetchSenderUser(),
+                    builder: (context, snapshot) {
+                      return Text(
+                        '${snapshot.data?.calcDisplayname() ?? displayEvent.senderFromMemoryOrFallback.calcDisplayname()}:',
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                        style: ReplyContentStyle.displayNameTextStyle(context),
+                      );
+                    },
+                  ),
+                replyBody,
+              ],
+            ),
           ),
-        ),
-      ],
+        ],
+      ),
     );
   }
 }
diff --git a/lib/pages/chat/events/reply_content_style.dart b/lib/pages/chat/events/reply_content_style.dart
@@ -0,0 +1,55 @@
+import 'package:fluffychat/config/app_config.dart';
+import 'package:flutter/material.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
+
+class ReplyContentStyle {
+  static const double fontSizeDisplayName = AppConfig.messageFontSize * 0.76;
+  static const double fontSizeDisplayContent = AppConfig.messageFontSize * 0.88;
+
+  static EdgeInsets replyParentContainerPadding(BuildContext context) {
+    return const EdgeInsets.only(
+      left: 4,
+      right: 8.0,
+      top: 8.0,
+      bottom: 8.0,
+    );
+  }
+
+  static BoxDecoration replyParentContainerDecoration(
+    BuildContext context,
+    bool ownMessage,
+  ) {
+    return BoxDecoration(
+      color: ownMessage
+          ? LinagoraRefColors.material().primary[95]
+          : Theme.of(context).colorScheme.surfaceTint.withOpacity(0.08),
+      borderRadius: BorderRadius.circular(12),
+    );
+  }
+
+  static const double prefixBarWidth = 3.0;
+  static BoxDecoration prefixBarDecoration(BuildContext context) {
+    return BoxDecoration(
+      borderRadius: BorderRadius.circular(2),
+      color: Theme.of(context).colorScheme.primary,
+    );
+  }
+
+  static const double prefixAndDisplayNameSpacing = 6.0;
+  static TextStyle? displayNameTextStyle(BuildContext context) {
+    return Theme.of(context).textTheme.titleSmall?.copyWith(
+          color: Theme.of(context).colorScheme.onSurfaceVariant,
+          fontWeight: FontWeight.w500,
+          fontSize: fontSizeDisplayName,
+        );
+  }
+
+  static TextStyle? replyBodyTextStyle(BuildContext context) {
+    return Theme.of(context).textTheme.bodySmall?.copyWith(
+          color: LinagoraRefColors.material().neutral[50],
+          fontWeight: FontWeight.w500,
+          overflow: TextOverflow.ellipsis,
+          fontSize: fontSizeDisplayContent,
+        );
+  }
+}