enfinnnnnnnnnn

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<PostComponent> 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<PostComponent> with TickerProviderStateM
                       )),
                   SizedBox(height: 15),
                   SizedBox(
-                    height: 60,
+                    height: 40,
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [

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<TopNavBarComponent> createState() => _TopNavBarComponentState();
 }
 
 class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProviderStateMixin {
-  bool choice = true;
+  late bool choice;
 
   bool isDismissed = true;
 
@@ -133,6 +134,7 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
 
   @override
   Widget build(BuildContext context) {
+    choice = widget.choice;
     return Padding(
       padding: const EdgeInsets.only(top: defaultPadding),
       child: Container(

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,34 +50,14 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
 
   @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(
+    return Container(
-      onTap: () {
-        FocusScopeNode currentFocus = FocusScope.of(context);
-        if (!currentFocus.hasPrimaryFocus) {
-          currentFocus.unfocus();
-          resetFullScreen();
-        }
-      },
-      child: Container(
       height: 760.h,
       child: Column(
         children: [
@@ -301,8 +276,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                                           child:
                                               SvgPicture.asset("assets/images/chat.svg", semanticsLabel: 'Chat Logo'),
                                         ),
-                                          SvgPicture.asset("assets/images/add.svg",
+                                        SvgPicture.asset("assets/images/add.svg", semanticsLabel: 'Add playlist Logo'),
-                                              semanticsLabel: 'Add playlist Logo'),
                                         SvgPicture.asset("assets/images/save.svg", semanticsLabel: 'Save Logo'),
                                         SvgPicture.asset("assets/images/report.svg", semanticsLabel: 'Report Logo'),
                                       ],
@@ -504,7 +478,6 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
           ),
         ],
       ),
-      ),
     );
   }
 }

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<FeedScreen> with SingleTickerProviderStateM
   Timer? timer;
 
   late List<Post> discoveryFeed;
-  late List<Post> displayFeed;
+  late Tuple2<List<Post>, List<Post>> 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<FeedScreen> with SingleTickerProviderStateM
       curve: Curves.easeInOutSine,
     );
     animationController.forward();
+    _fetchData().then((tuple) {
+      friendFeed = tuple.item2;
+      displayFeed = tuple.item1;
+      setState(() {});
+    });
   }
 
-  Future _refresh() async {
+  @override
-    if (choiceFeed) {
+  void dispose() {
-      await MyApp.postViewModel.getBestPosts();
+    animationController.dispose();
-      setState(() {});
+    super.dispose();
-    } else {
-      await MyApp.postViewModel.getPostsFriends();
-      setState(() {});
   }
+
+  Future<void> _refresh() async {
+    Tuple2<List<Post>, List<Post>> 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();
+      if (choice) {
-        displayFeed = MyApp.postViewModel.postsFriends.reversed.toList();
+        controller.nextPage(duration: Duration(milliseconds: 300), curve: Curves.linear);
-        animationController.forward();
-        choiceFeed = false;
-      });
       } else {
-      setState(() {
+        controller.previousPage(duration: Duration(milliseconds: 300), curve: Curves.linear);
-        animationController.reset();
-        displayFeed = MyApp.postViewModel.bestPosts.reversed.toList();
-        animationController.forward();
-        choiceFeed = true;
-      });
       }
+    });
   }
 
-  void openDetailPost(int index) {
+  void openDetailPost(Post post) {
     showModalBottomSheet(
       backgroundColor: bgModal,
       elevation: 1,
@@ -91,7 +91,7 @@ class _FeedScreenState extends State<FeedScreen> 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,32 +99,43 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
   _fetchData() async {
     friendFeed = await MyApp.postViewModel.getPostsFriends();
     discoveryFeed = await MyApp.postViewModel.getBestPosts();
-    return Tuple2(friendFeed, displayFeed);
+    return Tuple2(friendFeed, discoveryFeed);
   }
 
-  @override
+  switchTopBar(int index) {
-  Widget build(BuildContext context) {
+    if (index == 0) {
-    if (choiceFeed) {
+      setState(() {
-      displayFeed = MyApp.postViewModel.postsFriends.reversed.toList();
+        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
+      body: Container(
-            ? Container(
         width: double.infinity,
+        height: double.infinity,
         child: Stack(
           fit: StackFit.expand,
           children: [
-                    Container(
+            AnimatedOpacity(
+              opacity: empty ? 1 : 0,
+              duration: const Duration(milliseconds: 300),
+              curve: Curves.easeIn,
+              child: Container(
                 decoration: const BoxDecoration(
-                        image: DecorationImage(
+                  image:
-                            image: AssetImage("assets/images/empty_bg.png"), fit: BoxFit.cover, opacity: 0.3),
+                      DecorationImage(image: AssetImage("assets/images/empty_bg.png"), fit: BoxFit.cover, opacity: 0.3),
                 ),
                 child: Padding(
                   padding: EdgeInsets.only(top: 140.h, left: defaultPadding),
@@ -138,82 +149,77 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
                   ),
                 ),
               ),
+            ),
+            PageView(
+              onPageChanged: (value) {
+                switchTopBar(value);
+              },
+              controller: controller,
+              scrollBehavior: const ScrollBehavior().copyWith(overscroll: false),
+              physics: AlwaysScrollableScrollPhysics(),
+              scrollDirection: Axis.horizontal,
+              children: [
                 Align(
                   alignment: Alignment.topCenter,
-                      child: IgnorePointer(
+                  child: CircularRevealAnimation(
+                    animation: animation,
+                    centerOffset: Offset(30.w, -100),
                     child: Container(
-                          height: 240.h,
+                      height: double.infinity,
-                          decoration: BoxDecoration(
+                      constraints: BoxConstraints(maxWidth: 600),
-                              gradient: LinearGradient(
+                      padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0),
-                                  begin: Alignment.topRight,
+                      child: RefreshIndicator(
-                                  stops: [0.3, 1],
+                        displacement: 20,
-                                  colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])),
+                        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: ConstrainedBox(
-                        constraints: BoxConstraints(maxWidth: 800),
-                        child: TopNavBarComponent(callback: changeFeed),
                     ),
                   ),
-                  ],
                 ),
-              )
+                Align(
-            : 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: RefreshIndicator(
-                                  child: FutureBuilder(
-                                    future: _fetchData(),
-                                    builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
-                                      if (snapshot.hasData) {
-                                        return RefreshIndicator(
                         displacement: 20,
                         triggerMode: RefreshIndicatorTriggerMode.onEdge,
                         onRefresh: _refresh,
-                                          child: Expanded(
                         child: ListView.builder(
-                                              physics: const AlwaysScrollableScrollPhysics(),
+                          physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
                           clipBehavior: Clip.none,
-                                              shrinkWrap: true,
+                          shrinkWrap: false,
-                                              itemCount: displayFeed.length,
+                          itemCount: displayFeed.item2.length,
                           itemBuilder: (BuildContext context, int index) {
                             return Padding(
                               padding: const EdgeInsets.only(bottom: 40),
-                                                  child: PostComponent(
+                              child:
-                                                      callback: openDetailPost, post: displayFeed[index], index: index),
+                                  PostComponent(callback: openDetailPost, post: displayFeed.item2[index], index: index),
                             );
                           },
                         ),
                       ),
-                                        );
-                                      } else {
-                                        return Center(
-                                          child: CupertinoActivityIndicator(),
-                                        );
-                                      }
-                                    },
-                                  ),
-                                )),
                     ),
                   ),
                 ),
+              ],
             ),
             Align(
               alignment: Alignment.topCenter,
@@ -232,11 +238,39 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
               alignment: Alignment.topCenter,
               child: ConstrainedBox(
                 constraints: BoxConstraints(maxWidth: 800),
-                        child: TopNavBarComponent(callback: changeFeed),
+                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);
   }
 }