From 929f090464e34e3c42c2e992bcc434b1cca2e324 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Wed, 2 Aug 2023 23:54:07 +0200 Subject: [PATCH 1/4] change text artist and title --- .../lib/components/comment_component.dart | 21 +- Sources/justMUSIC/lib/main.dart | 2 + .../lib/model/mapper/CommentMapper.dart | 6 +- .../lib/screens/detail_post_screen.dart | 728 ++++++++++-------- .../lib/view_model/CommentViewModel.dart | 9 +- 5 files changed, 417 insertions(+), 349 deletions(-) diff --git a/Sources/justMUSIC/lib/components/comment_component.dart b/Sources/justMUSIC/lib/components/comment_component.dart index 2f86d14..859df15 100644 --- a/Sources/justMUSIC/lib/components/comment_component.dart +++ b/Sources/justMUSIC/lib/components/comment_component.dart @@ -2,17 +2,24 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; +import 'package:justmusic/model/Comment.dart'; + import '../values/constants.dart'; class CommentComponent extends StatelessWidget { - const CommentComponent({Key? key}) : super(key: key); + final Comment comment; + const CommentComponent({Key? key, required this.comment}) : super(key: key); @override Widget build(BuildContext context) { + final now = DateTime.now(); + final difference = now.difference(comment.date); + return Container( width: double.infinity, decoration: BoxDecoration(color: bgComment, borderRadius: BorderRadius.circular(20)), padding: EdgeInsets.all(20), + margin: EdgeInsets.only(bottom: 20), child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -20,28 +27,30 @@ class CommentComponent extends StatelessWidget { child: SizedBox.fromSize( // Image radius child: Image( - image: AssetImage("assets/images/exemple_profile.png"), + image: NetworkImage(comment.user.pp), width: 40, ), ), ), Expanded( child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.start, children: [ SizedBox( width: 10, ), Text( - "Melina", + comment.user.pseudo, style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w600), ), Padding( padding: EdgeInsets.only(top: 6, left: 10), child: Text( - "Il y a 2 min(s)", + "il y a ${difference.inHours}h", style: GoogleFonts.plusJakartaSans( color: Colors.white.withOpacity(0.6), fontWeight: FontWeight.w400, fontSize: 10), ), @@ -54,8 +63,8 @@ class CommentComponent extends StatelessWidget { Padding( padding: const EdgeInsets.symmetric(horizontal: 10), child: Text( - "J’adore ce son aussi, je trouve qu’il avait vraiment une plume de fou.", - style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w300, fontSize: 11), + comment.text, + style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w400, fontSize: 12), ), ), ], diff --git a/Sources/justMUSIC/lib/main.dart b/Sources/justMUSIC/lib/main.dart index 7baa4cb..f04370c 100644 --- a/Sources/justMUSIC/lib/main.dart +++ b/Sources/justMUSIC/lib/main.dart @@ -17,6 +17,7 @@ import 'package:justmusic/screens/profile_screen.dart'; import 'package:justmusic/screens/registration_screen.dart'; import 'package:justmusic/screens/welcome_screen.dart'; import 'package:justmusic/values/constants.dart'; +import 'package:justmusic/view_model/CommentViewModel.dart'; import 'package:justmusic/view_model/MusicViewModel.dart'; import 'package:justmusic/view_model/PostViewModel.dart'; import 'package:justmusic/view_model/UserViewModel.dart'; @@ -38,6 +39,7 @@ class MyApp extends StatefulWidget { static MusicViewModel musicViewModel = MusicViewModel(); static PostViewModel postViewModel = PostViewModel(); static AudioPlayer audioPlayer = AudioPlayer(); + static CommentViewModel commentViewModel = CommentViewModel(); const MyApp({super.key}); diff --git a/Sources/justMUSIC/lib/model/mapper/CommentMapper.dart b/Sources/justMUSIC/lib/model/mapper/CommentMapper.dart index cbd52e6..3977830 100644 --- a/Sources/justMUSIC/lib/model/mapper/CommentMapper.dart +++ b/Sources/justMUSIC/lib/model/mapper/CommentMapper.dart @@ -8,10 +8,6 @@ class CommentMapper { static Future toModel(DocumentSnapshot> snapshot) async { final data = snapshot.data(); User? user = await MyApp.userViewModel.getUser(data?['user_id']); - return Comment( - snapshot.id, - user!, - data?["text"], - data?["date"]); + return Comment(snapshot.id, user!, data?["text"] ?? "", data?["date"].toDate()); } } diff --git a/Sources/justMUSIC/lib/screens/detail_post_screen.dart b/Sources/justMUSIC/lib/screens/detail_post_screen.dart index 92be9b3..ef8dfb9 100644 --- a/Sources/justMUSIC/lib/screens/detail_post_screen.dart +++ b/Sources/justMUSIC/lib/screens/detail_post_screen.dart @@ -1,6 +1,7 @@ import 'dart:async'; import 'package:flutter/Material.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/services.dart'; import 'package:flutter_keyboard_visibility/flutter_keyboard_visibility.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; @@ -15,6 +16,7 @@ import '../components/comment_component.dart'; import '../main.dart'; import '../model/Post.dart'; +import '../model/Comment.dart'; import '../values/constants.dart'; class DetailPostScreen extends StatefulWidget { @@ -73,373 +75,429 @@ class _DetailPostScreenState extends State { @override Widget build(BuildContext context) { return GestureDetector( - onTap: () { - FocusScopeNode currentFocus = FocusScope.of(context); - if (!currentFocus.hasPrimaryFocus) { - currentFocus.unfocus(); - resetFullScreen(); - } - }, - child: Container( - height: 760.h, - child: Column( - children: [ - Expanded( - child: Stack( - children: [ - ScrollConfiguration( - behavior: MyBehavior(), - child: SingleChildScrollView( - controller: _scrollController, - physics: AlwaysScrollableScrollPhysics(), - child: Stack( - clipBehavior: Clip.hardEdge, + onTap: () { + FocusScopeNode currentFocus = FocusScope.of(context); + if (!currentFocus.hasPrimaryFocus) { + currentFocus.unfocus(); + resetFullScreen(); + } + }, + child: Container( + height: 760.h, + child: Column( + children: [ + Expanded( + child: Stack( + children: [ + ScrollConfiguration( + behavior: MyBehavior(), + child: SingleChildScrollView( + controller: _scrollController, + physics: AlwaysScrollableScrollPhysics(), + child: Stack( + clipBehavior: Clip.hardEdge, + children: [ + Align( + alignment: Alignment.topCenter, + child: Container( + height: 400, + width: double.infinity, + child: FadeInImage.assetNetwork( + placeholder: "assets/images/loadingPlaceholder.gif", + image: choice ? widget.post.selfie! : widget.post.music.cover!, + width: double.infinity, + fit: BoxFit.cover, + ), + ), + ), + Column( children: [ - Align( - alignment: Alignment.topCenter, - child: Container( - height: 400, - width: double.infinity, - child: FadeInImage.assetNetwork( - placeholder: "assets/images/loadingPlaceholder.gif", - image: choice ? widget.post.selfie! : widget.post.music.cover!, - width: double.infinity, - fit: BoxFit.cover, - ), - )), - Column( - children: [ - Container( - height: 200, - margin: EdgeInsets.only(top: 230), - width: double.infinity, - decoration: const BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topCenter, - end: Alignment.bottomCenter, - colors: [Colors.transparent, bgModal], - stops: [0, 0.8]), - ), - child: Padding( - padding: const EdgeInsets.fromLTRB(20, 0, 20, 10), - child: Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Padding( - padding: const EdgeInsets.only(right: 10), - child: choice - ? Padding( - padding: const EdgeInsets.all(4), - child: ClipOval( - child: SizedBox.fromSize( - // Image radius - child: Image( - image: NetworkImage(widget.post.user.pp), - width: 45, + Container( + height: 200, + margin: EdgeInsets.only(top: 230), + width: double.infinity, + decoration: const BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [Colors.transparent, bgModal], + stops: [0, 0.8], + ), + ), + child: Padding( + padding: const EdgeInsets.fromLTRB(20, 0, 20, 10), + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Padding( + padding: const EdgeInsets.only(right: 10), + child: choice + ? Padding( + padding: const EdgeInsets.all(4), + child: ClipOval( + child: SizedBox.fromSize( + // Image radius + child: Image( + image: NetworkImage(widget.post.user.pp), + width: 45, + ), + ), + ), + ) + : widget.post.music.previewUrl != null + ? ButtonPlayComponent(music: widget.post.music) + : Container(), + ), + Flexible( + child: Column( + mainAxisAlignment: MainAxisAlignment.end, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Flexible( + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + Expanded( + child: ScrollConfiguration( + behavior: ScrollBehavior().copyWith(scrollbars: false), + child: TextScroll( + choice ? widget.post.user.pseudo : widget.post.music.title!, + style: GoogleFonts.plusJakartaSans( + height: 1, + color: Colors.white, + fontWeight: FontWeight.w800, + fontSize: 22, ), + mode: TextScrollMode.endless, + pauseBetween: Duration(milliseconds: 500), + velocity: Velocity(pixelsPerSecond: Offset(20, 0)), ), ), - ) - : widget.post.music.previewUrl != null - ? ButtonPlayComponent(music: widget.post.music) - : Container(), - ), - Flexible( - child: Column( - mainAxisAlignment: MainAxisAlignment.end, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Flexible( - child: Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - Expanded( - child: ScrollConfiguration( - behavior: ScrollBehavior().copyWith(scrollbars: false), - child: TextScroll( - choice - ? widget.post.user.pseudo - : widget.post.music.title!, + ), + Padding( + padding: const EdgeInsets.only(left: 20.0), + child: choice + ? DateTime(today.year, today.month, today.day).isAtSameMomentAs( + DateTime( + widget.post.date.year, + widget.post.date.month, + widget.post.date.day, + ), + ) + ? Text( + "Aujourd'hui, ${widget.post.date.hour}:${widget.post.date.minute}", style: GoogleFonts.plusJakartaSans( - height: 1, - color: Colors.white, - fontWeight: FontWeight.w800, - fontSize: 22), - mode: TextScrollMode.endless, - pauseBetween: Duration(milliseconds: 500), - velocity: Velocity(pixelsPerSecond: Offset(20, 0)), - ))), - Padding( - padding: const EdgeInsets.only(left: 20.0), - child: choice - ? DateTime(today.year, today.month, today.day) - .isAtSameMomentAs(DateTime(widget.post.date.year, - widget.post.date.month, widget.post.date.day)) - ? Text( - "Aujourd'hui, ${widget.post.date.hour}:${widget.post.date.minute}", - style: GoogleFonts.plusJakartaSans( - height: 1, - color: Colors.white, - fontWeight: FontWeight.w900, - fontSize: 18), - ) - : Text( - "hier, ${widget.post.date.hour}:${widget.post.date.minute}", - style: GoogleFonts.plusJakartaSans( - height: 1, - color: Colors.white, - fontWeight: FontWeight.w900, - fontSize: 18), - ) + height: 1, + color: Colors.white, + fontWeight: FontWeight.w900, + fontSize: 18, + ), + ) : Text( - widget.post.music.date.toString(), + "hier, ${widget.post.date.hour}:${widget.post.date.minute}", style: GoogleFonts.plusJakartaSans( - height: 1, - color: Colors.white, - fontWeight: FontWeight.w900, - fontSize: 18), - ), - ) - ], - ), - ), - choice - ? widget.post.location.item2 != null - ? Text( - "${widget.post.location.item1}, ${widget.post.location.item2}", - style: GoogleFonts.plusJakartaSans( - color: Colors.white.withOpacity(0.5), - fontWeight: FontWeight.w400, - fontSize: 15), - ) + height: 1, + color: Colors.white, + fontWeight: FontWeight.w900, + fontSize: 18, + ), + ) : Text( - "", + widget.post.music.date.toString(), style: GoogleFonts.plusJakartaSans( - color: Colors.white.withOpacity(0.4), - fontWeight: FontWeight.w300, - fontSize: 13), - ) - : ScrollConfiguration( - behavior: ScrollBehavior().copyWith(scrollbars: false), - child: TextScroll(widget.post.music.artists.first.name!, - style: GoogleFonts.plusJakartaSans( - height: 1, - color: Colors.white, - fontWeight: FontWeight.w500, - fontSize: 17), - mode: TextScrollMode.endless, - pauseBetween: Duration(milliseconds: 500), - velocity: Velocity(pixelsPerSecond: Offset(20, 0))), - ) - ], + height: 1, + color: Colors.white, + fontWeight: FontWeight.w900, + fontSize: 18, + ), + ), + ), + ], + ), ), - ), - ], + choice + ? widget.post.location.item2 != null + ? Text( + "${widget.post.location.item1}, ${widget.post.location.item2}", + style: GoogleFonts.plusJakartaSans( + color: Colors.white.withOpacity(0.5), + fontWeight: FontWeight.w400, + fontSize: 15, + ), + ) + : Text( + "", + style: GoogleFonts.plusJakartaSans( + color: Colors.white.withOpacity(0.4), + fontWeight: FontWeight.w300, + fontSize: 13, + ), + ) + : ScrollConfiguration( + behavior: ScrollBehavior().copyWith(scrollbars: false), + child: TextScroll( + widget.post.music.artists.first.name!, + style: GoogleFonts.plusJakartaSans( + height: 1, + color: Colors.white, + fontWeight: FontWeight.w500, + fontSize: 17, + ), + mode: TextScrollMode.endless, + pauseBetween: Duration(milliseconds: 500), + velocity: Velocity(pixelsPerSecond: Offset(20, 0)), + ), + ), + ], + ), ), - ), + ], ), - widget.post.description != null - ? Align( - alignment: Alignment.bottomLeft, - child: Padding( - padding: const EdgeInsets.fromLTRB(50, 35, 50, 35), - child: Text( - widget.post.description!, - textAlign: TextAlign.left, - style: GoogleFonts.plusJakartaSans( - height: 1, - color: Colors.white, - fontWeight: FontWeight.w400, - fontSize: 14), - ), + ), + ), + widget.post.description != null + ? Align( + alignment: Alignment.bottomLeft, + child: Padding( + padding: const EdgeInsets.fromLTRB(50, 35, 50, 35), + child: Text( + widget.post.description!, + textAlign: TextAlign.left, + style: GoogleFonts.plusJakartaSans( + height: 1, + color: Colors.white, + fontWeight: FontWeight.w400, + fontSize: 14, ), - ) - : Container( - height: 30, - ), - Container( - width: double.infinity, - decoration: const BoxDecoration( - color: bgAppBar, - border: Border( - top: BorderSide( - color: Color(0xFF262626), // Couleur de la bordure - width: 1.0, // Épaisseur de la bordure ), ), + ) + : Container( + height: 30, ), - child: Column( - children: [ - Padding( - padding: EdgeInsets.symmetric(vertical: 20), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - SvgPicture.asset("assets/images/heart.svg", semanticsLabel: 'Like Logo'), - GestureDetector( - onTap: () { - myFocusNode.requestFocus(); - }, - child: SvgPicture.asset("assets/images/chat.svg", - semanticsLabel: 'Chat Logo')), - SvgPicture.asset("assets/images/add.svg", - semanticsLabel: 'Add playlist Logo'), - SvgPicture.asset("assets/images/save.svg", semanticsLabel: 'Save Logo'), - SvgPicture.asset("assets/images/report.svg", - semanticsLabel: 'Report Logo'), - ], + Container( + width: double.infinity, + decoration: const BoxDecoration( + color: bgAppBar, + border: Border( + top: BorderSide( + color: Color(0xFF262626), + width: 1.0, + ), + ), + ), + child: Column( + children: [ + Padding( + padding: EdgeInsets.symmetric(vertical: 20), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + SvgPicture.asset("assets/images/heart.svg", semanticsLabel: 'Like Logo'), + GestureDetector( + onTap: () { + myFocusNode.requestFocus(); + }, + child: + SvgPicture.asset("assets/images/chat.svg", semanticsLabel: 'Chat Logo'), ), - ), - Padding( - padding: const EdgeInsets.all(15.0), - child: RichText( - text: TextSpan( - text: "3", - style: GoogleFonts.plusJakartaSans( - color: Colors.white, fontWeight: FontWeight.w800), - children: [ - TextSpan( - text: " commentaires", - style: GoogleFonts.plusJakartaSans( - color: Colors.white, fontWeight: FontWeight.w400), - ) - ])), - ), - Padding( - padding: EdgeInsets.fromLTRB(20, 0, 20, 20), - child: Wrap( - runSpacing: 13, + SvgPicture.asset("assets/images/add.svg", + semanticsLabel: 'Add playlist Logo'), + SvgPicture.asset("assets/images/save.svg", semanticsLabel: 'Save Logo'), + SvgPicture.asset("assets/images/report.svg", semanticsLabel: 'Report Logo'), + ], + ), + ), + FutureBuilder>( + future: MyApp.commentViewModel.getCommentsByPostId(widget.post.id), + builder: (BuildContext context, AsyncSnapshot> snapshot) { + if (snapshot.hasData) { + print("test:"); + return Column( children: [ - CommentComponent(), - CommentComponent(), - CommentComponent(), + snapshot.data!.length > 0 + ? Padding( + padding: const EdgeInsets.all(15.0), + child: RichText( + text: TextSpan( + text: snapshot.data!.length.toString(), + style: GoogleFonts.plusJakartaSans( + color: Colors.white, + fontWeight: FontWeight.w800, + ), + children: [ + TextSpan( + text: snapshot.data!.length > 1 + ? " commentaires" + : " commentaire", + style: GoogleFonts.plusJakartaSans( + color: Colors.white, + fontWeight: FontWeight.w400, + ), + ), + ], + ), + ), + ) + : Container(), + snapshot.data!.length > 0 + ? Padding( + padding: const EdgeInsets.fromLTRB(20, 0, 20, 20), + child: ListView.builder( + shrinkWrap: true, + physics: NeverScrollableScrollPhysics(), + itemCount: snapshot.data?.length, + itemBuilder: (BuildContext context, int index) { + return CommentComponent(comment: snapshot.data![index]); + }, + ), + ) + : Container(), ], - ), - ) - ], + ); + } else { + return Container( + child: Center( + child: CupertinoActivityIndicator(), + ), + ); + } + }, ), - ), - ], + ], + ), ), - widget.post.selfie != null - ? Align( - alignment: Alignment.topRight, - child: ZoomTapAnimation( - onTap: () { - if (widget.post.selfie != null) { - switchChoice(); - } - }, - enableLongTapRepeatEvent: false, - longTapRepeatDuration: const Duration(milliseconds: 100), - begin: 1.0, - end: 0.96, - beginDuration: const Duration(milliseconds: 70), - endDuration: const Duration(milliseconds: 100), - beginCurve: Curves.decelerate, - endCurve: Curves.easeInOutSine, - child: Container( - margin: EdgeInsets.all(20), - width: 120, - height: 120, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(20), - border: Border.all(width: 4, color: Colors.white)), - child: ClipRRect( - borderRadius: BorderRadius.circular(15), - // implement image - child: Image( - image: NetworkImage( - choice ? widget.post.music.cover! : widget.post.selfie!), - fit: BoxFit.cover, - )), + ], + ), + widget.post.selfie != null + ? Align( + alignment: Alignment.topRight, + child: ZoomTapAnimation( + onTap: () { + if (widget.post.selfie != null) { + switchChoice(); + } + }, + enableLongTapRepeatEvent: false, + longTapRepeatDuration: const Duration(milliseconds: 100), + begin: 1.0, + end: 0.96, + beginDuration: const Duration(milliseconds: 70), + endDuration: const Duration(milliseconds: 100), + beginCurve: Curves.decelerate, + endCurve: Curves.easeInOutSine, + child: Container( + margin: EdgeInsets.all(20), + width: 120, + height: 120, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + border: Border.all(width: 4, color: Colors.white), + ), + child: ClipRRect( + borderRadius: BorderRadius.circular(15), + // implementer l'image + child: Image( + image: NetworkImage(choice ? widget.post.music.cover! : widget.post.selfie!), + fit: BoxFit.cover, ), ), - ) - : Container() - ], + ), + ), + ) + : Container(), + ], + ), + ), + ), + Align( + alignment: Alignment.topCenter, + child: Container( + height: 50, + width: double.infinity, + color: Colors.transparent, + child: Align( + alignment: Alignment.topCenter, + child: Container( + margin: EdgeInsets.only(top: 10), + width: 60, + height: 5, + decoration: BoxDecoration( + color: Colors.white.withOpacity(0.6), + borderRadius: BorderRadius.circular(20), ), - )), - Align( - alignment: Alignment.topCenter, - child: Container( - height: 50, - width: double.infinity, - color: Colors.transparent, - child: Align( - alignment: Alignment.topCenter, - child: Container( - margin: EdgeInsets.only(top: 10), - width: 60, - height: 5, - decoration: BoxDecoration( - color: Colors.white.withOpacity(0.6), borderRadius: BorderRadius.circular(20))), ), ), ), - ], - ), + ), + ], ), - Padding( - padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom), - child: Container( - height: 70, - width: double.infinity, - decoration: BoxDecoration( - border: Border(top: BorderSide(color: grayColor, width: 2)), color: textFieldMessage), - child: Center( - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 20), - child: Row( - children: [ - ClipOval( - child: SizedBox.fromSize( - // Image radius - child: Image.network( - MyApp.userViewModel.userCurrent.pp, - width: 45, - ), - ), - ), - SizedBox( - width: 10, + ), + Padding( + padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom), + child: Container( + height: 70, + width: double.infinity, + decoration: BoxDecoration( + border: Border(top: BorderSide(color: grayColor, width: 2)), + color: textFieldMessage, + ), + child: Center( + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 20), + child: Row( + children: [ + ClipOval( + child: SizedBox.fromSize( + // Rayon de l'image + child: Image.network( + MyApp.userViewModel.userCurrent.pp, + width: 45, ), - Expanded( - child: TextField( - keyboardAppearance: Brightness.dark, - controller: _textController, - focusNode: myFocusNode, - cursorColor: primaryColor, - keyboardType: TextInputType.emailAddress, - style: GoogleFonts.plusJakartaSans(color: Colors.white), - decoration: InputDecoration( - suffixIcon: Icon( - Icons.send, - color: grayText, - size: 20, - ), - focusedBorder: OutlineInputBorder( - borderSide: BorderSide(width: 1, color: grayText), - borderRadius: BorderRadius.all(Radius.circular(100))), - contentPadding: EdgeInsets.only(top: 0, bottom: 0, left: 20, right: 20), - fillColor: bgModal, - filled: true, - focusColor: Color.fromRGBO(255, 255, 255, 0.30), - enabledBorder: OutlineInputBorder( - borderSide: BorderSide(width: 1, color: grayText), - borderRadius: BorderRadius.all(Radius.circular(100))), - hintText: 'Ajoutez une réponse...', - hintStyle: GoogleFonts.plusJakartaSans(color: grayText)), + ), + ), + SizedBox(width: 10), + Expanded( + child: TextField( + keyboardAppearance: Brightness.dark, + controller: _textController, + focusNode: myFocusNode, + cursorColor: primaryColor, + keyboardType: TextInputType.emailAddress, + style: GoogleFonts.plusJakartaSans(color: Colors.white), + decoration: InputDecoration( + suffixIcon: Icon( + Icons.send, + color: grayText, + size: 20, ), - ) - ], + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(width: 1, color: grayText), + borderRadius: BorderRadius.all(Radius.circular(100)), + ), + contentPadding: EdgeInsets.only(top: 0, bottom: 0, left: 20, right: 20), + fillColor: bgModal, + filled: true, + focusColor: Color.fromRGBO(255, 255, 255, 0.30), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(width: 1, color: grayText), + borderRadius: BorderRadius.all(Radius.circular(100)), + ), + hintText: 'Ajoutez une réponse...', + hintStyle: GoogleFonts.plusJakartaSans(color: grayText), + ), + ), ), - ), - )), + ], + ), + ), + ), ), - ], - ), - )); + ), + ], + ), + ), + ); } } diff --git a/Sources/justMUSIC/lib/view_model/CommentViewModel.dart b/Sources/justMUSIC/lib/view_model/CommentViewModel.dart index 7c2be7f..9ea71f7 100644 --- a/Sources/justMUSIC/lib/view_model/CommentViewModel.dart +++ b/Sources/justMUSIC/lib/view_model/CommentViewModel.dart @@ -13,8 +13,8 @@ class CommentViewModel { // Methods addComment(String text, String idPost) async { try { - await _commentService.createComment(text,idPost); - } catch(e) { + await _commentService.createComment(text, idPost); + } catch (e) { print(e); rethrow; } @@ -23,12 +23,15 @@ class CommentViewModel { Future> getCommentsByPostId(String id) async { try { var responseData = await _commentService.getCommentsByPostId(id); + print(responseData.length); var commentsFutures = responseData.map((value) async { return await CommentMapper.toModel(value); }).toList(); _comments = await Future.wait(commentsFutures); + print("ccccccc"); + _comments.map((e) => print(e.text)); return _comments; - } catch(e) { + } catch (e) { print(e); _comments = []; return []; From 67b4dd0f5892eb948bf6757cce46c354998adb23 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Thu, 3 Aug 2023 00:53:16 +0200 Subject: [PATCH 2/4] change text artist and title --- .idea/libraries/Dart_Packages.xml | 8 +++ .../lib/components/comment_component.dart | 13 ++--- Sources/justMUSIC/lib/main.dart | 53 +++++++++---------- .../lib/screens/detail_post_screen.dart | 8 +++ .../justMUSIC/lib/screens/feed_screen.dart | 13 ++++- .../justMUSIC/lib/screens/loading_screen.dart | 20 +++++++ .../lib/services/CommentService.dart | 11 ++-- Sources/justMUSIC/pubspec.lock | 8 +++ Sources/justMUSIC/pubspec.yaml | 1 + 9 files changed, 90 insertions(+), 45 deletions(-) create mode 100644 Sources/justMUSIC/lib/screens/loading_screen.dart diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index 2328905..2795ffb 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -814,6 +814,13 @@ + + + + + + @@ -1013,6 +1020,7 @@ + diff --git a/Sources/justMUSIC/lib/components/comment_component.dart b/Sources/justMUSIC/lib/components/comment_component.dart index 859df15..c83463b 100644 --- a/Sources/justMUSIC/lib/components/comment_component.dart +++ b/Sources/justMUSIC/lib/components/comment_component.dart @@ -17,11 +17,12 @@ class CommentComponent extends StatelessWidget { return Container( width: double.infinity, - decoration: BoxDecoration(color: bgComment, borderRadius: BorderRadius.circular(20)), - padding: EdgeInsets.all(20), - margin: EdgeInsets.only(bottom: 20), + decoration: BoxDecoration(color: bgComment.withOpacity(0.6), borderRadius: BorderRadius.circular(15)), + padding: EdgeInsets.fromLTRB(20, 10, 20, 10), + margin: EdgeInsets.only(bottom: 13), child: Row( crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, children: [ ClipOval( child: SizedBox.fromSize( @@ -50,7 +51,7 @@ class CommentComponent extends StatelessWidget { Padding( padding: EdgeInsets.only(top: 6, left: 10), child: Text( - "il y a ${difference.inHours}h", + "il y a ${difference.inHours > 0 ? difference.inHours : difference.inMinutes}${difference.inHours > 0 ? "h" : "m"}", style: GoogleFonts.plusJakartaSans( color: Colors.white.withOpacity(0.6), fontWeight: FontWeight.w400, fontSize: 10), ), @@ -58,13 +59,13 @@ class CommentComponent extends StatelessWidget { ], ), SizedBox( - height: 8, + height: 4, ), Padding( padding: const EdgeInsets.symmetric(horizontal: 10), child: Text( comment.text, - style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w400, fontSize: 12), + style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w400, fontSize: 15), ), ), ], diff --git a/Sources/justMUSIC/lib/main.dart b/Sources/justMUSIC/lib/main.dart index f04370c..3c6a7ce 100644 --- a/Sources/justMUSIC/lib/main.dart +++ b/Sources/justMUSIC/lib/main.dart @@ -10,21 +10,23 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:justmusic/screens/add_friend_screen.dart'; import 'package:justmusic/screens/explanations_screen.dart'; import 'package:justmusic/screens/feed_screen.dart'; +import 'package:justmusic/screens/loading_screen.dart'; import 'package:justmusic/screens/login_screen.dart'; import 'package:justmusic/screens/launching_rocker_screen.dart'; import 'package:justmusic/screens/post_screen.dart'; import 'package:justmusic/screens/profile_screen.dart'; import 'package:justmusic/screens/registration_screen.dart'; import 'package:justmusic/screens/welcome_screen.dart'; -import 'package:justmusic/values/constants.dart'; import 'package:justmusic/view_model/CommentViewModel.dart'; import 'package:justmusic/view_model/MusicViewModel.dart'; import 'package:justmusic/view_model/PostViewModel.dart'; 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; Future main() async { + tz.initializeTimeZones(); WidgetsFlutterBinding.ensureInitialized(); await Firebase.initializeApp( options: DefaultFirebaseOptions.currentPlatform, @@ -99,25 +101,21 @@ class _MyAppState extends State { }, debugShowCheckedModeBanner: false, theme: ThemeData( - // This is the theme of your application. - // - // Try running your application with "flutter run". You'll see the - // application has a blue toolbar. Then, without quitting the app, try - // changing the primarySwatch below to Colors.green and then invoke - // "hot reload" (press "r" in the console where you ran "flutter run", - // or simply save your changes to "hot reload" in a Flutter IDE). - // Notice that the counter didn't reset back to zero; the application - // is not restarted. primarySwatch: Colors.blue, ), - home: FirebaseAuth.instance.currentUser != null - ? StreamBuilder( - stream: userCurrent, - initialData: null, - builder: (context, snapshot) { - if (snapshot.hasData) { - print("hasdata"); - + home: StreamBuilder( + stream: FirebaseAuth.instance.authStateChanges(), + builder: (context, snapshot) { + if (snapshot.connectionState == ConnectionState.waiting) { + return LoadingScreen(); + } else if (snapshot.hasData) { + return FutureBuilder( + future: MyApp.userViewModel.getUser(snapshot.data!.uid), + builder: (context, userSnapshot) { + if (userSnapshot.connectionState == ConnectionState.waiting) { + return LoadingScreen(); + } else if (userSnapshot.hasData) { + MyApp.userViewModel.userCurrent = userSnapshot.data!; return AnimatedSwitcher( duration: Duration(milliseconds: 1000), transitionBuilder: (child, animation) { @@ -126,18 +124,15 @@ class _MyAppState extends State { child: FeedScreen(), ); } else { - return Scaffold( - backgroundColor: bgColor, - body: Center( - child: Image( - image: AssetImage("assets/images/logo.png"), - width: 130, - ), - ), - ); + return WellcomeScreen(); } - }) - : WellcomeScreen()); + }, + ); + } else { + return WellcomeScreen(); + } + }, + )); }, designSize: Size(390, 844), ); diff --git a/Sources/justMUSIC/lib/screens/detail_post_screen.dart b/Sources/justMUSIC/lib/screens/detail_post_screen.dart index ef8dfb9..68c96c3 100644 --- a/Sources/justMUSIC/lib/screens/detail_post_screen.dart +++ b/Sources/justMUSIC/lib/screens/detail_post_screen.dart @@ -462,6 +462,14 @@ class _DetailPostScreenState extends State { keyboardAppearance: Brightness.dark, controller: _textController, focusNode: myFocusNode, + onSubmitted: (value) async { + if (value.isNotEmpty) { + await MyApp.commentViewModel.addComment(value, widget.post.id); + } + setState(() { + _textController.clear(); + }); + }, cursorColor: primaryColor, keyboardType: TextInputType.emailAddress, style: GoogleFonts.plusJakartaSans(color: Colors.white), diff --git a/Sources/justMUSIC/lib/screens/feed_screen.dart b/Sources/justMUSIC/lib/screens/feed_screen.dart index 0324f71..25bab59 100644 --- a/Sources/justMUSIC/lib/screens/feed_screen.dart +++ b/Sources/justMUSIC/lib/screens/feed_screen.dart @@ -16,6 +16,7 @@ import '../components/top_nav_bar_component.dart'; import '../model/Post.dart'; import '../values/constants.dart'; import 'detail_post_screen.dart'; +import 'package:timezone/timezone.dart' as tz; class FeedScreen extends StatefulWidget { const FeedScreen({Key? key}) : super(key: key); @@ -32,7 +33,6 @@ class _FeedScreenState extends State with SingleTickerProviderStateM late List discoveryFeed; late List displayFeed; - final DateTime midnight = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1); bool isDismissed = true; @override @@ -56,6 +56,15 @@ class _FeedScreenState extends State with SingleTickerProviderStateM } Future showCapsuleDot() async { + // Get the timezone for France + final franceTimeZone = tz.getLocation('Europe/Paris'); + + // Get the current date and time in France timezone + var now = tz.TZDateTime.now(franceTimeZone); + + // Calculate the midnight time for the next day in France timezone + var midnight = tz.TZDateTime(franceTimeZone, now.year, now.month, now.day + 1); + bool res = await MyApp.postViewModel.getAvailable(); if (isDismissed) { if (res) { @@ -116,7 +125,7 @@ class _FeedScreenState extends State with SingleTickerProviderStateM messageText: Align( alignment: Alignment.centerLeft, child: CountdownTimer( - endTime: midnight.millisecondsSinceEpoch - 2 * 60 * 60 * 1000, + endTime: midnight.millisecondsSinceEpoch, textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), ), ), diff --git a/Sources/justMUSIC/lib/screens/loading_screen.dart b/Sources/justMUSIC/lib/screens/loading_screen.dart new file mode 100644 index 0000000..e9bb106 --- /dev/null +++ b/Sources/justMUSIC/lib/screens/loading_screen.dart @@ -0,0 +1,20 @@ +import 'package:flutter/Material.dart'; + +import '../values/constants.dart'; + +class LoadingScreen extends StatelessWidget { + const LoadingScreen({Key? key}) : super(key: key); + + @override + Widget build(BuildContext context) { + return Scaffold( + backgroundColor: bgColor, + body: Center( + child: Image( + image: AssetImage("assets/images/logo.png"), + width: 130, + ), + ), + ); + } +} diff --git a/Sources/justMUSIC/lib/services/CommentService.dart b/Sources/justMUSIC/lib/services/CommentService.dart index 633ab78..961dae7 100644 --- a/Sources/justMUSIC/lib/services/CommentService.dart +++ b/Sources/justMUSIC/lib/services/CommentService.dart @@ -5,21 +5,16 @@ import '../main.dart'; class CommentService { createComment(String text, String idPost) async { var id = MyApp.userViewModel.userCurrent.id; - final comment = { - "user_id": id, - "text": text, - "date": DateTime.now(), - "post_id": idPost - }; + final comment = {"user_id": id, "text": text, "date": DateTime.now(), "post_id": idPost}; await MyApp.db.collection("comments").add(comment); } - Future>>> getCommentsByPostId( - String id) async { + Future>>> getCommentsByPostId(String id) async { var response = await FirebaseFirestore.instance .collection("comments") .where("post_id", isEqualTo: id) + .orderBy("date", descending: true) .get(); return response.docs; diff --git a/Sources/justMUSIC/pubspec.lock b/Sources/justMUSIC/pubspec.lock index 30973dd..27bf207 100644 --- a/Sources/justMUSIC/pubspec.lock +++ b/Sources/justMUSIC/pubspec.lock @@ -917,6 +917,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.2.0" + timezone: + dependency: "direct main" + description: + name: timezone + sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0" + url: "https://pub.dev" + source: hosted + version: "0.9.2" top_snackbar_flutter: dependency: "direct main" description: diff --git a/Sources/justMUSIC/pubspec.yaml b/Sources/justMUSIC/pubspec.yaml index d56b47b..3f7f94a 100644 --- a/Sources/justMUSIC/pubspec.yaml +++ b/Sources/justMUSIC/pubspec.yaml @@ -72,6 +72,7 @@ dependencies: animations: ^2.0.7 flutter_svg: ^2.0.7 flutter_keyboard_visibility: ^5.4.1 + timezone: ^0.9.2 dev_dependencies: flutter_test: From cc227a97a395044ce757a5bb99c5ad0c782bb5c9 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Thu, 3 Aug 2023 01:11:03 +0200 Subject: [PATCH 3/4] change text artist and title --- .../lib/components/top_nav_bar_component.dart | 169 ++++++++++-------- .../justMUSIC/lib/screens/feed_screen.dart | 103 ----------- 2 files changed, 90 insertions(+), 182 deletions(-) diff --git a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart index d567ce2..7fe21ef 100644 --- a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart +++ b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart @@ -9,6 +9,7 @@ import 'package:lottie/lottie.dart'; import 'package:zoom_tap_animation/zoom_tap_animation.dart'; import '../config/routes.dart'; +import 'package:timezone/timezone.dart' as tz; import '../main.dart'; import '../values/constants.dart'; @@ -22,7 +23,7 @@ class TopNavBarComponent extends StatefulWidget { class _TopNavBarComponentState extends State with TickerProviderStateMixin { bool choice = true; - late AnimationController _controller; + bool isDismissed = true; final DateTime midnight = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1); @@ -35,90 +36,100 @@ class _TopNavBarComponentState extends State with TickerProv @override void initState() { - _controller = AnimationController( - vsync: this, - duration: Duration(seconds: 3), - ); super.initState(); } - void showCapsuleDot(bool isAvailable) { - isAvailable - ? Flushbar( - maxWidth: 210, - animationDuration: Duration(seconds: 1), - forwardAnimationCurve: Curves.easeOutCirc, - margin: EdgeInsets.fromLTRB(0, 0, 0, 0), - icon: Icon( - Ionicons.sparkles, - color: Colors.white, - size: 18, - ), - padding: EdgeInsets.fromLTRB(8, 8, 8, 8), - messageText: Align( - alignment: Alignment.centerLeft, - child: Text( - "Capsule disponible", - style: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), - ), - ), - flushbarStyle: FlushbarStyle.FLOATING, - flushbarPosition: FlushbarPosition.BOTTOM, - textDirection: Directionality.of(context), - borderRadius: BorderRadius.circular(1000), - borderWidth: 1, - borderColor: Colors.white.withOpacity(0.04), - duration: const Duration(minutes: 100), - leftBarIndicatorColor: Colors.transparent, - positionOffset: 20, - onTap: (_) { - Navigator.pop(context); - Navigator.pushNamed(context, '/post'); - }, - ).show(context) - : Flushbar( - maxWidth: 155, - animationDuration: Duration(seconds: 1), - forwardAnimationCurve: Curves.easeOutCirc, - margin: EdgeInsets.fromLTRB(0, 0, 0, 0), - icon: Lottie.asset( - 'assets/animations/LottieHourGlass.json', - width: 26, - fit: BoxFit.fill, - ), - padding: EdgeInsets.fromLTRB(8, 8, 8, 8), - messageText: Align( - alignment: Alignment.centerLeft, - child: CountdownTimer( - endTime: midnight.millisecondsSinceEpoch - 2 * 60 * 60 * 1000, - textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), - ), - ), - flushbarStyle: FlushbarStyle.FLOATING, - flushbarPosition: FlushbarPosition.BOTTOM, - textDirection: Directionality.of(context), - borderRadius: BorderRadius.circular(1000), - borderWidth: 1, - borderColor: Colors.white.withOpacity(0.04), - duration: const Duration(minutes: 100), - leftBarIndicatorColor: Colors.transparent, - positionOffset: 20, - onTap: (_) { - Navigator.pop(context); - }, - ).show(context); + Future showCapsuleDot() async { + // Get the timezone for France + final franceTimeZone = tz.getLocation('Europe/Paris'); + + // Get the current date and time in France timezone + var now = tz.TZDateTime.now(franceTimeZone); + + // Calculate the midnight time for the next day in France timezone + var midnight = tz.TZDateTime(franceTimeZone, now.year, now.month, now.day + 1); + + bool res = await MyApp.postViewModel.getAvailable(); + if (res) { + Flushbar( + maxWidth: 210, + animationDuration: Duration(seconds: 1), + forwardAnimationCurve: Curves.easeOutCirc, + margin: EdgeInsets.fromLTRB(0, 0, 0, 0), + icon: Icon( + Ionicons.sparkles, + color: Colors.white, + size: 18, + ), + padding: EdgeInsets.fromLTRB(8, 8, 8, 8), + messageText: Align( + alignment: Alignment.centerLeft, + child: Text( + "Capsule disponible", + style: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), + ), + ), + flushbarStyle: FlushbarStyle.FLOATING, + flushbarPosition: FlushbarPosition.BOTTOM, + textDirection: Directionality.of(context), + borderRadius: BorderRadius.circular(1000), + borderWidth: 1, + borderColor: Colors.white.withOpacity(0.04), + duration: const Duration(minutes: 100), + leftBarIndicatorColor: Colors.transparent, + positionOffset: 20, + onTap: (_) { + Navigator.pop(context); + Navigator.pushNamed(context, '/post'); + }, + ).show(context).then((value) { + setState(() { + isDismissed = !isDismissed; + }); + }); + } else { + Flushbar( + maxWidth: 155, + animationDuration: Duration(seconds: 1), + forwardAnimationCurve: Curves.easeOutCirc, + margin: EdgeInsets.fromLTRB(0, 0, 0, 0), + icon: Lottie.asset( + 'assets/animations/LottieHourGlass.json', + width: 26, + fit: BoxFit.fill, + ), + padding: EdgeInsets.fromLTRB(8, 8, 8, 8), + messageText: Align( + alignment: Alignment.centerLeft, + child: CountdownTimer( + endTime: midnight.millisecondsSinceEpoch, + textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), + ), + ), + flushbarStyle: FlushbarStyle.FLOATING, + flushbarPosition: FlushbarPosition.BOTTOM, + textDirection: Directionality.of(context), + borderRadius: BorderRadius.circular(1000), + borderWidth: 1, + borderColor: Colors.white.withOpacity(0.04), + duration: const Duration(minutes: 100), + leftBarIndicatorColor: Colors.transparent, + positionOffset: 20, + onTap: (_) {}, + ).show(context).then((value) { + setState(() { + isDismissed = !isDismissed; + }); + }); + } } void checkAvailable() async { - print("test"); - var res = await MyApp.postViewModel.getAvailable(); - print(res); - ModalRoute? route = ModalRoute.of(context); - if (route != null) { - if (route.settings.name != '/flushbarRoute') { - print("yes"); - showCapsuleDot(res); - } + if (isDismissed) { + showCapsuleDot(); + setState(() { + isDismissed = !isDismissed; + }); } } diff --git a/Sources/justMUSIC/lib/screens/feed_screen.dart b/Sources/justMUSIC/lib/screens/feed_screen.dart index 25bab59..25515c7 100644 --- a/Sources/justMUSIC/lib/screens/feed_screen.dart +++ b/Sources/justMUSIC/lib/screens/feed_screen.dart @@ -1,22 +1,15 @@ import 'dart:async'; - -import 'package:another_flushbar/flushbar.dart'; import 'package:circular_reveal_animation/circular_reveal_animation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; -import 'package:flutter_countdown_timer/flutter_countdown_timer.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:ionicons/ionicons.dart'; import 'package:justmusic/main.dart'; -import 'package:lottie/lottie.dart'; - import '../components/post_component.dart'; import '../components/top_nav_bar_component.dart'; import '../model/Post.dart'; import '../values/constants.dart'; import 'detail_post_screen.dart'; -import 'package:timezone/timezone.dart' as tz; class FeedScreen extends StatefulWidget { const FeedScreen({Key? key}) : super(key: key); @@ -55,101 +48,6 @@ class _FeedScreenState extends State with SingleTickerProviderStateM animationController.forward(); } - Future showCapsuleDot() async { - // Get the timezone for France - final franceTimeZone = tz.getLocation('Europe/Paris'); - - // Get the current date and time in France timezone - var now = tz.TZDateTime.now(franceTimeZone); - - // Calculate the midnight time for the next day in France timezone - var midnight = tz.TZDateTime(franceTimeZone, now.year, now.month, now.day + 1); - - bool res = await MyApp.postViewModel.getAvailable(); - if (isDismissed) { - if (res) { - setState(() { - isDismissed = !isDismissed; - }); - Flushbar( - maxWidth: 210, - animationDuration: Duration(seconds: 1), - forwardAnimationCurve: Curves.easeOutCirc, - margin: EdgeInsets.fromLTRB(0, 0, 0, 0), - icon: Icon( - Ionicons.sparkles, - color: Colors.white, - size: 18, - ), - padding: EdgeInsets.fromLTRB(8, 8, 8, 8), - messageText: Align( - alignment: Alignment.centerLeft, - child: Text( - "Capsule disponible", - style: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), - ), - ), - flushbarStyle: FlushbarStyle.FLOATING, - flushbarPosition: FlushbarPosition.BOTTOM, - textDirection: Directionality.of(context), - borderRadius: BorderRadius.circular(1000), - borderWidth: 1, - isDismissible: false, - borderColor: Colors.white.withOpacity(0.04), - duration: const Duration(minutes: 100), - leftBarIndicatorColor: Colors.transparent, - positionOffset: 20, - onTap: (_) { - Navigator.pop(context); - Navigator.pushNamed(context, '/post'); - }, - ).show(context).then((value) { - isDismissed = !isDismissed; - }); - } else { - setState(() { - isDismissed = !isDismissed; - }); - Flushbar( - maxWidth: 155, - animationDuration: Duration(seconds: 1), - isDismissible: false, - forwardAnimationCurve: Curves.easeOutCirc, - margin: EdgeInsets.fromLTRB(0, 0, 0, 0), - icon: Lottie.asset( - 'assets/animations/LottieHourGlass.json', - width: 26, - fit: BoxFit.fill, - ), - padding: EdgeInsets.fromLTRB(8, 8, 8, 8), - messageText: Align( - alignment: Alignment.centerLeft, - child: CountdownTimer( - endTime: midnight.millisecondsSinceEpoch, - textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), - ), - ), - flushbarStyle: FlushbarStyle.FLOATING, - flushbarPosition: FlushbarPosition.BOTTOM, - textDirection: Directionality.of(context), - borderRadius: BorderRadius.circular(1000), - borderWidth: 1, - borderColor: Colors.white.withOpacity(0.04), - duration: const Duration(minutes: 100), - leftBarIndicatorColor: Colors.transparent, - positionOffset: 20, - onTap: (_) {}, - ).show(context).then((value) { - { - setState(() { - isDismissed = !isDismissed; - }); - } - }); - } - } - } - Future _refresh() async { print("refresh"); discoveryFeed = await MyApp.postViewModel.getBestPosts(); @@ -198,7 +96,6 @@ class _FeedScreenState extends State with SingleTickerProviderStateM @override Widget build(BuildContext context) { - showCapsuleDot(); return Scaffold( resizeToAvoidBottomInset: true, backgroundColor: bgColor, From 2ed4b1e515380390ca59d0f4504600f1a7080d8e Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Thu, 3 Aug 2023 02:13:31 +0200 Subject: [PATCH 4/4] change refresh feed --- .../lib/components/top_nav_bar_component.dart | 8 +- .../justMUSIC/lib/screens/feed_screen.dart | 110 ++++++++++++------ 2 files changed, 76 insertions(+), 42 deletions(-) diff --git a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart index 7fe21ef..e13bc85 100644 --- a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart +++ b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart @@ -28,10 +28,8 @@ class _TopNavBarComponentState extends State with TickerProv final DateTime midnight = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1); - void actionSurBouton() async { + void actionSurBouton(bool choice) async { widget.callback(choice); - await MyApp.postViewModel.getBestPosts(); - await MyApp.postViewModel.getPostsFriends(); } @override @@ -190,7 +188,7 @@ class _TopNavBarComponentState extends State with TickerProv if (!choice) { setState(() { choice = !choice; - actionSurBouton(); + actionSurBouton(false); }); } }, @@ -223,7 +221,7 @@ class _TopNavBarComponentState extends State with TickerProv if (choice) { setState(() { choice = !choice; - actionSurBouton(); + actionSurBouton(true); }); } }, diff --git a/Sources/justMUSIC/lib/screens/feed_screen.dart b/Sources/justMUSIC/lib/screens/feed_screen.dart index 25515c7..f28f2fe 100644 --- a/Sources/justMUSIC/lib/screens/feed_screen.dart +++ b/Sources/justMUSIC/lib/screens/feed_screen.dart @@ -1,10 +1,13 @@ import 'dart:async'; import 'package:circular_reveal_animation/circular_reveal_animation.dart'; +import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:justmusic/main.dart'; +import 'package:justmusic/main.dart'; +import 'package:tuple/tuple.dart'; import '../components/post_component.dart'; import '../components/top_nav_bar_component.dart'; import '../model/Post.dart'; @@ -27,16 +30,13 @@ class _FeedScreenState extends State with SingleTickerProviderStateM late List discoveryFeed; late List displayFeed; bool isDismissed = true; + bool choiceFeed = false; @override void initState() { super.initState(); - - MyApp.postViewModel.getPostsFriends(); friendFeed = MyApp.postViewModel.postsFriends; - MyApp.postViewModel.getBestPosts(); discoveryFeed = MyApp.postViewModel.bestPosts; - displayFeed = []; animationController = AnimationController( vsync: this, duration: Duration(milliseconds: 400), @@ -49,11 +49,13 @@ class _FeedScreenState extends State with SingleTickerProviderStateM } Future _refresh() async { - print("refresh"); - discoveryFeed = await MyApp.postViewModel.getBestPosts(); - setState(() { - displayFeed = discoveryFeed.reversed.toList(); - }); + if (choiceFeed) { + await MyApp.postViewModel.getBestPosts(); + setState(() {}); + } else { + await MyApp.postViewModel.getPostsFriends(); + setState(() {}); + } } void changeFeed(bool choice) { @@ -63,14 +65,14 @@ class _FeedScreenState extends State with SingleTickerProviderStateM animationController.reset(); displayFeed = MyApp.postViewModel.postsFriends.reversed.toList(); animationController.forward(); - print(displayFeed.length); + choiceFeed = false; }); } else { setState(() { animationController.reset(); displayFeed = MyApp.postViewModel.bestPosts.reversed.toList(); - print(displayFeed.length); animationController.forward(); + choiceFeed = true; }); } } @@ -94,8 +96,21 @@ class _FeedScreenState extends State with SingleTickerProviderStateM ); } + _fetchData() async { + friendFeed = await MyApp.postViewModel.getPostsFriends(); + discoveryFeed = await MyApp.postViewModel.getBestPosts(); + return Tuple2(friendFeed, displayFeed); + } + @override Widget build(BuildContext context) { + if (choiceFeed) { + displayFeed = MyApp.postViewModel.postsFriends.reversed.toList(); + } else { + displayFeed = MyApp.postViewModel.bestPosts.reversed.toList(); + } + _fetchData(); + return Scaffold( resizeToAvoidBottomInset: true, backgroundColor: bgColor, @@ -148,35 +163,56 @@ class _FeedScreenState extends State with SingleTickerProviderStateM ) : Container( width: double.infinity, + height: double.infinity, child: Stack( fit: StackFit.expand, children: [ - Align( - alignment: Alignment.topCenter, - child: CircularRevealAnimation( - animation: animation, - centerOffset: Offset(30.w, -100), - child: Container( - constraints: BoxConstraints(maxWidth: 600), - padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0), - child: RefreshIndicator( - displacement: 20, - triggerMode: RefreshIndicatorTriggerMode.onEdge, - onRefresh: _refresh, - child: ListView.builder( - physics: const BouncingScrollPhysics(decelerationRate: ScrollDecelerationRate.fast), - clipBehavior: Clip.none, - shrinkWrap: true, - itemCount: displayFeed.length, - itemBuilder: (BuildContext context, int index) { - return Padding( - padding: const EdgeInsets.only(bottom: 40), - child: - PostComponent(callback: openDetailPost, post: displayFeed[index], index: index), - ); - }, - ), - )), + Expanded( + child: Align( + alignment: Alignment.topCenter, + child: CircularRevealAnimation( + animation: animation, + centerOffset: Offset(30.w, -100), + child: Expanded( + child: Container( + height: double.infinity, + constraints: BoxConstraints(maxWidth: 600), + padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0), + child: Expanded( + child: FutureBuilder( + future: _fetchData(), + builder: (BuildContext context, AsyncSnapshot snapshot) { + if (snapshot.hasData) { + return RefreshIndicator( + displacement: 20, + triggerMode: RefreshIndicatorTriggerMode.onEdge, + onRefresh: _refresh, + child: Expanded( + child: ListView.builder( + physics: const AlwaysScrollableScrollPhysics(), + clipBehavior: Clip.none, + shrinkWrap: true, + itemCount: displayFeed.length, + itemBuilder: (BuildContext context, int index) { + return Padding( + padding: const EdgeInsets.only(bottom: 40), + child: PostComponent( + callback: openDetailPost, post: displayFeed[index], index: index), + ); + }, + ), + ), + ); + } else { + return Center( + child: CupertinoActivityIndicator(), + ); + } + }, + ), + )), + ), + ), ), ), Align(