ADD : Discplay messages in the views

Sources/dafl_project_flutter/lib/controller/controller.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:dafl_project_flutter/firebase_services/notification_service.dart';
 import 'package:dafl_project_flutter/model/message.dart';
 import 'package:dafl_project_flutter/firebase_services/message_database_services.dart';
 import 'package:flutter/cupertino.dart';
@@ -16,6 +17,7 @@ class Controller {
   static Loader loader = DatabaseLoader();
   static final Searcher _searcher = DatabaseSearcher();
   final MessageDatabaseServices _messageAccess = MessageDatabaseServices();
+  final NotificationService _notificationService = NotificationService();
 
   late BuildContext navigatorKey;
 
@@ -23,14 +25,15 @@ class Controller {
 
   Controller() {
     currentUser = User('', ''); //TODO : remove this line
+    NotificationService.initialize();
   }
 
-  void sendMessage(Message message, String idSender, String idReceiver){
+  void sendMessage(Message message, String idSender, String idReceiver) {
     _messageAccess.sendMessage(message, idSender, idReceiver);
   }
 
-  Stream<List<Message>> getMessage(String chatId){
+  Stream<List<Message>> getMessage(String idSender, String idReceiver) {
-    return _messageAccess.getMessage(chatId);
+    return _messageAccess.getMessage(idSender, idReceiver);
   }
 
   void save(User userToSave) {

Sources/dafl_project_flutter/lib/firebase_services/message_database_services.dart

@@ -1,30 +1,28 @@
 import 'package:dafl_project_flutter/model/message.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 
-
+class MessageDatabaseServices {
-class MessageDatabaseServices{
-
   // Make an unique chat ID between 2 client. Look like 'User1-User2'
-  static String getChatId(String idSender, String idReceiver){
+  String _getChatId(String idSender, String idReceiver) {
-
+    // Test to always have the same id
-      // Test to always have the same id
+    if (idSender.hashCode <= idReceiver.hashCode)
-      if (idSender.hashCode <= idReceiver.hashCode)
+      return '$idSender-${idReceiver}';
-        return '$idSender-${idReceiver}';
+    else
-      else
+      return '${idReceiver}-$idSender';
-        return '${idReceiver}-$idSender';
-
   }
 
-
   // Send a message from an user to an other
   void sendMessage(Message message, String idSender, String idReceiver) {
-    String chatId = getChatId(idSender, idReceiver);
+    String chatId = _getChatId(idSender, idReceiver);
 
     var documentReference = FirebaseFirestore.instance
         .collection('messages')
         .doc(chatId)
         .collection(chatId)
-        .doc(DateTime.now().millisecondsSinceEpoch.toString());
+        .doc(DateTime
+        .now()
+        .millisecondsSinceEpoch
+        .toString());
 
     FirebaseFirestore.instance.runTransaction((transaction) async {
       transaction.set(documentReference, message.toHashMap());
@@ -34,8 +32,7 @@ class MessageDatabaseServices{
   // Get a message from a snapshot Firestore
   Message _getMessage(DocumentSnapshot<Map<String, dynamic>> snapshot) {
     var data = snapshot.data();
-    if (data == null)
+    if (data == null) throw Exception("no data in database");
-      throw Exception("no data in database");
 
     return Message.fromMap(data);
   }
@@ -48,11 +45,14 @@ class MessageDatabaseServices{
   }
 
   // Get the massages from Firestore
-  Stream<List<Message>> getMessage(String chatId) {
+  Stream<List<Message>> getMessage(String idSender, String idReceiver) {
+    String chatId = _getChatId(idSender, idReceiver);
+
     return FirebaseFirestore.instance
         .collection('messages')
         .doc(chatId)
         .collection(chatId)
-        .snapshots().map(_getAllMessages);
+        .snapshots()
+        .map(_getAllMessages);
   }
 }

Sources/dafl_project_flutter/lib/firebase_services/notification_service.dart

@@ -0,0 +1,21 @@
+import 'package:firebase_messaging/firebase_messaging.dart';
+
+class NotificationService {
+  static void initialize() {
+    FirebaseMessaging.instance.requestPermission();
+
+    FirebaseMessaging.onMessage.listen((event) {
+      print('A new onMessage event was published!');
+    });
+
+    FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
+      print('A new onMessageOpenedApp event was published!');
+    });
+  }
+
+  static Future<String?> getToken() async {
+    return FirebaseMessaging.instance.getToken(
+        vapidKey:
+            "BOxfduRivQnT8TS1h9WRGEk4gV2IOzJpTCcoKxVTMgVWjxi6TUcQBng2mqM7fUfNy51esFrRGE68coa0XZaKdHc");
+  }
+}

Sources/dafl_project_flutter/lib/main.dart

@@ -1,19 +1,34 @@
 import 'dart:async';
 import 'dart:ui';
 import 'dart:math';
+import 'package:dafl_project_flutter/firebase_options.dart';
 import './views/pages/home/p_home.dart';
 import './views/pages/main/p_main.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:rive/rive.dart' as riv;
-import '../controller/controller.dart';
+import 'controller/controller.dart';
 import 'model/spot.dart';
 import 'api/api.dart';
 import 'dart:developer' as dev;
 import 'package:flutter_styled_toast/flutter_styled_toast.dart';
+import 'package:firebase_core/firebase_core.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+
+Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
+  print('Background message ${message.messageId}');
+}
+
+void main() async {
+  WidgetsFlutterBinding.ensureInitialized();
+
+  await Firebase.initializeApp(
+    options: DefaultFirebaseOptions.currentPlatform,
+  );
+
+  FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
 
-void main() {
   runApp(const MyApp());
 }
 

Sources/dafl_project_flutter/lib/model/message.dart

@@ -5,12 +5,12 @@ class Message {
   String idReceiver;
   String content;
 
-  Message({required this.idSender,
+  Message({
+    required this.idSender,
     required this.idReceiver,
-    required this.content
+    required this.content,
   });
 
-
   Map<String, dynamic> toHashMap() {
     return {
       'idSender': idSender,
@@ -19,12 +19,16 @@ class Message {
     };
   }
 
-
+  factory Message.fromMap(Map<String, dynamic> data) {
-  factory Message.fromMap(Map<String, dynamic> data){
     return Message(
       idSender: data['idSender'],
       idReceiver: data['idReceiver'],
       content: data['content'],
     );
   }
+
+  @override
+  String toString() {
+    return "idSender : $idSender " + "Content : $content \n";
+  }
 }

Sources/dafl_project_flutter/lib/model/user.dart

@@ -11,7 +11,6 @@ class User {
   int test = 0;
 
   //attributes from DAFL
-  late int idDafl;
   late String usernameDafl;
   late String passwDafl;
   List<Music> discovery = [];
@@ -22,6 +21,7 @@ class User {
   late Music _currentMusic;
   bool sortChoise = true;
 
+
   //constructors
   User(this.usernameDafl, this.passwDafl) {
     actualiseCurrentMusic();

Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart

@@ -18,12 +18,9 @@ class _ConversationPageState extends State<ConversationPage> {
 
   final messageTextField = TextEditingController();
 
-
   void sendMessage(String content, String idSender, String idReceiver) {
-    Message messageToSend = Message(
+    Message messageToSend =
-        idSender: idSender,
+        Message(idSender: idSender, idReceiver: idReceiver, content: content);
-        idReceiver: idReceiver,
-        content: content);
 
     MyApp.controller.sendMessage(messageToSend, idSender, idReceiver);
 
@@ -33,7 +30,7 @@ class _ConversationPageState extends State<ConversationPage> {
   }
 
   Widget messageWidget(Message message) {
-    if (message.idSender != MyApp.controller.currentUser.usernameDafl){
+    if (message.idSender != MyApp.controller.currentUser.usernameDafl) {
       return Align(
         alignment: Alignment.centerLeft,
         child: Container(
@@ -172,18 +169,34 @@ class _ConversationPageState extends State<ConversationPage> {
         ),
       ),
       body: SingleChildScrollView(
-        child: Container(
+          child: Container(
-            color: const Color(0xFF141414),
+              color: const Color(0xFF141414),
-            height: height * 0.92,
+              height: height * 0.92,
-            width: double.infinity,
+              width: double.infinity,
-            child: ListView.builder(
+              child: Flexible(
-                controller: listScrollController,
+                child: StreamBuilder<List<Message>>(
-                physics: const BouncingScrollPhysics(),
+                  stream: MyApp.controller.getMessage(
-                itemCount: messages.length,
+                      MyApp.controller.currentUser.usernameDafl,
-                itemBuilder: (context, index) {
+                      receiver.usernameDafl),
-                  return messages[index];
+                  builder: (BuildContext context,
-                })),
+                      AsyncSnapshot<List<Message>> snapshot) {
-      ),
+                    if (snapshot.hasData) {
+                      List<Message> listMessage =
+                          snapshot.data ?? List.from([]);
+                      return ListView.builder(
+                        padding: EdgeInsets.all(10.0),
+                        itemBuilder: (context, index) =>
+                            messageWidget(listMessage[index]),
+                        itemCount: listMessage.length,
+                        reverse: true,
+                        controller: listScrollController,
+                      );
+                    } else {
+                      return Center(child: Container());
+                    }
+                  },
+                ),
+              ))),
       bottomSheet: BottomAppBar(
         color: const Color(0xFF141414),
         child: Row(
@@ -225,7 +238,10 @@ class _ConversationPageState extends State<ConversationPage> {
               onTap: isNull
                   ? null
                   : () {
-                      sendMessage(messageTextField.text, MyApp.controller.currentUser.usernameDafl, receiver.usernameDafl);
+                      sendMessage(
+                          messageTextField.text,
+                          MyApp.controller.currentUser.usernameDafl,
+                          receiver.usernameDafl);
                       if (listScrollController.hasClients) {
                         final position =
                             listScrollController.position.maxScrollExtent;