Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TW-738 feat: add spacing between messages bubbles #767

Merged
merged 1 commit into from
Oct 6, 2023
Merged

TW-738 feat: add spacing between messages bubbles #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pages/chat/chat_event_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:scroll_to_index/scroll_to_index.dart';

import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pages/chat/events/message.dart';
import 'package:fluffychat/pages/chat/events/message/message.dart';
import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart';
import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart';
Expand Down
16 changes: 10 additions & 6 deletions lib/pages/chat/events/message.dart → lib/pages/chat/events/message/message.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import 'dart:math' as math;

import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pages/chat/chat_horizontal_action_menu.dart';
import 'package:fluffychat/pages/chat/context_item_chat_action.dart';
import 'package:fluffychat/pages/chat/events/message/message_style.dart';
import 'package:fluffychat/pages/chat/events/message_content.dart';
import 'package:fluffychat/pages/chat/events/message_reactions.dart';
import 'package:fluffychat/pages/chat/events/message_time.dart';
import 'package:fluffychat/pages/chat/events/reply_content.dart';
import 'package:fluffychat/pages/chat/events/state_message.dart';
import 'package:fluffychat/pages/chat/events/verification_request_content.dart';
import 'package:fluffychat/pages/chat/sticky_timstamp_widget.dart';
import 'package:fluffychat/utils/date_time_extension.dart';
import 'package:fluffychat/widgets/avatar/avatar.dart';
Expand All @@ -18,12 +23,6 @@ import 'package:flutter/services.dart';
import 'package:linagora_design_flutter/colors/linagora_sys_colors.dart';
import 'package:matrix/matrix.dart';

import '../../../config/app_config.dart';
import 'message_content.dart';
import 'reply_content.dart';
import 'state_message.dart';
import 'verification_request_content.dart';

typedef OnMenuAction = Function(BuildContext, ChatHorizontalActionMenu, Event);

class Message extends StatelessWidget {
Expand Down Expand Up @@ -141,6 +140,11 @@ class Message extends StatelessWidget {
Container(
alignment: alignment,
padding: EdgeInsetsDirectional.only(
top: MessageStyle.messageSpacing(
displayTime,
nextEvent,
event,
),
start: 8,
end: selected || controller.responsive.isDesktop(context)
? 8
Expand Down
16 changes: 16 additions & 0 deletions lib/pages/chat/events/message/message_style.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:fluffychat/di/global/get_it_initializer.dart';
import 'package:fluffychat/utils/responsive/responsive_utils.dart';
import 'package:flutter/material.dart';
import 'package:fluffychat/utils/extension/build_context_extension.dart';
import 'package:matrix/matrix.dart';

class MessageStyle {
static ResponsiveUtils responsiveUtils = getIt.get<ResponsiveUtils>();
Expand Down Expand Up @@ -68,4 +69,19 @@ class MessageStyle {
MediaQuery.of(context).size.width * messageBubbleMobileRatioMaxWidth,
);
}

static double messageSpacing(
bool displayTime,
Event? nextEvent,
Event currentEvent,
) {
// add spaces to messages only
if (nextEvent == null ||
displayTime ||
nextEvent.type != EventTypes.Message) {
return 0;
}

return currentEvent.senderId != nextEvent.senderId ? 8 : 4;
}
}
Loading