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

Fix error conflicts
continuous-integration/drone/push Build is passing Details

Browse Source
pull/42/head
emre.kartal 2 years ago
parent 2c9b8c1336 2ed4b1e515
commit 2240bcefa6
12 changed files with 1385 additions and 1141 deletions
Show Stats Download Patch File Download Diff File

8
.idea/libraries/Dart_Packages.xml
Unescape View File

@ -814,6 +814,13 @@
</list> </list>
</value> </value>
</entry> </entry>
<entry key="timezone">
<value>
<list>
<option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/timezone-0.9.2/lib" />
</list>
</value>
</entry>
<entry key="top_snackbar_flutter"> <entry key="top_snackbar_flutter">
<value> <value>
<list> <list>
@ -1013,6 +1020,7 @@
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" /> <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.5.1/lib" /> <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.5.1/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/text_scroll-0.2.0/lib" /> <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/text_scroll-0.2.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/timezone-0.9.2/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/top_snackbar_flutter-3.1.0/lib" /> <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/top_snackbar_flutter-3.1.0/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/tuple-2.0.2/lib" /> <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/tuple-2.0.2/lib" />
<root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.2/lib" /> <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.2/lib" />

41
Sources/justMUSIC/lib/components/comment_component.dart
Unescape View File

@ -2,60 +2,79 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:justmusic/model/Comment.dart';
import '../values/constants.dart'; import '../values/constants.dart';
class CommentComponent extends StatelessWidget { class CommentComponent extends StatelessWidget {
const CommentComponent({Key? key}) : super(key: key); final Comment comment;
const CommentComponent({Key? key, required this.comment}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final now = DateTime.now();
final difference = now.difference(comment.date);
return Container( return Container(
width: double.infinity, width: double.infinity,
decoration: BoxDecoration(color: bgComment, borderRadius: BorderRadius.circular(20)), decoration: BoxDecoration(
padding: EdgeInsets.all(20), color: bgComment.withOpacity(0.6),
borderRadius: BorderRadius.circular(15)),
padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
margin: EdgeInsets.only(bottom: 13),
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
ClipOval( ClipOval(
child: SizedBox.fromSize( child: SizedBox.fromSize(
// Image radius // Image radius
child: Image( child: Image(
image: AssetImage("assets/images/exemple_profile.png"), image: NetworkImage(comment.user.pp),
width: 40, width: 40,
), ),
), ),
), ),
Expanded( Expanded(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Row( Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.start,
children: [ children: [
SizedBox( SizedBox(
width: 10, width: 10,
), ),
Text( Text(
"Melina", comment.user.pseudo,
style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w600), style: GoogleFonts.plusJakartaSans(
color: Colors.white, fontWeight: FontWeight.w600),
), ),
Padding( Padding(
padding: EdgeInsets.only(top: 6, left: 10), padding: EdgeInsets.only(top: 6, left: 10),
child: Text( child: Text(
"Il y a 2 min(s)", "il y a ${difference.inHours > 0 ? difference.inHours : difference.inMinutes}${difference.inHours > 0 ? "h" : "m"}",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
color: Colors.white.withOpacity(0.6), fontWeight: FontWeight.w400, fontSize: 10), color: Colors.white.withOpacity(0.6),
fontWeight: FontWeight.w400,
fontSize: 10),
), ),
), ),
], ],
), ),
SizedBox( SizedBox(
height: 8, height: 4,
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 10), padding: const EdgeInsets.symmetric(horizontal: 10),
child: Text( child: Text(
"J’adore ce son aussi, je trouve qu’il avait vraiment une plume de fou.", comment.text,
style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w300, fontSize: 11), style: GoogleFonts.plusJakartaSans(
color: Colors.white,
fontWeight: FontWeight.w400,
fontSize: 15),
), ),
), ),
], ],

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

@ -9,42 +9,52 @@ import 'package:lottie/lottie.dart';
import 'package:zoom_tap_animation/zoom_tap_animation.dart'; import 'package:zoom_tap_animation/zoom_tap_animation.dart';
import '../config/routes.dart'; import '../config/routes.dart';
import 'package:timezone/timezone.dart' as tz;
import '../main.dart'; import '../main.dart';
import '../values/constants.dart'; import '../values/constants.dart';
class TopNavBarComponent extends StatefulWidget { class TopNavBarComponent extends StatefulWidget {
final Function(bool) callback; final Function(bool) callback;
const TopNavBarComponent({Key? key, required this.callback}) : super(key: key);
const TopNavBarComponent({Key? key, required this.callback})
: super(key: key);
@override @override
State<TopNavBarComponent> createState() => _TopNavBarComponentState(); State<TopNavBarComponent> createState() => _TopNavBarComponentState();
} }
class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProviderStateMixin { class _TopNavBarComponentState extends State<TopNavBarComponent>
with TickerProviderStateMixin {
bool choice = true; bool choice = true;
late AnimationController _controller;
bool isDismissed = true; bool isDismissed = true;
final DateTime midnight = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1); final DateTime midnight = DateTime(
DateTime.now().year, DateTime.now().month, DateTime.now().day + 1);
void actionSurBouton() async { void actionSurBouton(bool choice) async {
widget.callback(choice); widget.callback(choice);
await MyApp.postViewModel.getBestPosts();
await MyApp.postViewModel.getPostsFriends();
} }
@override @override
void initState() { void initState() {
_controller = AnimationController(
vsync: this,
duration: Duration(seconds: 3),
);
super.initState(); super.initState();
} }
void showCapsuleDot(bool isAvailable) { Future<void> showCapsuleDot() async {
isAvailable // Get the timezone for France
? Flushbar( final franceTimeZone = tz.getLocation('Europe/Paris');
// Get the current date and time in France timezone
var now = tz.TZDateTime.now(franceTimeZone);
// Calculate the midnight time for the next day in France timezone
var midnight =
tz.TZDateTime(franceTimeZone, now.year, now.month, now.day + 1);
bool res = await MyApp.postViewModel.getAvailable();
if (res) {
Flushbar(
maxWidth: 210, maxWidth: 210,
animationDuration: Duration(seconds: 1), animationDuration: Duration(seconds: 1),
forwardAnimationCurve: Curves.easeOutCirc, forwardAnimationCurve: Curves.easeOutCirc,
@ -59,7 +69,8 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: Text( child: Text(
"Capsule disponible", "Capsule disponible",
style: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), style:
GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
), ),
), ),
flushbarStyle: FlushbarStyle.FLOATING, flushbarStyle: FlushbarStyle.FLOATING,
@ -75,8 +86,13 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
Navigator.pop(context); Navigator.pop(context);
Navigator.pushNamed(context, '/post'); Navigator.pushNamed(context, '/post');
}, },
).show(context) ).show(context).then((value) {
: Flushbar( setState(() {
isDismissed = !isDismissed;
});
});
} else {
Flushbar(
maxWidth: 155, maxWidth: 155,
animationDuration: Duration(seconds: 1), animationDuration: Duration(seconds: 1),
forwardAnimationCurve: Curves.easeOutCirc, forwardAnimationCurve: Curves.easeOutCirc,
@ -90,8 +106,9 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
messageText: Align( messageText: Align(
alignment: Alignment.centerLeft, alignment: Alignment.centerLeft,
child: CountdownTimer( child: CountdownTimer(
endTime: midnight.millisecondsSinceEpoch - 2 * 60 * 60 * 1000, endTime: midnight.millisecondsSinceEpoch,
textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), textStyle:
GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
), ),
), ),
flushbarStyle: FlushbarStyle.FLOATING, flushbarStyle: FlushbarStyle.FLOATING,
@ -103,22 +120,21 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
duration: const Duration(minutes: 100), duration: const Duration(minutes: 100),
leftBarIndicatorColor: Colors.transparent, leftBarIndicatorColor: Colors.transparent,
positionOffset: 20, positionOffset: 20,
onTap: (_) { onTap: (_) {},
Navigator.pop(context); ).show(context).then((value) {
}, setState(() {
).show(context); isDismissed = !isDismissed;
});
});
}
} }
void checkAvailable() async { void checkAvailable() async {
print("test"); if (isDismissed) {
var res = await MyApp.postViewModel.getAvailable(); showCapsuleDot();
print(res); setState(() {
ModalRoute<dynamic>? route = ModalRoute.of(context); isDismissed = !isDismissed;
if (route != null) { });
if (route.settings.name != '/flushbarRoute') {
print("yes");
showCapsuleDot(res);
}
} }
} }
@ -179,28 +195,35 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
if (!choice) { if (!choice) {
setState(() { setState(() {
choice = !choice; choice = !choice;
actionSurBouton(); actionSurBouton(false);
}); });
} }
}, },
child: LayoutBuilder( child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) { builder: (BuildContext context,
BoxConstraints constraints) {
if (choice) { if (choice) {
return Padding( return Padding(
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), padding: const EdgeInsets.only(
left: 8, top: 0, right: 8, bottom: 6),
child: AutoSizeText( child: AutoSizeText(
"Mes amis", "Mes amis",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w500, fontSize: 16, color: Colors.white), fontWeight: FontWeight.w500,
fontSize: 16,
color: Colors.white),
), ),
); );
} else { } else {
return Padding( return Padding(
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), padding: const EdgeInsets.only(
left: 8, top: 0, right: 8, bottom: 6),
child: AutoSizeText( child: AutoSizeText(
"Mes amis", "Mes amis",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed), fontWeight: FontWeight.w300,
fontSize: 16,
color: unactiveFeed),
)); ));
} }
}, },
@ -212,27 +235,34 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
if (choice) { if (choice) {
setState(() { setState(() {
choice = !choice; choice = !choice;
actionSurBouton(); actionSurBouton(true);
}); });
} }
}, },
child: LayoutBuilder( child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) { builder: (BuildContext context,
BoxConstraints constraints) {
if (choice) { if (choice) {
return Padding( return Padding(
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), padding: const EdgeInsets.only(
left: 8, top: 0, right: 8, bottom: 6),
child: AutoSizeText( child: AutoSizeText(
"Discovery", "Discovery",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed), fontWeight: FontWeight.w300,
fontSize: 16,
color: unactiveFeed),
)); ));
} else { } else {
return Padding( return Padding(
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), padding: const EdgeInsets.only(
left: 8, top: 0, right: 8, bottom: 6),
child: AutoSizeText( child: AutoSizeText(
"Discovery", "Discovery",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w500, fontSize: 16, color: Colors.white), fontWeight: FontWeight.w500,
fontSize: 16,
color: Colors.white),
)); ));
} }
}, },

52
Sources/justMUSIC/lib/main.dart
Unescape View File

@ -11,20 +11,23 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:justmusic/screens/add_friend_screen.dart'; import 'package:justmusic/screens/add_friend_screen.dart';
import 'package:justmusic/screens/explanations_screen.dart'; import 'package:justmusic/screens/explanations_screen.dart';
import 'package:justmusic/screens/feed_screen.dart'; import 'package:justmusic/screens/feed_screen.dart';
import 'package:justmusic/screens/loading_screen.dart';
import 'package:justmusic/screens/login_screen.dart'; import 'package:justmusic/screens/login_screen.dart';
import 'package:justmusic/screens/launching_rocker_screen.dart'; import 'package:justmusic/screens/launching_rocker_screen.dart';
import 'package:justmusic/screens/post_screen.dart'; import 'package:justmusic/screens/post_screen.dart';
import 'package:justmusic/screens/profile_screen.dart'; import 'package:justmusic/screens/profile_screen.dart';
import 'package:justmusic/screens/registration_screen.dart'; import 'package:justmusic/screens/registration_screen.dart';
import 'package:justmusic/screens/welcome_screen.dart'; import 'package:justmusic/screens/welcome_screen.dart';
import 'package:justmusic/values/constants.dart'; import 'package:justmusic/view_model/CommentViewModel.dart';
import 'package:justmusic/view_model/MusicViewModel.dart'; import 'package:justmusic/view_model/MusicViewModel.dart';
import 'package:justmusic/view_model/PostViewModel.dart'; import 'package:justmusic/view_model/PostViewModel.dart';
import 'package:justmusic/view_model/UserViewModel.dart'; import 'package:justmusic/view_model/UserViewModel.dart';
import 'package:justmusic/model/User.dart' as userJustMusic; import 'package:justmusic/model/User.dart' as userJustMusic;
import 'firebase_options.dart'; import 'firebase_options.dart';
import 'package:timezone/data/latest.dart' as tz;
Future<void> main() async { Future<void> main() async {
tz.initializeTimeZones();
WidgetsFlutterBinding.ensureInitialized(); WidgetsFlutterBinding.ensureInitialized();
await Firebase.initializeApp( await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform, options: DefaultFirebaseOptions.currentPlatform,
@ -40,6 +43,7 @@ class MyApp extends StatefulWidget {
static MusicViewModel musicViewModel = MusicViewModel(); static MusicViewModel musicViewModel = MusicViewModel();
static PostViewModel postViewModel = PostViewModel(); static PostViewModel postViewModel = PostViewModel();
static AudioPlayer audioPlayer = AudioPlayer(); static AudioPlayer audioPlayer = AudioPlayer();
static CommentViewModel commentViewModel = CommentViewModel();
const MyApp({super.key}); const MyApp({super.key});
@ -100,25 +104,22 @@ class _MyAppState extends State<MyApp> {
}, },
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: ThemeData( theme: ThemeData(
// This is the theme of your application.
//
// Try running your application with "flutter run". You'll see the
// application has a blue toolbar. Then, without quitting the app, try
// changing the primarySwatch below to Colors.green and then invoke
// "hot reload" (press "r" in the console where you ran "flutter run",
// or simply save your changes to "hot reload" in a Flutter IDE).
// Notice that the counter didn't reset back to zero; the application
// is not restarted.
primarySwatch: Colors.blue, primarySwatch: Colors.blue,
), ),
home: FirebaseAuth.instance.currentUser != null home: StreamBuilder<User?>(
? StreamBuilder<userJustMusic.User?>( stream: FirebaseAuth.instance.authStateChanges(),
stream: userCurrent,
initialData: null,
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.hasData) { if (snapshot.connectionState == ConnectionState.waiting) {
print("hasdata"); return LoadingScreen();
} else if (snapshot.hasData) {
return FutureBuilder<userJustMusic.User?>(
future: MyApp.userViewModel.getUser(snapshot.data!.uid),
builder: (context, userSnapshot) {
if (userSnapshot.connectionState ==
ConnectionState.waiting) {
return LoadingScreen();
} else if (userSnapshot.hasData) {
MyApp.userViewModel.userCurrent = userSnapshot.data!;
return AnimatedSwitcher( return AnimatedSwitcher(
duration: Duration(milliseconds: 1000), duration: Duration(milliseconds: 1000),
transitionBuilder: (child, animation) { transitionBuilder: (child, animation) {
@ -128,18 +129,15 @@ class _MyAppState extends State<MyApp> {
child: FeedScreen(), child: FeedScreen(),
); );
} else { } else {
return Scaffold( return WellcomeScreen();
backgroundColor: bgColor, }
body: Center( },
child: Image(
image: AssetImage("assets/images/logo.png"),
width: 130,
),
),
); );
} else {
return WellcomeScreen();
} }
}) },
: WellcomeScreen()); ));
}, },
designSize: Size(390, 844), designSize: Size(390, 844),
); );

9
Sources/justMUSIC/lib/model/mapper/CommentMapper.dart
Unescape View File

@ -5,13 +5,10 @@ import '../Comment.dart';
import '../User.dart'; import '../User.dart';
class CommentMapper { class CommentMapper {
static Future<Comment> toModel(DocumentSnapshot<Map<String, dynamic>> snapshot) async { static Future<Comment> toModel(
DocumentSnapshot<Map<String, dynamic>> snapshot) async {
final data = snapshot.data(); final data = snapshot.data();
User? user = await MyApp.userViewModel.getUser(data?['user_id']); User? user = await MyApp.userViewModel.getUser(data?['user_id']);
return Comment( return Comment(snapshot.id, user!, data?["text"], data?["date"].toDate());
snapshot.id,
user!,
data?["text"],
data?["date"]);
} }
} }

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

@ -1,6 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/Material.dart'; import 'package:flutter/Material.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_keyboard_visibility/flutter_keyboard_visibility.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart';
@ -15,10 +16,12 @@ import '../components/comment_component.dart';
import '../main.dart'; import '../main.dart';
import '../model/Post.dart'; import '../model/Post.dart';
import '../model/Comment.dart';
import '../values/constants.dart'; import '../values/constants.dart';
class DetailPostScreen extends StatefulWidget { class DetailPostScreen extends StatefulWidget {
final Post post; final Post post;
const DetailPostScreen({super.key, required this.post}); const DetailPostScreen({super.key, required this.post});
@override @override
@ -29,6 +32,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
TextEditingController _textController = TextEditingController(); TextEditingController _textController = TextEditingController();
late FocusNode myFocusNode; late FocusNode myFocusNode;
late StreamSubscription<bool> keyboardSubscription; late StreamSubscription<bool> keyboardSubscription;
Future<void> resetFullScreen() async { Future<void> resetFullScreen() async {
await SystemChannels.platform.invokeMethod<void>( await SystemChannels.platform.invokeMethod<void>(
'SystemChrome.restoreSystemUIOverlays', 'SystemChrome.restoreSystemUIOverlays',
@ -57,11 +61,13 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
print("ajrd: ${DateTime.now().toString()}"); print("ajrd: ${DateTime.now().toString()}");
myFocusNode = FocusNode(); myFocusNode = FocusNode();
var keyboardVisibilityController = KeyboardVisibilityController(); var keyboardVisibilityController = KeyboardVisibilityController();
print('Keyboard visibility direct query: ${keyboardVisibilityController.isVisible}'); print(
'Keyboard visibility direct query: ${keyboardVisibilityController.isVisible}');
super.initState(); super.initState();
keyboardSubscription = keyboardVisibilityController.onChange.listen((bool visible) { keyboardSubscription =
keyboardVisibilityController.onChange.listen((bool visible) {
if (!visible) { if (!visible) {
myFocusNode.unfocus(); myFocusNode.unfocus();
} }
@ -101,12 +107,16 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 400, height: 400,
width: double.infinity, width: double.infinity,
child: FadeInImage.assetNetwork( child: FadeInImage.assetNetwork(
placeholder: "assets/images/loadingPlaceholder.gif", placeholder:
image: choice ? widget.post.selfie! : widget.post.music.cover!, "assets/images/loadingPlaceholder.gif",
image: choice
? widget.post.selfie!
: widget.post.music.cover!,
width: double.infinity, width: double.infinity,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
)), ),
),
Column( Column(
children: [ children: [
Container( Container(
@ -118,119 +128,194 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
begin: Alignment.topCenter, begin: Alignment.topCenter,
end: Alignment.bottomCenter, end: Alignment.bottomCenter,
colors: [Colors.transparent, bgModal], colors: [Colors.transparent, bgModal],
stops: [0, 0.8]), stops: [0, 0.8],
),
), ),
child: Padding( child: Padding(
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: const EdgeInsets.only(right: 10), padding:
const EdgeInsets.only(right: 10),
child: choice child: choice
? Padding( ? Padding(
padding: const EdgeInsets.all(4), padding:
const EdgeInsets.all(4),
child: ClipOval( child: ClipOval(
child: SizedBox.fromSize( child: SizedBox.fromSize(
// Image radius // Image radius
child: Image( child: Image(
image: NetworkImage(widget.post.user.pp), image: NetworkImage(
widget.post.user.pp),
width: 45, width: 45,
), ),
), ),
), ),
) )
: widget.post.music.previewUrl != null : widget.post.music.previewUrl !=
? ButtonPlayComponent(music: widget.post.music) null
? ButtonPlayComponent(
music: widget.post.music)
: Container(), : Container(),
), ),
Flexible( Flexible(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.end, mainAxisAlignment:
crossAxisAlignment: CrossAxisAlignment.start, MainAxisAlignment.end,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [ children: [
Flexible( Flexible(
child: Row( child: Row(
crossAxisAlignment: CrossAxisAlignment.end, crossAxisAlignment:
CrossAxisAlignment.end,
children: [ children: [
Expanded( Expanded(
child: ScrollConfiguration( child: ScrollConfiguration(
behavior: ScrollBehavior().copyWith(scrollbars: false), behavior: ScrollBehavior()
.copyWith(
scrollbars:
false),
child: TextScroll( child: TextScroll(
choice choice
? widget.post.user.pseudo ? widget.post.user
: widget.post.music.title!, .pseudo
style: GoogleFonts.plusJakartaSans( : widget.post.music
.title!,
style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.w800, fontWeight:
fontSize: 22), FontWeight.w800,
mode: TextScrollMode.endless, fontSize: 22,
pauseBetween: Duration(milliseconds: 500), ),
velocity: Velocity(pixelsPerSecond: Offset(20, 0)), mode: TextScrollMode
))), .endless,
pauseBetween: Duration(
milliseconds: 500),
velocity: Velocity(
pixelsPerSecond:
Offset(20, 0)),
),
),
),
Padding( Padding(
padding: const EdgeInsets.only(left: 20.0), padding:
const EdgeInsets.only(
left: 20.0),
child: choice child: choice
? DateTime(today.year, today.month, today.day) ? DateTime(
.isAtSameMomentAs(DateTime(widget.post.date.year, today.year,
widget.post.date.month, widget.post.date.day)) today.month,
today.day)
.isAtSameMomentAs(
DateTime(
widget.post.date
.year,
widget.post.date
.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.plusJakartaSans( style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color: Colors
fontWeight: FontWeight.w900, .white,
fontSize: 18), fontWeight:
FontWeight
.w900,
fontSize: 18,
),
) )
: Text( : Text(
"hier, ${widget.post.date.hour}:${widget.post.date.minute}", "hier, ${widget.post.date.hour}:${widget.post.date.minute}",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color: Colors
fontWeight: FontWeight.w900, .white,
fontSize: 18), fontWeight:
FontWeight
.w900,
fontSize: 18,
),
) )
: Text( : Text(
widget.post.music.date.toString(), widget
style: GoogleFonts.plusJakartaSans( .post.music.date
.toString(),
style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color:
fontWeight: FontWeight.w900, Colors.white,
fontSize: 18), fontWeight:
FontWeight
.w900,
fontSize: 18,
),
),
), ),
)
], ],
), ),
), ),
choice choice
? widget.post.location.item2 != null ? widget.post.location.item2 !=
null
? Text( ? Text(
"${widget.post.location.item1}, ${widget.post.location.item2}", "${widget.post.location.item1}, ${widget.post.location.item2}",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts
color: Colors.white.withOpacity(0.5), .plusJakartaSans(
fontWeight: FontWeight.w400, color: Colors.white
fontSize: 15), .withOpacity(0.5),
fontWeight:
FontWeight.w400,
fontSize: 15,
),
) )
: Text( : Text(
"", "",
style: GoogleFonts.plusJakartaSans( style: GoogleFonts
color: Colors.white.withOpacity(0.4), .plusJakartaSans(
fontWeight: FontWeight.w300, color: Colors.white
fontSize: 13), .withOpacity(0.4),
fontWeight:
FontWeight.w300,
fontSize: 13,
),
) )
: ScrollConfiguration( : ScrollConfiguration(
behavior: ScrollBehavior().copyWith(scrollbars: false), behavior: ScrollBehavior()
child: TextScroll(widget.post.music.artists.first.name!, .copyWith(
style: GoogleFonts.plusJakartaSans( scrollbars: false),
child: TextScroll(
widget.post.music.artists
.first.name!,
style: GoogleFonts
.plusJakartaSans(
height: 1, height: 1,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.w500, fontWeight:
fontSize: 17), FontWeight.w500,
mode: TextScrollMode.endless, fontSize: 17,
pauseBetween: Duration(milliseconds: 500), ),
velocity: Velocity(pixelsPerSecond: Offset(20, 0))), mode: TextScrollMode
) .endless,
pauseBetween: Duration(
milliseconds: 500),
velocity: Velocity(
pixelsPerSecond:
Offset(20, 0)),
),
),
], ],
), ),
), ),
@ -242,7 +327,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
? Align( ? Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Padding( child: Padding(
padding: const EdgeInsets.fromLTRB(50, 35, 50, 35), padding: const EdgeInsets.fromLTRB(
50, 35, 50, 35),
child: Text( child: Text(
widget.post.description!, widget.post.description!,
textAlign: TextAlign.left, textAlign: TextAlign.left,
@ -250,7 +336,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 1, height: 1,
color: Colors.white, color: Colors.white,
fontWeight: FontWeight.w400, fontWeight: FontWeight.w400,
fontSize: 14), fontSize: 14,
),
), ),
), ),
) )
@ -263,59 +350,127 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
color: bgAppBar, color: bgAppBar,
border: Border( border: Border(
top: BorderSide( top: BorderSide(
color: Color(0xFF262626), // Couleur de la bordure color: Color(0xFF262626),
width: 1.0, // Épaisseur de la bordure width: 1.0,
), ),
), ),
), ),
child: Column( child: Column(
children: [ children: [
Padding( Padding(
padding: EdgeInsets.symmetric(vertical: 20), padding:
EdgeInsets.symmetric(vertical: 20),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [ children: [
SvgPicture.asset("assets/images/heart.svg", semanticsLabel: 'Like Logo'), SvgPicture.asset(
"assets/images/heart.svg",
semanticsLabel: 'Like Logo'),
GestureDetector( GestureDetector(
onTap: () { onTap: () {
myFocusNode.requestFocus(); myFocusNode.requestFocus();
}, },
child: SvgPicture.asset("assets/images/chat.svg", child: SvgPicture.asset(
semanticsLabel: 'Chat Logo')), "assets/images/chat.svg",
SvgPicture.asset("assets/images/add.svg", semanticsLabel: 'Chat Logo'),
semanticsLabel: 'Add playlist Logo'), ),
SvgPicture.asset("assets/images/save.svg", semanticsLabel: 'Save Logo'), SvgPicture.asset(
SvgPicture.asset("assets/images/report.svg", "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'), semanticsLabel: 'Report Logo'),
], ],
), ),
), ),
Padding( FutureBuilder<List<Comment>>(
padding: const EdgeInsets.all(15.0), 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( child: RichText(
text: TextSpan( text: TextSpan(
text: "3", text: snapshot
style: GoogleFonts.plusJakartaSans( .data!.length
color: Colors.white, fontWeight: FontWeight.w800), .toString(),
style: GoogleFonts
.plusJakartaSans(
color: Colors.white,
fontWeight:
FontWeight.w800,
),
children: [ children: [
TextSpan( TextSpan(
text: " commentaires", text: snapshot
style: GoogleFonts.plusJakartaSans( .data!
color: Colors.white, fontWeight: FontWeight.w400), .length >
) 1
])), ? " commentaires"
: " commentaire",
style: GoogleFonts
.plusJakartaSans(
color: Colors
.white,
fontWeight:
FontWeight
.w400,
),
), ),
Padding(
padding: EdgeInsets.fromLTRB(20, 0, 20, 20),
child: Wrap(
runSpacing: 13,
children: [
CommentComponent(),
CommentComponent(),
CommentComponent(),
], ],
), ),
),
)
: 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(),
),
);
}
},
),
], ],
), ),
), ),
@ -331,11 +486,14 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
} }
}, },
enableLongTapRepeatEvent: false, enableLongTapRepeatEvent: false,
longTapRepeatDuration: const Duration(milliseconds: 100), longTapRepeatDuration:
const Duration(milliseconds: 100),
begin: 1.0, begin: 1.0,
end: 0.96, end: 0.96,
beginDuration: const Duration(milliseconds: 70), beginDuration:
endDuration: const Duration(milliseconds: 100), const Duration(milliseconds: 70),
endDuration:
const Duration(milliseconds: 100),
beginCurve: Curves.decelerate, beginCurve: Curves.decelerate,
endCurve: Curves.easeInOutSine, endCurve: Curves.easeInOutSine,
child: Container( child: Container(
@ -344,22 +502,27 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 120, height: 120,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20), borderRadius: BorderRadius.circular(20),
border: Border.all(width: 4, color: Colors.white)), border: Border.all(
width: 4, color: Colors.white),
),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),
// implement image // implementer l'image
child: Image( child: Image(
image: NetworkImage( image: NetworkImage(choice
choice ? widget.post.music.cover! : widget.post.selfie!), ? widget.post.music.cover!
: widget.post.selfie!),
fit: BoxFit.cover, fit: BoxFit.cover,
)), ),
),
), ),
), ),
) )
: Container() : Container(),
], ],
), ),
)), ),
),
Align( Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: Container( child: Container(
@ -373,7 +536,10 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
width: 60, width: 60,
height: 5, height: 5,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white.withOpacity(0.6), borderRadius: BorderRadius.circular(20))), color: Colors.white.withOpacity(0.6),
borderRadius: BorderRadius.circular(20),
),
),
), ),
), ),
), ),
@ -381,12 +547,15 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
), ),
), ),
Padding( Padding(
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom), padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom),
child: Container( child: Container(
height: 70, height: 70,
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
border: Border(top: BorderSide(color: grayColor, width: 2)), color: textFieldMessage), border: Border(top: BorderSide(color: grayColor, width: 2)),
color: textFieldMessage,
),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20), padding: const EdgeInsets.symmetric(horizontal: 20),
@ -394,24 +563,32 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
children: [ children: [
ClipOval( ClipOval(
child: SizedBox.fromSize( child: SizedBox.fromSize(
// Image radius // Rayon de l'image
child: Image.network( child: Image.network(
MyApp.userViewModel.userCurrent.pp, MyApp.userViewModel.userCurrent.pp,
width: 45, width: 45,
), ),
), ),
), ),
SizedBox( SizedBox(width: 10),
width: 10,
),
Expanded( Expanded(
child: TextField( child: TextField(
keyboardAppearance: Brightness.dark, keyboardAppearance: Brightness.dark,
controller: _textController, controller: _textController,
focusNode: myFocusNode, focusNode: myFocusNode,
onSubmitted: (value) async {
if (value.isNotEmpty) {
await MyApp.commentViewModel
.addComment(value, widget.post.id);
}
setState(() {
_textController.clear();
});
},
cursorColor: primaryColor, cursorColor: primaryColor,
keyboardType: TextInputType.emailAddress, keyboardType: TextInputType.emailAddress,
style: GoogleFonts.plusJakartaSans(color: Colors.white), style: GoogleFonts.plusJakartaSans(
color: Colors.white),
decoration: InputDecoration( decoration: InputDecoration(
suffixIcon: Icon( suffixIcon: Icon(
Icons.send, Icons.send,
@ -419,33 +596,45 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
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),
contentPadding: EdgeInsets.only(top: 0, bottom: 0, left: 20, right: 20), borderRadius:
BorderRadius.all(Radius.circular(100)),
),
contentPadding: EdgeInsets.only(
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(width: 1, color: grayText), borderSide:
borderRadius: BorderRadius.all(Radius.circular(100))), BorderSide(width: 1, color: grayText),
borderRadius:
BorderRadius.all(Radius.circular(100)),
),
hintText: 'Ajoutez une réponse...', hintText: 'Ajoutez une réponse...',
hintStyle: GoogleFonts.plusJakartaSans(color: grayText)), hintStyle:
GoogleFonts.plusJakartaSans(color: grayText),
),
),
), ),
)
], ],
), ),
), ),
)), ),
),
), ),
], ],
), ),
)); ),
);
} }
} }
class MyBehavior extends ScrollBehavior { class MyBehavior extends ScrollBehavior {
@override @override
Widget buildOverscrollIndicator(BuildContext context, Widget child, ScrollableDetails details) { Widget buildOverscrollIndicator(
BuildContext context, Widget child, ScrollableDetails details) {
return child; return child;
} }
} }

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

@ -1,16 +1,13 @@
import 'dart:async'; import 'dart:async';
import 'package:another_flushbar/flushbar.dart';
import 'package:circular_reveal_animation/circular_reveal_animation.dart'; import 'package:circular_reveal_animation/circular_reveal_animation.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_countdown_timer/flutter_countdown_timer.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:ionicons/ionicons.dart';
import 'package:justmusic/main.dart'; import 'package:justmusic/main.dart';
import 'package:lottie/lottie.dart'; import 'package:justmusic/main.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';
import '../model/Post.dart'; import '../model/Post.dart';
@ -24,7 +21,8 @@ class FeedScreen extends StatefulWidget {
State<FeedScreen> createState() => _FeedScreenState(); State<FeedScreen> createState() => _FeedScreenState();
} }
class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateMixin { class _FeedScreenState extends State<FeedScreen>
with SingleTickerProviderStateMixin {
late AnimationController animationController; late AnimationController animationController;
late Animation<double> animation; late Animation<double> animation;
late List<Post> friendFeed; late List<Post> friendFeed;
@ -32,18 +30,14 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
late List<Post> discoveryFeed; late List<Post> discoveryFeed;
late List<Post> displayFeed; late List<Post> displayFeed;
final DateTime midnight = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1);
bool isDismissed = true; bool isDismissed = true;
bool choiceFeed = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
MyApp.postViewModel.getPostsFriends();
friendFeed = MyApp.postViewModel.postsFriends; friendFeed = MyApp.postViewModel.postsFriends;
MyApp.postViewModel.getBestPosts();
discoveryFeed = MyApp.postViewModel.bestPosts; discoveryFeed = MyApp.postViewModel.bestPosts;
displayFeed = [];
animationController = AnimationController( animationController = AnimationController(
vsync: this, vsync: this,
duration: Duration(milliseconds: 400), duration: Duration(milliseconds: 400),
@ -55,99 +49,15 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
animationController.forward(); animationController.forward();
} }
Future<void> showCapsuleDot() async { Future _refresh() async {
bool res = await MyApp.postViewModel.getAvailable(); if (choiceFeed) {
if (isDismissed) { await MyApp.postViewModel.getBestPosts();
if (res) { setState(() {});
setState(() {
isDismissed = !isDismissed;
});
Flushbar(
maxWidth: 210,
animationDuration: Duration(seconds: 1),
forwardAnimationCurve: Curves.easeOutCirc,
margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
icon: Icon(
Ionicons.sparkles,
color: Colors.white,
size: 18,
),
padding: EdgeInsets.fromLTRB(8, 8, 8, 8),
messageText: Align(
alignment: Alignment.centerLeft,
child: Text(
"Capsule disponible",
style: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
),
),
flushbarStyle: FlushbarStyle.FLOATING,
flushbarPosition: FlushbarPosition.BOTTOM,
textDirection: Directionality.of(context),
borderRadius: BorderRadius.circular(1000),
borderWidth: 1,
isDismissible: false,
borderColor: Colors.white.withOpacity(0.04),
duration: const Duration(minutes: 100),
leftBarIndicatorColor: Colors.transparent,
positionOffset: 20,
onTap: (_) {
Navigator.pop(context);
Navigator.pushNamed(context, '/post');
},
).show(context).then((value) {
isDismissed = !isDismissed;
});
} else { } else {
setState(() { await MyApp.postViewModel.getPostsFriends();
isDismissed = !isDismissed; setState(() {});
});
Flushbar(
maxWidth: 155,
animationDuration: Duration(seconds: 1),
isDismissible: false,
forwardAnimationCurve: Curves.easeOutCirc,
margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
icon: Lottie.asset(
'assets/animations/LottieHourGlass.json',
width: 26,
fit: BoxFit.fill,
),
padding: EdgeInsets.fromLTRB(8, 8, 8, 8),
messageText: Align(
alignment: Alignment.centerLeft,
child: CountdownTimer(
endTime: midnight.millisecondsSinceEpoch - 2 * 60 * 60 * 1000,
textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
),
),
flushbarStyle: FlushbarStyle.FLOATING,
flushbarPosition: FlushbarPosition.BOTTOM,
textDirection: Directionality.of(context),
borderRadius: BorderRadius.circular(1000),
borderWidth: 1,
borderColor: Colors.white.withOpacity(0.04),
duration: const Duration(minutes: 100),
leftBarIndicatorColor: Colors.transparent,
positionOffset: 20,
onTap: (_) {},
).show(context).then((value) {
{
setState(() {
isDismissed = !isDismissed;
});
}
});
} }
} }
}
Future _refresh() async {
print("refresh");
discoveryFeed = await MyApp.postViewModel.getBestPosts();
setState(() {
displayFeed = discoveryFeed.reversed.toList();
});
}
void changeFeed(bool choice) { void changeFeed(bool choice) {
// Mettez ici le code pour l'action que vous souhaitez effectuer avec le paramètre // Mettez ici le code pour l'action que vous souhaitez effectuer avec le paramètre
@ -156,14 +66,14 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
animationController.reset(); animationController.reset();
displayFeed = MyApp.postViewModel.postsFriends.reversed.toList(); displayFeed = MyApp.postViewModel.postsFriends.reversed.toList();
animationController.forward(); animationController.forward();
print(displayFeed.length); choiceFeed = false;
}); });
} else { } else {
setState(() { setState(() {
animationController.reset(); animationController.reset();
displayFeed = MyApp.postViewModel.bestPosts.reversed.toList(); displayFeed = MyApp.postViewModel.bestPosts.reversed.toList();
print(displayFeed.length);
animationController.forward(); animationController.forward();
choiceFeed = true;
}); });
} }
} }
@ -178,18 +88,32 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
isScrollControlled: true, isScrollControlled: true,
context: context, context: context,
shape: const RoundedRectangleBorder( 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) { builder: ((BuildContext context) {
return ClipRRect( return ClipRRect(
borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)), borderRadius: BorderRadius.only(
topLeft: Radius.circular(20), topRight: Radius.circular(20)),
child: DetailPostScreen(post: displayFeed[index])); child: DetailPostScreen(post: displayFeed[index]));
}), }),
); );
} }
_fetchData() async {
friendFeed = await MyApp.postViewModel.getPostsFriends();
discoveryFeed = await MyApp.postViewModel.getBestPosts();
return Tuple2(friendFeed, displayFeed);
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
showCapsuleDot(); if (choiceFeed) {
displayFeed = MyApp.postViewModel.postsFriends.reversed.toList();
} else {
displayFeed = MyApp.postViewModel.bestPosts.reversed.toList();
}
_fetchData();
return Scaffold( return Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: bgColor, backgroundColor: bgColor,
@ -203,16 +127,21 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
Container( Container(
decoration: const BoxDecoration( decoration: const BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage("assets/images/empty_bg.png"), fit: BoxFit.cover, opacity: 0.3), image: AssetImage("assets/images/empty_bg.png"),
fit: BoxFit.cover,
opacity: 0.3),
), ),
child: Padding( child: Padding(
padding: EdgeInsets.only(top: 140.h, left: defaultPadding), padding:
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, fontSize: 23, fontWeight: FontWeight.w800)) color: Colors.white,
fontSize: 23,
fontWeight: FontWeight.w800))
], ],
), ),
), ),
@ -225,8 +154,14 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
begin: Alignment.topRight, begin: Alignment.topRight,
stops: [0.3, 1], stops: [
colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])), 0.3,
1
],
colors: [
bgColor.withOpacity(0.9),
bgColor.withOpacity(0)
])),
), ),
), ),
), ),
@ -242,37 +177,69 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
) )
: Container( : Container(
width: double.infinity, width: double.infinity,
height: double.infinity,
child: Stack( child: Stack(
fit: StackFit.expand, fit: StackFit.expand,
children: [ children: [
Align( 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,
constraints: BoxConstraints(maxWidth: 600), constraints: BoxConstraints(maxWidth: 600),
padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0), padding: EdgeInsets.fromLTRB(
child: RefreshIndicator( defaultPadding, 100.h, defaultPadding, 0),
child: Expanded(
child: FutureBuilder(
future: _fetchData(),
builder: (BuildContext context,
AsyncSnapshot<dynamic> snapshot) {
if (snapshot.hasData) {
return RefreshIndicator(
displacement: 20, displacement: 20,
triggerMode: RefreshIndicatorTriggerMode.onEdge, triggerMode:
RefreshIndicatorTriggerMode
.onEdge,
onRefresh: _refresh, onRefresh: _refresh,
child: Expanded(
child: ListView.builder( child: ListView.builder(
physics: const BouncingScrollPhysics(decelerationRate: ScrollDecelerationRate.fast), physics:
const AlwaysScrollableScrollPhysics(),
clipBehavior: Clip.none, clipBehavior: Clip.none,
shrinkWrap: true, shrinkWrap: true,
itemCount: displayFeed.length, itemCount: displayFeed.length,
itemBuilder: (BuildContext context, int index) { itemBuilder:
(BuildContext context,
int index) {
return Padding( return Padding(
padding: const EdgeInsets.only(bottom: 40), padding:
child: const EdgeInsets.only(
PostComponent(callback: openDetailPost, post: displayFeed[index], index: index), bottom: 40),
child: PostComponent(
callback: openDetailPost,
post: displayFeed[index],
index: index),
);
},
),
),
); );
} else {
return Center(
child: CupertinoActivityIndicator(),
);
}
}, },
), ),
)), )),
), ),
), ),
),
),
Align( Align(
alignment: Alignment.topCenter, alignment: Alignment.topCenter,
child: IgnorePointer( child: IgnorePointer(
@ -281,8 +248,14 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
decoration: BoxDecoration( decoration: BoxDecoration(
gradient: LinearGradient( gradient: LinearGradient(
begin: Alignment.topRight, begin: Alignment.topRight,
stops: [0.3, 1], stops: [
colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])), 0.3,
1
],
colors: [
bgColor.withOpacity(0.9),
bgColor.withOpacity(0)
])),
), ),
), ),
), ),

20
Sources/justMUSIC/lib/screens/loading_screen.dart
Unescape View File

@ -0,0 +1,20 @@
import 'package:flutter/Material.dart';
import '../values/constants.dart';
class LoadingScreen extends StatelessWidget {
const LoadingScreen({Key? key}) : super(key: key);
@override
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: bgColor,
body: Center(
child: Image(
image: AssetImage("assets/images/logo.png"),
width: 130,
),
),
);
}
}

1
Sources/justMUSIC/lib/services/CommentService.dart
Unescape View File

@ -20,6 +20,7 @@ class CommentService {
var response = await FirebaseFirestore.instance var response = await FirebaseFirestore.instance
.collection("comments") .collection("comments")
.where("post_id", isEqualTo: id) .where("post_id", isEqualTo: id)
.orderBy("date", descending: true)
.get(); .get();
return response.docs; return response.docs;

6
Sources/justMUSIC/lib/view_model/CommentViewModel.dart
Unescape View File

@ -13,8 +13,8 @@ class CommentViewModel {
// Methods // Methods
addComment(String text, String idPost) async { addComment(String text, String idPost) async {
try { try {
await _commentService.createComment(text,idPost); await _commentService.createComment(text, idPost);
} catch(e) { } catch (e) {
print(e); print(e);
rethrow; rethrow;
} }
@ -28,7 +28,7 @@ class CommentViewModel {
}).toList(); }).toList();
_comments = await Future.wait(commentsFutures); _comments = await Future.wait(commentsFutures);
return _comments; return _comments;
} catch(e) { } catch (e) {
print(e); print(e);
_comments = []; _comments = [];
return []; return [];

8
Sources/justMUSIC/pubspec.lock
Unescape View File

@ -941,6 +941,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.2.0" version: "0.2.0"
timezone:
dependency: "direct main"
description:
name: timezone
sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
url: "https://pub.dev"
source: hosted
version: "0.9.2"
top_snackbar_flutter: top_snackbar_flutter:
dependency: "direct main" dependency: "direct main"
description: description:

1
Sources/justMUSIC/pubspec.yaml
Unescape View File

@ -72,6 +72,7 @@ dependencies:
animations: ^2.0.7 animations: ^2.0.7
flutter_svg: ^2.0.7 flutter_svg: ^2.0.7
flutter_keyboard_visibility: ^5.4.1 flutter_keyboard_visibility: ^5.4.1
timezone: ^0.9.2
firebase_messaging: ^14.6.5 firebase_messaging: ^14.6.5
dev_dependencies: dev_dependencies:

Write Preview
Loading…
Cancel
Save