Skip to content

Show a line between old messages and new when opening chat with unread messages #74

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

Open
cameronaaron wants to merge 1 commit into
base: rustpush
Choose a base branch
from
Open

Show a line between old messages and new when opening chat with unread messages #74

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
25 changes: 25 additions & 0 deletions lib/app/layouts/conversation_view/pages/messages_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ class MessagesViewState extends OptimizedState<MessagesView> {

Chat get chat => controller.chat;

Message? lastReadMessage;
Message? firstUnreadMessage;

@override
void initState() {
super.initState();
Expand Down Expand Up @@ -127,6 +130,15 @@ class MessagesViewState extends OptimizedState<MessagesView> {
});
});
}

// Determine the last read message and the first unread message
lastReadMessage = _messages.firstWhereOrNull((message) => message.guid == chat.lastReadMessageGuid);
if (lastReadMessage != null) {
final lastReadMessageIndex = _messages.indexOf(lastReadMessage!);
if (lastReadMessageIndex + 1 < _messages.length) {
firstUnreadMessage = _messages[lastReadMessageIndex + 1];
}
}
});
}

Expand Down Expand Up @@ -511,6 +523,19 @@ class MessagesViewState extends OptimizedState<MessagesView> {
);
}

// Add a line separator between old and new messages
if (message == firstUnreadMessage) {
toReturn = Column(
children: [
Divider(
color: context.theme.colorScheme.primary,
thickness: 2,
),
toReturn,
],
);
}

// we are the last non-scheduled message
if (message.dateScheduled == null && (newerMessage?.dateScheduled != null || index == 0)) {
toReturn = Column(
Expand Down
8 changes: 5 additions & 3 deletions lib/app/layouts/conversation_view/widgets/message/timestamp/timestamp_separator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ class TimestampSeparator extends StatelessWidget {
super.key,
required this.olderMessage,
required this.message,
this.isNewMessageSeparator = false,
});
final Message? olderMessage;
final Message message;
final bool isNewMessageSeparator;

bool withinTimeThreshold(Message first, Message? second) {
if (second == null) return true;
Expand All @@ -29,7 +31,9 @@ class TimestampSeparator extends StatelessWidget {
}

Tuple2<String?, String>? buildTimeStamp() {
if (ss.settings.skin.value == Skins.Samsung && message.chatViewDate?.day != olderMessage?.chatViewDate?.day) {
if (isNewMessageSeparator) {
return Tuple2(null, "New Messages");
} else if (ss.settings.skin.value == Skins.Samsung && message.chatViewDate?.day != olderMessage?.chatViewDate?.day) {
return Tuple2(null, buildSeparatorDateSamsung(message.chatViewDate!));
} else if (ss.settings.skin.value != Skins.Samsung && withinTimeThreshold(message, olderMessage)) {
final time = message.chatViewDate!;
Expand All @@ -47,8 +51,6 @@ class TimestampSeparator extends StatelessWidget {
Widget build(BuildContext context) {
final timestamp = buildTimeStamp();



var child = timestamp != null ? Padding(
padding: const EdgeInsets.all(14.0),
child: RichText(
Expand Down