fixup! TW-1902 update icons, text style

linagora · Sep 16, 2024 · 8ae36ed · 8ae36ed
1 parent 5f32f2c
commit 8ae36ed
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 25 deletions.
diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart
@@ -89,16 +89,25 @@ class ChatListItem extends StatelessWidget with ChatListItemMixin {
     final displayName = room.getLocalizedDisplayname(
       MatrixLocals(L10n.of(context)!),
     );
-    return Padding(
-      padding: ChatListItemStyle.paddingConversation,
-      child: Material(
-        borderRadius: ChatListItemStyle.chatlistItemBorderRadius,
-        clipBehavior: Clip.hardEdge,
-        color: isSelectedItem
-            ? Theme.of(context).colorScheme.primaryContainer
-            : activeChat
-                ? Theme.of(context).colorScheme.secondaryContainer
-                : Colors.transparent,
+    return Material(
+      borderRadius: ChatListItemStyle.chatlistItemBorderRadius,
+      clipBehavior: Clip.hardEdge,
+      color: isSelectedItem
+          ? Theme.of(context).colorScheme.primaryContainer
+          : activeChat
+              ? Theme.of(context).colorScheme.secondaryContainer
+              : Colors.transparent,
+      child: Container(
+        decoration: BoxDecoration(
+          border: Border(
+            bottom: BorderSide(
+              color:
+                  LinagoraStateLayer(LinagoraSysColors.material().surfaceTint)
+                      .opacityLayer3,
+              width: ChatListItemStyle.chatListBottomBorderWidht,
+            ),
+          ),
+        ),
         child: InkWell(
           onTap: () => clickAction(context),
           onSecondaryTapDown: onSecondaryTapDown,

diff --git a/lib/pages/chat_list/chat_list_item_style.dart b/lib/pages/chat_list/chat_list_item_style.dart
@@ -35,7 +35,7 @@ class ChatListItemStyle {
   );
 
   static const EdgeInsetsDirectional paddingAvatar =
-      EdgeInsetsDirectional.only(end: 8);
+      EdgeInsetsDirectional.only(start: 8, end: 8);
 
   static const EdgeInsetsDirectional paddingIconGroup =
       EdgeInsetsDirectional.all(4);
@@ -61,4 +61,5 @@ class ChatListItemStyle {
 
   static final chatlistItemBorderRadius = BorderRadius.circular(4);
   static const paddingIcon = EdgeInsets.only(bottom: 4);
+  static const chatListBottomBorderWidht = 1.0;
 }
diff --git a/lib/pages/chat_list/chat_list_view_builder.dart b/lib/pages/chat_list/chat_list_view_builder.dart
@@ -4,8 +4,6 @@ import 'package:fluffychat/pages/chat_list/common_chat_list_item.dart';
 import 'package:fluffychat/pages/chat_list/slidable_chat_list_item.dart';
 import 'package:fluffychat/presentation/enum/chat_list/chat_list_enum.dart';
 import 'package:flutter/material.dart';
-import 'package:linagora_design_flutter/colors/linagora_state_layer.dart';
-import 'package:linagora_design_flutter/colors/linagora_sys_colors.dart';
 import 'package:matrix/matrix.dart';
 
 class ChatListViewBuilder extends StatelessWidget {
@@ -20,10 +18,10 @@ class ChatListViewBuilder extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return ListView.separated(
+    return ListView.builder(
       shrinkWrap: true,
       physics: const NeverScrollableScrollPhysics(),
-      itemCount: rooms.length + 1,
+      itemCount: rooms.length,
       itemBuilder: (BuildContext context, int index) {
         if (index == rooms.length) {
           return const SizedBox.shrink();
@@ -51,16 +49,6 @@ class ChatListViewBuilder extends StatelessWidget {
           },
         );
       },
-      separatorBuilder: (BuildContext context, int index) {
-        return Divider(
-          height: ChatListViewStyle.dividerHeight,
-          thickness: ChatListViewStyle.dividerThickness,
-          indent: ChatListViewStyle.dividerIndent,
-          endIndent: ChatListViewStyle.dividerIndent,
-          color: LinagoraStateLayer(LinagoraSysColors.material().surfaceTint)
-              .opacityLayer3,
-        );
-      },
     );
   }
 }