moxxy/moxxy
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui: Show the typing indicator also in the conversations list

Browse Source
This commit is contained in:
PapaTutuWawa 2022-04-10 16:52:28 +02:00
parent 8f17d2cb02
commit cae8acfc71
2 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ui/pages/conversations.dart
View File

@ -8,6 +8,7 @@ import "package:moxxyv2/ui/widgets/avatar.dart";
import "package:moxxyv2/ui/bloc/conversations_bloc.dart";
import "package:moxxyv2/ui/bloc/conversation_bloc.dart";
import "package:moxxyv2/ui/bloc/profile_bloc.dart";
import "package:moxxyv2/xmpp/xeps/xep_0085.dart";
import "package:flutter/material.dart";
import "package:get_it/get_it.dart";
@ -59,6 +60,7 @@ class ConversationsPage extends StatelessWidget {
maxTextWidth,
item.lastChangeTimestamp,
true,
typingIndicator: item.chatState == ChatState.composing,
key: ValueKey("conversationRow;" + item.jid)
)
)

53
lib/ui/widgets/conversation.dart
View File

@ -2,6 +2,7 @@ import "dart:async";
import "package:moxxyv2/ui/constants.dart";
import "package:moxxyv2/ui/widgets/avatar.dart";
import "package:moxxyv2/ui/widgets/chat/typing.dart";
import "package:moxxyv2/shared/helpers.dart";
import "package:moxxyv2/shared/constants.dart";
@ -16,11 +17,22 @@ class ConversationsListRow extends StatefulWidget {
final double maxTextWidth;
final int lastChangeTimestamp;
final bool update; // Should a timer run to update the timestamp
final bool typingIndicator;
const ConversationsListRow(this.avatarUrl, this.name, this.lastMessageBody, this.unreadCount, this.maxTextWidth, this.lastChangeTimestamp, this.update, { Key? key }) : super(key: key);
const ConversationsListRow(
this.avatarUrl,
this.name,
this.lastMessageBody,
this.unreadCount,
this.maxTextWidth,
this.lastChangeTimestamp,
this.update, {
this.typingIndicator = false,
Key? key
}
) : super(key: key);
@override
// ignore: no_logic_in_create_state
_ConversationsListRowState createState() => _ConversationsListRowState(
avatarUrl,
name,
@ -28,7 +40,8 @@ class ConversationsListRow extends StatefulWidget {
unreadCount,
maxTextWidth,
lastChangeTimestamp,
update
update,
typingIndicator: typingIndicator
);
}
@ -39,11 +52,23 @@ class _ConversationsListRowState extends State<ConversationsListRow> {
final int unreadCount;
final double maxTextWidth;
final int lastChangeTimestamp;
final bool update; // Should a timer run to update the timestamp
final bool typingIndicator;
late String _timestampString;
late Timer? _updateTimer;
_ConversationsListRowState(this.avatarUrl, this.name, this.lastMessageBody, this.unreadCount, this.maxTextWidth, this.lastChangeTimestamp, bool update) {
_ConversationsListRowState(
this.avatarUrl,
this.name,
this.lastMessageBody,
this.unreadCount,
this.maxTextWidth,
this.lastChangeTimestamp,
this.update, {
this.typingIndicator = false
}
) {
final _now = DateTime.now().millisecondsSinceEpoch;
_timestampString = formatConversationTimestamp(
@ -82,6 +107,18 @@ class _ConversationsListRowState extends State<ConversationsListRow> {
super.dispose();
}
Widget _buildLastMessageBody() {
if (typingIndicator) {
return TypingIndicatorWidget(Colors.black, Colors.white);
}
return Text(
lastMessageBody,
maxLines: 1,
overflow: TextOverflow.ellipsis
);
}
@override
Widget build(BuildContext context) {
String badgeText = unreadCount > 99 ? "99+" : unreadCount.toString();
@ -120,12 +157,8 @@ class _ConversationsListRowState extends State<ConversationsListRow> {
constraints: BoxConstraints(
maxWidth: maxTextWidth
),
child: Text(
lastMessageBody,
maxLines: 1,
overflow: TextOverflow.ellipsis
)
// TODO: Colors
child: _buildLastMessageBody()
)
]
)