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
android:label="justmusic"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher"
android:enableOnBackInvokedCallback="true">
android:icon="@mipmap/ic_launcher">
<activity
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';
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: [

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

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

@ -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';
@ -57,36 +52,15 @@ 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();
}
});
myFocusNode = FocusNode();
}
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(
return Container(
height: 760.h,
child: Column(
children: [
@ -107,11 +81,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 400,
width: double.infinity,
child: FadeInImage.assetNetwork(
placeholder:
"assets/images/loadingPlaceholder.gif",
image: choice
? widget.post.selfie!
: widget.post.music.cover!,
placeholder: "assets/images/loadingPlaceholder.gif",
image: choice ? widget.post.selfie! : widget.post.music.cover!,
width: double.infinity,
fit: BoxFit.cover,
),
@ -132,65 +103,47 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
),
),
child: Padding(
padding:
const EdgeInsets.fromLTRB(20, 0, 20, 10),
padding: const EdgeInsets.fromLTRB(20, 0, 20, 10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Padding(
padding:
const EdgeInsets.only(right: 10),
padding: const EdgeInsets.only(right: 10),
child: choice
? Padding(
padding:
const EdgeInsets.all(4),
padding: const EdgeInsets.all(4),
child: ClipOval(
child: SizedBox.fromSize(
// Image radius
child: Image(
image: NetworkImage(
widget.post.user.pp),
image: NetworkImage(widget.post.user.pp),
width: 45,
),
),
),
)
: widget.post.music.previewUrl !=
null
? ButtonPlayComponent(
music: widget.post.music)
: widget.post.music.previewUrl != null
? ButtonPlayComponent(music: widget.post.music)
: Container(),
),
Flexible(
child: Column(
mainAxisAlignment:
MainAxisAlignment.end,
crossAxisAlignment:
CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Flexible(
child: Row(
crossAxisAlignment:
CrossAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: ScrollConfiguration(
behavior: ScrollBehavior()
.copyWith(
scrollbars:
false),
behavior: ScrollBehavior().copyWith(scrollbars: false),
child: TextScroll(
choice
? widget.post.user
.pseudo
: widget.post.music
.title!,
style: GoogleFonts
.plusJakartaSans(
choice ? widget.post.user.pseudo : widget.post.music.title!,
style: GoogleFonts.plusJakartaSans(
height: 1,
color: Colors.white,
fontWeight:
FontWeight.w800,
fontWeight: FontWeight.w800,
fontSize: 22,
),
mode: TextScrollMode
@ -204,62 +157,39 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
),
),
Padding(
padding:
const EdgeInsets.only(
left: 20.0),
padding: const EdgeInsets.only(left: 20.0),
child: choice
? DateTime(
today.year,
today.month,
today.day)
.isAtSameMomentAs(
? DateTime(today.year, today.month, today.day).isAtSameMomentAs(
DateTime(
widget.post.date
.year,
widget.post.date
.month,
widget.post.date
.day,
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(
style: GoogleFonts.plusJakartaSans(
height: 1,
color: Colors
.white,
fontWeight:
FontWeight
.w900,
color: Colors.white,
fontWeight: FontWeight.w900,
fontSize: 18,
),
)
: Text(
"hier, ${widget.post.date.hour}:${widget.post.date.minute}",
style: GoogleFonts
.plusJakartaSans(
style: GoogleFonts.plusJakartaSans(
height: 1,
color: Colors
.white,
fontWeight:
FontWeight
.w900,
color: Colors.white,
fontWeight: FontWeight.w900,
fontSize: 18,
),
)
: Text(
widget
.post.music.date
.toString(),
style: GoogleFonts
.plusJakartaSans(
widget.post.music.date.toString(),
style: GoogleFonts.plusJakartaSans(
height: 1,
color:
Colors.white,
fontWeight:
FontWeight
.w900,
color: Colors.white,
fontWeight: FontWeight.w900,
fontSize: 18,
),
),
@ -268,52 +198,36 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
),
),
choice
? widget.post.location.item2 !=
null
? 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,
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,
style: GoogleFonts.plusJakartaSans(
color: Colors.white.withOpacity(0.4),
fontWeight: FontWeight.w300,
fontSize: 13,
),
)
: ScrollConfiguration(
behavior: ScrollBehavior()
.copyWith(
scrollbars: false),
behavior: ScrollBehavior().copyWith(scrollbars: false),
child: TextScroll(
widget.post.music.artists
.first.name!,
style: GoogleFonts
.plusJakartaSans(
widget.post.music.artists.first.name!,
style: GoogleFonts.plusJakartaSans(
height: 1,
color: Colors.white,
fontWeight:
FontWeight.w500,
fontWeight: FontWeight.w500,
fontSize: 17,
),
mode: TextScrollMode
.endless,
pauseBetween: Duration(
milliseconds: 500),
velocity: Velocity(
pixelsPerSecond:
Offset(20, 0)),
mode: TextScrollMode.endless,
pauseBetween: Duration(milliseconds: 500),
velocity: Velocity(pixelsPerSecond: Offset(20, 0)),
),
),
],
@ -327,8 +241,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
? Align(
alignment: Alignment.bottomLeft,
child: Padding(
padding: const EdgeInsets.fromLTRB(
50, 35, 50, 35),
padding: const EdgeInsets.fromLTRB(50, 35, 50, 35),
child: Text(
widget.post.description!,
textAlign: TextAlign.left,
@ -358,77 +271,49 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
child: Column(
children: [
Padding(
padding:
EdgeInsets.symmetric(vertical: 20),
padding: EdgeInsets.symmetric(vertical: 20),
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
SvgPicture.asset(
"assets/images/heart.svg",
semanticsLabel: 'Like Logo'),
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'),
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) {
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),
padding: const EdgeInsets.all(15.0),
child: RichText(
text: TextSpan(
text: snapshot
.data!.length
.toString(),
style: GoogleFonts
.plusJakartaSans(
text: snapshot.data!.length.toString(),
style: GoogleFonts.plusJakartaSans(
color: Colors.white,
fontWeight:
FontWeight.w800,
fontWeight: FontWeight.w800,
),
children: [
TextSpan(
text: snapshot
.data!
.length >
1
text: snapshot.data!.length > 1
? " commentaires"
: " commentaire",
style: GoogleFonts
.plusJakartaSans(
color: Colors
.white,
fontWeight:
FontWeight
.w400,
style: GoogleFonts.plusJakartaSans(
color: Colors.white,
fontWeight: FontWeight.w400,
),
),
],
@ -438,23 +323,13 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
: Container(),
snapshot.data!.length > 0
? Padding(
padding: const EdgeInsets
.fromLTRB(
20, 0, 20, 20),
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]);
physics: NeverScrollableScrollPhysics(),
itemCount: snapshot.data?.length,
itemBuilder: (BuildContext context, int index) {
return CommentComponent(comment: snapshot.data![index]);
},
),
)
@ -464,8 +339,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
} else {
return Container(
child: Center(
child:
CupertinoActivityIndicator(),
child: CupertinoActivityIndicator(),
),
);
}
@ -486,14 +360,11 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
}
},
enableLongTapRepeatEvent: false,
longTapRepeatDuration:
const Duration(milliseconds: 100),
longTapRepeatDuration: const Duration(milliseconds: 100),
begin: 1.0,
end: 0.96,
beginDuration:
const Duration(milliseconds: 70),
endDuration:
const Duration(milliseconds: 100),
beginDuration: const Duration(milliseconds: 70),
endDuration: const Duration(milliseconds: 100),
beginCurve: Curves.decelerate,
endCurve: Curves.easeInOutSine,
child: Container(
@ -502,16 +373,13 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 120,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20),
border: Border.all(
width: 4, color: Colors.white),
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!),
image: NetworkImage(choice ? widget.post.music.cover! : widget.post.selfie!),
fit: BoxFit.cover,
),
),
@ -547,8 +415,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
),
),
Padding(
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom),
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
child: Container(
height: 70,
width: double.infinity,
@ -578,8 +445,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
focusNode: myFocusNode,
onSubmitted: (value) async {
if (value.isNotEmpty) {
await MyApp.commentViewModel
.addComment(value, widget.post.id);
await MyApp.commentViewModel.addComment(value, widget.post.id);
}
setState(() {
_textController.clear();
@ -587,8 +453,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
},
cursorColor: primaryColor,
keyboardType: TextInputType.emailAddress,
style: GoogleFonts.plusJakartaSans(
color: Colors.white),
style: GoogleFonts.plusJakartaSans(color: Colors.white),
decoration: InputDecoration(
suffixIcon: Icon(
Icons.send,
@ -596,25 +461,19 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
size: 20,
),
focusedBorder: OutlineInputBorder(
borderSide:
BorderSide(width: 1, color: grayText),
borderRadius:
BorderRadius.all(Radius.circular(100)),
borderSide: BorderSide(width: 1, color: grayText),
borderRadius: BorderRadius.all(Radius.circular(100)),
),
contentPadding: EdgeInsets.only(
top: 0, bottom: 0, left: 20, right: 20),
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)),
borderSide: BorderSide(width: 1, color: grayText),
borderRadius: BorderRadius.all(Radius.circular(100)),
),
hintText: 'Ajoutez une réponse...',
hintStyle:
GoogleFonts.plusJakartaSans(color: grayText),
hintStyle: 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: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';
@ -21,23 +20,24 @@ class FeedScreen extends StatefulWidget {
State<FeedScreen> createState() => _FeedScreenState();
}
class _FeedScreenState extends State<FeedScreen>
with SingleTickerProviderStateMixin {
class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateMixin {
late AnimationController animationController;
late Animation<double> animation;
late List<Post> friendFeed;
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;
animationController = AnimationController(
vsync: this,
duration: Duration(milliseconds: 400),
@ -47,38 +47,36 @@ class _FeedScreenState extends State<FeedScreen>
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<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();
displayFeed = MyApp.postViewModel.postsFriends.reversed.toList();
animationController.forward();
choiceFeed = false;
});
if (choice) {
controller.nextPage(duration: Duration(milliseconds: 300), curve: Curves.linear);
} else {
setState(() {
animationController.reset();
displayFeed = MyApp.postViewModel.bestPosts.reversed.toList();
animationController.forward();
choiceFeed = true;
});
controller.previousPage(duration: Duration(milliseconds: 300), curve: Curves.linear);
}
});
}
void openDetailPost(int index) {
void openDetailPost(Post post) {
showModalBottomSheet(
backgroundColor: bgModal,
elevation: 1,
@ -88,13 +86,11 @@ class _FeedScreenState extends State<FeedScreen>
isScrollControlled: true,
context: context,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20), topRight: Radius.circular(20))),
borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))),
builder: ((BuildContext context) {
return ClipRRect(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20), topRight: Radius.circular(20)),
child: DetailPostScreen(post: displayFeed[index]));
borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
child: DetailPostScreen(post: post));
}),
);
}
@ -102,143 +98,129 @@ class _FeedScreenState extends State<FeedScreen>
_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) {
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(
resizeToAvoidBottomInset: true,
backgroundColor: bgColor,
extendBodyBehindAppBar: true,
body: displayFeed.isEmpty
? Container(
body: 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: AssetImage("assets/images/empty_bg.png"),
fit: BoxFit.cover,
opacity: 0.3),
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),
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))
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: IgnorePointer(
child: CircularRevealAnimation(
animation: animation,
centerOffset: Offset(30.w, -100),
child: Container(
height: 240.h,
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topRight,
stops: [
0.3,
1
],
colors: [
bgColor.withOpacity(0.9),
bgColor.withOpacity(0)
])),
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: ConstrainedBox(
constraints: BoxConstraints(maxWidth: 800),
child: TopNavBarComponent(callback: changeFeed),
),
),
],
),
)
: Container(
width: double.infinity,
height: double.infinity,
child: Stack(
fit: StackFit.expand,
children: [
Expanded(
child: Align(
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<dynamic> snapshot) {
if (snapshot.hasData) {
return RefreshIndicator(
padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0),
child: RefreshIndicator(
displacement: 20,
triggerMode:
RefreshIndicatorTriggerMode
.onEdge,
triggerMode: RefreshIndicatorTriggerMode.onEdge,
onRefresh: _refresh,
child: Expanded(
child: ListView.builder(
physics:
const AlwaysScrollableScrollPhysics(),
physics: const BouncingScrollPhysics(parent: AlwaysScrollableScrollPhysics()),
clipBehavior: Clip.none,
shrinkWrap: true,
itemCount: displayFeed.length,
itemBuilder:
(BuildContext context,
int index) {
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[index],
index: index),
padding: const EdgeInsets.only(bottom: 40),
child:
PostComponent(callback: openDetailPost, post: displayFeed.item2[index], index: index),
);
},
),
),
);
} else {
return Center(
child: CupertinoActivityIndicator(),
);
}
},
),
)),
),
),
),
],
),
Align(
alignment: Alignment.topCenter,
@ -248,14 +230,8 @@ class _FeedScreenState extends State<FeedScreen>
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topRight,
stops: [
0.3,
1
],
colors: [
bgColor.withOpacity(0.9),
bgColor.withOpacity(0)
])),
stops: [0.3, 1],
colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])),
),
),
),
@ -263,11 +239,39 @@ class _FeedScreenState extends State<FeedScreen>
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);
}
}

Write Preview
Loading…
Cancel
Save