fixup! fixup! fixup! TW-403: refactor chat_list and forward screen

linagora · Aug 28, 2023 · d998380 · d998380
1 parent 4b3cded
commit d998380
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/lib/pages/forward/selectable_chat_list_item.dart b/lib/pages/forward/selectable_chat_list_item.dart
@@ -1,6 +1,6 @@
-import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat_list/chat_list_item_style.dart';
 import 'package:fluffychat/pages/forward/forward_item_style.dart';
+import 'package:fluffychat/pages/forward/selectable_chat_list_item_style.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
 import 'package:fluffychat/widgets/avatar/avatar.dart';
 import 'package:flutter/material.dart';
@@ -26,7 +26,7 @@ class SelectableChatListItem extends StatelessWidget {
       MatrixLocals(L10n.of(context)!),
     );
     return Material(
-      borderRadius: BorderRadius.circular(AppConfig.borderRadius),
+      borderRadius: BorderRadius.circular(16.0),
       clipBehavior: Clip.hardEdge,
       color: Colors.transparent,
       child: Theme(
@@ -49,8 +49,10 @@ class SelectableChatListItem extends StatelessWidget {
                     ),
                     if (selected)
                       Positioned(
-                        right: -3,
-                        bottom: -3,
+                        right: SelectableChatListItemStyle
+                            .rightFromAvatarBottomRight,
+                        bottom: SelectableChatListItemStyle
+                            .bottomFromAvatarBottomRight,
                         child: Container(
                           width: ForwardItemStyle.selectedContainerSize,
                           height: ForwardItemStyle.selectedContainerSize,
@@ -72,12 +74,12 @@ class SelectableChatListItem extends StatelessWidget {
               Flexible(
                 child: Text(
                   displayName,
-                  overflow: TextOverflow.ellipsis,
                   maxLines: 1,
                   softWrap: false,
                   style: Theme.of(context).textTheme.titleMedium?.copyWith(
                         overflow: TextOverflow.ellipsis,
-                        letterSpacing: 0.15,
+                        letterSpacing:
+                            SelectableChatListItemStyle.letterSpacing,
                         color: room.isUnread ||
                                 room.membership == Membership.invite
                             ? Theme.of(context).colorScheme.onSurfaceVariant

diff --git a/lib/pages/forward/selectable_chat_list_item_style.dart b/lib/pages/forward/selectable_chat_list_item_style.dart
@@ -0,0 +1,5 @@
+class SelectableChatListItemStyle {
+  static const rightFromAvatarBottomRight = -3.0;
+  static const bottomFromAvatarBottomRight = -3.0;
+  static const letterSpacing = 0.15;
+}