Fix error conflicts
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
emre.kartal
2 years ago
commit
2240bcefa6
@ -1,269 +1,299 @@
|
||||
import 'package:another_flushbar/flushbar.dart';
|
||||
import 'package:auto_size_text/auto_size_text.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:ionicons/ionicons.dart';
|
||||
import 'package:lottie/lottie.dart';
|
||||
import 'package:zoom_tap_animation/zoom_tap_animation.dart';
|
||||
|
||||
import '../config/routes.dart';
|
||||
import '../main.dart';
|
||||
import '../values/constants.dart';
|
||||
|
||||
class TopNavBarComponent extends StatefulWidget {
|
||||
final Function(bool) callback;
|
||||
const TopNavBarComponent({Key? key, required this.callback}) : super(key: key);
|
||||
|
||||
@override
|
||||
State<TopNavBarComponent> createState() => _TopNavBarComponentState();
|
||||
}
|
||||
|
||||
class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProviderStateMixin {
|
||||
bool choice = true;
|
||||
late AnimationController _controller;
|
||||
bool isDismissed = true;
|
||||
|
||||
final DateTime midnight = DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 1);
|
||||
|
||||
void actionSurBouton() async {
|
||||
widget.callback(choice);
|
||||
await MyApp.postViewModel.getBestPosts();
|
||||
await MyApp.postViewModel.getPostsFriends();
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
_controller = AnimationController(
|
||||
vsync: this,
|
||||
duration: Duration(seconds: 3),
|
||||
);
|
||||
super.initState();
|
||||
}
|
||||
|
||||
void showCapsuleDot(bool isAvailable) {
|
||||
isAvailable
|
||||
? 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,
|
||||
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)
|
||||
: Flushbar(
|
||||
maxWidth: 155,
|
||||
animationDuration: Duration(seconds: 1),
|
||||
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: (_) {
|
||||
Navigator.pop(context);
|
||||
},
|
||||
).show(context);
|
||||
}
|
||||
|
||||
void checkAvailable() async {
|
||||
print("test");
|
||||
var res = await MyApp.postViewModel.getAvailable();
|
||||
print(res);
|
||||
ModalRoute<dynamic>? route = ModalRoute.of(context);
|
||||
if (route != null) {
|
||||
if (route.settings.name != '/flushbarRoute') {
|
||||
print("yes");
|
||||
showCapsuleDot(res);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(top: defaultPadding),
|
||||
child: Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: defaultPadding),
|
||||
width: double.infinity,
|
||||
height: 100,
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Flexible(
|
||||
flex: 1,
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onTap: () async {
|
||||
Navigator.of(context).push(routeAddFriend());
|
||||
},
|
||||
child: const Icon(
|
||||
Icons.person_add_alt_1_rounded,
|
||||
color: Colors.white,
|
||||
size: 30,
|
||||
),
|
||||
),
|
||||
),
|
||||
ConstrainedBox(
|
||||
constraints: BoxConstraints(maxWidth: 200),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
ZoomTapAnimation(
|
||||
enableLongTapRepeatEvent: false,
|
||||
longTapRepeatDuration: const Duration(milliseconds: 100),
|
||||
begin: 1.0,
|
||||
onTap: () {
|
||||
checkAvailable();
|
||||
},
|
||||
end: 0.97,
|
||||
beginDuration: const Duration(milliseconds: 70),
|
||||
endDuration: const Duration(milliseconds: 100),
|
||||
beginCurve: Curves.decelerate,
|
||||
endCurve: Curves.easeInOutSine,
|
||||
child: Image(
|
||||
image: AssetImage("assets/images/logo.png"),
|
||||
height: 30,
|
||||
)),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onTap: () {
|
||||
if (!choice) {
|
||||
setState(() {
|
||||
choice = !choice;
|
||||
actionSurBouton();
|
||||
});
|
||||
}
|
||||
},
|
||||
child: LayoutBuilder(
|
||||
builder: (BuildContext context, BoxConstraints constraints) {
|
||||
if (choice) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6),
|
||||
child: AutoSizeText(
|
||||
"Mes amis",
|
||||
style: GoogleFonts.plusJakartaSans(
|
||||
fontWeight: FontWeight.w500, fontSize: 16, color: Colors.white),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6),
|
||||
child: AutoSizeText(
|
||||
"Mes amis",
|
||||
style: GoogleFonts.plusJakartaSans(
|
||||
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed),
|
||||
));
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onTap: () {
|
||||
if (choice) {
|
||||
setState(() {
|
||||
choice = !choice;
|
||||
actionSurBouton();
|
||||
});
|
||||
}
|
||||
},
|
||||
child: LayoutBuilder(
|
||||
builder: (BuildContext context, BoxConstraints constraints) {
|
||||
if (choice) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(left: 8, top: 0, right: 8, bottom: 6),
|
||||
child: AutoSizeText(
|
||||
"Discovery",
|
||||
style: GoogleFonts.plusJakartaSans(
|
||||
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed),
|
||||
));
|
||||
} else {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(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,
|
||||
)),
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
import 'package:another_flushbar/flushbar.dart';
|
||||
import 'package:auto_size_text/auto_size_text.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
import 'package:ionicons/ionicons.dart';
|
||||
import 'package:lottie/lottie.dart';
|
||||
import 'package:zoom_tap_animation/zoom_tap_animation.dart';
|
||||
|
||||
import '../config/routes.dart';
|
||||
import 'package:timezone/timezone.dart' as tz;
|
||||
import '../main.dart';
|
||||
import '../values/constants.dart';
|
||||
|
||||
class TopNavBarComponent extends StatefulWidget {
|
||||
final Function(bool) callback;
|
||||
|
||||
const TopNavBarComponent({Key? key, required this.callback})
|
||||
: super(key: key);
|
||||
|
||||
@override
|
||||
State<TopNavBarComponent> createState() => _TopNavBarComponentState();
|
||||
}
|
||||
|
||||
class _TopNavBarComponentState extends State<TopNavBarComponent>
|
||||
with TickerProviderStateMixin {
|
||||
bool choice = true;
|
||||
|
||||
bool isDismissed = true;
|
||||
|
||||
final DateTime midnight = DateTime(
|
||||
DateTime.now().year, DateTime.now().month, DateTime.now().day + 1);
|
||||
|
||||
void actionSurBouton(bool choice) async {
|
||||
widget.callback(choice);
|
||||
}
|
||||
|
||||
@override
|
||||
void initState() {
|
||||
super.initState();
|
||||
}
|
||||
|
||||
Future<void> showCapsuleDot() async {
|
||||
// Get the timezone for France
|
||||
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,
|
||||
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,
|
||||
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) {
|
||||
setState(() {
|
||||
isDismissed = !isDismissed;
|
||||
});
|
||||
});
|
||||
} else {
|
||||
Flushbar(
|
||||
maxWidth: 155,
|
||||
animationDuration: Duration(seconds: 1),
|
||||
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,
|
||||
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;
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void checkAvailable() async {
|
||||
if (isDismissed) {
|
||||
showCapsuleDot();
|
||||
setState(() {
|
||||
isDismissed = !isDismissed;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(top: defaultPadding),
|
||||
child: Container(
|
||||
padding: EdgeInsets.symmetric(horizontal: defaultPadding),
|
||||
width: double.infinity,
|
||||
height: 100,
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
Flexible(
|
||||
flex: 1,
|
||||
child: GestureDetector(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onTap: () async {
|
||||
Navigator.of(context).push(routeAddFriend());
|
||||
},
|
||||
child: const Icon(
|
||||
Icons.person_add_alt_1_rounded,
|
||||
color: Colors.white,
|
||||
size: 30,
|
||||
),
|
||||
),
|
||||
),
|
||||
ConstrainedBox(
|
||||
constraints: BoxConstraints(maxWidth: 200),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.start,
|
||||
children: [
|
||||
ZoomTapAnimation(
|
||||
enableLongTapRepeatEvent: false,
|
||||
longTapRepeatDuration: const Duration(milliseconds: 100),
|
||||
begin: 1.0,
|
||||
onTap: () {
|
||||
checkAvailable();
|
||||
},
|
||||
end: 0.97,
|
||||
beginDuration: const Duration(milliseconds: 70),
|
||||
endDuration: const Duration(milliseconds: 100),
|
||||
beginCurve: Curves.decelerate,
|
||||
endCurve: Curves.easeInOutSine,
|
||||
child: Image(
|
||||
image: AssetImage("assets/images/logo.png"),
|
||||
height: 30,
|
||||
)),
|
||||
Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.center,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onTap: () {
|
||||
if (!choice) {
|
||||
setState(() {
|
||||
choice = !choice;
|
||||
actionSurBouton(false);
|
||||
});
|
||||
}
|
||||
},
|
||||
child: LayoutBuilder(
|
||||
builder: (BuildContext context,
|
||||
BoxConstraints constraints) {
|
||||
if (choice) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 8, top: 0, right: 8, bottom: 6),
|
||||
child: AutoSizeText(
|
||||
"Mes amis",
|
||||
style: GoogleFonts.plusJakartaSans(
|
||||
fontWeight: FontWeight.w500,
|
||||
fontSize: 16,
|
||||
color: Colors.white),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 8, top: 0, right: 8, bottom: 6),
|
||||
child: AutoSizeText(
|
||||
"Mes amis",
|
||||
style: GoogleFonts.plusJakartaSans(
|
||||
fontWeight: FontWeight.w300,
|
||||
fontSize: 16,
|
||||
color: unactiveFeed),
|
||||
));
|
||||
}
|
||||
},
|
||||
),
|
||||
),
|
||||
GestureDetector(
|
||||
behavior: HitTestBehavior.translucent,
|
||||
onTap: () {
|
||||
if (choice) {
|
||||
setState(() {
|
||||
choice = !choice;
|
||||
actionSurBouton(true);
|
||||
});
|
||||
}
|
||||
},
|
||||
child: LayoutBuilder(
|
||||
builder: (BuildContext context,
|
||||
BoxConstraints constraints) {
|
||||
if (choice) {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
left: 8, top: 0, right: 8, bottom: 6),
|
||||
child: AutoSizeText(
|
||||
"Discovery",
|
||||
style: GoogleFonts.plusJakartaSans(
|
||||
fontWeight: FontWeight.w300,
|
||||
fontSize: 16,
|
||||
color: unactiveFeed),
|
||||
));
|
||||
} else {
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(
|
||||
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,
|
||||
)),
|
||||
),
|
||||
),
|
||||
)
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -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,37 +1,37 @@
|
||||
import 'package:justmusic/model/mapper/CommentMapper.dart';
|
||||
|
||||
import '../model/Comment.dart';
|
||||
import '../services/CommentService.dart';
|
||||
|
||||
class CommentViewModel {
|
||||
List<Comment> _comments = [];
|
||||
final CommentService _commentService = CommentService();
|
||||
|
||||
// Constructor
|
||||
CommentViewModel();
|
||||
|
||||
// Methods
|
||||
addComment(String text, String idPost) async {
|
||||
try {
|
||||
await _commentService.createComment(text,idPost);
|
||||
} catch(e) {
|
||||
print(e);
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<Comment>> getCommentsByPostId(String id) async {
|
||||
try {
|
||||
var responseData = await _commentService.getCommentsByPostId(id);
|
||||
var commentsFutures = responseData.map((value) async {
|
||||
return await CommentMapper.toModel(value);
|
||||
}).toList();
|
||||
_comments = await Future.wait(commentsFutures);
|
||||
return _comments;
|
||||
} catch(e) {
|
||||
print(e);
|
||||
_comments = [];
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
import 'package:justmusic/model/mapper/CommentMapper.dart';
|
||||
|
||||
import '../model/Comment.dart';
|
||||
import '../services/CommentService.dart';
|
||||
|
||||
class CommentViewModel {
|
||||
List<Comment> _comments = [];
|
||||
final CommentService _commentService = CommentService();
|
||||
|
||||
// Constructor
|
||||
CommentViewModel();
|
||||
|
||||
// Methods
|
||||
addComment(String text, String idPost) async {
|
||||
try {
|
||||
await _commentService.createComment(text, idPost);
|
||||
} catch (e) {
|
||||
print(e);
|
||||
rethrow;
|
||||
}
|
||||
}
|
||||
|
||||
Future<List<Comment>> getCommentsByPostId(String id) async {
|
||||
try {
|
||||
var responseData = await _commentService.getCommentsByPostId(id);
|
||||
var commentsFutures = responseData.map((value) async {
|
||||
return await CommentMapper.toModel(value);
|
||||
}).toList();
|
||||
_comments = await Future.wait(commentsFutures);
|
||||
return _comments;
|
||||
} catch (e) {
|
||||
print(e);
|
||||
_comments = [];
|
||||
return [];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,129 +1,130 @@
|
||||
name: justmusic
|
||||
description: A new Flutter project.
|
||||
|
||||
# The following line prevents the package from being accidentally published to
|
||||
# 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
|
||||
|
||||
# The following defines the version and build number for your application.
|
||||
# A version number is three numbers separated by dots, like 1.2.43
|
||||
# followed by an optional build number separated by a +.
|
||||
# Both the version and the builder number may be overridden in flutter
|
||||
# build by specifying --build-name and --build-number, respectively.
|
||||
# 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
|
||||
# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
|
||||
# Read more about iOS versioning at
|
||||
# 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
|
||||
# of the product and file versions while build-number is used as the build suffix.
|
||||
version: 1.0.0+1
|
||||
|
||||
environment:
|
||||
sdk: '>=2.18.2 <3.0.0'
|
||||
|
||||
# Dependencies specify other packages that your package needs in order to work.
|
||||
# To automatically upgrade your package dependencies to the latest versions
|
||||
# consider running `flutter pub upgrade --major-versions`. Alternatively,
|
||||
# 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
|
||||
# versions available, run `flutter pub outdated`.
|
||||
dependencies:
|
||||
flutter:
|
||||
sdk: flutter
|
||||
http: ^0.13.5
|
||||
|
||||
|
||||
# The following adds the Cupertino Icons font to your application.
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
cupertino_icons: ^1.0.2
|
||||
google_fonts: ^4.0.4
|
||||
gradiantbutton: ^0.0.1
|
||||
smooth_corner: ^1.1.0
|
||||
flutter_signin_button: ^2.0.0
|
||||
flutter_screenutil: ^5.7.0
|
||||
auto_size_text: ^3.0.0
|
||||
gradient_borders: ^1.0.0
|
||||
text_scroll: ^0.2.0
|
||||
circular_reveal_animation: ^2.0.1
|
||||
zoom_tap_animation: ^1.1.0
|
||||
custom_draggable_widget: ^0.0.2
|
||||
modal_bottom_sheet: ^2.1.2
|
||||
flutter_animated_play_button: ^0.3.0
|
||||
audioplayers: ^4.1.0
|
||||
ionicons: ^0.2.2
|
||||
top_snackbar_flutter: ^3.1.0
|
||||
firebase_core: ^2.15.0
|
||||
firebase_auth: ^4.7.2
|
||||
cloud_firestore: ^4.8.4
|
||||
image_picker: ^1.0.1
|
||||
insta_image_viewer: ^1.0.2
|
||||
pinch_zoom: ^1.0.0
|
||||
smooth_list_view: ^1.0.4
|
||||
animated_appear: ^0.0.4
|
||||
geolocator: ^9.0.2
|
||||
tuple: ^2.0.2
|
||||
firebase_storage: ^11.2.5
|
||||
another_flushbar: ^1.12.30
|
||||
flutter_countdown_timer: ^4.1.0
|
||||
intl: ^0.18.1
|
||||
lottie: ^2.5.0
|
||||
custom_refresh_indicator: ^2.2.1
|
||||
animations: ^2.0.7
|
||||
flutter_svg: ^2.0.7
|
||||
flutter_keyboard_visibility: ^5.4.1
|
||||
firebase_messaging: ^14.6.5
|
||||
|
||||
dev_dependencies:
|
||||
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
|
||||
# activated in the `analysis_options.yaml` file located at the root of your
|
||||
# package. See that file for information about deactivating specific lint
|
||||
# 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
|
||||
|
||||
# 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 material Icons class.
|
||||
uses-material-design: true
|
||||
|
||||
# To add assets to your application, add an assets section, like this:
|
||||
assets:
|
||||
- assets/images/
|
||||
- assets/animations/
|
||||
- assets/
|
||||
|
||||
# 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
|
||||
|
||||
# To add custom fonts to your application, add a fonts section here,
|
||||
# in this "flutter" section. Each entry in this list should have a
|
||||
# "family" key with the font family name, and a "fonts" key with a
|
||||
# list giving the asset and other descriptors for the font. For
|
||||
# example:
|
||||
# fonts:
|
||||
# - family: Schyler
|
||||
# fonts:
|
||||
# - asset: fonts/Schyler-Regular.ttf
|
||||
# - asset: fonts/Schyler-Italic.ttf
|
||||
# style: italic
|
||||
# - family: Trajan Pro
|
||||
# fonts:
|
||||
# - asset: fonts/TrajanPro.ttf
|
||||
# - asset: fonts/TrajanPro_Bold.ttf
|
||||
# weight: 700
|
||||
#
|
||||
# For details regarding fonts from package dependencies,
|
||||
# see https://flutter.dev/custom-fonts/#from-packages
|
||||
name: justmusic
|
||||
description: A new Flutter project.
|
||||
|
||||
# The following line prevents the package from being accidentally published to
|
||||
# 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
|
||||
|
||||
# The following defines the version and build number for your application.
|
||||
# A version number is three numbers separated by dots, like 1.2.43
|
||||
# followed by an optional build number separated by a +.
|
||||
# Both the version and the builder number may be overridden in flutter
|
||||
# build by specifying --build-name and --build-number, respectively.
|
||||
# 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
|
||||
# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
|
||||
# Read more about iOS versioning at
|
||||
# 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
|
||||
# of the product and file versions while build-number is used as the build suffix.
|
||||
version: 1.0.0+1
|
||||
|
||||
environment:
|
||||
sdk: '>=2.18.2 <3.0.0'
|
||||
|
||||
# Dependencies specify other packages that your package needs in order to work.
|
||||
# To automatically upgrade your package dependencies to the latest versions
|
||||
# consider running `flutter pub upgrade --major-versions`. Alternatively,
|
||||
# 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
|
||||
# versions available, run `flutter pub outdated`.
|
||||
dependencies:
|
||||
flutter:
|
||||
sdk: flutter
|
||||
http: ^0.13.5
|
||||
|
||||
|
||||
# The following adds the Cupertino Icons font to your application.
|
||||
# Use with the CupertinoIcons class for iOS style icons.
|
||||
cupertino_icons: ^1.0.2
|
||||
google_fonts: ^4.0.4
|
||||
gradiantbutton: ^0.0.1
|
||||
smooth_corner: ^1.1.0
|
||||
flutter_signin_button: ^2.0.0
|
||||
flutter_screenutil: ^5.7.0
|
||||
auto_size_text: ^3.0.0
|
||||
gradient_borders: ^1.0.0
|
||||
text_scroll: ^0.2.0
|
||||
circular_reveal_animation: ^2.0.1
|
||||
zoom_tap_animation: ^1.1.0
|
||||
custom_draggable_widget: ^0.0.2
|
||||
modal_bottom_sheet: ^2.1.2
|
||||
flutter_animated_play_button: ^0.3.0
|
||||
audioplayers: ^4.1.0
|
||||
ionicons: ^0.2.2
|
||||
top_snackbar_flutter: ^3.1.0
|
||||
firebase_core: ^2.15.0
|
||||
firebase_auth: ^4.7.2
|
||||
cloud_firestore: ^4.8.4
|
||||
image_picker: ^1.0.1
|
||||
insta_image_viewer: ^1.0.2
|
||||
pinch_zoom: ^1.0.0
|
||||
smooth_list_view: ^1.0.4
|
||||
animated_appear: ^0.0.4
|
||||
geolocator: ^9.0.2
|
||||
tuple: ^2.0.2
|
||||
firebase_storage: ^11.2.5
|
||||
another_flushbar: ^1.12.30
|
||||
flutter_countdown_timer: ^4.1.0
|
||||
intl: ^0.18.1
|
||||
lottie: ^2.5.0
|
||||
custom_refresh_indicator: ^2.2.1
|
||||
animations: ^2.0.7
|
||||
flutter_svg: ^2.0.7
|
||||
flutter_keyboard_visibility: ^5.4.1
|
||||
timezone: ^0.9.2
|
||||
firebase_messaging: ^14.6.5
|
||||
|
||||
dev_dependencies:
|
||||
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
|
||||
# activated in the `analysis_options.yaml` file located at the root of your
|
||||
# package. See that file for information about deactivating specific lint
|
||||
# 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
|
||||
|
||||
# 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 material Icons class.
|
||||
uses-material-design: true
|
||||
|
||||
# To add assets to your application, add an assets section, like this:
|
||||
assets:
|
||||
- assets/images/
|
||||
- assets/animations/
|
||||
- assets/
|
||||
|
||||
# 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
|
||||
|
||||
# To add custom fonts to your application, add a fonts section here,
|
||||
# in this "flutter" section. Each entry in this list should have a
|
||||
# "family" key with the font family name, and a "fonts" key with a
|
||||
# list giving the asset and other descriptors for the font. For
|
||||
# example:
|
||||
# fonts:
|
||||
# - family: Schyler
|
||||
# fonts:
|
||||
# - asset: fonts/Schyler-Regular.ttf
|
||||
# - asset: fonts/Schyler-Italic.ttf
|
||||
# style: italic
|
||||
# - family: Trajan Pro
|
||||
# fonts:
|
||||
# - asset: fonts/TrajanPro.ttf
|
||||
# - asset: fonts/TrajanPro_Bold.ttf
|
||||
# weight: 700
|
||||
#
|
||||
# For details regarding fonts from package dependencies,
|
||||
# see https://flutter.dev/custom-fonts/#from-packages
|
||||
|
||||
Loading…
Reference in new issue