Mise à jour de 'README.md'

Reviewed-on: #73

README.md

@@ -39,9 +39,9 @@ C'est un réseau social donc l'utilisateur pourra publier et commenter des posts
 
 La racine de notre gitlab est composé de deux dossier essentielles au projet:
 
-[**src**](src) : **Code de l'application**
+[**Sources**](Sources) : **Code de l'application**
 
-[**doc**](doc) : **Regroupe l'entièreté  de la documentation**
+[**Documentation**](Documentation) : **Regroupe l'entièreté  de la documentation**
 
 </br>
 
@@ -49,10 +49,33 @@ La racine de notre gitlab est composé de deux dossier essentielles au projet:
 
 ## Fonctionnement
 
+<div align = center>
+
+  <img src="Documentation/Images/Overview.png" />
+  
+</div>
+
+### Feeds
+
+Une fois authentifié vous aurez la possibilité de voir les posts capsules de vos amis, de voir les musiques qu'ils mettent en avant accompagner éventuellement d'une image, d'une description, de leurs localisations... (Vous n'avez pas d'amis, pas de soucis, cliquer seulement sur l'icon en haut a gauche de la page pour suivre nimporte quel personne que vous voulez), Mais aussi juste d'un simple mouvement du doigt swiper pour vous retrouvez sur la page Discovery où vous verrais les posts récents en tendance dans le monde 🌎
+
+Amuser vous à cliquer sur les posts pour ecouter la music mais aussi connaître les détails et savoir qui a commenter 💬 et liker ❤️. Si la musique vous plaît enregistrer la et vous la retrouverez lorsque vous aurez envie de poster.
+
+### Post
+
+Pour participer à cette aventure musicale avec des gens du monde entier, cliquez simplement sur l'icône JustMusic. Gardez à l'esprit que vous ne pourrez poster qu'une fois par jour, donc réfléchissez bien à la musique que vous souhaitez mettre en avant. N'hésitez pas à ajouter une photo et une description pour rendre votre publication plus chaleureuse 😃.
+
+### Profil
+
+Consultez l'aperçu de votre profil pour savoir combien de personnes vous suivent et que vous suivez. Vous pouvez également voir le nombre de capsules que vous avez publiées, personnaliser les paramètres de votre compte selon vos préférences, et explorez votre historique de capsules pour vous remémorer vos précédentes publications 🎧.
+
+#### Bonne aventure musicale 🎵🌟
+
 ## Deploiement
 
 - [x] &nbsp; ![IOS](https://img.shields.io/badge/IOS-000?style=for-the-badge&logo=apple&logoColor=black&color=white)
 - [x] &nbsp; ![Android](https://img.shields.io/badge/Android-000?style=for-the-badge&logo=android&logoColor=white&color=green)
+- [x] &nbsp; ![Safari](https://img.shields.io/badge/Safari-000000.svg?style=for-the-badge&logo=Safari&logoColor=white)
 
 
 ## Techniciens
@@ -64,7 +87,7 @@ La racine de notre gitlab est composé de deux dossier essentielles au projet:
 <img src ="https://codefirst.iut.uca.fr/git/avatars/1ff65c9c5ab0e8c8883fb48adbcf972f?size=870" height="50px">
 </a>
 <a href = "https://codefirst.iut.uca.fr/git/david.d_almeida">
-<img src ="https://codefirst.iut.uca.fr/git/avatars/0f8eaaad1e26d3de644ca522eccaea7c?size=870" height="50px">
+<img src ="https://codefirst.iut.uca.fr/git/avatars/a16fa2dc52ceae18d8923c91121caa66?size=870" height="50px">
 </a>
 <a href = "https://codefirst.iut.uca.fr/git/rayhan.hassou">
 <img src ="https://codefirst.iut.uca.fr/git/avatars/84062b2bb326d9e9154a9859b375e599?size=870" height="50px">

Sources/justMUSIC/lib/components/editable_post_component.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:html' as html;
 import 'package:animated_appear/animated_appear.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:firebase_storage/firebase_storage.dart';
@@ -10,7 +9,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:image_picker/image_picker.dart';
-import 'package:image_picker_for_web/image_picker_for_web.dart';
 import 'package:insta_image_viewer/insta_image_viewer.dart';
 import 'package:justmusic/values/constants.dart';
 import 'package:text_scroll/text_scroll.dart';
@@ -64,21 +62,7 @@ class _EditablePostComponentState extends State<EditablePostComponent> with Tick
   }
 
   Future pickImage(ImageSource source) async {
-    if(kIsWeb){
-      print('you are on web');
-      try {
-        final image = await ImagePicker().pickImage(source: source, imageQuality: 20);
-        if (image == null) return;
-        final imageTemp = File(image.path);
-    setState(() {
-          this.image = imageTemp;
-          widget.callBackImage(imageTemp);
-        });
-      } on PlatformException catch (e) {
-        print('Failed to pick image: $e');
-      }
-    }
-    else{
+
       try {
         final image = await ImagePicker().pickImage(source: source, imageQuality: 20);
         if (image == null) return;
@@ -90,7 +74,6 @@ class _EditablePostComponentState extends State<EditablePostComponent> with Tick
       } on PlatformException catch (e) {
         print('Failed to pick image: $e');
       }
-    }
 
   }
 

Sources/justMUSIC/lib/components/historic_component.dart

@@ -35,7 +35,7 @@ class _HistoricComponentState extends State<HistoricComponent> {
         builder: (context, snapshot) {
           if (snapshot.hasData) {
             return Container(
-              constraints: const BoxConstraints( maxWidth: 420),
+              constraints: const BoxConstraints( maxWidth: 600),
               child: Wrap(
                 spacing: 14,
                 runSpacing: 14,
@@ -65,13 +65,19 @@ class _HistoricComponentState extends State<HistoricComponent> {
                     );
                   }
                   if (checkCapsule != null) {
-                    return Container(
+                    return Tooltip(
+                      message: "${checkCapsule.item2.artists.first.name} - ${checkCapsule.item2.title}".length < 30? "${checkCapsule.item2.artists.first.name} - ${checkCapsule.item2.title}": "${checkCapsule.item2.artists.first.name} - ${checkCapsule.item2.title}".substring(0,30)+"...",
+                        decoration: const BoxDecoration(
+                          border: Border.fromBorderSide(BorderSide(color: Color(0xFF3A3A3A), width: 1)),
+                          color: tooltipBackground, borderRadius: BorderRadius.all(Radius.circular(20))
+                        ),
+                        child: Container(
                       decoration: BoxDecoration(
                           image: DecorationImage(image: NetworkImage((checkCapsule.item2.cover)!)),
                           borderRadius: BorderRadius.circular(5)),
                       height: 60,
                       width: 60,
-                    );
+                    ));
                   } else {
                     return Container(
                       color: bgColor,

Sources/justMUSIC/lib/components/post_component.dart

@@ -152,10 +152,8 @@ class _PostComponentState extends State<PostComponent> with TickerProviderStateM
                             children: [
                               SizedBox(
                                 width: double.infinity,
-                                child: FadeInImage.assetNetwork(
-                                  image: widget.post.music.cover!,
-                                  fadeInDuration: const Duration(milliseconds: 100),
-                                  placeholder: "assets/images/loadingPlaceholder.gif",
+                                child: Image.network(
+                                  widget.post.music.cover!,
                                 ),
                               ),
                               Image(
@@ -196,11 +194,9 @@ class _PostComponentState extends State<PostComponent> with TickerProviderStateM
                                           child: ClipRRect(
                                             borderRadius: BorderRadius.circular(13),
                                             // implement image
-                                            child: FadeInImage.assetNetwork(
-                                              image: widget.post.selfie!,
+                                            child: Image.network(
+                                              widget.post.selfie!,
                                               fit: BoxFit.cover,
-                                              fadeInDuration: const Duration(milliseconds: 100),
-                                              placeholder: "assets/images/loadingPlaceholder.gif",
                                             ),
                                           ),
                                         ),

Sources/justMUSIC/lib/model/Capsule.dart

@@ -0,0 +1,34 @@
+import 'package:tuple/tuple.dart';
+
+import 'Music.dart';
+
+class Capsule {
+  final String _id;
+  late Music _music;
+  Tuple2<String?,String?> _location;
+  DateTime _date;
+
+  // Constructor
+  Capsule(this._id, this._location, this._date);
+
+  //Getters and setters
+  String get id => _id;
+
+  Music get music => _music;
+
+  set music(Music value) {
+    _music = value;
+  }
+
+  Tuple2<String?, String?> get location => _location;
+
+  set location(Tuple2<String?, String?> value) {
+    _location = value;
+  }
+
+  DateTime get date => _date;
+
+  set date(DateTime value) {
+    _date = value;
+  }
+}

Sources/justMUSIC/lib/screens/capsule_historic_screen.dart

@@ -78,8 +78,8 @@ class _CapsuleHistoricScreenState extends State<CapsuleHistoricScreen> {
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 Container(
-                  padding: const EdgeInsets.only(top: 80, left: 60, right: 60),
-                  constraints: const BoxConstraints( maxWidth: 450),
+                  padding: const EdgeInsets.only(top: 80, left: 30, right: 30),
+                  constraints: const BoxConstraints( maxWidth: 700),
                   child: Align(
                     alignment: Alignment.center,
                     child: Row(
@@ -131,7 +131,6 @@ class _CapsuleHistoricScreenState extends State<CapsuleHistoricScreen> {
                   child: SizedBox(
                       width: double.infinity,
                       child: Container(
-                        padding: EdgeInsets.symmetric(horizontal: 15),
                         child: Column(
                           children: [
                             HistoricComponent(

Sources/justMUSIC/lib/screens/detail_post_screen.dart

@@ -612,6 +612,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                           Expanded(
                             child: TextField(
                               keyboardAppearance: Brightness.dark,
+                              keyboardType: TextInputType.text,
                               controller: _textController,
                               focusNode: myFocusNode,
                               onSubmitted: (value) async {
@@ -626,7 +627,6 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                                 setState(() {});
                               },
                               cursorColor: primaryColor,
-                              keyboardType: TextInputType.emailAddress,
                               style: GoogleFonts.plusJakartaSans(color: Colors.white),
                               decoration: InputDecoration(
                                 suffixIcon: _textController.text.isEmpty

Sources/justMUSIC/lib/screens/feed_screen.dart

@@ -25,13 +25,15 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
   late Animation<double> animation;
   late List<Post> friendFeed;
   Timer? timer;
-
+  var pageFriend = 0;
   late List<Post> discoveryFeed;
   late Tuple2<List<Post>, List<Post>> displayFeed;
   bool isDismissed = true;
   bool choiceFeed = true;
   PageController controller = PageController();
 
+
+
   @override
   void initState() {
     super.initState();
@@ -124,9 +126,26 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
   @override
   Widget build(BuildContext context) {
     displayFeed =
-        Tuple2(MyApp.postViewModel.postsFriends.reversed.toList(), MyApp.postViewModel.bestPosts.reversed.toList());
+        Tuple2(MyApp.postViewModel.postsFriends.toList(), MyApp.postViewModel.bestPosts.toList());
     bool empty =
         (choiceFeed == true && displayFeed.item1.isEmpty) || (choiceFeed == false && displayFeed.item2.isEmpty);
+    ScrollController _scrollController = ScrollController();
+    _scrollController.addListener(() {
+      if (_scrollController.position.maxScrollExtent ==
+          _scrollController.position.pixels) {
+        print("fin");
+        if (choiceFeed) {
+          setState(() {
+            MyApp.postViewModel.getMorePostsFriends();
+          });
+        } else {
+          setState(() {
+            MyApp.postViewModel.getMoreBestPosts();
+          });
+        }
+      }
+    });
+
     return Scaffold(
       resizeToAvoidBottomInset: false,
       backgroundColor: bgColor,
@@ -185,6 +204,7 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
                           physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
                           clipBehavior: Clip.none,
                           shrinkWrap: false,
+                          controller: _scrollController,
                           itemCount: displayFeed.item1.length,
                           itemBuilder: (BuildContext context, int index) {
                             return Padding(
@@ -193,6 +213,7 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
                                   PostComponent(callback: openDetailPost, post: displayFeed.item1[index], index: index),
                             );
                           },
+
                         ),
                       ),
                     ),
@@ -212,6 +233,7 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
                         triggerMode: RefreshIndicatorTriggerMode.onEdge,
                         onRefresh: _refresh,
                         child: ListView.builder(
+                          controller: _scrollController,
                           physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
                           clipBehavior: Clip.none,
                           shrinkWrap: false,

Sources/justMUSIC/lib/screens/forget_password_screen.dart

@@ -52,9 +52,9 @@ class _ForgetPasswordScreenState extends State<ForgetPasswordScreen> {
         setState(() => canResendEmail = true);
       } on FirebaseAuthException catch (e) {
         if (e.code == "invalid-email") {
-          error = "Mail incorrect";
-        } else if (e.code == "user-not-found") {
           error = "Format de mail incorrect";
+        } else if (e.code == "user-not-found") {
+          error = "Mail incorrect";
         } else if (e.code == "too-many-requests") {
           error =
               "Trop de tentatives. Veuillez réessayer plus tard";

Sources/justMUSIC/lib/screens/login_screen.dart

@@ -95,7 +95,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                               SizedBox(
                                                 width: 230.w,
                                                 child: Text(
-                                                  "Bon retour parmis nous tu nous as manqué!",
+                                                  "Bon retour parmis nous. Tu nous as manqué !",
                                                   style: GoogleFonts.plusJakartaSans(
                                                       color: Colors.white, fontWeight: FontWeight.w400, fontSize: 20.h),
                                                   textAlign: TextAlign.center,
@@ -116,7 +116,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                               keyboardAppearance: Brightness.dark,
                                               validator: (value) {
                                                 if (value == null || value.isEmpty) {
-                                                  return 'entrez un email valide';
+                                                  return 'Entrez un email valide';
                                                 }
                                                 return null;
                                               },
@@ -148,7 +148,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                               obscureText: passenable,
                                               validator: (value) {
                                                 if (value == null || value.isEmpty) {
-                                                  return 'entrez un mot de passe valide';
+                                                  return 'Entrez un mot de passe valide';
                                                 }
                                                 return null;
                                               },
@@ -233,7 +233,7 @@ class _LoginScreenState extends State<LoginScreen> {
                                                           fontSize: 15),
                                                       children: <TextSpan>[
                                                         TextSpan(
-                                                            text: " S’inscire",
+                                                            text: " S’inscrire",
                                                             style: GoogleFonts.plusJakartaSans(
                                                                 fontSize: 15,
                                                                 fontWeight: FontWeight.w400,

Sources/justMUSIC/lib/screens/profile_screen.dart

@@ -2,6 +2,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:google_fonts/google_fonts.dart';
+import 'package:justmusic/services/AuthService.dart';
 import 'package:justmusic/values/icons.dart';
 import '../components/profile_component.dart';
 import '../components/setting_part_component.dart';
@@ -32,7 +33,40 @@ class _ProfileScreenState extends State<ProfileScreen> {
       Navigator.of(context).push(routeUser(MyApp.userViewModel.userCurrent));
     }
 
-    void _openPassword() {
+    void openConfirmationDelete() {
+        showCupertinoModalPopup<void>(
+          context: context,
+          barrierColor: Colors.black.withOpacity(0.7),
+          builder: (BuildContext context) => Container(
+            child: CupertinoActionSheet(
+              title: Text(
+                'Supprimer mon compte',
+                style: GoogleFonts.plusJakartaSans(fontWeight: FontWeight.bold),
+              ),
+              actions: <CupertinoActionSheetAction>[
+                CupertinoActionSheetAction(
+                  onPressed: () {
+                    MyApp.userViewModel.delete();
+                    Navigator.pop(context);
+                    Navigator.of(context).push(routeWelcome());
+
+                  },
+                  child: Text('Confirmer', style: TextStyle(color: Colors.blue),),
+                ),
+              ],
+              cancelButton: CupertinoActionSheetAction(
+                isDestructiveAction: true,
+                onPressed: () {
+                  Navigator.pop(context);
+                },
+                child: const Text('Annuler'),
+              ),
+            ),
+          ),
+        );
+    }
+
+    void openPassword() {
       Navigator.of(context).push(routePassword());
     }
 
@@ -122,12 +156,12 @@ class _ProfileScreenState extends State<ProfileScreen> {
                           SettingPartComponent(
                             icon: JustMusicIcon.password,
                             label: 'Modifier mon mot de passe',
-                            action: _openPassword,
+                            action: openPassword,
                           ),
-                          const SettingPartComponent(
+                          SettingPartComponent(
                             icon: JustMusicIcon.trash,
                             label: 'Supprimer mon compte',
-                            action: null,
+                            action: openConfirmationDelete,
                           ),
                           SettingPartComponent(
                             icon: JustMusicIcon.cross,

Sources/justMUSIC/lib/services/CapsuleService.dart

@@ -0,0 +1,33 @@
+import 'package:cloud_firestore/cloud_firestore.dart';
+
+class CapsuleService {
+  Future<List<bool>> recapSevenDays(String id) async {
+    List<bool> recapList = [];
+
+    DateTime sevenDaysAgo = DateTime.now().subtract(Duration(days: 6));
+
+    QuerySnapshot<Map<String, dynamic>> response = await FirebaseFirestore
+        .instance
+        .collection("capsules")
+        .where("user_id", isEqualTo: id)
+        .get();
+
+    List<Map<String, dynamic>?> capsuleList = response.docs
+        .map((DocumentSnapshot<Map<String, dynamic>> doc) => doc.data())
+        .toList();
+
+    for (int i = 0; i < 7; i++) {
+      DateTime date = sevenDaysAgo.add(Duration(days: i));
+      bool capsuleExists = capsuleList.any((post) =>
+      post?["date"] != null &&
+          post?["date"].toDate().year == date.year &&
+          post?["date"].toDate().month == date.month &&
+          post?["date"].toDate().day == date.day);
+
+      recapList.add(capsuleExists);
+    }
+
+    return recapList;
+  }
+
+}

Sources/justMUSIC/lib/services/MusicService.dart

@@ -37,7 +37,7 @@ class MusicService {
     List<Tuple2<int, String>> capsules = [];
 
     var querySnapshot = await FirebaseFirestore.instance
-        .collection('posts')
+        .collection('capsules')
         .where('user_id', isEqualTo: idUser)
         .where('date', isGreaterThanOrEqualTo: DateTime(year, month))
         .where('date', isLessThan: DateTime(year, month + 1))

Sources/justMUSIC/lib/services/PostService.dart

@@ -23,6 +23,15 @@ class PostService {
 
     var userRef = MyApp.db.collection("users").doc(id);
 
+    var capsule = {
+      "user_id": id,
+      "date": DateTime.now(),
+      "place": [location?.item1, location?.item2],
+      "song_id": idMusic,
+    };
+
+    await MyApp.db.collection("capsules").doc(postAdd.id).set(capsule);
+
     await MyApp.db.runTransaction((transaction) async {
       var userSnapshot = await transaction.get(userRef);
       if (userSnapshot.exists) {
@@ -42,16 +51,41 @@ class PostService {
 
   deletePost() {}
 
-  Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getPopularPosts(
-      {int limit = 10,
-      QueryDocumentSnapshot<Map<String, dynamic>>? offset}) async {
+  Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getPopularPosts(int limit) async {
+    DateTime twentyFourHoursAgo = DateTime.now().subtract(Duration(hours: 24));
+    var response = await FirebaseFirestore.instance
+        .collection("posts")
+        .where("date", isGreaterThan: twentyFourHoursAgo)
+        .orderBy("date", descending: true)
+        .limit(limit)
+        .get();
+
+    MyApp.postViewModel.lastPostDiscovery = response.docs.isNotEmpty
+        ? response.docs.last
+        : MyApp.postViewModel.lastPostDiscovery;
+
+    var filteredPosts = response.docs.where((doc) {
+      String user = doc["user_id"];
+      return user != MyApp.userViewModel.userCurrent.id;
+    }).toList();
+    return filteredPosts;
+  }
+
+  Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getMorePopularPosts(int limit) async {
+    DateTime twentyFourHoursAgo = DateTime.now().subtract(Duration(hours: 24));
     QuerySnapshot<Map<String, dynamic>> response;
     response = await FirebaseFirestore.instance
         .collection("posts")
-        .orderBy("date")
+        .where("date", isGreaterThan: twentyFourHoursAgo)
+        .orderBy("date", descending: true)
         .limit(limit)
+        .startAfterDocument(MyApp.postViewModel.lastPostDiscovery)
         .get();
 
+    MyApp.postViewModel.lastPostDiscovery = response.docs.isNotEmpty
+        ? response.docs.last
+        : MyApp.postViewModel.lastPostDiscovery;
+
     var filteredPosts = response.docs.where((doc) {
       String user = doc["user_id"];
       return user != MyApp.userViewModel.userCurrent.id;
@@ -59,18 +93,41 @@ class PostService {
     return filteredPosts;
   }
 
-  Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getPostsFriends(
-      {int limit = 10, int offset = 0}) async {
+  Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getPostsFriends(int limit) async {
+    var response = await FirebaseFirestore.instance
+        .collection("posts")
+        .where("user_id", whereIn: [
+          MyApp.userViewModel.userCurrent.id,
+          ...MyApp.userViewModel.userCurrent.followed
+        ])
+        .where("")
+        .orderBy("date", descending: true)
+        .limit(limit)
+        .get();
+
+    MyApp.postViewModel.lastPostFriend = response.docs.isNotEmpty
+        ? response.docs.last
+        : MyApp.postViewModel.lastPostFriend;
+
+    return response.docs;
+  }
+
+  Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getMorePostsFriends(int limit) async {
     var response = await FirebaseFirestore.instance
         .collection("posts")
         .where("user_id", whereIn: [
           MyApp.userViewModel.userCurrent.id,
           ...MyApp.userViewModel.userCurrent.followed
         ])
-        .orderBy("date")
+        .orderBy("date", descending: true)
         .limit(limit)
+        .startAfterDocument(MyApp.postViewModel.lastPostFriend)
         .get();
 
+    MyApp.postViewModel.lastPostFriend = response.docs.isNotEmpty
+        ? response.docs.last
+        : MyApp.postViewModel.lastPostFriend;
+
     return response.docs;
   }
 
@@ -93,35 +150,6 @@ class PostService {
     return !isTodayAvailable;
   }
 
-  Future<List<bool>> recapSevenDays(String id) async {
-    List<bool> recapList = [];
-
-    DateTime sevenDaysAgo = DateTime.now().subtract(Duration(days: 6));
-
-    QuerySnapshot<Map<String, dynamic>> response = await FirebaseFirestore
-        .instance
-        .collection("posts")
-        .where("user_id", isEqualTo: id)
-        .get();
-
-    List<Map<String, dynamic>?> postList = response.docs
-        .map((DocumentSnapshot<Map<String, dynamic>> doc) => doc.data())
-        .toList();
-
-    for (int i = 0; i < 7; i++) {
-      DateTime date = sevenDaysAgo.add(Duration(days: i));
-      bool postExists = postList.any((post) =>
-          post?["date"] != null &&
-          post?["date"].toDate().year == date.year &&
-          post?["date"].toDate().month == date.month &&
-          post?["date"].toDate().day == date.day);
-
-      recapList.add(postExists);
-    }
-
-    return recapList;
-  }
-
   Future<List<String>> getLikesByPostId(String id) async {
     var response =
         await FirebaseFirestore.instance.collection("posts").doc(id).get();

Sources/justMUSIC/lib/values/constants.dart

@@ -24,6 +24,7 @@ const searchBarColor = Color(0xFF161616);
 const postbutton = Color(0xFF1B1B1B);
 const fillButton = Color(0xFF633AF4);
 const selectedButton = Color(0xFF1F1B2E);
+const tooltipBackground = Color(0xFF2D2D2D);
 // All constants important too us
 
 const defaultPadding = 30.0;

Sources/justMUSIC/lib/view_model/MusicViewModel.dart

@@ -241,8 +241,12 @@ class MusicViewModel {
       var musics = await getMusicsWithIds(capsulesData.map((capsule) => capsule.item2).toList());
 
       for (var capsule in capsulesData) {
-        var music = musics.firstWhere((music) => music.id == capsule.item2);
-        print(capsule.item1);
+        var music = musics.firstWhere(
+              (music) => music.id == capsule.item2,
+          orElse: () => Music("-1", "", "", "", 0, 0, false, []),
+        );
+
+        if (music.id != "-1")
           capsules.add(Tuple2(capsule.item1, music));
       }
       return capsules;

Sources/justMUSIC/lib/view_model/PostViewModel.dart

@@ -1,6 +1,7 @@
 import 'dart:io';
 
 import 'package:justmusic/model/Post.dart';
+import 'package:justmusic/services/CapsuleService.dart';
 import 'package:justmusic/services/PostService.dart';
 import 'package:tuple/tuple.dart';
 
@@ -11,7 +12,10 @@ import '../model/mapper/PostMapper.dart';
 class PostViewModel {
   List<Post> _postsFriends = [];
   List<Post> _bestPosts = [];
+  var lastPostFriend;
+  var lastPostDiscovery;
   final PostService _postService = PostService();
+  final CapsuleService _capsuleService = CapsuleService();
 
   // Constructor
   PostViewModel();
@@ -26,10 +30,10 @@ class PostViewModel {
     await _postService.createPost(description, idMusic, image, location);
   }
 
-  Future<List<Post>> getPostsFriends() async {
+  Future<List<Post>> getPostsFriends({int limit = 10}) async {
     try {
       _postsFriends = [];
-      var responseData = await _postService.getPostsFriends();
+      var responseData = await _postService.getPostsFriends(limit);
       List<String> ids = [];
       var postsFutures = responseData.map((value) {
         ids.add(value.data()["song_id"]);
@@ -40,7 +44,7 @@ class PostViewModel {
       for (int i = 0; i < posts.length; i++) {
         posts[i].music = musics[i];
       }
-      _postsFriends = posts;
+      _postsFriends.addAll(posts);
       return _postsFriends;
     } catch (e) {
       print(e);
@@ -49,13 +53,29 @@ class PostViewModel {
     }
   }
 
-  List<Post> getMorePostsFriends() {
-    throw new Error();
+  void getMorePostsFriends({int limit = 10}) async {
+    try {
+      var responseData = await _postService.getMorePostsFriends(limit);
+      List<String> ids = [];
+      var postsFutures = responseData.map((value) {
+        ids.add(value.data()["song_id"]);
+        return PostMapper.toModel(value);
+      }).toList();
+      var posts = await Future.wait(postsFutures);
+      List<Music> musics = await MyApp.musicViewModel.getMusicsWithIds(ids);
+      for (int i = 0; i < posts.length; i++) {
+        posts[i].music = musics[i];
+      }
+      _postsFriends.addAll(posts);
+    } catch (e) {
+      print(e);
+    }
   }
 
-  Future<List<Post>> getBestPosts() async {
+  Future<List<Post>> getBestPosts({int limit = 10}) async {
     try {
-      var responseData = await _postService.getPopularPosts();
+      _bestPosts = [];
+      var responseData = await _postService.getPopularPosts(limit);
       List<String> ids = [];
       var postsFutures = responseData.map((value) async {
         ids.add(value.data()["song_id"]);
@@ -66,7 +86,7 @@ class PostViewModel {
       for (int i = 0; i < posts.length; i++) {
         posts[i].music = musics[i];
       }
-      _bestPosts = posts;
+      _bestPosts.addAll(posts);
       return _bestPosts;
     } catch (e) {
       print(e);
@@ -75,13 +95,28 @@ class PostViewModel {
     }
   }
 
-  List<Post> getMoreBestPosts() {
-    throw new Error();
+  void getMoreBestPosts({int limit = 10}) async {
+    try {
+      var responseData = await _postService.getMorePopularPosts(limit);
+      List<String> ids = [];
+      var postsFutures = responseData.map((value) async {
+        ids.add(value.data()["song_id"]);
+        return await PostMapper.toModel(value);
+      }).toList();
+      var posts = await Future.wait(postsFutures);
+      List<Music> musics = await MyApp.musicViewModel.getMusicsWithIds(ids);
+      for (int i = 0; i < posts.length; i++) {
+        posts[i].music = musics[i];
+      }
+      _bestPosts.addAll(posts);
+    } catch (e) {
+      print(e);
+    }
   }
 
   Future<List<bool>> recapSevenDays(String id) async {
     try {
-      return await _postService.recapSevenDays(id);
+      return await _capsuleService.recapSevenDays(id);
     } catch (e) {
       print(e);
       rethrow;
@@ -112,7 +147,6 @@ class PostViewModel {
       print(bool);
       return bool;
     } catch (e) {
-      print("haaaaaaaaa");
       rethrow;
     }
   }

Sources/justMUSIC/pubspec.lock

@@ -784,14 +784,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.9.0"
-  image_picker_web:
-    dependency: "direct main"
-    description:
-      name: image_picker_web
-      sha256: e1656f1ce48a614aefdf22ab73c0cc7e498fa7b78893ffdcc83171e7289092e0
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.1.1"
   image_picker_windows:
     dependency: transitive
     description:

Sources/justMUSIC/pubspec.yaml

@@ -78,7 +78,6 @@ dependencies:
   google_sign_in: ^6.1.4
   flutter_launcher_icons: ^0.13.1
   fullscreen_window: ^1.0.3
-  image_picker_web: ^3.1.1
 
 dev_dependencies:
   flutter_test: