From 6396a8dba8abdca8b22916186689f84a97907a10 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Thu, 3 Aug 2023 06:15:25 +0200 Subject: [PATCH 1/2] enfinnnnnnnnnn --- .../lib/components/post_component.dart | 6 +- .../lib/components/top_nav_bar_component.dart | 6 +- .../lib/screens/detail_post_screen.dart | 763 +++++++++--------- .../justMUSIC/lib/screens/feed_screen.dart | 342 ++++---- 4 files changed, 563 insertions(+), 554 deletions(-) diff --git a/Sources/justMUSIC/lib/components/post_component.dart b/Sources/justMUSIC/lib/components/post_component.dart index 4b1b9a2..2118eee 100644 --- a/Sources/justMUSIC/lib/components/post_component.dart +++ b/Sources/justMUSIC/lib/components/post_component.dart @@ -9,7 +9,7 @@ import 'package:zoom_tap_animation/zoom_tap_animation.dart'; import '../model/Post.dart'; class PostComponent extends StatefulWidget { - final Function(int)? callback; + final Function(Post)? callback; final Post post; final int index; @@ -293,7 +293,7 @@ class _PostComponentState extends State with TickerProviderStateM SizedBox(height: 10), ZoomTapAnimation( onTap: () { - widget.callback!(widget.index); + widget.callback!(widget.post); }, enableLongTapRepeatEvent: false, longTapRepeatDuration: const Duration(milliseconds: 100), @@ -382,7 +382,7 @@ class _PostComponentState extends State with TickerProviderStateM )), SizedBox(height: 15), SizedBox( - height: 60, + height: 40, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart index e13bc85..a27963c 100644 --- a/Sources/justMUSIC/lib/components/top_nav_bar_component.dart +++ b/Sources/justMUSIC/lib/components/top_nav_bar_component.dart @@ -15,14 +15,15 @@ import '../values/constants.dart'; class TopNavBarComponent extends StatefulWidget { final Function(bool) callback; - const TopNavBarComponent({Key? key, required this.callback}) : super(key: key); + final bool choice; + const TopNavBarComponent({Key? key, required this.callback, required this.choice}) : super(key: key); @override State createState() => _TopNavBarComponentState(); } class _TopNavBarComponentState extends State with TickerProviderStateMixin { - bool choice = true; + late bool choice; bool isDismissed = true; @@ -133,6 +134,7 @@ class _TopNavBarComponentState extends State with TickerProv @override Widget build(BuildContext context) { + choice = widget.choice; return Padding( padding: const EdgeInsets.only(top: defaultPadding), child: Container( diff --git a/Sources/justMUSIC/lib/screens/detail_post_screen.dart b/Sources/justMUSIC/lib/screens/detail_post_screen.dart index 68c96c3..df7602b 100644 --- a/Sources/justMUSIC/lib/screens/detail_post_screen.dart +++ b/Sources/justMUSIC/lib/screens/detail_post_screen.dart @@ -1,19 +1,14 @@ 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'; import 'package:flutter_svg/svg.dart'; import 'package:google_fonts/google_fonts.dart'; - import 'package:text_scroll/text_scroll.dart'; import 'package:zoom_tap_animation/zoom_tap_animation.dart'; - import '../components/button_play_component.dart'; import '../components/comment_component.dart'; - import '../main.dart'; import '../model/Post.dart'; import '../model/Comment.dart'; @@ -55,455 +50,433 @@ class _DetailPostScreenState extends State { @override void initState() { - print("post: ${widget.post.date.toString()}"); - print("ajrd: ${DateTime.now().toString()}"); myFocusNode = FocusNode(); - var keyboardVisibilityController = KeyboardVisibilityController(); - print('Keyboard visibility direct query: ${keyboardVisibilityController.isVisible}'); - - super.initState(); - - keyboardSubscription = keyboardVisibilityController.onChange.listen((bool visible) { - if (!visible) { - myFocusNode.unfocus(); - } - }); } final ScrollController _scrollController = ScrollController(); @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, - children: [ - Align( - alignment: Alignment.topCenter, - child: Container( - height: 400, + return 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, - child: FadeInImage.assetNetwork( - placeholder: "assets/images/loadingPlaceholder.gif", - image: choice ? widget.post.selfie! : widget.post.music.cover!, - width: double.infinity, - fit: BoxFit.cover, - ), + 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], - ), + ), + 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, - ), + ), + 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)), - ), - ), - ), - 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, - ), - ) - : Text( - widget.post.music.date.toString(), - 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, - ), - ) - : Text( - "", - style: GoogleFonts.plusJakartaSans( - color: Colors.white.withOpacity(0.4), - fontWeight: FontWeight.w300, - fontSize: 13, - ), - ) - : ScrollConfiguration( + ) + : 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( - widget.post.music.artists.first.name!, + choice ? widget.post.user.pseudo : widget.post.music.title!, style: GoogleFonts.plusJakartaSans( height: 1, color: Colors.white, - fontWeight: FontWeight.w500, - fontSize: 17, + fontWeight: FontWeight.w800, + fontSize: 22, ), 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, - ), - ), - ), - ) - : Container( - height: 30, - ), - 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'), - ), - 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: [ - 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, + ), + 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, ), - children: [ - TextSpan( - text: snapshot.data!.length > 1 - ? " commentaires" - : " commentaire", + ) + ? Text( + "Aujourd'hui, ${widget.post.date.hour}:${widget.post.date.minute}", style: GoogleFonts.plusJakartaSans( + height: 1, color: Colors.white, - fontWeight: FontWeight.w400, + 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, + ), + ) + : Text( + widget.post.music.date.toString(), + 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, ), ) - : 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]); - }, + : Text( + "", + style: GoogleFonts.plusJakartaSans( + color: Colors.white.withOpacity(0.4), + fontWeight: FontWeight.w300, + fontSize: 13, ), ) - : Container(), - ], - ); - } else { - return Container( - child: Center( - child: CupertinoActivityIndicator(), - ), - ); - } - }, + : 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.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), + ), + 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, + ), ), - 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( + height: 30, + ), + 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'), ), + 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: [ + 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), + // 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( - // Rayon de l'image - child: Image.network( - MyApp.userViewModel.userCurrent.pp, - width: 45, - ), + ], + ), + ), + 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, ), ), - SizedBox(width: 10), - Expanded( - child: TextField( - 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), - 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, + 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), + 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/screens/feed_screen.dart b/Sources/justMUSIC/lib/screens/feed_screen.dart index f28f2fe..8eb6bf4 100644 --- a/Sources/justMUSIC/lib/screens/feed_screen.dart +++ b/Sources/justMUSIC/lib/screens/feed_screen.dart @@ -6,7 +6,6 @@ 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'; @@ -28,15 +27,18 @@ class _FeedScreenState extends State with SingleTickerProviderStateM Timer? timer; late List discoveryFeed; - late List displayFeed; + late Tuple2, List> displayFeed; bool isDismissed = true; - bool choiceFeed = false; + bool choiceFeed = true; + PageController controller = PageController(); @override void initState() { super.initState(); friendFeed = MyApp.postViewModel.postsFriends; discoveryFeed = MyApp.postViewModel.bestPosts; + displayFeed = + Tuple2(MyApp.postViewModel.postsFriends.reversed.toList(), MyApp.postViewModel.bestPosts.reversed.toList()); animationController = AnimationController( vsync: this, duration: Duration(milliseconds: 400), @@ -46,38 +48,36 @@ class _FeedScreenState extends State with SingleTickerProviderStateM curve: Curves.easeInOutSine, ); animationController.forward(); + _fetchData().then((tuple) { + friendFeed = tuple.item2; + displayFeed = tuple.item1; + setState(() {}); + }); } - Future _refresh() async { - if (choiceFeed) { - await MyApp.postViewModel.getBestPosts(); - setState(() {}); - } else { - await MyApp.postViewModel.getPostsFriends(); - setState(() {}); - } + @override + void dispose() { + animationController.dispose(); + super.dispose(); + } + + Future _refresh() async { + Tuple2, List> tuple = await _fetchData(); + displayFeed = Tuple2(tuple.item1, tuple.item2); + setState(() {}); } void changeFeed(bool choice) { - // Mettez ici le code pour l'action que vous souhaitez effectuer avec le paramètre - if (choice) { - setState(() { - animationController.reset(); - displayFeed = MyApp.postViewModel.postsFriends.reversed.toList(); - animationController.forward(); - choiceFeed = false; - }); - } else { - setState(() { - animationController.reset(); - displayFeed = MyApp.postViewModel.bestPosts.reversed.toList(); - animationController.forward(); - choiceFeed = true; - }); - } + setState(() { + if (choice) { + controller.nextPage(duration: Duration(milliseconds: 300), curve: Curves.linear); + } else { + controller.previousPage(duration: Duration(milliseconds: 300), curve: Curves.linear); + } + }); } - void openDetailPost(int index) { + void openDetailPost(Post post) { showModalBottomSheet( backgroundColor: bgModal, elevation: 1, @@ -91,7 +91,7 @@ class _FeedScreenState extends State with SingleTickerProviderStateM builder: ((BuildContext context) { return ClipRRect( borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)), - child: DetailPostScreen(post: displayFeed[index])); + child: DetailPostScreen(post: post)); }), ); } @@ -99,144 +99,178 @@ class _FeedScreenState extends State with SingleTickerProviderStateM _fetchData() async { friendFeed = await MyApp.postViewModel.getPostsFriends(); discoveryFeed = await MyApp.postViewModel.getBestPosts(); - return Tuple2(friendFeed, displayFeed); + return Tuple2(friendFeed, discoveryFeed); } - @override - Widget build(BuildContext context) { - if (choiceFeed) { - displayFeed = MyApp.postViewModel.postsFriends.reversed.toList(); + switchTopBar(int index) { + if (index == 0) { + setState(() { + choiceFeed = true; + }); } else { - displayFeed = MyApp.postViewModel.bestPosts.reversed.toList(); + setState(() { + choiceFeed = false; + }); } - _fetchData(); + } + @override + Widget build(BuildContext context) { + bool empty = + (choiceFeed == true && displayFeed.item1.isEmpty) || (choiceFeed == false && displayFeed.item2.isEmpty); return Scaffold( - resizeToAvoidBottomInset: true, - backgroundColor: bgColor, - extendBodyBehindAppBar: true, - body: displayFeed.isEmpty - ? Container( - width: double.infinity, - child: Stack( - fit: StackFit.expand, - children: [ - Container( - decoration: const BoxDecoration( - image: DecorationImage( - image: AssetImage("assets/images/empty_bg.png"), fit: BoxFit.cover, opacity: 0.3), - ), - child: Padding( - padding: EdgeInsets.only(top: 140.h, left: defaultPadding), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text("Suis tes amis pour voir leurs capsules", - style: GoogleFonts.plusJakartaSans( - color: Colors.white, fontSize: 23, fontWeight: FontWeight.w800)) - ], - ), - ), - ), - Align( - alignment: Alignment.topCenter, - child: IgnorePointer( - child: Container( - height: 240.h, - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topRight, - stops: [0.3, 1], - colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])), - ), - ), - ), - Align( - alignment: Alignment.topCenter, - child: ConstrainedBox( - constraints: BoxConstraints(maxWidth: 800), - child: TopNavBarComponent(callback: changeFeed), - ), - ), - ], + resizeToAvoidBottomInset: true, + backgroundColor: bgColor, + extendBodyBehindAppBar: true, + body: Container( + width: double.infinity, + height: double.infinity, + child: Stack( + fit: StackFit.expand, + children: [ + AnimatedOpacity( + opacity: empty ? 1 : 0, + duration: const Duration(milliseconds: 300), + curve: Curves.easeIn, + child: Container( + decoration: const BoxDecoration( + image: + DecorationImage(image: AssetImage("assets/images/empty_bg.png"), fit: BoxFit.cover, opacity: 0.3), ), - ) - : Container( - width: double.infinity, - height: double.infinity, - child: Stack( - fit: StackFit.expand, - children: [ - 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(), - ); - } - }, - ), - )), - ), + child: Padding( + padding: EdgeInsets.only(top: 140.h, left: defaultPadding), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text("Suis tes amis pour voir leurs capsules", + style: GoogleFonts.plusJakartaSans( + color: Colors.white, fontSize: 23, fontWeight: FontWeight.w800)) + ], + ), + ), + ), + ), + PageView( + onPageChanged: (value) { + switchTopBar(value); + }, + controller: controller, + scrollBehavior: const ScrollBehavior().copyWith(overscroll: false), + physics: AlwaysScrollableScrollPhysics(), + scrollDirection: Axis.horizontal, + children: [ + Align( + alignment: Alignment.topCenter, + child: CircularRevealAnimation( + animation: animation, + centerOffset: Offset(30.w, -100), + child: Container( + height: double.infinity, + 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(parent: AlwaysScrollableScrollPhysics()), + clipBehavior: Clip.none, + shrinkWrap: false, + itemCount: displayFeed.item1.length, + itemBuilder: (BuildContext context, int index) { + return Padding( + padding: const EdgeInsets.only(bottom: 40), + child: + PostComponent(callback: openDetailPost, post: displayFeed.item1[index], index: index), + ); + }, ), ), ), - Align( - alignment: Alignment.topCenter, - child: IgnorePointer( - child: Container( - height: 240.h, - decoration: BoxDecoration( - gradient: LinearGradient( - begin: Alignment.topRight, - stops: [0.3, 1], - colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])), + ), + ), + Align( + alignment: Alignment.topCenter, + child: CircularRevealAnimation( + animation: animation, + centerOffset: Offset(30.w, -100), + child: Container( + height: double.infinity, + 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(parent: AlwaysScrollableScrollPhysics()), + clipBehavior: Clip.none, + shrinkWrap: false, + itemCount: displayFeed.item2.length, + itemBuilder: (BuildContext context, int index) { + return Padding( + padding: const EdgeInsets.only(bottom: 40), + child: + PostComponent(callback: openDetailPost, post: displayFeed.item2[index], index: index), + ); + }, ), ), ), - Align( - alignment: Alignment.topCenter, - child: ConstrainedBox( - constraints: BoxConstraints(maxWidth: 800), - child: TopNavBarComponent(callback: changeFeed), - ), - ), - ], + ), ), - )); + ], + ), + Align( + alignment: Alignment.topCenter, + child: IgnorePointer( + child: Container( + height: 240.h, + decoration: BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topRight, + stops: [0.3, 1], + colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])), + ), + ), + ), + Align( + alignment: Alignment.topCenter, + child: ConstrainedBox( + constraints: BoxConstraints(maxWidth: 800), + child: TopNavBarComponent(callback: changeFeed, choice: choiceFeed), + ), + ), + ], + ), + ), + ); + } +} + +class NoEdgeEffectScrollPhysics extends ScrollPhysics { + const NoEdgeEffectScrollPhysics({ScrollPhysics? parent}) : super(parent: parent); + + @override + NoEdgeEffectScrollPhysics applyTo(ScrollPhysics? ancestor) { + return NoEdgeEffectScrollPhysics(parent: buildParent(ancestor)); + } + + @override + double applyBoundaryConditions(ScrollMetrics position, double value) { + // Supprimez l'effet de bord (effet de vague) + return 0.0; + } + + @override + double applyPhysicsToUserOffset(ScrollMetrics position, double offset) { + // Supprimez la rétroaction haptique + return offset; + } + + @override + Simulation? createBallisticSimulation(ScrollMetrics position, double velocity) { + // Désactivez l'overscroll + return super.createBallisticSimulation(position, 0.0); } } From 10f2b967a832c526f73be55c551045c013d4a4fd Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Thu, 3 Aug 2023 07:07:41 +0200 Subject: [PATCH 2/2] enfinnnnnnnnnn --- Sources/justMUSIC/android/app/src/main/AndroidManifest.xml | 3 +-- Sources/justMUSIC/lib/screens/detail_post_screen.dart | 1 + Sources/justMUSIC/lib/screens/feed_screen.dart | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml b/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml index 519a56e..5fefc0b 100644 --- a/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml +++ b/Sources/justMUSIC/android/app/src/main/AndroidManifest.xml @@ -3,8 +3,7 @@ package="com.example.justmusic"> + android:icon="@mipmap/ic_launcher"> { @override void initState() { + super.initState(); myFocusNode = FocusNode(); } diff --git a/Sources/justMUSIC/lib/screens/feed_screen.dart b/Sources/justMUSIC/lib/screens/feed_screen.dart index 8eb6bf4..83c9d95 100644 --- a/Sources/justMUSIC/lib/screens/feed_screen.dart +++ b/Sources/justMUSIC/lib/screens/feed_screen.dart @@ -37,8 +37,7 @@ class _FeedScreenState extends State with SingleTickerProviderStateM super.initState(); friendFeed = MyApp.postViewModel.postsFriends; discoveryFeed = MyApp.postViewModel.bestPosts; - displayFeed = - Tuple2(MyApp.postViewModel.postsFriends.reversed.toList(), MyApp.postViewModel.bestPosts.reversed.toList()); + animationController = AnimationController( vsync: this, duration: Duration(milliseconds: 400), @@ -116,6 +115,8 @@ class _FeedScreenState extends State with SingleTickerProviderStateM @override Widget build(BuildContext context) { + displayFeed = + Tuple2(MyApp.postViewModel.postsFriends.reversed.toList(), MyApp.postViewModel.bestPosts.reversed.toList()); bool empty = (choiceFeed == true && displayFeed.item1.isEmpty) || (choiceFeed == false && displayFeed.item2.isEmpty); return Scaffold(