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(

888
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,255 +52,99 @@ 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: () { height: 760.h,
FocusScopeNode currentFocus = FocusScope.of(context); child: Column(
if (!currentFocus.hasPrimaryFocus) { children: [
currentFocus.unfocus(); Expanded(
resetFullScreen(); child: Stack(
} children: [
}, ScrollConfiguration(
child: Container( behavior: MyBehavior(),
height: 760.h, child: SingleChildScrollView(
child: Column( controller: _scrollController,
children: [ physics: AlwaysScrollableScrollPhysics(),
Expanded( child: Stack(
child: Stack( clipBehavior: Clip.hardEdge,
children: [ children: [
ScrollConfiguration( Align(
behavior: MyBehavior(), alignment: Alignment.topCenter,
child: SingleChildScrollView( child: Container(
controller: _scrollController, height: 400,
physics: AlwaysScrollableScrollPhysics(), width: double.infinity,
child: Stack( child: FadeInImage.assetNetwork(
clipBehavior: Clip.hardEdge, placeholder: "assets/images/loadingPlaceholder.gif",
children: [ image: choice ? widget.post.selfie! : widget.post.music.cover!,
Align(
alignment: Alignment.topCenter,
child: Container(
height: 400,
width: double.infinity, width: double.infinity,
child: FadeInImage.assetNetwork( fit: BoxFit.cover,
placeholder:
"assets/images/loadingPlaceholder.gif",
image: choice
? widget.post.selfie!
: widget.post.music.cover!,
width: double.infinity,
fit: BoxFit.cover,
),
), ),
), ),
Column( ),
children: [ Column(
Container( children: [
height: 200, Container(
margin: EdgeInsets.only(top: 230), height: 200,
width: double.infinity, margin: EdgeInsets.only(top: 230),
decoration: const BoxDecoration( width: double.infinity,
gradient: LinearGradient( decoration: const BoxDecoration(
begin: Alignment.topCenter, gradient: LinearGradient(
end: Alignment.bottomCenter, begin: Alignment.topCenter,
colors: [Colors.transparent, bgModal], end: Alignment.bottomCenter,
stops: [0, 0.8], colors: [Colors.transparent, bgModal],
), stops: [0, 0.8],
), ),
child: Padding( ),
padding: child: Padding(
const EdgeInsets.fromLTRB(20, 0, 20, 10), padding: 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: const EdgeInsets.all(4),
padding: child: ClipOval(
const EdgeInsets.all(4), child: SizedBox.fromSize(
child: ClipOval( // Image radius
child: SizedBox.fromSize( child: Image(
// Image radius image: NetworkImage(widget.post.user.pp),
child: Image( width: 45,
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.music.previewUrl != null
? widget.post.location.item2 != ? ButtonPlayComponent(music: widget.post.music)
null : Container(),
? Text( ),
"${widget.post.location.item1}, ${widget.post.location.item2}", Flexible(
style: GoogleFonts child: Column(
.plusJakartaSans( mainAxisAlignment: MainAxisAlignment.end,
color: Colors.white crossAxisAlignment: CrossAxisAlignment.start,
.withOpacity(0.5), children: [
fontWeight: Flexible(
FontWeight.w400, child: Row(
fontSize: 15, crossAxisAlignment: CrossAxisAlignment.end,
), children: [
) Expanded(
: Text( child: ScrollConfiguration(
"", behavior: ScrollBehavior().copyWith(scrollbars: false),
style: GoogleFonts
.plusJakartaSans(
color: Colors.white
.withOpacity(0.4),
fontWeight:
FontWeight.w300,
fontSize: 13,
),
)
: ScrollConfiguration(
behavior: ScrollBehavior()
.copyWith(
scrollbars: false),
child: TextScroll( child: TextScroll(
widget.post.music.artists choice ? widget.post.user.pseudo : widget.post.music.title!,
.first.name!, style: GoogleFonts.plusJakartaSans(
style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color: Colors.white,
fontWeight: fontWeight: FontWeight.w800,
FontWeight.w500, fontSize: 22,
fontSize: 17,
), ),
mode: TextScrollMode mode: TextScrollMode
.endless, .endless,
@ -316,316 +155,335 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
Offset(20, 0)), 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.description != null widget.post.date.month,
? Align( widget.post.date.day,
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<List<Comment>>(
future: MyApp.commentViewModel
.getCommentsByPostId(widget.post.id),
builder: (BuildContext context,
AsyncSnapshot<List<Comment>>
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(
text: snapshot "Aujourd'hui, ${widget.post.date.hour}:${widget.post.date.minute}",
.data! style: GoogleFonts.plusJakartaSans(
.length > height: 1,
1 color: Colors.white,
? " commentaires" fontWeight: FontWeight.w900,
: " commentaire", fontSize: 18,
style: GoogleFonts
.plusJakartaSans(
color: Colors
.white,
fontWeight:
FontWeight
.w400,
), ),
), )
], : 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(), : Text(
snapshot.data!.length > 0 "",
? Padding( style: GoogleFonts.plusJakartaSans(
padding: const EdgeInsets color: Colors.white.withOpacity(0.4),
.fromLTRB( fontWeight: FontWeight.w300,
20, 0, 20, 20), fontSize: 13,
child: ListView.builder(
shrinkWrap: true,
physics:
NeverScrollableScrollPhysics(),
itemCount: snapshot
.data?.length,
itemBuilder:
(BuildContext
context,
int index) {
return CommentComponent(
comment: snapshot
.data![
index]);
},
), ),
) )
: Container(), : ScrollConfiguration(
], behavior: ScrollBehavior().copyWith(scrollbars: false),
); child: TextScroll(
} else { widget.post.music.artists.first.name!,
return Container( style: GoogleFonts.plusJakartaSans(
child: Center( height: 1,
child: color: Colors.white,
CupertinoActivityIndicator(), fontWeight: FontWeight.w500,
), fontSize: 17,
); ),
} mode: TextScrollMode.endless,
}, pauseBetween: Duration(milliseconds: 500),
velocity: Velocity(pixelsPerSecond: Offset(20, 0)),
),
),
],
),
), ),
], ],
), ),
), ),
], ),
), widget.post.description != null
widget.post.selfie != null ? Align(
? Align( alignment: Alignment.bottomLeft,
alignment: Alignment.topRight, child: Padding(
child: ZoomTapAnimation( padding: const EdgeInsets.fromLTRB(50, 35, 50, 35),
onTap: () { child: Text(
if (widget.post.selfie != null) { widget.post.description!,
switchChoice(); textAlign: TextAlign.left,
} style: GoogleFonts.plusJakartaSans(
}, height: 1,
enableLongTapRepeatEvent: false, color: Colors.white,
longTapRepeatDuration: fontWeight: FontWeight.w400,
const Duration(milliseconds: 100), fontSize: 14,
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 : Container(
child: Image( height: 30,
image: NetworkImage(choice ),
? widget.post.music.cover! Container(
: widget.post.selfie!), width: double.infinity,
fit: BoxFit.cover, 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<List<Comment>>(
future: MyApp.commentViewModel.getCommentsByPostId(widget.post.id),
builder: (BuildContext context, AsyncSnapshot<List<Comment>> 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, Align(
child: Container( alignment: Alignment.topCenter,
height: 50, child: Container(
width: double.infinity, height: 50,
color: Colors.transparent, width: double.infinity,
child: Align( color: Colors.transparent,
alignment: Alignment.topCenter, child: Align(
child: Container( alignment: Alignment.topCenter,
margin: EdgeInsets.only(top: 10), child: Container(
width: 60, margin: EdgeInsets.only(top: 10),
height: 5, width: 60,
decoration: BoxDecoration( height: 5,
color: Colors.white.withOpacity(0.6), decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20), 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( Padding(
children: [ padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
ClipOval( child: Container(
child: SizedBox.fromSize( height: 70,
// Rayon de l'image width: double.infinity,
child: Image.network( decoration: BoxDecoration(
MyApp.userViewModel.userCurrent.pp, border: Border(top: BorderSide(color: grayColor, width: 2)),
width: 45, 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( SizedBox(width: 10),
child: TextField( Expanded(
keyboardAppearance: Brightness.dark, child: TextField(
controller: _textController, keyboardAppearance: Brightness.dark,
focusNode: myFocusNode, controller: _textController,
onSubmitted: (value) async { focusNode: myFocusNode,
if (value.isNotEmpty) { onSubmitted: (value) async {
await MyApp.commentViewModel if (value.isNotEmpty) {
.addComment(value, widget.post.id); await MyApp.commentViewModel.addComment(value, widget.post.id);
} }
setState(() { setState(() {
_textController.clear(); _textController.clear();
}); });
}, },
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, color: grayText,
color: grayText, size: 20,
size: 20, ),
), focusedBorder: OutlineInputBorder(
focusedBorder: OutlineInputBorder( borderSide: BorderSide(width: 1, color: grayText),
borderSide: borderRadius: BorderRadius.all(Radius.circular(100)),
BorderSide(width: 1, color: grayText), ),
borderRadius: contentPadding: EdgeInsets.only(top: 0, bottom: 0, left: 20, right: 20),
BorderRadius.all(Radius.circular(100)), fillColor: bgModal,
), filled: true,
contentPadding: EdgeInsets.only( focusColor: Color.fromRGBO(255, 255, 255, 0.30),
top: 0, bottom: 0, left: 20, right: 20), enabledBorder: OutlineInputBorder(
fillColor: bgModal, borderSide: BorderSide(width: 1, color: grayText),
filled: true, borderRadius: BorderRadius.all(Radius.circular(100)),
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),
), ),
hintText: 'Ajoutez une réponse...',
hintStyle: GoogleFonts.plusJakartaSans(color: grayText),
), ),
), ),
], ),
), ],
), ),
), ),
), ),
), ),
], ),
), ],
), ),
); );
} }

380
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 setState(() {
if (choice) { if (choice) {
setState(() { controller.nextPage(duration: Duration(milliseconds: 300), curve: Curves.linear);
animationController.reset(); } else {
displayFeed = MyApp.postViewModel.postsFriends.reversed.toList(); controller.previousPage(duration: Duration(milliseconds: 300), curve: Curves.linear);
animationController.forward(); }
choiceFeed = false; });
});
} else {
setState(() {
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,172 +98,180 @@ 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(
decoration: const BoxDecoration( opacity: empty ? 1 : 0,
image: DecorationImage( duration: const Duration(milliseconds: 300),
image: AssetImage("assets/images/empty_bg.png"), curve: Curves.easeIn,
fit: BoxFit.cover, child: Container(
opacity: 0.3), decoration: const BoxDecoration(
), image:
child: Padding( DecorationImage(image: AssetImage("assets/images/empty_bg.png"), fit: BoxFit.cover, opacity: 0.3),
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),
),
),
],
), ),
) child: Padding(
: Container( padding: EdgeInsets.only(top: 140.h, left: defaultPadding),
width: double.infinity, child: Column(
height: double.infinity, crossAxisAlignment: CrossAxisAlignment.start,
child: Stack( children: [
fit: StackFit.expand, Text("Suis tes amis pour voir leurs capsules",
children: [ style: GoogleFonts.plusJakartaSans(
Expanded( color: Colors.white, fontSize: 23, fontWeight: FontWeight.w800))
child: Align( ],
alignment: Alignment.topCenter, ),
child: CircularRevealAnimation( ),
animation: animation, ),
centerOffset: Offset(30.w, -100), ),
child: Expanded( PageView(
child: Container( onPageChanged: (value) {
height: double.infinity, switchTopBar(value);
constraints: BoxConstraints(maxWidth: 600), },
padding: EdgeInsets.fromLTRB( controller: controller,
defaultPadding, 100.h, defaultPadding, 0), scrollBehavior: const ScrollBehavior().copyWith(overscroll: false),
child: Expanded( physics: AlwaysScrollableScrollPhysics(),
child: FutureBuilder( scrollDirection: Axis.horizontal,
future: _fetchData(), children: [
builder: (BuildContext context, Align(
AsyncSnapshot<dynamic> snapshot) { alignment: Alignment.topCenter,
if (snapshot.hasData) { child: CircularRevealAnimation(
return RefreshIndicator( animation: animation,
displacement: 20, centerOffset: Offset(30.w, -100),
triggerMode: child: Container(
RefreshIndicatorTriggerMode height: double.infinity,
.onEdge, constraints: BoxConstraints(maxWidth: 600),
onRefresh: _refresh, padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0),
child: Expanded( child: RefreshIndicator(
child: ListView.builder( displacement: 20,
physics: triggerMode: RefreshIndicatorTriggerMode.onEdge,
const AlwaysScrollableScrollPhysics(), onRefresh: _refresh,
clipBehavior: Clip.none, child: ListView.builder(
shrinkWrap: true, physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
itemCount: displayFeed.length, clipBehavior: Clip.none,
itemBuilder: shrinkWrap: false,
(BuildContext context, itemCount: displayFeed.item1.length,
int index) { itemBuilder: (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.item1[index], index: index),
child: PostComponent( );
callback: openDetailPost, },
post: displayFeed[index],
index: index),
);
},
),
),
);
} else {
return Center(
child: CupertinoActivityIndicator(),
);
}
},
),
)),
),
), ),
), ),
), ),
Align( ),
alignment: Alignment.topCenter, ),
child: IgnorePointer( Align(
child: Container( alignment: Alignment.topCenter,
height: 240.h, child: CircularRevealAnimation(
decoration: BoxDecoration( animation: animation,
gradient: LinearGradient( centerOffset: Offset(30.w, -100),
begin: Alignment.topRight, child: Container(
stops: [ height: double.infinity,
0.3, constraints: BoxConstraints(maxWidth: 600),
1 padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0),
], child: RefreshIndicator(
colors: [ displacement: 20,
bgColor.withOpacity(0.9), triggerMode: RefreshIndicatorTriggerMode.onEdge,
bgColor.withOpacity(0) 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);
} }
} }

Write Preview
Loading…
Cancel
Save