Merge with HISTORIC_CAPSULE_LDE 🔀

Sources/justMUSIC/lib/components/historic_component.dart

@@ -1,8 +1,16 @@
 import 'package:flutter/Material.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:google_fonts/google_fonts.dart';
+import 'package:justmusic/main.dart';
+import 'package:justmusic/values/constants.dart';
+import 'package:tuple/tuple.dart';
+
+import '../model/Music.dart';
 
 class HistoricComponent extends StatefulWidget {
   final int month;
-  const HistoricComponent({super.key, required this.month});
+  final int year;
+  const HistoricComponent({super.key, required this.month, required this.year});
 
   @override
   State<HistoricComponent> createState() => _HistoricComponentState();
@@ -17,27 +25,72 @@ class _HistoricComponentState extends State<HistoricComponent> {
     return DateTime(year, month + 1, 0).day;
   }
 
+  getHistoric() {}
+
   @override
   Widget build(BuildContext context) {
+    return FutureBuilder(
+        future: MyApp.musicViewModel
+            .getHistoryCapsulesMonthWhitIdUser(MyApp.userViewModel.userCurrent.id, widget.month, widget.year),
+        builder: (context, snapshot) {
+          if (snapshot.hasData) {
             return Wrap(
               spacing: 14,
               runSpacing: 14,
-      children: List.generate(getNumberOfDaysInMonth(DateTime.now().year, widget.month), (index) {
+              children: List.generate(getNumberOfDaysInMonth(widget.year, widget.month), (index) {
-        // Generate widgets
+                Tuple2<int, Music>? checkCapsule;
-        return LimitedBox(
+                if (snapshot.data != null) {
-          maxWidth: MediaQuery.of(context).size.width - 40 / 5,
+                  for (var element in snapshot.data!) {
-          child: Container(
+                    if (element.item1 == index + 1) {
+                      checkCapsule = element;
+                    }
+                  }
+                }
+
+                if ((widget.year > DateTime.now().year || widget.month > DateTime.now().month) ||
+                    (widget.year == DateTime.now().year &&
+                        widget.month == DateTime.now().month &&
+                        index > DateTime.now().day)) {
+                  return Container(
                     decoration: BoxDecoration(
                         gradient: LinearGradient(colors: [
                           Color(0xFF1E1E1E).withOpacity(0.7),
                           Color(0xFF1E1E1E).withOpacity(0),
                         ], begin: Alignment.topCenter, end: Alignment.bottomCenter),
-                borderRadius: BorderRadius.circular(3)),
+                        borderRadius: BorderRadius.circular(5)),
+                    height: 60,
+                    width: 60,
+                  );
+                }
+                if (checkCapsule != null) {
+                  return Container(
+                    decoration: BoxDecoration(
+                        image: DecorationImage(image: NetworkImage((checkCapsule.item2.cover)!)),
+                        borderRadius: BorderRadius.circular(5)),
+                    height: 60,
+                    width: 60,
+                  );
+                } else {
+                  return Container(
+                    color: bgColor,
                     height: 60,
                     width: 60,
+                    child: Center(
+                      child: Text(
+                        (index + 1).toString(),
+                        style:
+                            GoogleFonts.plusJakartaSans(color: Colors.white, fontSize: 22, fontWeight: FontWeight.w800),
+                      ),
                     ),
                   );
+                }
+
+                // Generate widgets
               }),
             );
+          } else {
+            return CupertinoActivityIndicator();
+          }
+        });
   }
 }

Sources/justMUSIC/lib/main.dart

@@ -26,6 +26,9 @@ import 'package:justmusic/view_model/UserViewModel.dart';
 import 'package:justmusic/model/User.dart' as userJustMusic;
 import 'firebase_options.dart';
 import 'package:timezone/data/latest.dart' as tz;
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart';
+import 'package:intl/date_symbol_data_local.dart';
 
 Future<void> main() async {
   tz.initializeTimeZones();
@@ -35,6 +38,7 @@ Future<void> main() async {
   await Firebase.initializeApp(
     options: DefaultFirebaseOptions.currentPlatform,
   );
+  await initializeDateFormatting('fr_FR', null);
   await FirebaseMessaging.instance.requestPermission(sound: true);
   runApp(const MyApp());
 }

Sources/justMUSIC/lib/screens/capsule_historic_screen.dart

@@ -3,6 +3,7 @@ import 'package:google_fonts/google_fonts.dart';
 
 import '../components/historic_component.dart';
 import '../values/constants.dart';
+import 'package:intl/intl.dart';
 
 class CapsuleHistoricScreen extends StatefulWidget {
   const CapsuleHistoricScreen({super.key});
@@ -12,6 +13,20 @@ class CapsuleHistoricScreen extends StatefulWidget {
 }
 
 class _CapsuleHistoricScreenState extends State<CapsuleHistoricScreen> {
+  DateTime date = DateTime.now();
+
+  _reduceMonth() {
+    setState(() {
+      date = DateTime(date.year, date.month - 1, date.day);
+    });
+  }
+
+  _addMonth() {
+    setState(() {
+      date = DateTime(date.year, date.month + 1, date.day);
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -60,29 +75,72 @@ class _CapsuleHistoricScreenState extends State<CapsuleHistoricScreen> {
             padding: const EdgeInsets.symmetric(horizontal: settingPadding),
             child: Column(
               mainAxisAlignment: MainAxisAlignment.center,
-              crossAxisAlignment: CrossAxisAlignment.start,
+              crossAxisAlignment: CrossAxisAlignment.center,
+              children: [
+                Padding(
+                  padding: const EdgeInsets.only(top: 80, left: 60, right: 60),
+                  child: Align(
+                    alignment: Alignment.center,
+                    child: Row(
+                      mainAxisSize: MainAxisSize.max,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                       children: [
+                        GestureDetector(
+                          child: Container(
+                            padding: EdgeInsets.symmetric(horizontal: 10),
+                            height: 30,
+                            width: 30,
+                            child: Image(
+                              image: AssetImage("assets/images/return_icon.png"),
+                              height: 8,
+                            ),
+                          ),
+                          onTap: _reduceMonth,
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 30),
+                          child: Text(
+                            '${DateFormat.MMMM('fr_FR').format(date)[0].toUpperCase()}${DateFormat.MMMM('fr_FR').format(date).substring(1)} ${date.year}',
+                            style: GoogleFonts.plusJakartaSans(
+                                color: Colors.white, fontWeight: FontWeight.w600, fontSize: 16),
+                          ),
+                        ),
+                        GestureDetector(
+                          onTap: _addMonth,
+                          child: Transform(
+                              alignment: Alignment.center,
+                              transform: Matrix4.rotationY(3.14159265),
+                              child: Container(
+                                padding: EdgeInsets.symmetric(horizontal: 10),
+                                height: 30,
+                                width: 30,
+                                child: Image(
+                                  image: AssetImage("assets/images/return_icon.png"),
+                                  height: 8,
+                                ),
+                              )),
+                        )
+                      ],
+                    ),
+                  ),
+                ),
                 Padding(
                   padding: EdgeInsets.only(top: 30, bottom: 40),
                   child: SizedBox(
                       width: double.infinity,
-                    child: Stack(
+                      child: Container(
-                      alignment: Alignment.center,
-                      children: [
-                        Container(
                         padding: EdgeInsets.symmetric(horizontal: 15),
                         constraints: BoxConstraints(maxWidth: 600),
                         child: Column(
                           children: [
                             HistoricComponent(
-                                month: DateTime.now().month,
+                              month: date.month,
-                              ),
+                              year: date.year,
-                            ],
                             ),
-                        )
                           ],
                         ),
-                  ),
+                      )),
                 ),
               ],
             ),

Sources/justMUSIC/lib/services/MusicService.dart

@@ -33,9 +33,8 @@ class MusicService {
     }
   }
 
-  Future<List<Tuple2<String, String>>> getHistoryCapsulesMonthWhitIdUser(
+  Future<List<Tuple2<int, String>>> getHistoryCapsulesMonthWhitIdUser(String idUser, int month, int year) async {
-      String idUser, int month, int year) async {
+    List<Tuple2<int, String>> capsules = [];
-    List<Tuple2<String, String>> capsules = [];
 
     var querySnapshot = await FirebaseFirestore.instance
         .collection('posts')
@@ -46,8 +45,7 @@ class MusicService {
         .get();
 
     for (var document in querySnapshot.docs) {
-      capsules.add(Tuple2(document.data()['date'].toDate().day.toString(),
+      capsules.add(Tuple2(document.data()['date'].toDate().day, document.data()['song_id']));
-          document.data()['idMusic']));
     }
 
     return capsules;

Sources/justMUSIC/lib/view_model/MusicViewModel.dart

@@ -2,6 +2,7 @@ import 'dart:convert';
 
 import 'package:justmusic/view_model/TokenSpotify.dart';
 import 'package:http/http.dart' as http;
+import 'package:tuple/tuple.dart';
 import '../main.dart';
 import '../model/Artist.dart';
 import '../model/Music.dart';
@@ -231,4 +232,23 @@ class MusicViewModel {
       rethrow;
     }
   }
+
+  Future<List<Tuple2<int, Music>>> getHistoryCapsulesMonthWhitIdUser(String idUser, int month, int year) async {
+    try {
+      List<Tuple2<int, Music>> capsules = [];
+      var capsulesData = await _musicService.getHistoryCapsulesMonthWhitIdUser(idUser, month, year);
+
+      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);
+        capsules.add(Tuple2(capsule.item1, music));
+      }
+      return capsules;
+    } catch (e) {
+      print(e);
+      rethrow;
+    }
+  }
 }