justDEV
/
justMusic
2
4
Fork 0
Code Issues 35 Pull Requests 5 Packages Projects 1 Releases Wiki Activity

Merge branch 'NEW_REFRESH_LDE'
continuous-integration/drone/push Build is passing Details

Browse Source
FAVORITE_MUSICS_EKA
emre.kartal 2 years ago
parent fd9b015fa3 10f2b967a8
commit 46a11ded7c
5 changed files with 1094 additions and 1234 deletions
Show Stats Download Patch File Download Diff File

3
Sources/justMUSIC/android/app/src/main/AndroidManifest.xml
Unescape View File

@ -3,8 +3,7 @@ package="com.example.justmusic">
<application <application
android:label="justmusic" android:label="justmusic"
android:name="${applicationName}" android:name="${applicationName}"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher">
android:enableOnBackInvokedCallback="true">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"

6
Sources/justMUSIC/lib/components/post_component.dart
Unescape View File

@ -9,7 +9,7 @@ import 'package:zoom_tap_animation/zoom_tap_animation.dart';
import '../model/Post.dart'; import '../model/Post.dart';
class PostComponent extends StatefulWidget { class PostComponent extends StatefulWidget {
final Function(int)? callback; final Function(Post)? callback;
final Post post; final Post post;
final int index; final int index;
@ -293,7 +293,7 @@ class _PostComponentState extends State<PostComponent> with TickerProviderStateM
SizedBox(height: 10), SizedBox(height: 10),
ZoomTapAnimation( ZoomTapAnimation(
onTap: () { onTap: () {
widget.callback!(widget.index); widget.callback!(widget.post);
}, },
enableLongTapRepeatEvent: false, enableLongTapRepeatEvent: false,
longTapRepeatDuration: const Duration(milliseconds: 100), longTapRepeatDuration: const Duration(milliseconds: 100),
@ -382,7 +382,7 @@ class _PostComponentState extends State<PostComponent> with TickerProviderStateM
)), )),
SizedBox(height: 15), SizedBox(height: 15),
SizedBox( SizedBox(
height: 60, height: 40,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

11
Sources/justMUSIC/lib/components/top_nav_bar_component.dart
Unescape View File

@ -15,17 +15,15 @@ import '../values/constants.dart';
class TopNavBarComponent extends StatefulWidget { class TopNavBarComponent extends StatefulWidget {
final Function(bool) callback; final Function(bool) callback;
final bool choice;
const TopNavBarComponent({Key? key, required this.callback}) const TopNavBarComponent({Key? key, required this.callback, required this.choice}) : super(key: key);
: super(key: key);
@override @override
State<TopNavBarComponent> createState() => _TopNavBarComponentState(); State<TopNavBarComponent> createState() => _TopNavBarComponentState();
} }
class _TopNavBarComponentState extends State<TopNavBarComponent> class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProviderStateMixin {
with TickerProviderStateMixin { late bool choice;
bool choice = true;
bool isDismissed = true; bool isDismissed = true;
@ -140,6 +138,7 @@ class _TopNavBarComponentState extends State<TopNavBarComponent>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
choice = widget.choice;
return Padding( return Padding(
padding: const EdgeInsets.only(top: defaultPadding), padding: const EdgeInsets.only(top: defaultPadding),
child: Container( child: Container(

314
Sources/justMUSIC/lib/screens/detail_post_screen.dart
Unescape View File

@ -1,19 +1,14 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/Material.dart'; import 'package:flutter/Material.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/services.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_screenutil/flutter_screenutil.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:text_scroll/text_scroll.dart'; import 'package:text_scroll/text_scroll.dart';
import 'package:zoom_tap_animation/zoom_tap_animation.dart'; import 'package:zoom_tap_animation/zoom_tap_animation.dart';
import '../components/button_play_component.dart'; import '../components/button_play_component.dart';
import '../components/comment_component.dart'; import '../components/comment_component.dart';
import '../main.dart'; import '../main.dart';
import '../model/Post.dart'; import '../model/Post.dart';
import '../model/Comment.dart'; import '../model/Comment.dart';
@ -57,36 +52,15 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
@override @override
void initState() { 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(); super.initState();
myFocusNode = FocusNode();
keyboardSubscription =
keyboardVisibilityController.onChange.listen((bool visible) {
if (!visible) {
myFocusNode.unfocus();
}
});
} }
final ScrollController _scrollController = ScrollController(); final ScrollController _scrollController = ScrollController();
@override @override
Widget build(BuildContext context) { 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, height: 760.h,
child: Column( child: Column(
children: [ children: [
@ -107,11 +81,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 400, height: 400,
width: double.infinity, width: double.infinity,
child: FadeInImage.assetNetwork( child: FadeInImage.assetNetwork(
placeholder: placeholder: "assets/images/loadingPlaceholder.gif",
"assets/images/loadingPlaceholder.gif", image: choice ? widget.post.selfie! : widget.post.music.cover!,
image: choice
? widget.post.selfie!
: widget.post.music.cover!,
width: double.infinity, width: double.infinity,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
@ -132,65 +103,47 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
), ),
), ),
child: Padding( child: Padding(
padding: padding: const EdgeInsets.fromLTRB(20, 0, 20, 10),
const EdgeInsets.fromLTRB(20, 0, 20, 10),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.end,
children: [ children: [
Padding( Padding(
padding: padding: const EdgeInsets.only(right: 10),
const EdgeInsets.only(right: 10),
child: choice child: choice
? Padding( ? Padding(
padding: padding: const EdgeInsets.all(4),
const EdgeInsets.all(4),
child: ClipOval( child: ClipOval(
child: SizedBox.fromSize( child: SizedBox.fromSize(
// Image radius // Image radius
child: Image( child: Image(
image: NetworkImage( image: NetworkImage(widget.post.user.pp),
widget.post.user.pp),
width: 45, width: 45,
), ),
), ),
), ),
) )
: widget.post.music.previewUrl != : widget.post.music.previewUrl != null
null ? ButtonPlayComponent(music: widget.post.music)
? ButtonPlayComponent(
music: widget.post.music)
: Container(), : Container(),
), ),
Flexible( Flexible(
child: Column( child: Column(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.end,
MainAxisAlignment.end, crossAxisAlignment: CrossAxisAlignment.start,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Flexible( Flexible(
child: Row( child: Row(
crossAxisAlignment: crossAxisAlignment: CrossAxisAlignment.end,
CrossAxisAlignment.end,
children: [ children: [
Expanded( Expanded(
child: ScrollConfiguration( child: ScrollConfiguration(
behavior: ScrollBehavior() behavior: ScrollBehavior().copyWith(scrollbars: false),
.copyWith(
scrollbars:
false),
child: TextScroll( child: TextScroll(
choice choice ? widget.post.user.pseudo : widget.post.music.title!,
? widget.post.user style: GoogleFonts.plusJakartaSans(
.pseudo
: widget.post.music
.title!,
style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color: Colors.white,
fontWeight: fontWeight: FontWeight.w800,
FontWeight.w800,
fontSize: 22, fontSize: 22,
), ),
mode: TextScrollMode mode: TextScrollMode
@ -204,62 +157,39 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
), ),
), ),
Padding( Padding(
padding: padding: const EdgeInsets.only(left: 20.0),
const EdgeInsets.only(
left: 20.0),
child: choice child: choice
? DateTime( ? DateTime(today.year, today.month, today.day).isAtSameMomentAs(
today.year,
today.month,
today.day)
.isAtSameMomentAs(
DateTime( DateTime(
widget.post.date widget.post.date.year,
.year, widget.post.date.month,
widget.post.date widget.post.date.day,
.month,
widget.post.date
.day,
), ),
) )
? Text( ? Text(
"Aujourd'hui, ${widget.post.date.hour}:${widget.post.date.minute}", "Aujourd'hui, ${widget.post.date.hour}:${widget.post.date.minute}",
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans(
height: 1, height: 1,
color: Colors color: Colors.white,
.white, fontWeight: FontWeight.w900,
fontWeight:
FontWeight
.w900,
fontSize: 18, fontSize: 18,
), ),
) )
: Text( : Text(
"hier, ${widget.post.date.hour}:${widget.post.date.minute}", "hier, ${widget.post.date.hour}:${widget.post.date.minute}",
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans(
height: 1, height: 1,
color: Colors color: Colors.white,
.white, fontWeight: FontWeight.w900,
fontWeight:
FontWeight
.w900,
fontSize: 18, fontSize: 18,
), ),
) )
: Text( : Text(
widget widget.post.music.date.toString(),
.post.music.date style: GoogleFonts.plusJakartaSans(
.toString(),
style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: color: Colors.white,
Colors.white, fontWeight: FontWeight.w900,
fontWeight:
FontWeight
.w900,
fontSize: 18, fontSize: 18,
), ),
), ),
@ -268,52 +198,36 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
), ),
), ),
choice choice
? widget.post.location.item2 != ? widget.post.location.item2 != null
null
? Text( ? Text(
"${widget.post.location.item1}, ${widget.post.location.item2}", "${widget.post.location.item1}, ${widget.post.location.item2}",
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans( color: Colors.white.withOpacity(0.5),
color: Colors.white fontWeight: FontWeight.w400,
.withOpacity(0.5),
fontWeight:
FontWeight.w400,
fontSize: 15, fontSize: 15,
), ),
) )
: Text( : Text(
"", "",
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans( color: Colors.white.withOpacity(0.4),
color: Colors.white fontWeight: FontWeight.w300,
.withOpacity(0.4),
fontWeight:
FontWeight.w300,
fontSize: 13, fontSize: 13,
), ),
) )
: ScrollConfiguration( : ScrollConfiguration(
behavior: ScrollBehavior() behavior: ScrollBehavior().copyWith(scrollbars: false),
.copyWith(
scrollbars: false),
child: TextScroll( child: TextScroll(
widget.post.music.artists widget.post.music.artists.first.name!,
.first.name!, style: GoogleFonts.plusJakartaSans(
style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color: Colors.white,
fontWeight: fontWeight: FontWeight.w500,
FontWeight.w500,
fontSize: 17, fontSize: 17,
), ),
mode: TextScrollMode mode: TextScrollMode.endless,
.endless, pauseBetween: Duration(milliseconds: 500),
pauseBetween: Duration( velocity: Velocity(pixelsPerSecond: Offset(20, 0)),
milliseconds: 500),
velocity: Velocity(
pixelsPerSecond:
Offset(20, 0)),
), ),
), ),
], ],
@ -327,8 +241,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
? Align( ? Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB( padding: const EdgeInsets.fromLTRB(50, 35, 50, 35),
50, 35, 50, 35),
child: Text( child: Text(
widget.post.description!, widget.post.description!,
textAlign: TextAlign.left, textAlign: TextAlign.left,
@ -358,77 +271,49 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: padding: EdgeInsets.symmetric(vertical: 20),
EdgeInsets.symmetric(vertical: 20),
child: Row( child: Row(
mainAxisAlignment: mainAxisAlignment: MainAxisAlignment.spaceEvenly,
MainAxisAlignment.spaceEvenly,
children: [ children: [
SvgPicture.asset( SvgPicture.asset("assets/images/heart.svg", semanticsLabel: 'Like Logo'),
"assets/images/heart.svg",
semanticsLabel: 'Like Logo'),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
myFocusNode.requestFocus(); myFocusNode.requestFocus();
}, },
child: SvgPicture.asset( child:
"assets/images/chat.svg", SvgPicture.asset("assets/images/chat.svg", semanticsLabel: 'Chat Logo'),
semanticsLabel: 'Chat Logo'), ),
), SvgPicture.asset("assets/images/add.svg", semanticsLabel: 'Add playlist Logo'),
SvgPicture.asset( SvgPicture.asset("assets/images/save.svg", semanticsLabel: 'Save Logo'),
"assets/images/add.svg", SvgPicture.asset("assets/images/report.svg", semanticsLabel: 'Report Logo'),
semanticsLabel:
'Add playlist Logo'),
SvgPicture.asset(
"assets/images/save.svg",
semanticsLabel: 'Save Logo'),
SvgPicture.asset(
"assets/images/report.svg",
semanticsLabel: 'Report Logo'),
], ],
), ),
), ),
FutureBuilder<List<Comment>>( FutureBuilder<List<Comment>>(
future: MyApp.commentViewModel future: MyApp.commentViewModel.getCommentsByPostId(widget.post.id),
.getCommentsByPostId(widget.post.id), builder: (BuildContext context, AsyncSnapshot<List<Comment>> snapshot) {
builder: (BuildContext context,
AsyncSnapshot<List<Comment>>
snapshot) {
if (snapshot.hasData) { if (snapshot.hasData) {
print("test:"); print("test:");
return Column( return Column(
children: [ children: [
snapshot.data!.length > 0 snapshot.data!.length > 0
? Padding( ? Padding(
padding: padding: const EdgeInsets.all(15.0),
const EdgeInsets.all(
15.0),
child: RichText( child: RichText(
text: TextSpan( text: TextSpan(
text: snapshot text: snapshot.data!.length.toString(),
.data!.length style: GoogleFonts.plusJakartaSans(
.toString(),
style: GoogleFonts
.plusJakartaSans(
color: Colors.white, color: Colors.white,
fontWeight: fontWeight: FontWeight.w800,
FontWeight.w800,
), ),
children: [ children: [
TextSpan( TextSpan(
text: snapshot text: snapshot.data!.length > 1
.data!
.length >
1
? " commentaires" ? " commentaires"
: " commentaire", : " commentaire",
style: GoogleFonts style: GoogleFonts.plusJakartaSans(
.plusJakartaSans( color: Colors.white,
color: Colors fontWeight: FontWeight.w400,
.white,
fontWeight:
FontWeight
.w400,
), ),
), ),
], ],
@ -438,23 +323,13 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
: Container(), : Container(),
snapshot.data!.length > 0 snapshot.data!.length > 0
? Padding( ? Padding(
padding: const EdgeInsets padding: const EdgeInsets.fromLTRB(20, 0, 20, 20),
.fromLTRB(
20, 0, 20, 20),
child: ListView.builder( child: ListView.builder(
shrinkWrap: true, shrinkWrap: true,
physics: physics: NeverScrollableScrollPhysics(),
NeverScrollableScrollPhysics(), itemCount: snapshot.data?.length,
itemCount: snapshot itemBuilder: (BuildContext context, int index) {
.data?.length, return CommentComponent(comment: snapshot.data![index]);
itemBuilder:
(BuildContext
context,
int index) {
return CommentComponent(
comment: snapshot
.data![
index]);
}, },
), ),
) )
@ -464,8 +339,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
} else { } else {
return Container( return Container(
child: Center( child: Center(
child: child: CupertinoActivityIndicator(),
CupertinoActivityIndicator(),
), ),
); );
} }
@ -486,14 +360,11 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
} }
}, },
enableLongTapRepeatEvent: false, enableLongTapRepeatEvent: false,
longTapRepeatDuration: longTapRepeatDuration: const Duration(milliseconds: 100),
const Duration(milliseconds: 100),
begin: 1.0, begin: 1.0,
end: 0.96, end: 0.96,
beginDuration: beginDuration: const Duration(milliseconds: 70),
const Duration(milliseconds: 70), endDuration: const Duration(milliseconds: 100),
endDuration:
const Duration(milliseconds: 100),
beginCurve: Curves.decelerate, beginCurve: Curves.decelerate,
endCurve: Curves.easeInOutSine, endCurve: Curves.easeInOutSine,
child: Container( child: Container(
@ -502,16 +373,13 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 120, height: 120,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
border: Border.all( border: Border.all(width: 4, color: Colors.white),
width: 4, color: Colors.white),
), ),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
// implementer l'image // implementer l'image
child: Image( child: Image(
image: NetworkImage(choice image: NetworkImage(choice ? widget.post.music.cover! : widget.post.selfie!),
? widget.post.music.cover!
: widget.post.selfie!),
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
), ),
@ -547,8 +415,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
bottom: MediaQuery.of(context).viewInsets.bottom),
child: Container( child: Container(
height: 70, height: 70,
width: double.infinity, width: double.infinity,
@ -578,8 +445,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
focusNode: myFocusNode, focusNode: myFocusNode,
onSubmitted: (value) async { onSubmitted: (value) async {
if (value.isNotEmpty) { if (value.isNotEmpty) {
await MyApp.commentViewModel await MyApp.commentViewModel.addComment(value, widget.post.id);
.addComment(value, widget.post.id);
} }
setState(() { setState(() {
_textController.clear(); _textController.clear();
@ -587,8 +453,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
}, },
cursorColor: primaryColor, cursorColor: primaryColor,
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(color: Colors.white),
color: Colors.white),
decoration: InputDecoration( decoration: InputDecoration(
suffixIcon: Icon( suffixIcon: Icon(
Icons.send, Icons.send,
@ -596,25 +461,19 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
size: 20, size: 20,
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: borderSide: BorderSide(width: 1, color: grayText),
BorderSide(width: 1, color: grayText), borderRadius: BorderRadius.all(Radius.circular(100)),
borderRadius:
BorderRadius.all(Radius.circular(100)),
), ),
contentPadding: EdgeInsets.only( contentPadding: EdgeInsets.only(top: 0, bottom: 0, left: 20, right: 20),
top: 0, bottom: 0, left: 20, right: 20),
fillColor: bgModal, fillColor: bgModal,
filled: true, filled: true,
focusColor: Color.fromRGBO(255, 255, 255, 0.30), focusColor: Color.fromRGBO(255, 255, 255, 0.30),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: borderSide: BorderSide(width: 1, color: grayText),
BorderSide(width: 1, color: grayText), borderRadius: BorderRadius.all(Radius.circular(100)),
borderRadius:
BorderRadius.all(Radius.circular(100)),
), ),
hintText: 'Ajoutez une réponse...', hintText: 'Ajoutez une réponse...',
hintStyle: hintStyle: GoogleFonts.plusJakartaSans(color: grayText),
GoogleFonts.plusJakartaSans(color: grayText),
), ),
), ),
), ),
@ -626,7 +485,6 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
), ),
], ],
), ),
),
); );
} }
} }

256
Sources/justMUSIC/lib/screens/feed_screen.dart
Unescape View File

@ -6,7 +6,6 @@ import 'package:flutter/services.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:justmusic/main.dart'; import 'package:justmusic/main.dart';
import 'package:justmusic/main.dart';
import 'package:tuple/tuple.dart'; import 'package:tuple/tuple.dart';
import '../components/post_component.dart'; import '../components/post_component.dart';
import '../components/top_nav_bar_component.dart'; import '../components/top_nav_bar_component.dart';
@ -21,23 +20,24 @@ class FeedScreen extends StatefulWidget {
State<FeedScreen> createState() => _FeedScreenState(); State<FeedScreen> createState() => _FeedScreenState();
} }
class _FeedScreenState extends State<FeedScreen> class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateMixin {
with SingleTickerProviderStateMixin {
late AnimationController animationController; late AnimationController animationController;
late Animation<double> animation; late Animation<double> animation;
late List<Post> friendFeed; late List<Post> friendFeed;
Timer? timer; Timer? timer;
late List<Post> discoveryFeed; late List<Post> discoveryFeed;
late List<Post> displayFeed; late Tuple2<List<Post>, List<Post>> displayFeed;
bool isDismissed = true; bool isDismissed = true;
bool choiceFeed = false; bool choiceFeed = true;
PageController controller = PageController();
@override @override
void initState() { void initState() {
super.initState(); super.initState();
friendFeed = MyApp.postViewModel.postsFriends; friendFeed = MyApp.postViewModel.postsFriends;
discoveryFeed = MyApp.postViewModel.bestPosts; discoveryFeed = MyApp.postViewModel.bestPosts;
animationController = AnimationController( animationController = AnimationController(
vsync: this, vsync: this,
duration: Duration(milliseconds: 400), duration: Duration(milliseconds: 400),
@ -47,38 +47,36 @@ class _FeedScreenState extends State<FeedScreen>
curve: Curves.easeInOutSine, curve: Curves.easeInOutSine,
); );
animationController.forward(); 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) { void changeFeed(bool choice) {
// Mettez ici le code pour l'action que vous souhaitez effectuer avec le paramètre
if (choice) {
setState(() { 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 { } 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( showModalBottomSheet(
backgroundColor: bgModal, backgroundColor: bgModal,
elevation: 1, elevation: 1,
@ -88,13 +86,11 @@ class _FeedScreenState extends State<FeedScreen>
isScrollControlled: true, isScrollControlled: true,
context: context, context: context,
shape: const RoundedRectangleBorder( shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))),
topLeft: Radius.circular(20), topRight: Radius.circular(20))),
builder: ((BuildContext context) { builder: ((BuildContext context) {
return ClipRRect( return ClipRRect(
borderRadius: BorderRadius.only( borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
topLeft: Radius.circular(20), topRight: Radius.circular(20)), child: DetailPostScreen(post: post));
child: DetailPostScreen(post: displayFeed[index]));
}), }),
); );
} }
@ -102,143 +98,129 @@ class _FeedScreenState extends State<FeedScreen>
_fetchData() async { _fetchData() async {
friendFeed = await MyApp.postViewModel.getPostsFriends(); friendFeed = await MyApp.postViewModel.getPostsFriends();
discoveryFeed = await MyApp.postViewModel.getBestPosts(); 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 { } else {
displayFeed = MyApp.postViewModel.bestPosts.reversed.toList(); setState(() {
choiceFeed = false;
});
}
} }
_fetchData();
@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( return Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: bgColor, backgroundColor: bgColor,
extendBodyBehindAppBar: true, extendBodyBehindAppBar: true,
body: displayFeed.isEmpty body: Container(
? Container(
width: double.infinity, width: double.infinity,
height: double.infinity,
child: Stack( child: Stack(
fit: StackFit.expand, fit: StackFit.expand,
children: [ children: [
Container( AnimatedOpacity(
opacity: empty ? 1 : 0,
duration: const Duration(milliseconds: 300),
curve: Curves.easeIn,
child: Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
image: DecorationImage( image:
image: AssetImage("assets/images/empty_bg.png"), DecorationImage(image: AssetImage("assets/images/empty_bg.png"), fit: BoxFit.cover, opacity: 0.3),
fit: BoxFit.cover,
opacity: 0.3),
), ),
child: Padding( child: Padding(
padding: padding: EdgeInsets.only(top: 140.h, left: defaultPadding),
EdgeInsets.only(top: 140.h, left: defaultPadding),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text("Suis tes amis pour voir leurs capsules", Text("Suis tes amis pour voir leurs capsules",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
color: Colors.white, color: Colors.white, fontSize: 23, fontWeight: FontWeight.w800))
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( Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: IgnorePointer( child: CircularRevealAnimation(
animation: animation,
centerOffset: Offset(30.w, -100),
child: Container( 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: [ displacement: 20,
0.3, triggerMode: RefreshIndicatorTriggerMode.onEdge,
1 onRefresh: _refresh,
], child: ListView.builder(
colors: [ physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
bgColor.withOpacity(0.9), clipBehavior: Clip.none,
bgColor.withOpacity(0) 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, alignment: Alignment.topCenter,
child: CircularRevealAnimation( child: CircularRevealAnimation(
animation: animation, animation: animation,
centerOffset: Offset(30.w, -100), centerOffset: Offset(30.w, -100),
child: Expanded(
child: Container( child: Container(
height: double.infinity, height: double.infinity,
constraints: BoxConstraints(maxWidth: 600), constraints: BoxConstraints(maxWidth: 600),
padding: EdgeInsets.fromLTRB( padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0),
defaultPadding, 100.h, defaultPadding, 0), child: RefreshIndicator(
child: Expanded(
child: FutureBuilder(
future: _fetchData(),
builder: (BuildContext context,
AsyncSnapshot<dynamic> snapshot) {
if (snapshot.hasData) {
return RefreshIndicator(
displacement: 20, displacement: 20,
triggerMode: triggerMode: RefreshIndicatorTriggerMode.onEdge,
RefreshIndicatorTriggerMode
.onEdge,
onRefresh: _refresh, onRefresh: _refresh,
child: Expanded(
child: ListView.builder( child: ListView.builder(
physics: physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
const AlwaysScrollableScrollPhysics(),
clipBehavior: Clip.none, clipBehavior: Clip.none,
shrinkWrap: true, shrinkWrap: false,
itemCount: displayFeed.length, itemCount: displayFeed.item2.length,
itemBuilder: itemBuilder: (BuildContext context, int index) {
(BuildContext context,
int index) {
return Padding( return Padding(
padding: padding: const EdgeInsets.only(bottom: 40),
const EdgeInsets.only( child:
bottom: 40), PostComponent(callback: openDetailPost, post: displayFeed.item2[index], index: index),
child: PostComponent(
callback: openDetailPost,
post: displayFeed[index],
index: index),
); );
}, },
), ),
), ),
);
} else {
return Center(
child: CupertinoActivityIndicator(),
);
}
},
),
)),
), ),
), ),
), ),
],
), ),
Align( Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
@ -248,14 +230,8 @@ class _FeedScreenState extends State<FeedScreen>
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
begin: Alignment.topRight, begin: Alignment.topRight,
stops: [ stops: [0.3, 1],
0.3, colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])),
1
],
colors: [
bgColor.withOpacity(0.9),
bgColor.withOpacity(0)
])),
), ),
), ),
), ),
@ -263,11 +239,39 @@ class _FeedScreenState extends State<FeedScreen>
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: ConstrainedBox( child: ConstrainedBox(
constraints: BoxConstraints(maxWidth: 800), 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);
} }
} }

Write Preview
Loading…
Cancel
Save