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

pull/42/head
emre.kartal 2 years ago
commit 2240bcefa6

@ -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" />

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

@ -1,269 +1,299 @@
import 'package:another_flushbar/flushbar.dart'; import 'package:another_flushbar/flushbar.dart';
import 'package:auto_size_text/auto_size_text.dart'; import 'package:auto_size_text/auto_size_text.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_countdown_timer/flutter_countdown_timer.dart'; import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
import 'package:google_fonts/google_fonts.dart'; import 'package:google_fonts/google_fonts.dart';
import 'package:ionicons/ionicons.dart'; import 'package:ionicons/ionicons.dart';
import 'package:lottie/lottie.dart'; 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 '../main.dart'; import 'package:timezone/timezone.dart' as tz;
import '../values/constants.dart'; import '../main.dart';
import '../values/constants.dart';
class TopNavBarComponent extends StatefulWidget {
final Function(bool) callback; class TopNavBarComponent extends StatefulWidget {
const TopNavBarComponent({Key? key, required this.callback}) : super(key: key); final Function(bool) callback;
@override const TopNavBarComponent({Key? key, required this.callback})
State<TopNavBarComponent> createState() => _TopNavBarComponentState(); : super(key: key);
}
@override
class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProviderStateMixin { State<TopNavBarComponent> createState() => _TopNavBarComponentState();
bool choice = true; }
late AnimationController _controller;
bool isDismissed = true; class _TopNavBarComponentState extends State<TopNavBarComponent>
with TickerProviderStateMixin {
final DateTime midnight = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1); bool choice = true;
void actionSurBouton() async { bool isDismissed = true;
widget.callback(choice);
await MyApp.postViewModel.getBestPosts(); final DateTime midnight = DateTime(
await MyApp.postViewModel.getPostsFriends(); DateTime.now().year, DateTime.now().month, DateTime.now().day + 1);
}
void actionSurBouton(bool choice) async {
@override widget.callback(choice);
void initState() { }
_controller = AnimationController(
vsync: this, @override
duration: Duration(seconds: 3), void initState() {
); super.initState();
super.initState(); }
}
Future<void> showCapsuleDot() async {
void showCapsuleDot(bool isAvailable) { // Get the timezone for France
isAvailable final franceTimeZone = tz.getLocation('Europe/Paris');
? Flushbar(
maxWidth: 210, // Get the current date and time in France timezone
animationDuration: Duration(seconds: 1), var now = tz.TZDateTime.now(franceTimeZone);
forwardAnimationCurve: Curves.easeOutCirc,
margin: EdgeInsets.fromLTRB(0, 0, 0, 0), // Calculate the midnight time for the next day in France timezone
icon: Icon( var midnight =
Ionicons.sparkles, tz.TZDateTime(franceTimeZone, now.year, now.month, now.day + 1);
color: Colors.white,
size: 18, bool res = await MyApp.postViewModel.getAvailable();
), if (res) {
padding: EdgeInsets.fromLTRB(8, 8, 8, 8), Flushbar(
messageText: Align( maxWidth: 210,
alignment: Alignment.centerLeft, animationDuration: Duration(seconds: 1),
child: Text( forwardAnimationCurve: Curves.easeOutCirc,
"Capsule disponible", margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
style: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), icon: Icon(
), Ionicons.sparkles,
), color: Colors.white,
flushbarStyle: FlushbarStyle.FLOATING, size: 18,
flushbarPosition: FlushbarPosition.BOTTOM, ),
textDirection: Directionality.of(context), padding: EdgeInsets.fromLTRB(8, 8, 8, 8),
borderRadius: BorderRadius.circular(1000), messageText: Align(
borderWidth: 1, alignment: Alignment.centerLeft,
borderColor: Colors.white.withOpacity(0.04), child: Text(
duration: const Duration(minutes: 100), "Capsule disponible",
leftBarIndicatorColor: Colors.transparent, style:
positionOffset: 20, GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
onTap: (_) { ),
Navigator.pop(context); ),
Navigator.pushNamed(context, '/post'); flushbarStyle: FlushbarStyle.FLOATING,
}, flushbarPosition: FlushbarPosition.BOTTOM,
).show(context) textDirection: Directionality.of(context),
: Flushbar( borderRadius: BorderRadius.circular(1000),
maxWidth: 155, borderWidth: 1,
animationDuration: Duration(seconds: 1), borderColor: Colors.white.withOpacity(0.04),
forwardAnimationCurve: Curves.easeOutCirc, duration: const Duration(minutes: 100),
margin: EdgeInsets.fromLTRB(0, 0, 0, 0), leftBarIndicatorColor: Colors.transparent,
icon: Lottie.asset( positionOffset: 20,
'assets/animations/LottieHourGlass.json', onTap: (_) {
width: 26, Navigator.pop(context);
fit: BoxFit.fill, Navigator.pushNamed(context, '/post');
), },
padding: EdgeInsets.fromLTRB(8, 8, 8, 8), ).show(context).then((value) {
messageText: Align( setState(() {
alignment: Alignment.centerLeft, isDismissed = !isDismissed;
child: CountdownTimer( });
endTime: midnight.millisecondsSinceEpoch - 2 * 60 * 60 * 1000, });
textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15), } else {
), Flushbar(
), maxWidth: 155,
flushbarStyle: FlushbarStyle.FLOATING, animationDuration: Duration(seconds: 1),
flushbarPosition: FlushbarPosition.BOTTOM, forwardAnimationCurve: Curves.easeOutCirc,
textDirection: Directionality.of(context), margin: EdgeInsets.fromLTRB(0, 0, 0, 0),
borderRadius: BorderRadius.circular(1000), icon: Lottie.asset(
borderWidth: 1, 'assets/animations/LottieHourGlass.json',
borderColor: Colors.white.withOpacity(0.04), width: 26,
duration: const Duration(minutes: 100), fit: BoxFit.fill,
leftBarIndicatorColor: Colors.transparent, ),
positionOffset: 20, padding: EdgeInsets.fromLTRB(8, 8, 8, 8),
onTap: (_) { messageText: Align(
Navigator.pop(context); alignment: Alignment.centerLeft,
}, child: CountdownTimer(
).show(context); endTime: midnight.millisecondsSinceEpoch,
} textStyle:
GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
void checkAvailable() async { ),
print("test"); ),
var res = await MyApp.postViewModel.getAvailable(); flushbarStyle: FlushbarStyle.FLOATING,
print(res); flushbarPosition: FlushbarPosition.BOTTOM,
ModalRoute<dynamic>? route = ModalRoute.of(context); textDirection: Directionality.of(context),
if (route != null) { borderRadius: BorderRadius.circular(1000),
if (route.settings.name != '/flushbarRoute') { borderWidth: 1,
print("yes"); borderColor: Colors.white.withOpacity(0.04),
showCapsuleDot(res); duration: const Duration(minutes: 100),
} leftBarIndicatorColor: Colors.transparent,
} positionOffset: 20,
} onTap: (_) {},
).show(context).then((value) {
@override setState(() {
Widget build(BuildContext context) { isDismissed = !isDismissed;
return Padding( });
padding: const EdgeInsets.only(top: defaultPadding), });
child: Container( }
padding: EdgeInsets.symmetric(horizontal: defaultPadding), }
width: double.infinity,
height: 100, void checkAvailable() async {
child: Row( if (isDismissed) {
crossAxisAlignment: CrossAxisAlignment.start, showCapsuleDot();
mainAxisAlignment: MainAxisAlignment.spaceBetween, setState(() {
children: [ isDismissed = !isDismissed;
Flexible( });
flex: 1, }
child: GestureDetector( }
behavior: HitTestBehavior.translucent,
onTap: () async { @override
Navigator.of(context).push(routeAddFriend()); Widget build(BuildContext context) {
}, return Padding(
child: const Icon( padding: const EdgeInsets.only(top: defaultPadding),
Icons.person_add_alt_1_rounded, child: Container(
color: Colors.white, padding: EdgeInsets.symmetric(horizontal: defaultPadding),
size: 30, width: double.infinity,
), height: 100,
), child: Row(
), crossAxisAlignment: CrossAxisAlignment.start,
ConstrainedBox( mainAxisAlignment: MainAxisAlignment.spaceBetween,
constraints: BoxConstraints(maxWidth: 200), children: [
child: Column( Flexible(
mainAxisAlignment: MainAxisAlignment.start, flex: 1,
children: [ child: GestureDetector(
ZoomTapAnimation( behavior: HitTestBehavior.translucent,
enableLongTapRepeatEvent: false, onTap: () async {
longTapRepeatDuration: const Duration(milliseconds: 100), Navigator.of(context).push(routeAddFriend());
begin: 1.0, },
onTap: () { child: const Icon(
checkAvailable(); Icons.person_add_alt_1_rounded,
}, color: Colors.white,
end: 0.97, size: 30,
beginDuration: const Duration(milliseconds: 70), ),
endDuration: const Duration(milliseconds: 100), ),
beginCurve: Curves.decelerate, ),
endCurve: Curves.easeInOutSine, ConstrainedBox(
child: Image( constraints: BoxConstraints(maxWidth: 200),
image: AssetImage("assets/images/logo.png"), child: Column(
height: 30, mainAxisAlignment: MainAxisAlignment.start,
)), children: [
Row( ZoomTapAnimation(
crossAxisAlignment: CrossAxisAlignment.center, enableLongTapRepeatEvent: false,
mainAxisAlignment: MainAxisAlignment.center, longTapRepeatDuration: const Duration(milliseconds: 100),
children: [ begin: 1.0,
GestureDetector( onTap: () {
behavior: HitTestBehavior.translucent, checkAvailable();
onTap: () { },
if (!choice) { end: 0.97,
setState(() { beginDuration: const Duration(milliseconds: 70),
choice = !choice; endDuration: const Duration(milliseconds: 100),
actionSurBouton(); beginCurve: Curves.decelerate,
}); endCurve: Curves.easeInOutSine,
} child: Image(
}, image: AssetImage("assets/images/logo.png"),
child: LayoutBuilder( height: 30,
builder: (BuildContext context, BoxConstraints constraints) { )),
if (choice) { Row(
return Padding( crossAxisAlignment: CrossAxisAlignment.center,
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), mainAxisAlignment: MainAxisAlignment.center,
child: AutoSizeText( children: [
"Mes amis", GestureDetector(
style: GoogleFonts.plusJakartaSans( behavior: HitTestBehavior.translucent,
fontWeight: FontWeight.w500, fontSize: 16, color: Colors.white), onTap: () {
), if (!choice) {
); setState(() {
} else { choice = !choice;
return Padding( actionSurBouton(false);
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), });
child: AutoSizeText( }
"Mes amis", },
style: GoogleFonts.plusJakartaSans( child: LayoutBuilder(
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed), builder: (BuildContext context,
)); BoxConstraints constraints) {
} if (choice) {
}, return Padding(
), padding: const EdgeInsets.only(
), left: 8, top: 0, right: 8, bottom: 6),
GestureDetector( child: AutoSizeText(
behavior: HitTestBehavior.translucent, "Mes amis",
onTap: () { style: GoogleFonts.plusJakartaSans(
if (choice) { fontWeight: FontWeight.w500,
setState(() { fontSize: 16,
choice = !choice; color: Colors.white),
actionSurBouton(); ),
}); );
} } else {
}, return Padding(
child: LayoutBuilder( padding: const EdgeInsets.only(
builder: (BuildContext context, BoxConstraints constraints) { left: 8, top: 0, right: 8, bottom: 6),
if (choice) { child: AutoSizeText(
return Padding( "Mes amis",
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), style: GoogleFonts.plusJakartaSans(
child: AutoSizeText( fontWeight: FontWeight.w300,
"Discovery", fontSize: 16,
style: GoogleFonts.plusJakartaSans( color: unactiveFeed),
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed), ));
)); }
} else { },
return Padding( ),
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6), ),
child: AutoSizeText( GestureDetector(
"Discovery", behavior: HitTestBehavior.translucent,
style: GoogleFonts.plusJakartaSans( onTap: () {
fontWeight: FontWeight.w500, fontSize: 16, color: Colors.white), if (choice) {
)); setState(() {
} choice = !choice;
}, actionSurBouton(true);
), });
), }
], },
), child: LayoutBuilder(
], builder: (BuildContext context,
), BoxConstraints constraints) {
), if (choice) {
Flexible( return Padding(
flex: 1, padding: const EdgeInsets.only(
child: GestureDetector( left: 8, top: 0, right: 8, bottom: 6),
onTap: () async { child: AutoSizeText(
await MyApp.userViewModel.updateUserCurrent(); "Discovery",
Navigator.of(context).push(routeProfile()); style: GoogleFonts.plusJakartaSans(
}, fontWeight: FontWeight.w300,
child: ClipOval( fontSize: 16,
child: SizedBox.fromSize( color: unactiveFeed),
// Image radius ));
child: FadeInImage.assetNetwork( } else {
placeholder: 'assets/images/loadingPlaceholder.gif', return Padding(
image: MyApp.userViewModel.userCurrent.pp, padding: const EdgeInsets.only(
width: 30, left: 8, top: 0, right: 8, bottom: 6),
)), child: AutoSizeText(
), "Discovery",
), style: GoogleFonts.plusJakartaSans(
) fontWeight: FontWeight.w500,
], fontSize: 16,
), color: Colors.white),
), ));
); }
} },
} ),
),
],
),
],
),
),
Flexible(
flex: 1,
child: GestureDetector(
onTap: () async {
await MyApp.userViewModel.updateUserCurrent();
Navigator.of(context).push(routeProfile());
},
child: ClipOval(
child: SizedBox.fromSize(
// Image radius
child: FadeInImage.assetNetwork(
placeholder: 'assets/images/loadingPlaceholder.gif',
image: MyApp.userViewModel.userCurrent.pp,
width: 30,
)),
),
),
)
],
),
),
);
}
}

@ -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});
@ -64,7 +68,7 @@ class _MyAppState extends State<MyApp> {
return null; return null;
} else { } else {
MyApp.userViewModel.userCurrent = MyApp.userViewModel.userCurrent =
(await (MyApp.userViewModel.getUser(user.uid)))!; (await (MyApp.userViewModel.getUser(user.uid)))!;
userCurrent = Stream.value(MyApp.userViewModel.userCurrent); userCurrent = Stream.value(MyApp.userViewModel.userCurrent);
print('User is signed in!'); print('User is signed in!');
} }
@ -100,46 +104,40 @@ 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, builder: (context, snapshot) {
initialData: null, if (snapshot.connectionState == ConnectionState.waiting) {
builder: (context, snapshot) { return LoadingScreen();
if (snapshot.hasData) { } else if (snapshot.hasData) {
print("hasdata"); return FutureBuilder<userJustMusic.User?>(
future: MyApp.userViewModel.getUser(snapshot.data!.uid),
return AnimatedSwitcher( builder: (context, userSnapshot) {
duration: Duration(milliseconds: 1000), if (userSnapshot.connectionState ==
transitionBuilder: (child, animation) { ConnectionState.waiting) {
return FadeTransition( return LoadingScreen();
opacity: animation, child: child); } else if (userSnapshot.hasData) {
}, MyApp.userViewModel.userCurrent = userSnapshot.data!;
child: FeedScreen(), return AnimatedSwitcher(
); duration: Duration(milliseconds: 1000),
} else { transitionBuilder: (child, animation) {
return Scaffold( return FadeTransition(
backgroundColor: bgColor, opacity: animation, child: child);
body: Center( },
child: Image( child: FeedScreen(),
image: AssetImage("assets/images/logo.png"), );
width: 130, } else {
), return WellcomeScreen();
), }
); },
} );
}) } else {
: WellcomeScreen()); return WellcomeScreen();
}
},
));
}, },
designSize: Size(390, 844), designSize: Size(390, 844),
); );

@ -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"]);
} }
} }

File diff suppressed because it is too large Load Diff

@ -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,98 +49,14 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
animationController.forward(); animationController.forward();
} }
Future<void> showCapsuleDot() async {
bool res = await MyApp.postViewModel.getAvailable();
if (isDismissed) {
if (res) {
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 {
setState(() {
isDismissed = !isDismissed;
});
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 { Future _refresh() async {
print("refresh"); if (choiceFeed) {
discoveryFeed = await MyApp.postViewModel.getBestPosts(); await MyApp.postViewModel.getBestPosts();
setState(() { setState(() {});
displayFeed = discoveryFeed.reversed.toList(); } else {
}); await MyApp.postViewModel.getPostsFriends();
setState(() {});
}
} }
void changeFeed(bool choice) { void changeFeed(bool choice) {
@ -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,35 +177,67 @@ 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(
alignment: Alignment.topCenter, child: Align(
child: CircularRevealAnimation( alignment: Alignment.topCenter,
animation: animation, child: CircularRevealAnimation(
centerOffset: Offset(30.w, -100), animation: animation,
child: Container( centerOffset: Offset(30.w, -100),
constraints: BoxConstraints(maxWidth: 600), child: Expanded(
padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0), child: Container(
child: RefreshIndicator( height: double.infinity,
displacement: 20, constraints: BoxConstraints(maxWidth: 600),
triggerMode: RefreshIndicatorTriggerMode.onEdge, padding: EdgeInsets.fromLTRB(
onRefresh: _refresh, defaultPadding, 100.h, defaultPadding, 0),
child: ListView.builder( child: Expanded(
physics: const BouncingScrollPhysics(decelerationRate: ScrollDecelerationRate.fast), child: FutureBuilder(
clipBehavior: Clip.none, future: _fetchData(),
shrinkWrap: true, builder: (BuildContext context,
itemCount: displayFeed.length, AsyncSnapshot<dynamic> snapshot) {
itemBuilder: (BuildContext context, int index) { if (snapshot.hasData) {
return Padding( return RefreshIndicator(
padding: const EdgeInsets.only(bottom: 40), displacement: 20,
child: triggerMode:
PostComponent(callback: openDetailPost, post: displayFeed[index], index: index), RefreshIndicatorTriggerMode
); .onEdge,
}, onRefresh: _refresh,
), child: Expanded(
)), child: ListView.builder(
physics:
const AlwaysScrollableScrollPhysics(),
clipBehavior: Clip.none,
shrinkWrap: true,
itemCount: displayFeed.length,
itemBuilder:
(BuildContext context,
int index) {
return Padding(
padding:
const EdgeInsets.only(
bottom: 40),
child: PostComponent(
callback: openDetailPost,
post: displayFeed[index],
index: index),
);
},
),
),
);
} else {
return Center(
child: CupertinoActivityIndicator(),
);
}
},
),
)),
),
),
), ),
), ),
Align( Align(
@ -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)
])),
), ),
), ),
), ),

@ -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,
),
),
);
}
}

@ -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;

@ -1,37 +1,37 @@
import 'package:justmusic/model/mapper/CommentMapper.dart'; import 'package:justmusic/model/mapper/CommentMapper.dart';
import '../model/Comment.dart'; import '../model/Comment.dart';
import '../services/CommentService.dart'; import '../services/CommentService.dart';
class CommentViewModel { class CommentViewModel {
List<Comment> _comments = []; List<Comment> _comments = [];
final CommentService _commentService = CommentService(); final CommentService _commentService = CommentService();
// Constructor // Constructor
CommentViewModel(); 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;
} }
} }
Future<List<Comment>> getCommentsByPostId(String id) async { Future<List<Comment>> getCommentsByPostId(String id) async {
try { try {
var responseData = await _commentService.getCommentsByPostId(id); var responseData = await _commentService.getCommentsByPostId(id);
var commentsFutures = responseData.map((value) async { var commentsFutures = responseData.map((value) async {
return await CommentMapper.toModel(value); return await CommentMapper.toModel(value);
}).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 [];
} }
} }
} }

@ -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,129 +1,130 @@
name: justmusic name: justmusic
description: A new Flutter project. description: A new Flutter project.
# The following line prevents the package from being accidentally published to # The following line prevents the package from being accidentally published to
# pub.dev using `flutter pub publish`. This is preferred for private packages. # pub.dev using `flutter pub publish`. This is preferred for private packages.
publish_to: 'none' # Remove this line if you wish to publish to pub.dev publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# The following defines the version and build number for your application. # The following defines the version and build number for your application.
# A version number is three numbers separated by dots, like 1.2.43 # A version number is three numbers separated by dots, like 1.2.43
# followed by an optional build number separated by a +. # followed by an optional build number separated by a +.
# Both the version and the builder number may be overridden in flutter # Both the version and the builder number may be overridden in flutter
# build by specifying --build-name and --build-number, respectively. # build by specifying --build-name and --build-number, respectively.
# In Android, build-name is used as versionName while build-number used as versionCode. # In Android, build-name is used as versionName while build-number used as versionCode.
# Read more about Android versioning at https://developer.android.com/studio/publish/versioning # Read more about Android versioning at https://developer.android.com/studio/publish/versioning
# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. # In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
# Read more about iOS versioning at # Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
# In Windows, build-name is used as the major, minor, and patch parts # In Windows, build-name is used as the major, minor, and patch parts
# of the product and file versions while build-number is used as the build suffix. # of the product and file versions while build-number is used as the build suffix.
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: '>=2.18.2 <3.0.0' sdk: '>=2.18.2 <3.0.0'
# Dependencies specify other packages that your package needs in order to work. # Dependencies specify other packages that your package needs in order to work.
# To automatically upgrade your package dependencies to the latest versions # To automatically upgrade your package dependencies to the latest versions
# consider running `flutter pub upgrade --major-versions`. Alternatively, # consider running `flutter pub upgrade --major-versions`. Alternatively,
# dependencies can be manually updated by changing the version numbers below to # dependencies can be manually updated by changing the version numbers below to
# the latest version available on pub.dev. To see which dependencies have newer # the latest version available on pub.dev. To see which dependencies have newer
# versions available, run `flutter pub outdated`. # versions available, run `flutter pub outdated`.
dependencies: dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
http: ^0.13.5 http: ^0.13.5
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.2 cupertino_icons: ^1.0.2
google_fonts: ^4.0.4 google_fonts: ^4.0.4
gradiantbutton: ^0.0.1 gradiantbutton: ^0.0.1
smooth_corner: ^1.1.0 smooth_corner: ^1.1.0
flutter_signin_button: ^2.0.0 flutter_signin_button: ^2.0.0
flutter_screenutil: ^5.7.0 flutter_screenutil: ^5.7.0
auto_size_text: ^3.0.0 auto_size_text: ^3.0.0
gradient_borders: ^1.0.0 gradient_borders: ^1.0.0
text_scroll: ^0.2.0 text_scroll: ^0.2.0
circular_reveal_animation: ^2.0.1 circular_reveal_animation: ^2.0.1
zoom_tap_animation: ^1.1.0 zoom_tap_animation: ^1.1.0
custom_draggable_widget: ^0.0.2 custom_draggable_widget: ^0.0.2
modal_bottom_sheet: ^2.1.2 modal_bottom_sheet: ^2.1.2
flutter_animated_play_button: ^0.3.0 flutter_animated_play_button: ^0.3.0
audioplayers: ^4.1.0 audioplayers: ^4.1.0
ionicons: ^0.2.2 ionicons: ^0.2.2
top_snackbar_flutter: ^3.1.0 top_snackbar_flutter: ^3.1.0
firebase_core: ^2.15.0 firebase_core: ^2.15.0
firebase_auth: ^4.7.2 firebase_auth: ^4.7.2
cloud_firestore: ^4.8.4 cloud_firestore: ^4.8.4
image_picker: ^1.0.1 image_picker: ^1.0.1
insta_image_viewer: ^1.0.2 insta_image_viewer: ^1.0.2
pinch_zoom: ^1.0.0 pinch_zoom: ^1.0.0
smooth_list_view: ^1.0.4 smooth_list_view: ^1.0.4
animated_appear: ^0.0.4 animated_appear: ^0.0.4
geolocator: ^9.0.2 geolocator: ^9.0.2
tuple: ^2.0.2 tuple: ^2.0.2
firebase_storage: ^11.2.5 firebase_storage: ^11.2.5
another_flushbar: ^1.12.30 another_flushbar: ^1.12.30
flutter_countdown_timer: ^4.1.0 flutter_countdown_timer: ^4.1.0
intl: ^0.18.1 intl: ^0.18.1
lottie: ^2.5.0 lottie: ^2.5.0
custom_refresh_indicator: ^2.2.1 custom_refresh_indicator: ^2.2.1
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
firebase_messaging: ^14.6.5 timezone: ^0.9.2
firebase_messaging: ^14.6.5
dev_dependencies:
flutter_test: dev_dependencies:
sdk: flutter flutter_test:
sdk: flutter
# The "flutter_lints" package below contains a set of recommended lints to
# encourage good coding practices. The lint set provided by the package is # The "flutter_lints" package below contains a set of recommended lints to
# activated in the `analysis_options.yaml` file located at the root of your # encourage good coding practices. The lint set provided by the package is
# package. See that file for information about deactivating specific lint # activated in the `analysis_options.yaml` file located at the root of your
# rules and activating additional ones. # package. See that file for information about deactivating specific lint
flutter_lints: ^2.0.0 # rules and activating additional ones.
flutter_lints: ^2.0.0
# For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec # For information on the generic Dart part of this file, see the
# following page: https://dart.dev/tools/pub/pubspec
# The following section is specific to Flutter packages.
flutter: # The following section is specific to Flutter packages.
flutter:
# The following line ensures that the Material Icons font is
# included with your application, so that you can use the icons in # The following line ensures that the Material Icons font is
# the material Icons class. # included with your application, so that you can use the icons in
uses-material-design: true # the material Icons class.
uses-material-design: true
# To add assets to your application, add an assets section, like this:
assets: # To add assets to your application, add an assets section, like this:
- assets/images/ assets:
- assets/animations/ - assets/images/
- assets/ - assets/animations/
- assets/
# An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware # An image asset can refer to one or more resolution-specific "variants", see
# https://flutter.dev/assets-and-images/#resolution-aware
# For details regarding adding assets from package dependencies, see
# https://flutter.dev/assets-and-images/#from-packages # For details regarding adding assets from package dependencies, see
# https://flutter.dev/assets-and-images/#from-packages
# To add custom fonts to your application, add a fonts section here,
# in this "flutter" section. Each entry in this list should have a # To add custom fonts to your application, add a fonts section here,
# "family" key with the font family name, and a "fonts" key with a # in this "flutter" section. Each entry in this list should have a
# list giving the asset and other descriptors for the font. For # "family" key with the font family name, and a "fonts" key with a
# example: # list giving the asset and other descriptors for the font. For
# fonts: # example:
# - family: Schyler # fonts:
# fonts: # - family: Schyler
# - asset: fonts/Schyler-Regular.ttf # fonts:
# - asset: fonts/Schyler-Italic.ttf # - asset: fonts/Schyler-Regular.ttf
# style: italic # - asset: fonts/Schyler-Italic.ttf
# - family: Trajan Pro # style: italic
# fonts: # - family: Trajan Pro
# - asset: fonts/TrajanPro.ttf # fonts:
# - asset: fonts/TrajanPro_Bold.ttf # - asset: fonts/TrajanPro.ttf
# weight: 700 # - asset: fonts/TrajanPro_Bold.ttf
# # weight: 700
# For details regarding fonts from package dependencies, #
# see https://flutter.dev/custom-fonts/#from-packages # For details regarding fonts from package dependencies,
# see https://flutter.dev/custom-fonts/#from-packages

Loading…
Cancel
Save