TW-2144 Update search result list item

linagora · Dec 23, 2024 · f2c0a46 · f2c0a46
1 parent f32ecaf
commit f2c0a46
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 43 deletions.
diff --git a/lib/pages/chat_search/chat_search_style.dart b/lib/pages/chat_search/chat_search_style.dart
@@ -5,19 +5,19 @@ class ChatSearchStyle {
       EdgeInsetsDirectional.only(start: 8, top: 16, bottom: 16, end: 16);
 
   static const EdgeInsetsGeometry itemMargin =
-      EdgeInsetsDirectional.symmetric(horizontal: 16);
+      EdgeInsetsDirectional.symmetric(horizontal: 8);
 
   static const EdgeInsetsGeometry itemPadding =
-      EdgeInsetsDirectional.only(end: 8);
+      EdgeInsetsDirectional.only(end: 8, top: 8);
 
   static const EdgeInsetsGeometry avatarPadding =
-      EdgeInsetsDirectional.symmetric(horizontal: 8, vertical: 16);
+      EdgeInsetsDirectional.symmetric(horizontal: 8, vertical: 8);
 
   static const EdgeInsetsGeometry emptyPadding = EdgeInsetsDirectional.all(16);
 
   static const double emptyGap = 128.0;
 
-  static const double itemHeight = 90.0;
+  static const double itemHeight = 80.0;
 
   static const double itemBorderRadius = 12.0;
 }
diff --git a/lib/pages/chat_search/chat_search_view.dart b/lib/pages/chat_search/chat_search_view.dart
@@ -76,6 +76,11 @@ class _ServerSearchView extends StatelessWidget {
     return CustomScrollView(
       controller: controller.scrollController,
       slivers: [
+        const SliverToBoxAdapter(
+          child: SizedBox(
+            height: 8,
+          ),
+        ),
         ValueListenableBuilder(
           valueListenable: serverSearchController.searchResultsNotifier,
           builder: (context, searchResults, child) {
@@ -196,12 +201,10 @@ class _SearchItem extends StatelessWidget {
       future: event.fetchSenderUser(),
       builder: (context, snapshot) {
         final user = snapshot.data ?? event.senderFromMemoryOrFallback;
-        return Padding(
-          padding: ChatSearchStyle.itemMargin,
-          child: InkWell(
-            hoverColor: LinagoraRefColors.material().primary[99],
-            borderRadius:
-                BorderRadius.circular(ChatSearchStyle.itemBorderRadius),
+        return TwakeListItem(
+          height: ChatSearchStyle.itemHeight,
+          margin: ChatSearchStyle.itemMargin,
+          child: TwakeInkWell(
             onTap: () => onTap(event),
             child: Row(
               children: [
@@ -216,18 +219,9 @@ class _SearchItem extends StatelessWidget {
                   child: Container(
                     margin: ChatSearchStyle.itemPadding,
                     height: ChatSearchStyle.itemHeight,
-                    decoration: BoxDecoration(
-                      border: Border(
-                        bottom: BorderSide(
-                          color: LinagoraRefColors.material().tertiary[60] ??
-                              Colors.black,
-                          width: 1,
-                        ),
-                      ),
-                    ),
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
-                      mainAxisAlignment: MainAxisAlignment.center,
+                      mainAxisAlignment: MainAxisAlignment.start,
                       children: [
                         Row(
                           children: [
@@ -237,13 +231,9 @@ class _SearchItem extends StatelessWidget {
                                     ? L10n.of(context)!.you
                                     : user.calcDisplayname(),
                                 maxLines: 1,
-                                style: Theme.of(context)
-                                    .textTheme
-                                    .bodyLarge
-                                    ?.copyWith(
-                                      color: LinagoraSysColors.material()
-                                          .onSurface,
-                                    ),
+                                style: ListItemStyle.titleTextStyle(
+                                  fontFamily: 'Inter',
+                                ),
                               ),
                             ),
                             Text(
@@ -252,8 +242,8 @@ class _SearchItem extends StatelessWidget {
                                   .textTheme
                                   .labelMedium
                                   ?.copyWith(
-                                    color:
-                                        LinagoraSysColors.material().onSurface,
+                                    color: LinagoraRefColors.material()
+                                        .tertiary[30],
                                   ),
                             ),
                           ],

diff --git a/lib/pages/new_private_chat/widget/expansion_list.dart b/lib/pages/new_private_chat/widget/expansion_list.dart
@@ -12,11 +12,10 @@ import 'package:fluffychat/presentation/model/contact/presentation_contact_succe
 import 'package:fluffychat/utils/responsive/responsive_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
-import 'package:linagora_design_flutter/colors/linagora_ref_colors.dart';
-
 import 'package:fluffychat/pages/new_private_chat/widget/expansion_contact_list_tile.dart';
 import 'package:fluffychat/pages/new_private_chat/widget/no_contacts_found.dart';
 import 'package:fluffychat/widgets/twake_components/twake_icon_button.dart';
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 
 class ExpansionList extends StatelessWidget {
   final ValueNotifier<Either<Failure, Success>> presentationContactsNotifier;
@@ -88,14 +87,13 @@ class ExpansionList extends StatelessWidget {
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
                   ..._buildResponsiveButtons(context),
-                  InkWell(
+                  TwakeInkWell(
                     onTap: () {
                       onContactTap(
                         context,
                         success.contact,
                       );
                     },
-                    borderRadius: BorderRadius.circular(16.0),
                     child: ExpansionContactListTile(
                       contact: success.contact,
                       highlightKeyword: textEditingController.text,
@@ -138,14 +136,13 @@ class ExpansionList extends StatelessWidget {
                       physics: const NeverScrollableScrollPhysics(),
                       itemCount: contacts.length,
                       itemBuilder: (context, index) {
-                        return InkWell(
+                        return TwakeInkWell(
                           onTap: () {
                             onContactTap(
                               context,
                               contacts[index],
                             );
                           },
-                          borderRadius: BorderRadius.circular(16.0),
                           child: ExpansionContactListTile(
                             contact: contacts[index],
                             highlightKeyword: textEditingController.text,

diff --git a/lib/pages/search/server_search_view.dart b/lib/pages/search/server_search_view.dart
@@ -10,6 +10,7 @@ import 'package:fluffychat/pages/chat_list/chat_list_item_title.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import 'package:fluffychat/widgets/search/empty_search_widget.dart';
 import 'package:flutter/material.dart' hide SearchController;
+import 'package:linagora_design_flutter/linagora_design_flutter.dart';
 import 'package:matrix/matrix.dart';
 
 class ServerSearchMessagesList extends StatelessWidget {
@@ -55,12 +56,10 @@ class ServerSearchMessagesList extends StatelessWidget {
                 final event = Event.fromMatrixEvent(searchResult, room);
                 final originServerTs = searchResult.originServerTs;
 
-                return Padding(
-                  padding: ServerSearchViewStyle.paddingListItem,
-                  child: InkWell(
-                    onTap: () =>
-                        context.goToRoomWithEvent(event.room.id, event.eventId),
-                    borderRadius: ServerSearchViewStyle.itemBorderRadius,
+                return TwakeInkWell(
+                  onTap: () =>
+                      context.goToRoomWithEvent(event.room.id, event.eventId),
+                  child: TwakeListItem(
                     child: Padding(
                       padding: ServerSearchViewStyle.paddingInsideListItem,
                       child: Row(

diff --git a/pubspec.lock b/pubspec.lock
@@ -1779,7 +1779,7 @@ packages:
     description:
       path: "."
       ref: master
-      resolved-ref: "730692596f54708fab806f54912e3cbecb027825"
+      resolved-ref: "90f11f5350c691a6244dfbfadfbf53795acf3151"
       url: "[email protected]:linagora/linagora-design-flutter.git"
     source: git
     version: "0.0.1"

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -30,7 +30,6 @@ dependencies:
     git:
       url: [email protected]:linagora/linagora-design-flutter.git
       ref: master
-
   flutter_matrix_html:
     git:
       url: https://github.com/linagora/flutter_matrix_html.git