From 279417c7a9e01848af7c3b2d6f3bb87bdd852f04 Mon Sep 17 00:00:00 2001 From: "khaled.njim" Date: Fri, 26 Jul 2024 11:04:30 +0100 Subject: [PATCH] fixup! TW-1902 update icons, text style --- lib/pages/chat_list/chat_list_item.dart | 2 +- lib/pages/chat_list/chat_list_item_style.dart | 8 +++++++- lib/pages/chat_list/chat_list_item_subtitle.dart | 4 ++-- lib/pages/chat_list/chat_list_view_builder.dart | 8 ++++---- lib/pages/chat_list/chat_list_view_style.dart | 4 ++++ 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 966c658c2e..6085a4c77b 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -92,7 +92,7 @@ class ChatListItem extends StatelessWidget with ChatListItemMixin { return Padding( padding: ChatListItemStyle.paddingConversation, child: Material( - borderRadius: BorderRadius.circular(4), + borderRadius: ChatListItemStyle.chatlistItemBorderRadius, clipBehavior: Clip.hardEdge, color: isSelectedItem ? Theme.of(context).colorScheme.primaryContainer diff --git a/lib/pages/chat_list/chat_list_item_style.dart b/lib/pages/chat_list/chat_list_item_style.dart index 9a02c26637..ea8b57e573 100644 --- a/lib/pages/chat_list/chat_list_item_style.dart +++ b/lib/pages/chat_list/chat_list_item_style.dart @@ -27,8 +27,11 @@ class ChatListItemStyle { : 0.0; } - static const EdgeInsets paddingConversation = EdgeInsets.all( + static const EdgeInsets paddingConversation = EdgeInsets.fromLTRB( 8, + 8, + 8, + 0, ); static const EdgeInsetsDirectional paddingAvatar = @@ -55,4 +58,7 @@ class ChatListItemStyle { } static const double letterSpaceDisplayName = 0.15; + + static final chatlistItemBorderRadius = BorderRadius.circular(4); + static const paddingIcon = EdgeInsets.only(bottom: 4); } diff --git a/lib/pages/chat_list/chat_list_item_subtitle.dart b/lib/pages/chat_list/chat_list_item_subtitle.dart index f7254bb434..3d001bc27f 100644 --- a/lib/pages/chat_list/chat_list_item_subtitle.dart +++ b/lib/pages/chat_list/chat_list_item_subtitle.dart @@ -76,12 +76,12 @@ class ChatListItemSubtitle extends StatelessWidget with ChatListItemMixin { color: room.lastEvent!.receipts.isEmpty ? LinagoraRefColors.material().tertiary[30] : LinagoraSysColors.material().secondary, - size: 20, + size: ChatListItemStyle.readIconSize, ) : AnimatedContainer( duration: TwakeThemes.animationDuration, curve: TwakeThemes.animationCurve, - padding: const EdgeInsets.only(bottom: 4), + padding: ChatListItemStyle.paddingIcon, height: ChatListItemStyle.mentionIconWidth, width: isMentionned && room.isUnreadOrInvited ? ChatListItemStyle.mentionIconWidth diff --git a/lib/pages/chat_list/chat_list_view_builder.dart b/lib/pages/chat_list/chat_list_view_builder.dart index 1ca9795f9d..9853e788a3 100644 --- a/lib/pages/chat_list/chat_list_view_builder.dart +++ b/lib/pages/chat_list/chat_list_view_builder.dart @@ -53,10 +53,10 @@ class ChatListViewBuilder extends StatelessWidget { }, separatorBuilder: (BuildContext context, int index) { return Divider( - height: 1, - thickness: 1, - indent: 8, - endIndent: 8, + height: ChatListViewStyle.dividerHeight, + thickness: ChatListViewStyle.dividerThickness, + indent: ChatListViewStyle.dividerIndent, + endIndent: ChatListViewStyle.dividerIndent, color: LinagoraStateLayer(LinagoraSysColors.material().surfaceTint) .opacityLayer3, ); diff --git a/lib/pages/chat_list/chat_list_view_style.dart b/lib/pages/chat_list/chat_list_view_style.dart index 6289134c67..54ae368360 100644 --- a/lib/pages/chat_list/chat_list_view_style.dart +++ b/lib/pages/chat_list/chat_list_view_style.dart @@ -38,4 +38,8 @@ class ChatListViewStyle { ? LinagoraRefColors.material().primary[50] : LinagoraRefColors.material().primary[40]; } + + static double dividerHeight = 1.0; + static double dividerIndent = 8.0; + static double dividerThickness = 1.0; }