NOTIFICATION_EKA #42

Merged
emre.kartal merged 5 commits from NOTIFICATION_EKA into master 2 years ago

@ -24,6 +24,7 @@ if (flutterVersionName == null) {
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'com.google.gms.google-services'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android {

@ -8,6 +8,7 @@ import '../values/constants.dart';
class CommentComponent extends StatelessWidget {
final Comment comment;
const CommentComponent({Key? key, required this.comment}) : super(key: key);
@override
@ -17,7 +18,9 @@ class CommentComponent extends StatelessWidget {
return Container(
width: double.infinity,
decoration: BoxDecoration(color: bgComment.withOpacity(0.6), borderRadius: BorderRadius.circular(15)),
decoration: BoxDecoration(
color: bgComment.withOpacity(0.6),
borderRadius: BorderRadius.circular(15)),
padding: EdgeInsets.fromLTRB(20, 10, 20, 10),
margin: EdgeInsets.only(bottom: 13),
child: Row(
@ -46,14 +49,17 @@ class CommentComponent extends StatelessWidget {
),
Text(
comment.user.pseudo,
style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w600),
style: GoogleFonts.plusJakartaSans(
color: Colors.white, fontWeight: FontWeight.w600),
),
Padding(
padding: EdgeInsets.only(top: 6, left: 10),
child: Text(
"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),
color: Colors.white.withOpacity(0.6),
fontWeight: FontWeight.w400,
fontSize: 10),
),
),
],
@ -65,7 +71,10 @@ class CommentComponent extends StatelessWidget {
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Text(
comment.text,
style: GoogleFonts.plusJakartaSans(color: Colors.white, fontWeight: FontWeight.w400, fontSize: 15),
style: GoogleFonts.plusJakartaSans(
color: Colors.white,
fontWeight: FontWeight.w400,
fontSize: 15),
),
),
],

@ -15,18 +15,22 @@ import '../values/constants.dart';
class TopNavBarComponent extends StatefulWidget {
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
State<TopNavBarComponent> createState() => _TopNavBarComponentState();
}
class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProviderStateMixin {
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);
final DateTime midnight = DateTime(
DateTime.now().year, DateTime.now().month, DateTime.now().day + 1);
void actionSurBouton(bool choice) async {
widget.callback(choice);
@ -45,7 +49,8 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
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);
var midnight =
tz.TZDateTime(franceTimeZone, now.year, now.month, now.day + 1);
bool res = await MyApp.postViewModel.getAvailable();
if (res) {
@ -64,7 +69,8 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
alignment: Alignment.centerLeft,
child: Text(
"Capsule disponible",
style: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
style:
GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
),
),
flushbarStyle: FlushbarStyle.FLOATING,
@ -101,7 +107,8 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
alignment: Alignment.centerLeft,
child: CountdownTimer(
endTime: midnight.millisecondsSinceEpoch,
textStyle: GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
textStyle:
GoogleFonts.plusJakartaSans(color: Colors.grey, fontSize: 15),
),
),
flushbarStyle: FlushbarStyle.FLOATING,
@ -193,23 +200,30 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
}
},
child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
builder: (BuildContext context,
BoxConstraints constraints) {
if (choice) {
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(
"Mes amis",
style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w500, fontSize: 16, color: Colors.white),
fontWeight: FontWeight.w500,
fontSize: 16,
color: Colors.white),
),
);
} else {
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(
"Mes amis",
style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed),
fontWeight: FontWeight.w300,
fontSize: 16,
color: unactiveFeed),
));
}
},
@ -226,22 +240,29 @@ class _TopNavBarComponentState extends State<TopNavBarComponent> with TickerProv
}
},
child: LayoutBuilder(
builder: (BuildContext context, BoxConstraints constraints) {
builder: (BuildContext context,
BoxConstraints constraints) {
if (choice) {
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(
"Discovery",
style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w300, fontSize: 16, color: unactiveFeed),
fontWeight: FontWeight.w300,
fontSize: 16,
color: unactiveFeed),
));
} else {
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(
"Discovery",
style: GoogleFonts.plusJakartaSans(
fontWeight: FontWeight.w500, fontSize: 16, color: Colors.white),
fontWeight: FontWeight.w500,
fontSize: 16,
color: Colors.white),
));
}
},

@ -3,6 +3,7 @@ import 'package:audioplayers/audioplayers.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -31,6 +32,7 @@ Future<void> main() async {
await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform,
);
await FirebaseMessaging.instance.requestPermission(sound: true);
runApp(const MyApp());
}
@ -65,7 +67,8 @@ class _MyAppState extends State<MyApp> {
print('User is currently signed out!');
return null;
} else {
MyApp.userViewModel.userCurrent = (await (MyApp.userViewModel.getUser(user.uid)))!;
MyApp.userViewModel.userCurrent =
(await (MyApp.userViewModel.getUser(user.uid)))!;
userCurrent = Stream.value(MyApp.userViewModel.userCurrent);
print('User is signed in!');
}
@ -112,14 +115,16 @@ class _MyAppState extends State<MyApp> {
return FutureBuilder<userJustMusic.User?>(
future: MyApp.userViewModel.getUser(snapshot.data!.uid),
builder: (context, userSnapshot) {
if (userSnapshot.connectionState == ConnectionState.waiting) {
if (userSnapshot.connectionState ==
ConnectionState.waiting) {
return LoadingScreen();
} else if (userSnapshot.hasData) {
MyApp.userViewModel.userCurrent = userSnapshot.data!;
return AnimatedSwitcher(
duration: Duration(milliseconds: 1000),
transitionBuilder: (child, animation) {
return FadeTransition(opacity: animation, child: child);
return FadeTransition(
opacity: animation, child: child);
},
child: FeedScreen(),
);

@ -4,13 +4,14 @@ class User {
String _uniquePseudo;
String _mail;
String _pp;
String _token;
List<String> _followers;
int _capsules;
List<String> _followed;
// Constructor
User(this._id, this._pseudo, this._uniquePseudo, this._mail,
this._pp, this._followers, this._capsules, this._followed);
User(this._id, this._pseudo, this._uniquePseudo, this._mail, this._pp,
this._token, this._followers, this._capsules, this._followed);
//Getters and setters
String get id => _id;
@ -39,6 +40,12 @@ class User {
_pp = value;
}
String get token => _token;
set token(String value) {
_token = value;
}
int get capsules => _capsules;
set capsules(int value) {

@ -5,9 +5,10 @@ import '../Comment.dart';
import '../User.dart';
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();
User? user = await MyApp.userViewModel.getUser(data?['user_id']);
return Comment(snapshot.id, user!, data?["text"] ?? "", data?["date"].toDate());
return Comment(snapshot.id, user!, data?["text"], data?["date"].toDate());
}
}

@ -10,6 +10,7 @@ class UserMapper {
data?["unique_id"],
data?["mail"],
data?["picture"],
data?["token_notify"],
List<String>.from(data?["followers"] as List),
data?["nbCapsules"] ?? 0,
List<String>.from(data?["followed"] as List));

@ -21,6 +21,7 @@ import '../values/constants.dart';
class DetailPostScreen extends StatefulWidget {
final Post post;
const DetailPostScreen({super.key, required this.post});
@override
@ -31,6 +32,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
TextEditingController _textController = TextEditingController();
late FocusNode myFocusNode;
late StreamSubscription<bool> keyboardSubscription;
Future<void> resetFullScreen() async {
await SystemChannels.platform.invokeMethod<void>(
'SystemChrome.restoreSystemUIOverlays',
@ -59,11 +61,13 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
print("ajrd: ${DateTime.now().toString()}");
myFocusNode = FocusNode();
var keyboardVisibilityController = KeyboardVisibilityController();
print('Keyboard visibility direct query: ${keyboardVisibilityController.isVisible}');
print(
'Keyboard visibility direct query: ${keyboardVisibilityController.isVisible}');
super.initState();
keyboardSubscription = keyboardVisibilityController.onChange.listen((bool visible) {
keyboardSubscription =
keyboardVisibilityController.onChange.listen((bool visible) {
if (!visible) {
myFocusNode.unfocus();
}
@ -103,8 +107,11 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 400,
width: double.infinity,
child: FadeInImage.assetNetwork(
placeholder: "assets/images/loadingPlaceholder.gif",
image: choice ? widget.post.selfie! : widget.post.music.cover!,
placeholder:
"assets/images/loadingPlaceholder.gif",
image: choice
? widget.post.selfie!
: widget.post.music.cover!,
width: double.infinity,
fit: BoxFit.cover,
),
@ -125,89 +132,134 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
),
),
child: Padding(
padding: const EdgeInsets.fromLTRB(20, 0, 20, 10),
padding:
const EdgeInsets.fromLTRB(20, 0, 20, 10),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Padding(
padding: const EdgeInsets.only(right: 10),
padding:
const EdgeInsets.only(right: 10),
child: choice
? Padding(
padding: const EdgeInsets.all(4),
padding:
const EdgeInsets.all(4),
child: ClipOval(
child: SizedBox.fromSize(
// Image radius
child: Image(
image: NetworkImage(widget.post.user.pp),
image: NetworkImage(
widget.post.user.pp),
width: 45,
),
),
),
)
: widget.post.music.previewUrl != null
? ButtonPlayComponent(music: widget.post.music)
: widget.post.music.previewUrl !=
null
? ButtonPlayComponent(
music: widget.post.music)
: Container(),
),
Flexible(
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment:
MainAxisAlignment.end,
crossAxisAlignment:
CrossAxisAlignment.start,
children: [
Flexible(
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
crossAxisAlignment:
CrossAxisAlignment.end,
children: [
Expanded(
child: ScrollConfiguration(
behavior: ScrollBehavior().copyWith(scrollbars: false),
behavior: ScrollBehavior()
.copyWith(
scrollbars:
false),
child: TextScroll(
choice ? widget.post.user.pseudo : widget.post.music.title!,
style: GoogleFonts.plusJakartaSans(
choice
? widget.post.user
.pseudo
: widget.post.music
.title!,
style: GoogleFonts
.plusJakartaSans(
height: 1,
color: Colors.white,
fontWeight: FontWeight.w800,
fontWeight:
FontWeight.w800,
fontSize: 22,
),
mode: TextScrollMode.endless,
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: const EdgeInsets.only(left: 20.0),
padding:
const EdgeInsets.only(
left: 20.0),
child: choice
? DateTime(today.year, today.month, today.day).isAtSameMomentAs(
? DateTime(
today.year,
today.month,
today.day)
.isAtSameMomentAs(
DateTime(
widget.post.date.year,
widget.post.date.month,
widget.post.date.day,
widget.post.date
.year,
widget.post.date
.month,
widget.post.date
.day,
),
)
? Text(
"Aujourd'hui, ${widget.post.date.hour}:${widget.post.date.minute}",
style: GoogleFonts.plusJakartaSans(
style: GoogleFonts
.plusJakartaSans(
height: 1,
color: Colors.white,
fontWeight: FontWeight.w900,
color: Colors
.white,
fontWeight:
FontWeight
.w900,
fontSize: 18,
),
)
: Text(
"hier, ${widget.post.date.hour}:${widget.post.date.minute}",
style: GoogleFonts.plusJakartaSans(
style: GoogleFonts
.plusJakartaSans(
height: 1,
color: Colors.white,
fontWeight: FontWeight.w900,
color: Colors
.white,
fontWeight:
FontWeight
.w900,
fontSize: 18,
),
)
: Text(
widget.post.music.date.toString(),
style: GoogleFonts.plusJakartaSans(
widget
.post.music.date
.toString(),
style: GoogleFonts
.plusJakartaSans(
height: 1,
color: Colors.white,
fontWeight: FontWeight.w900,
color:
Colors.white,
fontWeight:
FontWeight
.w900,
fontSize: 18,
),
),
@ -216,36 +268,52 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
),
),
choice
? widget.post.location.item2 != null
? widget.post.location.item2 !=
null
? Text(
"${widget.post.location.item1}, ${widget.post.location.item2}",
style: GoogleFonts.plusJakartaSans(
color: Colors.white.withOpacity(0.5),
fontWeight: FontWeight.w400,
style: GoogleFonts
.plusJakartaSans(
color: Colors.white
.withOpacity(0.5),
fontWeight:
FontWeight.w400,
fontSize: 15,
),
)
: Text(
"",
style: GoogleFonts.plusJakartaSans(
color: Colors.white.withOpacity(0.4),
fontWeight: FontWeight.w300,
style: GoogleFonts
.plusJakartaSans(
color: Colors.white
.withOpacity(0.4),
fontWeight:
FontWeight.w300,
fontSize: 13,
),
)
: ScrollConfiguration(
behavior: ScrollBehavior().copyWith(scrollbars: false),
behavior: ScrollBehavior()
.copyWith(
scrollbars: false),
child: TextScroll(
widget.post.music.artists.first.name!,
style: GoogleFonts.plusJakartaSans(
widget.post.music.artists
.first.name!,
style: GoogleFonts
.plusJakartaSans(
height: 1,
color: Colors.white,
fontWeight: FontWeight.w500,
fontWeight:
FontWeight.w500,
fontSize: 17,
),
mode: TextScrollMode.endless,
pauseBetween: Duration(milliseconds: 500),
velocity: Velocity(pixelsPerSecond: Offset(20, 0)),
mode: TextScrollMode
.endless,
pauseBetween: Duration(
milliseconds: 500),
velocity: Velocity(
pixelsPerSecond:
Offset(20, 0)),
),
),
],
@ -259,7 +327,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
? Align(
alignment: Alignment.bottomLeft,
child: Padding(
padding: const EdgeInsets.fromLTRB(50, 35, 50, 35),
padding: const EdgeInsets.fromLTRB(
50, 35, 50, 35),
child: Text(
widget.post.description!,
textAlign: TextAlign.left,
@ -289,50 +358,77 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
child: Column(
children: [
Padding(
padding: EdgeInsets.symmetric(vertical: 20),
padding:
EdgeInsets.symmetric(vertical: 20),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
mainAxisAlignment:
MainAxisAlignment.spaceEvenly,
children: [
SvgPicture.asset("assets/images/heart.svg", semanticsLabel: 'Like Logo'),
SvgPicture.asset(
"assets/images/heart.svg",
semanticsLabel: 'Like Logo'),
GestureDetector(
onTap: () {
myFocusNode.requestFocus();
},
child:
SvgPicture.asset("assets/images/chat.svg", semanticsLabel: 'Chat Logo'),
child: SvgPicture.asset(
"assets/images/chat.svg",
semanticsLabel: 'Chat Logo'),
),
SvgPicture.asset("assets/images/add.svg",
semanticsLabel: 'Add playlist Logo'),
SvgPicture.asset("assets/images/save.svg", semanticsLabel: 'Save Logo'),
SvgPicture.asset("assets/images/report.svg", semanticsLabel: 'Report Logo'),
SvgPicture.asset(
"assets/images/add.svg",
semanticsLabel:
'Add playlist Logo'),
SvgPicture.asset(
"assets/images/save.svg",
semanticsLabel: 'Save Logo'),
SvgPicture.asset(
"assets/images/report.svg",
semanticsLabel: 'Report Logo'),
],
),
),
FutureBuilder<List<Comment>>(
future: MyApp.commentViewModel.getCommentsByPostId(widget.post.id),
builder: (BuildContext context, AsyncSnapshot<List<Comment>> snapshot) {
future: MyApp.commentViewModel
.getCommentsByPostId(widget.post.id),
builder: (BuildContext context,
AsyncSnapshot<List<Comment>>
snapshot) {
if (snapshot.hasData) {
print("test:");
return Column(
children: [
snapshot.data!.length > 0
? Padding(
padding: const EdgeInsets.all(15.0),
padding:
const EdgeInsets.all(
15.0),
child: RichText(
text: TextSpan(
text: snapshot.data!.length.toString(),
style: GoogleFonts.plusJakartaSans(
text: snapshot
.data!.length
.toString(),
style: GoogleFonts
.plusJakartaSans(
color: Colors.white,
fontWeight: FontWeight.w800,
fontWeight:
FontWeight.w800,
),
children: [
TextSpan(
text: snapshot.data!.length > 1
text: snapshot
.data!
.length >
1
? " commentaires"
: " commentaire",
style: GoogleFonts.plusJakartaSans(
color: Colors.white,
fontWeight: FontWeight.w400,
style: GoogleFonts
.plusJakartaSans(
color: Colors
.white,
fontWeight:
FontWeight
.w400,
),
),
],
@ -342,13 +438,23 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
: Container(),
snapshot.data!.length > 0
? Padding(
padding: const EdgeInsets.fromLTRB(20, 0, 20, 20),
padding: const EdgeInsets
.fromLTRB(
20, 0, 20, 20),
child: ListView.builder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
itemCount: snapshot.data?.length,
itemBuilder: (BuildContext context, int index) {
return CommentComponent(comment: snapshot.data![index]);
physics:
NeverScrollableScrollPhysics(),
itemCount: snapshot
.data?.length,
itemBuilder:
(BuildContext
context,
int index) {
return CommentComponent(
comment: snapshot
.data![
index]);
},
),
)
@ -358,7 +464,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
} else {
return Container(
child: Center(
child: CupertinoActivityIndicator(),
child:
CupertinoActivityIndicator(),
),
);
}
@ -379,11 +486,14 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
}
},
enableLongTapRepeatEvent: false,
longTapRepeatDuration: const Duration(milliseconds: 100),
longTapRepeatDuration:
const Duration(milliseconds: 100),
begin: 1.0,
end: 0.96,
beginDuration: const Duration(milliseconds: 70),
endDuration: const Duration(milliseconds: 100),
beginDuration:
const Duration(milliseconds: 70),
endDuration:
const Duration(milliseconds: 100),
beginCurve: Curves.decelerate,
endCurve: Curves.easeInOutSine,
child: Container(
@ -392,13 +502,16 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
height: 120,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20),
border: Border.all(width: 4, color: Colors.white),
border: Border.all(
width: 4, color: Colors.white),
),
child: ClipRRect(
borderRadius: BorderRadius.circular(15),
// implementer l'image
child: Image(
image: NetworkImage(choice ? widget.post.music.cover! : widget.post.selfie!),
image: NetworkImage(choice
? widget.post.music.cover!
: widget.post.selfie!),
fit: BoxFit.cover,
),
),
@ -434,7 +547,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
),
),
Padding(
padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom),
child: Container(
height: 70,
width: double.infinity,
@ -464,7 +578,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
focusNode: myFocusNode,
onSubmitted: (value) async {
if (value.isNotEmpty) {
await MyApp.commentViewModel.addComment(value, widget.post.id);
await MyApp.commentViewModel
.addComment(value, widget.post.id);
}
setState(() {
_textController.clear();
@ -472,7 +587,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
},
cursorColor: primaryColor,
keyboardType: TextInputType.emailAddress,
style: GoogleFonts.plusJakartaSans(color: Colors.white),
style: GoogleFonts.plusJakartaSans(
color: Colors.white),
decoration: InputDecoration(
suffixIcon: Icon(
Icons.send,
@ -480,19 +596,25 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
size: 20,
),
focusedBorder: OutlineInputBorder(
borderSide: BorderSide(width: 1, color: grayText),
borderRadius: BorderRadius.all(Radius.circular(100)),
borderSide:
BorderSide(width: 1, color: grayText),
borderRadius:
BorderRadius.all(Radius.circular(100)),
),
contentPadding: EdgeInsets.only(top: 0, bottom: 0, left: 20, right: 20),
contentPadding: EdgeInsets.only(
top: 0, bottom: 0, left: 20, right: 20),
fillColor: bgModal,
filled: true,
focusColor: Color.fromRGBO(255, 255, 255, 0.30),
enabledBorder: OutlineInputBorder(
borderSide: BorderSide(width: 1, color: grayText),
borderRadius: BorderRadius.all(Radius.circular(100)),
borderSide:
BorderSide(width: 1, color: grayText),
borderRadius:
BorderRadius.all(Radius.circular(100)),
),
hintText: 'Ajoutez une réponse...',
hintStyle: GoogleFonts.plusJakartaSans(color: grayText),
hintStyle:
GoogleFonts.plusJakartaSans(color: grayText),
),
),
),
@ -511,7 +633,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
class MyBehavior extends ScrollBehavior {
@override
Widget buildOverscrollIndicator(BuildContext context, Widget child, ScrollableDetails details) {
Widget buildOverscrollIndicator(
BuildContext context, Widget child, ScrollableDetails details) {
return child;
}
}

@ -21,7 +21,8 @@ class FeedScreen extends StatefulWidget {
State<FeedScreen> createState() => _FeedScreenState();
}
class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateMixin {
class _FeedScreenState extends State<FeedScreen>
with SingleTickerProviderStateMixin {
late AnimationController animationController;
late Animation<double> animation;
late List<Post> friendFeed;
@ -87,10 +88,12 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
isScrollControlled: true,
context: context,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20))),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20), topRight: Radius.circular(20))),
builder: ((BuildContext context) {
return ClipRRect(
borderRadius: BorderRadius.only(topLeft: Radius.circular(20), topRight: Radius.circular(20)),
borderRadius: BorderRadius.only(
topLeft: Radius.circular(20), topRight: Radius.circular(20)),
child: DetailPostScreen(post: displayFeed[index]));
}),
);
@ -124,16 +127,21 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
Container(
decoration: const BoxDecoration(
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(
padding: EdgeInsets.only(top: 140.h, left: defaultPadding),
padding:
EdgeInsets.only(top: 140.h, left: defaultPadding),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text("Suis tes amis pour voir leurs capsules",
style: GoogleFonts.plusJakartaSans(
color: Colors.white, fontSize: 23, fontWeight: FontWeight.w800))
color: Colors.white,
fontSize: 23,
fontWeight: FontWeight.w800))
],
),
),
@ -146,8 +154,14 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topRight,
stops: [0.3, 1],
colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])),
stops: [
0.3,
1
],
colors: [
bgColor.withOpacity(0.9),
bgColor.withOpacity(0)
])),
),
),
),
@ -177,27 +191,38 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
child: Container(
height: double.infinity,
constraints: BoxConstraints(maxWidth: 600),
padding: EdgeInsets.fromLTRB(defaultPadding, 100.h, defaultPadding, 0),
padding: EdgeInsets.fromLTRB(
defaultPadding, 100.h, defaultPadding, 0),
child: Expanded(
child: FutureBuilder(
future: _fetchData(),
builder: (BuildContext context, AsyncSnapshot<dynamic> snapshot) {
builder: (BuildContext context,
AsyncSnapshot<dynamic> snapshot) {
if (snapshot.hasData) {
return RefreshIndicator(
displacement: 20,
triggerMode: RefreshIndicatorTriggerMode.onEdge,
triggerMode:
RefreshIndicatorTriggerMode
.onEdge,
onRefresh: _refresh,
child: Expanded(
child: ListView.builder(
physics: const AlwaysScrollableScrollPhysics(),
physics:
const AlwaysScrollableScrollPhysics(),
clipBehavior: Clip.none,
shrinkWrap: true,
itemCount: displayFeed.length,
itemBuilder: (BuildContext context, int index) {
itemBuilder:
(BuildContext context,
int index) {
return Padding(
padding: const EdgeInsets.only(bottom: 40),
padding:
const EdgeInsets.only(
bottom: 40),
child: PostComponent(
callback: openDetailPost, post: displayFeed[index], index: index),
callback: openDetailPost,
post: displayFeed[index],
index: index),
);
},
),
@ -223,8 +248,14 @@ class _FeedScreenState extends State<FeedScreen> with SingleTickerProviderStateM
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topRight,
stops: [0.3, 1],
colors: [bgColor.withOpacity(0.9), bgColor.withOpacity(0)])),
stops: [
0.3,
1
],
colors: [
bgColor.withOpacity(0.9),
bgColor.withOpacity(0)
])),
),
),
),

@ -1,15 +1,24 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/foundation.dart';
import '../main.dart';
class AuthService {
register(String pseudo, String email, String password) async {
try {
var token;
final data = await FirebaseAuth.instance.createUserWithEmailAndPassword(
email: email,
password: password,
);
if (kIsWeb) {
token = "empty";
} else {
token = await FirebaseMessaging.instance.getToken();
}
String uniqueId = await generateUniqueId(pseudo);
final user = <String, dynamic>{
@ -19,6 +28,7 @@ class AuthService {
"followed": [],
"nbCapsules": 0,
"followers": [],
"token_notify": token,
"picture":
"https://firebasestorage.googleapis.com/v0/b/justmusic-435d5.appspot.com/o/justMusicDefaultImage.png?alt=media&token=020d0fcb-b7df-4d4d-b380-e99597293fcc"
};

@ -5,12 +5,18 @@ import '../main.dart';
class CommentService {
createComment(String text, String idPost) async {
var id = MyApp.userViewModel.userCurrent.id;
final comment = <String, dynamic>{"user_id": id, "text": text, "date": DateTime.now(), "post_id": idPost};
final comment = <String, dynamic>{
"user_id": id,
"text": text,
"date": DateTime.now(),
"post_id": idPost
};
await MyApp.db.collection("comments").add(comment);
}
Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getCommentsByPostId(String id) async {
Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getCommentsByPostId(
String id) async {
var response = await FirebaseFirestore.instance
.collection("comments")
.where("post_id", isEqualTo: id)

@ -0,0 +1,31 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
class NotificationService {
sendPushMessage(String token, String title, String body) async {
try {
await http.post(Uri.parse('https://fcm.googleapis.com/fcm/send'),
headers: <String, String>{
'Content-Type': 'application/json',
'Authorization':
'key=AAAA56TmIPg:APA91bFeKMr_i6CbUuuUdFI1XkdaNE2A7OVHzxrPIsOSlDfhR6qzZwof7JNGxthWUKj1dRHQMheWNYaLbf3AtXUp9o4DX_gB2073yR4urqUEh9CjvnxVws_9g1cWMgmFS3EpaQEA3icC'
},
body: jsonEncode(<String, dynamic>{
'priority': 'high',
'data': <String, dynamic>{
'click_action': 'FLUTTER_NOTIFICATION_CLICK',
'status': 'done',
'body': body,
'title': title
},
"notification": <String, dynamic>{
"title": title,
"body": body,
},
"to": token,
}));
} catch (e) {
print("error push notification");
}
}
}

@ -56,7 +56,7 @@ class PostService {
.get();
var filteredPosts = response.docs.where((doc) {
String user = doc["user_id"]; // Assuming the field name is "date"
String user = doc["user_id"];
return user != MyApp.userViewModel.userCurrent.id;
}).toList();
return filteredPosts;

@ -3,11 +3,14 @@ import 'package:cloud_firestore/cloud_firestore.dart';
import '../main.dart';
class UserService {
Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getUsersByIdUnique(String uniqueId) async {
QuerySnapshot<Map<String, dynamic>> response = await FirebaseFirestore.instance
Future<List<QueryDocumentSnapshot<Map<String, dynamic>>>> getUsersByIdUnique(
String uniqueId) async {
QuerySnapshot<Map<String, dynamic>> response = await FirebaseFirestore
.instance
.collection("users")
.where("unique_id", isGreaterThanOrEqualTo: uniqueId)
.where("unique_id", isLessThanOrEqualTo: uniqueId + "zzzzzzzzzzzzzzzzzzzzzzzzzzzz")
.where("unique_id",
isLessThanOrEqualTo: uniqueId + "zzzzzzzzzzzzzzzzzzzzzzzzzzzz")
.limit(20)
.get();
var users = response.docs.where((doc) {
@ -18,8 +21,20 @@ class UserService {
return users;
}
updateTokenNotify(String idUser, String token) {
FirebaseFirestore.instance
.collection('users')
.doc(idUser)
.update({'token_notify': token}).then((_) {
print("Mise à jour réussie !");
}).catchError((error) {
print("Erreur lors de la mise à jour : $error");
});
}
addOrDeleteFriend(String id) async {
var userRef = MyApp.db.collection("users").doc(MyApp.userViewModel.userCurrent.id);
var userRef =
MyApp.db.collection("users").doc(MyApp.userViewModel.userCurrent.id);
var actionUserRef = MyApp.db.collection("users").doc(id);
if (MyApp.userViewModel.isFriend(id)) {
@ -28,7 +43,7 @@ class UserService {
'followed': FieldValue.arrayRemove([id])
});
transaction.update(actionUserRef, {
'followers': FieldValue.arrayRemove([id])
'followers': FieldValue.arrayRemove([userRef.id])
});
});
MyApp.userViewModel.userCurrent.followed.remove(id);
@ -38,7 +53,7 @@ class UserService {
'followed': FieldValue.arrayUnion([id])
});
transaction.update(actionUserRef, {
'followers': FieldValue.arrayUnion([id])
'followers': FieldValue.arrayUnion([userRef.id])
});
});
MyApp.userViewModel.userCurrent.followed.add(id);

@ -23,13 +23,10 @@ class CommentViewModel {
Future<List<Comment>> getCommentsByPostId(String id) async {
try {
var responseData = await _commentService.getCommentsByPostId(id);
print(responseData.length);
var commentsFutures = responseData.map((value) async {
return await CommentMapper.toModel(value);
}).toList();
_comments = await Future.wait(commentsFutures);
print("ccccccc");
_comments.map((e) => print(e.text));
return _comments;
} catch (e) {
print(e);

@ -1,4 +1,6 @@
import 'package:firebase_auth/firebase_auth.dart' as firebase_auth;
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/foundation.dart';
import 'package:justmusic/services/AuthService.dart';
import 'package:justmusic/services/UserService.dart';
@ -27,8 +29,20 @@ class UserViewModel {
login(String pseudo, String password) async {
try {
var token;
await authService.login(pseudo, password);
final user = await MyApp.db.collection("users").doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid).get();
final user = await MyApp.db
.collection("users")
.doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid)
.get();
if (!kIsWeb) {
token = await FirebaseMessaging.instance.getToken();
if (MyApp.userViewModel.userCurrent.token != token) {
_userService.updateTokenNotify(
MyApp.userViewModel.userCurrent.id, token);
MyApp.userViewModel.userCurrent.token = token;
}
}
User data = UserMapper.toModel(user);
_userCurrent = data;
} catch (e) {
@ -43,7 +57,10 @@ class UserViewModel {
updateUserCurrent() async {
try {
final user = await MyApp.db.collection("users").doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid).get();
final user = await MyApp.db
.collection("users")
.doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid)
.get();
User data = UserMapper.toModel(user);
_userCurrent = data;
} catch (e) {
@ -58,7 +75,10 @@ class UserViewModel {
try {
await authService.register(pseudo.toLowerCase(), email, password);
final user = await MyApp.db.collection("users").doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid).get();
final user = await MyApp.db
.collection("users")
.doc(firebase_auth.FirebaseAuth.instance.currentUser?.uid)
.get();
User data = UserMapper.toModel(user);
_userCurrent = data;
} catch (e) {
@ -68,7 +88,8 @@ class UserViewModel {
Future<List<User>> getUsersByUniqueId(String uniqueId) async {
try {
var response = await _userService.getUsersByIdUnique(uniqueId.toLowerCase());
var response =
await _userService.getUsersByIdUnique(uniqueId.toLowerCase());
var users = response.map((value) {
return UserMapper.toModel(value);
}).toList();

@ -337,6 +337,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.6.0"
firebase_messaging:
dependency: "direct main"
description:
name: firebase_messaging
sha256: "8ac91d83a028eef050de770f1dc98421e215714d245f34de7b154d436676fbd0"
url: "https://pub.dev"
source: hosted
version: "14.6.5"
firebase_messaging_platform_interface:
dependency: transitive
description:
name: firebase_messaging_platform_interface
sha256: b2995e3640efb646e9ebf0e2fa50dea84895f0746a31d7e3af0e5e009a533a1a
url: "https://pub.dev"
source: hosted
version: "4.5.4"
firebase_messaging_web:
dependency: transitive
description:
name: firebase_messaging_web
sha256: "5d8446a28339124a2cb4f57a6ca454a3aca7d0c5c0cdfa5707afb192f7c830a7"
url: "https://pub.dev"
source: hosted
version: "3.5.4"
firebase_storage:
dependency: "direct main"
description:

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

@ -0,0 +1,6 @@
import 'package:justmusic/services/NotificationService.dart';
Future<void> main() async {
var notif = NotificationService();
await notif.sendPushMessage("cAJAJw_aR7yPQbFTMS-r6H:APA91bEZs34Ab3-xSYeIGykHrxD5pRj-OyODaEcNBPtds1eLzEH0uzFkzCSQY7BvZQHEFPfeHSN7nri4webskXbu1zzgwe9NIdPagsc6IHaouuewWqWd9V7ucTeDeYt1Sbby4-pb6jtA", "Just Music", "Vien voir les nouveautés");
}
Loading…
Cancel
Save