add icon

Sources/justMUSIC/lib/main.dart

@@ -106,36 +106,7 @@ class _MyAppState extends State<MyApp> {
             theme: ThemeData(
               primarySwatch: Colors.blue,
             ),
-            home: StreamBuilder<User?>(
+            home: WellcomeScreen());
-              stream: FirebaseAuth.instance.authStateChanges(),
-              builder: (context, snapshot) {
-                if (snapshot.connectionState == ConnectionState.waiting) {
-                  return LoadingScreen();
-                } else if (snapshot.hasData) {
-                  return FutureBuilder<userJustMusic.User?>(
-                    future: MyApp.userViewModel.getUser(snapshot.data!.uid),
-                    builder: (context, userSnapshot) {
-                      if (userSnapshot.connectionState == ConnectionState.waiting) {
-                        return LoadingScreen();
-                      } else if (userSnapshot.hasData) {
-                        MyApp.userViewModel.userCurrent = userSnapshot.data!;
-                        return AnimatedSwitcher(
-                          duration: Duration(milliseconds: 1000),
-                          transitionBuilder: (child, animation) {
-                            return FadeTransition(opacity: animation, child: child);
-                          },
-                          child: FeedScreen(),
-                        );
-                      } else {
-                        return WellcomeScreen();
-                      }
-                    },
-                  );
-                } else {
-                  return WellcomeScreen();
-                }
-              },
-            ));
       },
       designSize: Size(390, 844),
     );

Sources/justMUSIC/lib/screens/detail_post_screen.dart

@@ -61,7 +61,15 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return GestureDetector(
+        onTap: () {
+          FocusScopeNode currentFocus = FocusScope.of(context);
+          if (!currentFocus.hasPrimaryFocus) {
+            currentFocus.unfocus();
+            resetFullScreen();
+          }
+        },
+        child: Container(
           height: 760.h,
           child: Column(
             children: [
@@ -153,7 +161,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                                                     Padding(
                                                       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,
@@ -274,10 +283,11 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                                               onTap: () {
                                                 myFocusNode.requestFocus();
                                               },
-                                          child:
+                                              child: SvgPicture.asset("assets/images/chat.svg",
-                                              SvgPicture.asset("assets/images/chat.svg", semanticsLabel: 'Chat Logo'),
+                                                  semanticsLabel: 'Chat Logo'),
                                             ),
-                                        SvgPicture.asset("assets/images/add.svg", semanticsLabel: 'Add playlist 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'),
                                           ],
@@ -287,7 +297,6 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                                         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
@@ -373,7 +382,8 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                                           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,
                                           ),
                                         ),
@@ -445,15 +455,32 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
                                   _textController.clear();
                                 });
                               },
+                              onChanged: (value) {
+                                setState(() {});
+                              },
                               cursorColor: primaryColor,
                               keyboardType: TextInputType.emailAddress,
                               style: GoogleFonts.plusJakartaSans(color: Colors.white),
                               decoration: InputDecoration(
-                            suffixIcon: IconButton(
+                                suffixIcon: _textController.text.isEmpty
-                                onPressed: () {},
+                                    ? Container(
+                                        height: 20,
+                                        width: 20,
+                                      )
+                                    : IconButton(
+                                        onPressed: () async {
+                                          if (_textController.text.isNotEmpty) {
+                                            await MyApp.commentViewModel
+                                                .addComment(_textController.text, widget.post.id, widget.post.user);
+                                          }
+                                          myFocusNode.unfocus();
+                                          setState(() {
+                                            _textController.clear();
+                                          });
+                                        },
                                         icon: Icon(
                                           Icons.send,
-                                  color: grayText,
+                                          color: primaryColor,
                                           size: 20,
                                         )),
                                 focusedBorder: OutlineInputBorder(
@@ -481,7 +508,7 @@ class _DetailPostScreenState extends State<DetailPostScreen> {
               ),
             ],
           ),
-    );
+        ));
   }
 }