fix presence message structure

Author: Wahid Nasri

lib/MqttImpl/MqttChatEventsSender.dart

@@ -66,7 +66,7 @@ class MqttChatEventsSender extends ChatEventsSender {
 
   @override
   void sendPresence(PresenceType presenceType, String myId) {
-    PresenceMessage presenceMessage = PresenceMessage(id: Uuid().v4(), type: presenceType, fromId: myId);
+    PresenceMessage presenceMessage = PresenceMessage(id: Uuid().v4(), type: MessageType.Presence, presenceType: presenceType, fromId: myId);
     String payload = presenceMessage.toJson();
     clientHandler.sendPayload(payload, "presence/" + myId);
   }

lib/MqttImpl/MqttOnlineReader.dart

@@ -29,7 +29,6 @@ class MqttOnlineReader extends MessageOnlineReaderHandler {
         return;
       }
       Map<String, dynamic> payloadMap = jsonDecode(payload);
-      BaseMessage baseMsg = BaseMessage.fromJson(payloadMap);
 
       if (topic.toLowerCase().startsWith("messages/")) {
         ChatMessage chatMessage = ChatMessage.fromJson(payload);
@@ -38,6 +37,7 @@ class MqttOnlineReader extends MessageOnlineReaderHandler {
         PresenceMessage pMsg = PresenceMessage.fromJson(payload);
         _presenceController.add(pMsg);
       } else if (topic.toLowerCase().startsWith("events/")) {
+        BaseMessage baseMsg = BaseMessage.fromJson(payloadMap);
         //handle rooms events
         //String roomId = topic.toLowerCase().split("/")[1];
         if (baseMsg.isChatMarkerEvent()) {

lib/abstraction/models/PresenceMesssage.dart

@@ -1,16 +1,19 @@
 import 'dart:convert';
 
 import 'package:flutter/foundation.dart';
+import 'package:flutter_mqtt/abstraction/models/enums/MessageType.dart';
 
 import 'enums/PresenceType.dart';
 
 class PresenceMessage {
   late String id;
-  late PresenceType type;
+  late PresenceType presenceType;
+  late MessageType type;
   String? fromId;
   String? fromName;
   PresenceMessage({
     required this.id,
+    required this.presenceType,
     required this.type,
     this.fromId,
     this.fromName,
@@ -22,6 +25,9 @@ class PresenceMessage {
       'type': type
           .toString()
           .substring(type.toString().toString().indexOf('.') + 1),
+      'presenceType': presenceType
+          .toString()
+          .substring(presenceType.toString().toString().indexOf('.') + 1),
       'fromId': fromId,
       'fromName': fromName,
     };
@@ -30,7 +36,10 @@ class PresenceMessage {
   factory PresenceMessage.fromMap(Map<String, dynamic> map) {
     return PresenceMessage(
       id: map['id'],
-      type: PresenceType.values
+      presenceType: PresenceType.values
+          .where((e) => describeEnum(e) == map['presenceType'])
+          .first,
+      type: MessageType.values
           .where((e) => describeEnum(e) == map['type'])
           .first,
       fromId: map['fromId'],

lib/ui/screens/chatting/chat_db_pages.dart

@@ -227,7 +227,7 @@ class _ChatUIPageState extends State<ChatUIDBPage> {
                   padding: const EdgeInsets.only(right: 10),
                   child: Hero(
                     tag: "avatar_" + widget.contactChat.id,
-                    child: ContactAvatar(chat: widget.contactChat, radius: 15,),
+                    child: ContactAvatar(chat: widget.contactChat, radius: 15, borderWidth: 1,borderColor: Colors.grey),//fixme: use color for presence
                   ),
                 ),
                 Column(

lib/ui/screens/details/contact_page.dart

@@ -40,6 +40,8 @@ class _ContactDetailsPageState extends State<ContactDetailsPage> {
                     chat:
                         widget.contactChat,
                     radius: 100,
+                    borderWidth: widget.contactChat.isGroup! ? 0 : 5,
+                    borderColor: Colors.grey,//fixme: use color for presence
                   ),
                 ),
               ),