twonly/twonly-app
1
0
Fork 0
mirror of https://github.com/twonlyapp/twonly-app.git synced 2026-01-15 12:48:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix #60

Browse source
This commit is contained in:
otsmr 2025-03-30 22:35:16 +02:00
parent f6c6b0fafe
commit 61763498dc
5 changed files with 141 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/src/json_models/message.dart
View file

@ -152,15 +152,23 @@ class MediaMessageContent extends MessageContent {
class TextMessageContent extends MessageContent {
String text;
TextMessageContent({required this.text});
int? responseToMessageId;
TextMessageContent({required this.text, this.responseToMessageId});
static TextMessageContent fromJson(Map json) {
return TextMessageContent(text: json['text']);
return TextMessageContent(
text: json['text'],
responseToMessageId: json.containsKey('responseToMessageId')
? json['responseToMessageId']
: null);
}
@override
Map toJson() {
return {'text': text};
return {
'text': text,
'responseToMessageId': responseToMessageId,
};
}
}

10
lib/src/providers/api/api.dart
View file

@ -134,9 +134,7 @@ Future<Result> encryptAndSendMessage(
return resp;
}
Future sendTextMessage(int target, String message) async {
MessageContent content = TextMessageContent(text: message);
Future sendTextMessage(int target, TextMessageContent content) async {
DateTime messageSendAt = DateTime.now();
int? messageId = await twonlyDatabase.messagesDao.insertMessage(
@ -144,8 +142,12 @@ Future sendTextMessage(int target, String message) async {
contactId: Value(target),
kind: Value(MessageKind.textMessage),
sendAt: Value(messageSendAt),
responseToOtherMessageId: Value(content.responseToMessageId),
downloadState: Value(DownloadState.downloaded),
contentJson: Value(jsonEncode(content.toJson()))),
contentJson: Value(
jsonEncode(content.toJson()),
),
),
);
if (messageId == null) return;

9
lib/src/providers/api/server_messages.dart
View file

@ -225,7 +225,7 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
message.kind != MessageKind.storedMediaFile) {
Logger("handleServerMessages")
.shout("Got unknown MessageKind $message");
} else {
} else if (message.content != null) {
String content = jsonEncode(message.content!.toJson());
bool acknowledgeByUser = false;
@ -235,6 +235,12 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
openedAt = DateTime.now();
}
int? responseToMessageId;
final textContent = message.content!;
if (textContent is TextMessageContent) {
responseToMessageId = textContent.responseToMessageId;
}
final update = MessagesCompanion(
contactId: Value(fromUserId),
kind: Value(message.kind),
@ -242,6 +248,7 @@ Future<client.Response> handleNewMessage(int fromUserId, Uint8List body) async {
contentJson: Value(content),
acknowledgeByServer: Value(true),
acknowledgeByUser: Value(acknowledgeByUser),
responseToMessageId: Value(responseToMessageId),
openedAt: Value(openedAt),
downloadState: Value(message.kind == MessageKind.media
? DownloadState.pending

124
lib/src/views/chats/chat_item_details_view.dart
View file

@ -24,11 +24,46 @@ import 'package:twonly/src/views/contact/contact_view.dart';
import 'package:twonly/src/views/home_view.dart';
class ChatListEntry extends StatelessWidget {
const ChatListEntry(this.message, this.userId, this.lastMessageFromSameUser,
const ChatListEntry(
this.message, this.userId, this.lastMessageFromSameUser, this.reactions,
{super.key});
final Message message;
final int userId;
final bool lastMessageFromSameUser;
final List<Message> reactions;
Widget getReactionRow() {
List<Widget> children = [];
for (final reaction in reactions) {
if (children.isNotEmpty) break;
MessageContent? content = MessageContent.fromJson(
reaction.kind, jsonDecode(reaction.contentJson!));
if (content is TextMessageContent) {
late Widget child;
if (EmojiAnimation.animatedIcons.containsKey(content.text)) {
child = SizedBox(
height: 18,
child: EmojiAnimation(emoji: content.text),
);
} else {
child = Text(content.text, style: TextStyle(fontSize: 14));
}
children.add(Padding(
padding: EdgeInsets.only(left: 3),
child: child,
));
}
}
if (children.isEmpty) return Container();
return Row(
mainAxisAlignment: message.messageOtherId == null
? MainAxisAlignment.start
: MainAxisAlignment.end,
children: children,
);
}
@override
Widget build(BuildContext context) {
@ -54,14 +89,12 @@ class ChatListEntry extends StatelessWidget {
constraints: BoxConstraints(
maxWidth: MediaQuery.of(context).size.width * 0.8,
),
padding: EdgeInsets.symmetric(
vertical: 4, horizontal: 10), // Add some padding around the text
padding: EdgeInsets.symmetric(vertical: 4, horizontal: 10),
decoration: BoxDecoration(
color: right
? const Color.fromARGB(107, 124, 77, 255)
: const Color.fromARGB(
83, 68, 137, 255), // Set the background color
borderRadius: BorderRadius.circular(12.0), // Set border radius
: const Color.fromARGB(83, 68, 137, 255),
borderRadius: BorderRadius.circular(12.0),
),
child: BetterText(text: content.text),
);
@ -94,17 +127,16 @@ class ChatListEntry extends StatelessWidget {
width: 150,
decoration: BoxDecoration(
border: Border.all(
color: color, // Set the background color
width: 1.0, // Set the border width here
color: color,
width: 1.0,
),
borderRadius: BorderRadius.circular(12.0), // Set border radius
borderRadius: BorderRadius.circular(12.0),
),
child: Align(
alignment: Alignment.centerRight,
child: MessageSendStateIcon(
[message],
mainAxisAlignment:
right ? MainAxisAlignment.center : MainAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center,
),
),
),
@ -137,7 +169,14 @@ class ChatListEntry extends StatelessWidget {
padding: lastMessageFromSameUser
? EdgeInsets.only(top: 5, bottom: 0, right: 10, left: 10)
: EdgeInsets.only(top: 5, bottom: 20, right: 10, left: 10),
child: child),
child: Stack(
alignment: right ? Alignment.centerRight : Alignment.centerLeft,
children: [
child,
Positioned(bottom: 5, left: 5, right: 5, child: getReactionRow()),
],
),
),
);
}
}
@ -160,6 +199,8 @@ class _ChatItemDetailsViewState extends State<ChatItemDetailsView> {
late StreamSubscription<Contact> userSub;
late StreamSubscription<List<Message>> messageSub;
List<Message> messages = [];
Map<int, List<Message>> reactionsToMyMessages = {};
Map<int, List<Message>> reactionsToOtherMessages = {};
@override
void initState() {
@ -189,6 +230,10 @@ class _ChatItemDetailsViewState extends State<ChatItemDetailsView> {
messageSub = msgStream.listen((msgs) {
if (!context.mounted) return;
var updated = false;
List<Message> displayedMessages = [];
// should be cleared
Map<int, List<Message>> tmpReactionsToMyMessages = {};
Map<int, List<Message>> tmpTeactionsToOtherMessages = {};
for (Message msg in msgs) {
if (msg.kind == MessageKind.textMessage &&
msg.messageOtherId != null &&
@ -197,12 +242,32 @@ class _ChatItemDetailsViewState extends State<ChatItemDetailsView> {
flutterLocalNotificationsPlugin.cancel(msg.messageId);
notifyContactAboutOpeningMessage(widget.userid, msg.messageOtherId!);
}
if (msg.responseToMessageId != null) {
if (!tmpReactionsToMyMessages.containsKey(msg.responseToMessageId!)) {
tmpReactionsToMyMessages[msg.responseToMessageId!] = [msg];
} else {
tmpReactionsToMyMessages[msg.responseToMessageId!]!.add(msg);
}
} else if (msg.responseToOtherMessageId != null) {
if (!tmpTeactionsToOtherMessages
.containsKey(msg.responseToOtherMessageId!)) {
tmpTeactionsToOtherMessages[msg.responseToOtherMessageId!] = [msg];
} else {
tmpTeactionsToOtherMessages[msg.responseToOtherMessageId!]!
.add(msg);
}
} else {
displayedMessages.add(msg);
}
}
twonlyDatabase.messagesDao.openedAllNonMediaMessages(widget.userid);
if (!updated) {
// The stream should be get an update, so only update the UI when all are opened
setState(() {
messages = msgs;
reactionsToMyMessages = tmpReactionsToMyMessages;
reactionsToOtherMessages = tmpTeactionsToOtherMessages;
messages = displayedMessages;
});
}
});
@ -210,7 +275,12 @@ class _ChatItemDetailsViewState extends State<ChatItemDetailsView> {
Future _sendMessage() async {
if (newMessageController.text == "" || user == null) return;
await sendTextMessage(user!.userId, newMessageController.text);
await sendTextMessage(
user!.userId,
TextMessageContent(
text: newMessageController.text,
),
);
newMessageController.clear();
currentInputText = "";
setState(() {});
@ -256,7 +326,7 @@ class _ChatItemDetailsViewState extends State<ChatItemDetailsView> {
children: [
Expanded(
child: ListView.builder(
itemCount: messages.length, // Number of items in the list
itemCount: messages.length,
reverse: true,
itemBuilder: (context, i) {
bool lastMessageFromSameUser = false;
@ -267,10 +337,21 @@ class _ChatItemDetailsViewState extends State<ChatItemDetailsView> {
(messages[i - 1].messageOtherId != null &&
messages[i].messageOtherId != null);
}
Message msg = messages[i];
List<Message> reactions = [];
if (reactionsToMyMessages.containsKey(msg.messageId)) {
reactions = reactionsToMyMessages[msg.messageId]!;
}
if (msg.messageOtherId != null &&
reactionsToOtherMessages
.containsKey(msg.messageOtherId!)) {
reactions = reactionsToOtherMessages[msg.messageOtherId!]!;
}
return ChatListEntry(
messages[i],
msg,
widget.userid,
lastMessageFromSameUser,
reactions,
);
},
),
@ -295,22 +376,19 @@ class _ChatItemDetailsViewState extends State<ChatItemDetailsView> {
contentPadding:
EdgeInsets.symmetric(horizontal: 20, vertical: 10),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(
20), // Set the border radius here
borderRadius: BorderRadius.circular(20),
borderSide: BorderSide(
color: Theme.of(context).colorScheme.primary,
width: 2.0), // Customize border color and width
width: 2.0),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(
20.0), // Same radius for focused border
borderRadius: BorderRadius.circular(20.0),
borderSide: BorderSide(
color: Theme.of(context).colorScheme.primary,
width: 2.0),
),
enabledBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(
20.0), // Same radius for enabled border
borderRadius: BorderRadius.circular(20.0),
borderSide:
BorderSide(color: Colors.grey, width: 2.0),
),

9
lib/src/views/chats/media_viewer_view.dart
View file

@ -316,7 +316,14 @@ class _MediaViewerViewState extends State<MediaViewerView> {
curve: Curves.linearToEaseOut,
child: GestureDetector(
onTap: () {
sendTextMessage(widget.userId, emoji);
sendTextMessage(
widget.userId,
TextMessageContent(
text: emoji,
responseToMessageId:
allMediaFiles.first.messageOtherId,
),
);
setState(() {
selectedShortReaction = index;
});