Erweiterungen

This commit is contained in:
Sven committed 2024-11-14 10:56:36 +01:00
1 parent 96544ca924
commit def0f3fc2f
136 files changed
+4172 -499

No files matched your search

+32 -13
View File
@@ -1,4 +1,5 @@
import 'package:dart_mq/dart_mq.dart';
import 'package:flutter/material.dart';
import 'package:flutter_chat_ui/flutter_chat_ui.dart';
import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
@@ -7,8 +8,8 @@ import 'package:mqtt5_client/mqtt5_client.dart';
import 'package:stadtbote/content_views/utils/content_view_widget.dart';
import 'package:stadtbote/main.dart';
import 'package:stadtbote/messages/pop_content_view_message.dart';
import 'package:stadtbote/model/message.dart' as sbmessage;
import 'package:stadtbote/model/message.dart';
import 'package:stadtbote/model/chat_message.dart' as sbmessage;
import 'package:stadtbote/model/chat_message.dart';
import 'package:stadtbote/model/session_status.dart';
import 'package:stadtbote/tools/constants.dart';
import 'package:stadtbote/tools/message_service.dart';
@@ -30,7 +31,7 @@ class MessagesPage extends ContentViewWidget {
}
}
class _MessagesPageState extends State<MessagesPage> {
class _MessagesPageState extends State<MessagesPage> with ProducerMixin {
bool _initCompleted = false;
late String _sid;
@@ -87,19 +88,25 @@ class _MessagesPageState extends State<MessagesPage> {
void _handleSendPressed(types.PartialText text) async {
var now = DateTime.now();
var message = sbmessage.Message();
var message = sbmessage.ChatMessage();
message.text = text.text;
message.from = _sid;
message.subj = '';
message.time = now.toUtc().toIso8601String();
message.read = true;
message.id = await sbmessage.Message.getNextId();
message.id = await sbmessage.ChatMessage.getNextId();
await MyApp.isarInstance.writeTxn(() async {
await MyApp.isarInstance.messages.put(message);
await MyApp.isarInstance.chatMessages.put(message);
});
await MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "message", message: message.toJson(), qos: MqttQos.exactlyOnce));
// TODO MESSAGING
sendMessage(
routingKey: Constants.messageTopicPublishPayload,
payload: PublishPayloadMessage(topic: "message", message: message.toJson(), qos: MqttQos.exactlyOnce),
);
//await MessageService().publish<PublishPayloadMessage>(Constants.messageTopicPublishPayload, arguments: PublishPayloadMessage(topic: "message", message: message.toJson(), qos: MqttQos.exactlyOnce));
_messages.insert(0, types.TextMessage(
author: _user,
@@ -114,7 +121,7 @@ class _MessagesPageState extends State<MessagesPage> {
Future<void> _fetchMessages() async {
_messages.clear();
var messages = await MyApp.isarInstance.messages.where().findAll();
var messages = await MyApp.isarInstance.chatMessages.where().findAll();
for (var message in messages) {
_messages.add(types.TextMessage(
author: message.from == _sid ? _user : _central,
@@ -127,7 +134,7 @@ class _MessagesPageState extends State<MessagesPage> {
message.read = true;
await MyApp.isarInstance.writeTxn(() async {
await MyApp.isarInstance.messages.put(message);
await MyApp.isarInstance.chatMessages.put(message);
});
}
@@ -166,7 +173,7 @@ class _MessagesPageState extends State<MessagesPage> {
const SizedBox(width: 20),
Expanded(
child: getDefaultButton('Ja', () async => {
await MyApp.isarInstance.writeTxn(() async => { await MyApp.isarInstance.messages.delete(int.parse(message.id))}),
await MyApp.isarInstance.writeTxn(() async => { await MyApp.isarInstance.chatMessages.delete(int.parse(message.id))}),
_fetchMessages(),
@@ -192,7 +199,7 @@ class _HeaderWidget extends StatefulWidget {
State<_HeaderWidget> createState() => _HeaderWidgetState();
}
class _HeaderWidgetState extends State<_HeaderWidget> {
class _HeaderWidgetState extends State<_HeaderWidget> with ProducerMixin {
@override
void initState() {
super.initState();
@@ -222,7 +229,13 @@ class _HeaderWidgetState extends State<_HeaderWidget> {
child: FittedBox(
child: GestureDetector(
onTap: () async {
await MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1));
// TODO MESSAGING
sendMessage(
routingKey: Constants.messageTopicPopContentView,
payload: PopContentViewMessage(count: 1),
);
//await MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1));
},
child: const CircleAvatar(
radius: 10,
@@ -245,7 +258,13 @@ class _HeaderWidgetState extends State<_HeaderWidget> {
child: FittedBox(
child: GestureDetector(
onTap: () async {
await MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1));
// TODO MESSAGING
sendMessage(
routingKey: Constants.messageTopicPopContentView,
payload: PopContentViewMessage(count: 1),
);
//await MessageService().publish<PopContentViewMessage>(Constants.messageTopicPopContentView, arguments: PopContentViewMessage(count: 1));
},
child: const CircleAvatar(
backgroundColor: Constants.colorPrimary,