update uditha

.dart_tool/package_config.json

@@ -668,13 +668,13 @@
       "languageVersion": "3.0"
     },
     {
-      "name": "jema_app",
+      "name": "mobile_application_kids",
       "rootUri": "../",
       "packageUri": "lib/",
       "languageVersion": "3.0"
     }
   ],
-  "generated": "2024-03-09T19:18:50.460515Z",
+  "generated": "2024-03-17T10:38:35.142846Z",
   "generator": "pub",
   "generatorVersion": "3.0.1"
 }

.dart_tool/package_config_subset

@@ -442,8 +442,8 @@ xdg_directories
 3.0
 file:///Users/avishkanew/.pub-cache/hosted/pub.dev/xdg_directories-1.0.4/
 file:///Users/avishkanew/.pub-cache/hosted/pub.dev/xdg_directories-1.0.4/lib/
-jema_app
+mobile_application_kids
 3.0
-file:///Users/avishkanew/Desktop/Avishk678/monitoring-and-recommendations-for-early-childhood-development/
-file:///Users/avishkanew/Desktop/Avishk678/monitoring-and-recommendations-for-early-childhood-development/lib/
+file:///Users/avishkanew/Documents/Jema678/monitoring-and-recommendations-for-early-childhood-development/
+file:///Users/avishkanew/Documents/Jema678/monitoring-and-recommendations-for-early-childhood-development/lib/
 2

lib/ChatScreen.dart

@@ -214,7 +214,9 @@ class MessageBubble extends StatelessWidget {
         alignment: isCurrentUser ? Alignment.centerRight : Alignment.centerLeft,
         child: Container(
           decoration: BoxDecoration(
-            color: isCurrentUser ? Colors.blue : Colors.green,
+            color: isCurrentUser
+                ? Color.fromARGB(36, 85, 193, 255)
+                : const Color.fromARGB(255, 240, 240, 240),
             borderRadius: BorderRadius.circular(12.0),
           ),
           padding: EdgeInsets.all(12.0),
@@ -228,12 +230,18 @@ class MessageBubble extends StatelessWidget {
                   imageUrl!,
                   width: 200,
                 ),
-              if (message.isNotEmpty) Text(message),
+              if (message.isNotEmpty)
+                Text(
+                  message,
+                  style: TextStyle(
+                    fontSize: 18,
+                  ),
+                ),
               Text(
                 userName,
                 style: TextStyle(
-                  color: Color.fromARGB(255, 248, 4, 4),
-                  fontSize: 8,
+                  color: Color.fromARGB(255, 29, 51, 243),
+                  fontSize: 12,
                 ),
               )
             ],

lib/CheckKids.dart

@@ -86,7 +86,7 @@ class CheckKidsPage extends StatelessWidget {
                   stream: _usersStream,
                   builder: (context, snapshot) {
                     print("--------------------------------------");
-                    print(snapshot.data!.docs.length);
+                    // print(snapshot.data!.docs.length);
                     if (snapshot.connectionState == ConnectionState.waiting) {
                       return CircularProgressIndicator();
                     }

lib/ChildrenActivity.dart

@@ -116,9 +116,9 @@ class ChildrenActivity extends StatelessWidget {
                           decoration: BoxDecoration(
                               image: DecorationImage(
                             image: AssetImage(
-                                'lib/assets/ac1.png'), // Replace 'path/to/your/image.jpg' with your image path
+                                'lib/assets/ac1.png'), 
                             fit: BoxFit
-                                .cover, // Adjust this according to your needs
+                                .cover, 
                           )),
                         ),
                       ),
@@ -136,9 +136,9 @@ class ChildrenActivity extends StatelessWidget {
                           decoration: BoxDecoration(
                               image: DecorationImage(
                             image: AssetImage(
-                                'lib/assets/ac2.png'), // Replace 'path/to/your/image.jpg' with your image path
+                                'lib/assets/ac2.png'), 
                             fit: BoxFit
-                                .cover, // Adjust this according to your needs
+                                .cover, 
                           )),
                         ),
                       ),
@@ -158,9 +158,9 @@ class ChildrenActivity extends StatelessWidget {
                           decoration: BoxDecoration(
                               image: DecorationImage(
                             image: AssetImage(
-                                'lib/assets/ac3.png'), // Replace 'path/to/your/image.jpg' with your image path
+                                'lib/assets/ac7.png'), 
                             fit: BoxFit
-                                .cover, // Adjust this according to your needs
+                                .cover, 
                           )),
                         ),
                       ),
@@ -180,9 +180,9 @@ class ChildrenActivity extends StatelessWidget {
                           decoration: BoxDecoration(
                               image: DecorationImage(
                             image: AssetImage(
-                                'lib/assets/ac4.png'), // Replace 'path/to/your/image.jpg' with your image path
+                                'lib/assets/ac4.png'), 
                             fit: BoxFit
-                                .cover, // Adjust this according to your needs
+                                .cover, 
                           )),
                         ),
                       ),
@@ -202,9 +202,9 @@ class ChildrenActivity extends StatelessWidget {
                           decoration: BoxDecoration(
                               image: DecorationImage(
                             image: AssetImage(
-                                'lib/assets/ac5.png'), // Replace 'path/to/your/image.jpg' with your image path
+                                'lib/assets/ac6.png'), 
                             fit: BoxFit
-                                .cover, // Adjust this according to your needs
+                                .cover, 
                           )),
                         ),
                       ),

lib/ChildrenHomePage.dart

@@ -138,7 +138,7 @@ class ChildrenHomePage extends StatelessWidget {
                   stream: _usersStream,
                   builder: (context, snapshot) {
                     print("--------------------------------------");
-                    print(snapshot.data!.docs.length);
+                    // print(snapshot.data!.docs.length);
                     if (snapshot.connectionState == ConnectionState.waiting) {
                       return CircularProgressIndicator();
                     }
@@ -198,7 +198,7 @@ class ChildrenHomePage extends StatelessWidget {
                                 Navigator.of(context).push(
                                   MaterialPageRoute(
                                     builder: (_) =>
-                                        ChildrenProfilePage(document),
+                                        ChildrenProfilePage(document, 'C'),
                                   ),
                                 );
                               },

lib/ParentLogin.dart

@@ -26,7 +26,7 @@ class _ParentLoginPage extends State<ParentLoginPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        backgroundColor: Colors.transparent,
+        backgroundColor: Colors.white,
         elevation: 0,
         leading: IconButton(
           icon: const Icon(
@@ -135,15 +135,16 @@ class _ParentLoginPage extends State<ParentLoginPage> {
                       child: Container(
                         width: double.infinity,
                         decoration: BoxDecoration(
-                          borderRadius: BorderRadius.circular(10.0),
-                          color: Colors.green,
+                          borderRadius: BorderRadius.circular(8.0),
+                          color: Colors.blueAccent,
                         ),
                         child: Center(
                           child: Padding(
-                            padding: const EdgeInsets.all(10.0),
+                            padding: const EdgeInsets.all(12.0),
                             child: Text(
                               'Login',
-                              style: TextStyle(color: Colors.black),
+                              style:
+                                  TextStyle(color: Colors.white, fontSize: 18),
                             ),
                           ),
                         ),

lib/TeacherProfile.dart

 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:mobile_application_kids/games.dart';
 import 'package:mobile_application_kids/login.dart';
 import 'package:mobile_application_kids/teacherchat.dart';
 import 'package:mobile_application_kids/teacherhome.dart';
@@ -108,7 +107,7 @@ class _TeacherProfilePageState extends State<TeacherProfilePage> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
-                'Bright Sparkle ',
+                'Bright Sparkle',
                 style: TextStyle(
                   color: Color(0xFF11324D),
                   fontSize: 24,
@@ -155,7 +154,7 @@ class _TeacherProfilePageState extends State<TeacherProfilePage> {
                           SizedBox(
                             width: 148,
                             child: Text(
-                              'Bright Spark',
+                              ' ',
                               style: TextStyle(
                                 color: Color(0xFF473D7F),
                                 fontSize: 23,
@@ -478,7 +477,7 @@ class _TeacherProfilePageState extends State<TeacherProfilePage> {
             ],
           ),
         ),
-          bottomNavigationBar: BottomNavigationBar(
+        bottomNavigationBar: BottomNavigationBar(
           items: const [
             BottomNavigationBarItem(
               icon: Icon(Icons.home),
@@ -488,54 +487,33 @@ class _TeacherProfilePageState extends State<TeacherProfilePage> {
               icon: Icon(Icons.chat),
               label: 'Chat',
             ),
-            BottomNavigationBarItem(
-              icon: Icon(Icons.videogame_asset), 
-              label: 'Games',
-            ),
             BottomNavigationBarItem(
               icon: Icon(Icons.person),
               label: 'Profile',
             ),
           ],
-          selectedItemColor: Color(0xFF7A1FA0),
-          unselectedItemColor: Color(0xFFA9ABAD),
-          selectedLabelStyle: TextStyle(color: Color(0xFF7A1FA0)),
-          unselectedLabelStyle: TextStyle(color: Color.fromARGB(0, 197, 16, 16)),
-          currentIndex: 3,
+          selectedItemColor: Colors.blue,
+          currentIndex: 2,
           onTap: (index) {
-            switch (index) {
-              case 0:
-                Navigator.push(
+            // Handle bottom navigation item tap
+            if (index == 0) {
+              Navigator.push(
                 context,
                 MaterialPageRoute(builder: (context) => TeacherHomePage()),
               );
-                break;
-              case 1:
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (context) => ChatScreen()),
-                );
-                break;
-              case 2:
-                // Handle Game
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => GamesPage(
-                  ),
-                  ),
-                );
-                break;
-              case 3:
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (context) => TeacherProfilePage(
-                      uid: user?.uid,
-                    ),
-                  ),
-                );
-                break;
+            }
+            if (index == 1) {
+              Navigator.push(
+                context,
+                MaterialPageRoute(builder: (context) => ChatScreen()),
+              );
+            }
+            if (index == 2) {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                    builder: (context) => TeacherProfilePage(uid: user?.uid)),
+              );
             }
           },
         ),

lib/activities.dart

@@ -44,7 +44,7 @@ class ActivitiesPage extends StatelessWidget {
               children: [
                 Expanded(
                   child: ActivityBox(
-                    title: 'Social Activities',
+                    title: 'Coloring Book',
                     icon: Icons.group,
                   ),
                 ),
@@ -62,7 +62,7 @@ class ActivitiesPage extends StatelessWidget {
               children: [
                 Expanded(
                   child: ActivityBox(
-                    title: 'Kid Activity',
+                    title: 'Environment',
                     icon: Icons.child_care,
                   ),
                 ),
@@ -170,4 +170,4 @@ class CameraScreen extends StatelessWidget {
       ),
     );
   }
-}
+}
\ No newline at end of file

lib/addclassroom.dart

@@ -68,11 +68,11 @@ class _AddClassroomPageState extends State<AddClassroomPage> {
                 ),
                 SizedBox(height: 20),
                 Container(
-                  height: 50.0,
-                  width: 150.0,
+                  height: 48.0,
+                  width: 200.0,
                   decoration: BoxDecoration(
-                    color: Color.fromARGB(203, 164, 88, 177),
-                    borderRadius: BorderRadius.circular(4.0),
+                    color:  Colors.blueAccent,
+                    borderRadius: BorderRadius.circular(8.0),
                   ),
                   child: TextButton(
                     onPressed: () {

lib/classroomview.dart

@@ -54,64 +54,112 @@ class ClassroomViewPage extends StatelessWidget {
                 ),
               ),
               SizedBox(height: 10),
-              Container(
-                height: 35.0,
-                width: 120.0,
-                decoration: BoxDecoration(
-                  color: Color.fromARGB(203, 164, 88, 177),
-                  borderRadius: BorderRadius.circular(4.0),
-                ),
-                child: TextButton(
-                  onPressed: () {
-                    Navigator.push(
-                      context,
-                      MaterialPageRoute(
-                          builder: (context) =>
-                              AddStudentPage(classname: documents)),
-                    );
-                  },
-                  child: Text(
-                    'Add Student',
-                    style: TextStyle(
-                      color: Colors.white,
-                    ),
-                  ),
-                ),
-              ),
-              SizedBox(height: 10),
-              Padding(
-                padding: EdgeInsets.fromLTRB(width * 0.1, 20, width * 0.1, 20),
-                child: Container(
-                  width: 293,
-                  height: 44,
-                  decoration: ShapeDecoration(
-                    color: Colors.white,
-                    shape: RoundedRectangleBorder(
-                      borderRadius: BorderRadius.circular(8),
-                    ),
-                    shadows: [
-                      BoxShadow(
-                        color: Color(0x3F000000),
-                        blurRadius: 4,
-                        offset: Offset(0, 1),
-                        spreadRadius: 0,
-                      ),
-                    ],
-                  ),
-                  child: TextField(
-                    controller: _searchController,
-                    onChanged: (value) {
-                      _searchTermController.add(value);
-                    },
-                    decoration: InputDecoration(
-                      hintText: 'Search',
-                      border: InputBorder.none,
-                      icon: Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: Icon(Icons.search),
+              Center(
+                child: Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Container(
+                    width: MediaQuery.of(context).size.width * 0.9,
+                    height: MediaQuery.of(context).size.height / 20,
+                    child: SingleChildScrollView(
+                      scrollDirection: Axis.horizontal,
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        mainAxisAlignment: MainAxisAlignment.start,
+                        crossAxisAlignment: CrossAxisAlignment.end,
+                        children: [
+                          Container(
+                            child: SingleChildScrollView(
+                              scrollDirection: Axis
+                                  .horizontal, // Enable horizontal scrolling
+                              child: Container(
+                                width: 333,
+                                padding: const EdgeInsets.symmetric(
+                                    horizontal: 56, vertical: 5),
+                                decoration: ShapeDecoration(
+                                  color: Color.fromARGB(255, 255, 255, 255),
+                                  shape: RoundedRectangleBorder(
+                                      borderRadius: BorderRadius.circular(6)),
+                                  shadows: [
+                                    BoxShadow(
+                                      color: Color(0x3F000000),
+                                      blurRadius: 6,
+                                      offset: Offset(0, 1),
+                                      spreadRadius: 0,
+                                    )
+                                  ],
+                                ),
+                                child: Row(
+                                  mainAxisAlignment: MainAxisAlignment.center,
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  children: [
+                                    Container(
+                                      width: 32,
+                                      height: 32,
+                                      decoration: ShapeDecoration(
+                                        image: DecorationImage(
+                                          image: AssetImage(
+                                              'lib/assets/Vector 2.png'),
+                                          fit: BoxFit.fill,
+                                        ),
+                                        shape: OvalBorder(),
+                                      ),
+                                    ),
+                                    const SizedBox(width: 40),
+                                    FutureBuilder<String>(
+                                      future: getStudentCount(),
+                                      builder: (context, snapshot) {
+                                        if (snapshot.connectionState ==
+                                            ConnectionState.waiting) {
+                                          return CircularProgressIndicator(); // Show loading indicator
+                                        }
+                                        if (snapshot.hasError) {
+                                          return Text(
+                                              'Error: ${snapshot.error}'); // Show error message
+                                        }
+                                        // Use the result of getStudentCount
+                                        return Text(
+                                          'Children ' +
+                                              (snapshot.data ??
+                                                  '0'), // Default to '0' if data is null
+                                          style: TextStyle(
+                                            color: Colors.black,
+                                            fontSize: 12,
+                                            fontFamily: 'Poppins',
+                                            fontWeight: FontWeight.w400,
+                                          ),
+                                        );
+                                      },
+                                    ),
+                                    const SizedBox(width: 8),
+                                    GestureDetector(
+                                      onTap: () => Navigator.push(
+                                        context,
+                                        MaterialPageRoute(
+                                            builder: (context) =>
+                                                AddStudentPage(
+                                                    classname: documents)),
+                                      ),
+                                      child: Container(
+                                        margin: EdgeInsets.only(left: 8.0),
+                                        decoration: BoxDecoration(
+                                          color:
+                                              Color.fromARGB(203, 164, 88, 177),
+                                          borderRadius:
+                                              BorderRadius.circular(4.20),
+                                        ),
+                                        child: Icon(
+                                          Icons.add,
+                                          color: Colors.white,
+                                        ),
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            ),
+                          ),
+                        ],
                       ),
-                      suffixIcon: Icon(Icons.mic),
-                      contentPadding: EdgeInsets.all(8),
                     ),
                   ),
                 ),
@@ -646,4 +694,20 @@ class ClassroomViewPage extends StatelessWidget {
       ),
     );
   }
+
+  Future<String> getStudentCount() async {
+    try {
+      final QuerySnapshot<Map<String, dynamic>> snapshot =
+          await FirebaseFirestore.instance
+              .collection('students')
+              .where('className', isEqualTo: documents)
+              .get();
+
+      final int count = snapshot.size;
+      return count.toString();
+    } catch (e) {
+      print("Error getting student count: $e");
+      return '0';
+    }
+  }
 }

lib/kidsReport.dart

@@ -2,78 +2,78 @@ import 'package:awesome_dialog/awesome_dialog.dart';
 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-
+ 
 class KidsReportPage extends StatefulWidget {
   String id;
   KidsReportPage({required this.id});
-
+ 
   @override
   _KidsReportPageState createState() => _KidsReportPageState(id: id);
 }
-
+ 
 class _KidsReportPageState extends State<KidsReportPage> {
   String id;
   _KidsReportPageState({required this.id});
-
+ 
   List<String> dropdownValues = ['Select', '1', '2', '3', '4', '5'];
-
+ 
   Map<String, String?> understandingDropdownMap = {
     'Understanding commands': 'Select',
     'Answer questions': 'Select',
     'Keeping eye contact': 'Select',
     'Following rules': 'Select',
   };
-
+ 
   Map<String, String?> movementsDropdownMap = {
     'Motor activities': 'Select',
     'Correct posture': 'Select',
   };
-
+ 
   Map<String, String?> manipulatingDropdownMap = {
     'Can build/create new things': 'Select',
     'Knows how to handle accessories': 'Select',
   };
-
+ 
   Map<String, String?> socializingDropdownMap = {
     'Play with groups': 'Select',
     'Help each other': 'Select',
     'Friendly towards peers': 'Select',
     'Close to teacher': 'Select',
   };
-
+ 
   Map<String, String?> speechDropdownMap = {
     'Communicate well': 'Select',
     'Like singing': 'Select',
   };
-
+ 
   Map<String, String?> recognitionDropdownMap = {
     'Can express with pictures and words': 'Select',
     'Identify shapes': 'Select',
     'Knows Primary colors.': 'Select',
     'Identify basic objects in the environment': 'Select',
   };
-
+ 
   Map<String, String?> habitsDropdownMap = {
     'Organized': 'Select',
     'Have good eating habits': 'Select',
     'Taking care of own needs': 'Select',
   };
-
+ 
   Map<String, String?> personalHygieneDropdownMap = {
     'Stay clean': 'Select',
     'Keep the workplace and environment clean': 'Select',
   };
-
+ 
   Map<String, String?> personalityDropdownMap = {
     'Act according to the situation': 'Select',
     'Finish allocated work': 'Select',
     'More active': 'Select',
     'Less active': 'Select',
   };
-
+ 
   final _formkey = GlobalKey<FormState>();
   final _auth = FirebaseAuth.instance;
-
+ 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
@@ -190,7 +190,7 @@ class _KidsReportPageState extends State<KidsReportPage> {
       ),
     );
   }
-
+ 
   Widget _buildDropdownSection({
   required String title,
   required Map<String, String?> dropdownMap,
@@ -257,16 +257,16 @@ class _KidsReportPageState extends State<KidsReportPage> {
     ],
   );
 }
-
-
-
+ 
+ 
+ 
   postDetailsToFirestore(context) async {
     FirebaseFirestore firebaseFirestore = FirebaseFirestore.instance;
     var user = _auth.currentUser;
-
+ 
     CollectionReference ref =
         FirebaseFirestore.instance.collection('reports');
-
+ 
     // Constructing the data to be saved
     Map<String, dynamic> data = {};
     understandingDropdownMap.forEach((key, value) {
@@ -297,9 +297,9 @@ class _KidsReportPageState extends State<KidsReportPage> {
       data[key] = value;
     });
     data['sId'] = id;
-
+ 
     await ref.doc(id).set(data);
-
+ 
     AwesomeDialog(
       context: context,
       dialogType: DialogType.success,
@@ -308,5 +308,4 @@ class _KidsReportPageState extends State<KidsReportPage> {
       btnOkOnPress: () {},
     )..show();
   }
-}
-
+}
\ No newline at end of file

lib/login.dart

@@ -25,7 +25,7 @@ class _LoginPage extends State<LoginPage> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        backgroundColor: Colors.transparent,
+        backgroundColor: Colors.white,
         elevation: 0,
         leading: IconButton(
           icon: const Icon(
@@ -135,14 +135,15 @@ class _LoginPage extends State<LoginPage> {
                         width: double.infinity,
                         decoration: BoxDecoration(
                           borderRadius: BorderRadius.circular(10.0),
-                          color: Colors.green,
+                          color: Colors.blueAccent,
                         ),
                         child: Center(
                           child: Padding(
-                            padding: const EdgeInsets.all(10.0),
+                            padding: const EdgeInsets.all(15.0),
                             child: Text(
                               'Login',
-                              style: TextStyle(color: Colors.black),
+                              style:
+                                  TextStyle(color: Colors.white, fontSize: 16),
                             ),
                           ),
                         ),

lib/main.dart

@@ -61,14 +61,14 @@ class _MyHomePageState extends State<MyHomePage> {
   @override
   void initState() {
     super.initState();
-    Timer.periodic(Duration(milliseconds: 500), (timer) {
+    Timer.periodic(Duration(milliseconds: 800), (timer) {
       setState(() {
         // Toggle between zoom in and zoom out
         scaleFactor = scaleFactor == 1.0 ? 1.05 : 1.0;
       });
     });
 
-    Future.delayed(Duration(seconds: 3), () {
+    Future.delayed(Duration(seconds: 2), () {
       Navigator.push(
         context,
         MaterialPageRoute(

lib/p_or_t.dart

@@ -67,12 +67,12 @@ class ParentTeacherPage extends StatelessWidget {
                     child: Container(
                       width: 200,
                       decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(10.0),
-                        color: Color.fromARGB(220, 164, 68, 215),
+                        borderRadius: BorderRadius.circular(8.0),
+                        color: Colors.blueAccent,
                       ),
                       child: Center(
                         child: Padding(
-                          padding: const EdgeInsets.all(10.0),
+                          padding: const EdgeInsets.all(12.0),
                           child: Text(
                             'Parent',
                             style: TextStyle(color: Colors.white),
@@ -100,12 +100,12 @@ class ParentTeacherPage extends StatelessWidget {
                     child: Container(
                       width: 200,
                       decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(10.0),
-                        color: Color.fromARGB(220, 164, 68, 215),
+                        borderRadius: BorderRadius.circular(8.0),
+                        color: Colors.blueAccent,
                       ),
                       child: Center(
                         child: Padding(
-                          padding: const EdgeInsets.all(10.0),
+                          padding: const EdgeInsets.all(12.0),
                           child: Text(
                             'Teacher',
                             style: TextStyle(color: Colors.white),

lib/p_or_t_s.dart

@@ -67,12 +67,12 @@ class ParentTeacherSignUpPage extends StatelessWidget {
                     child: Container(
                       width: 200,
                       decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(10.0),
-                        color: Color.fromARGB(220, 164, 68, 215),
+                        borderRadius: BorderRadius.circular(8.0),
+                        color: Colors.blueAccent,
                       ),
                       child: Center(
                         child: Padding(
-                          padding: const EdgeInsets.all(10.0),
+                          padding: const EdgeInsets.all(12.0),
                           child: Text(
                             'Parent',
                             style: TextStyle(color: Colors.white),
@@ -98,12 +98,12 @@ class ParentTeacherSignUpPage extends StatelessWidget {
                     child: Container(
                       width: 200,
                       decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(10.0),
-                        color: Color.fromARGB(220, 164, 68, 215),
+                        borderRadius: BorderRadius.circular(8.0),
+                        color: Colors.blueAccent,
                       ),
                       child: Center(
                         child: Padding(
-                          padding: const EdgeInsets.all(10.0),
+                          padding: const EdgeInsets.all(12.0),
                           child: Text(
                             'Teacher',
                             style: TextStyle(color: Colors.white),

lib/parentHome.dart

 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:mobile_application_kids/addclassroom.dart';
-import 'package:mobile_application_kids/childrenProfile.dart';
 import 'package:mobile_application_kids/classroomview.dart';
+import 'package:mobile_application_kids/addclassroom.dart';
 import 'package:mobile_application_kids/games.dart';
 import 'package:mobile_application_kids/teacherchat.dart';
 
 import 'ChatScreen.dart';
 import 'TeacherProfile.dart';
+import 'childrenProfile.dart';
 
 class ParentHomePage extends StatelessWidget {
   late User? user;
   late final Stream<QuerySnapshot> _usersStream;
   late String phoneNo;
   late String role;
-
   ParentHomePage(param0, role) {
     this.role = role;
     this.phoneNo = param0;
@@ -30,6 +29,7 @@ class ParentHomePage extends StatelessWidget {
         .snapshots();
   }
 
+  // Define a TextStyle with the Poppins font
   final TextStyle poppinsTextStyle = TextStyle(
     fontFamily: 'Poppins',
   );
@@ -38,14 +38,24 @@ class ParentHomePage extends StatelessWidget {
   Widget build(BuildContext context) {
     return WillPopScope(
       onWillPop: () async {
+        // Disable the back button press
         return false;
       },
       child: Scaffold(
         appBar: AppBar(
+          // leading: Flexible(
+          //   child: Image.asset(
+          //     'lib/assets/logo.png',
+          //     fit: BoxFit.contain,
+          //     height: 150, // Adjust the height to make the logo bigger
+          //   ),
+          // ),
           actions: [
             IconButton(
               icon: Icon(Icons.notifications),
-              onPressed: () {},
+              onPressed: () {
+                // Handle notification icon press
+              },
             ),
           ],
         ),
@@ -58,6 +68,7 @@ class ParentHomePage extends StatelessWidget {
               Text(
                 'Explore, learn, and play in our magical world of wonder!',
                 style: poppinsTextStyle.copyWith(
+                  // fontWeight: FontWeight.bold,
                   fontSize: 13,
                 ),
               ),
@@ -74,9 +85,11 @@ class ParentHomePage extends StatelessWidget {
                 children: [
                   TextButton(
                     onPressed: () {
+                      // Navigate to the AddClassroomPage
                       Navigator.push(
                         context,
-                        MaterialPageRoute(builder: (context) => AddClassroomPage()),
+                        MaterialPageRoute(
+                            builder: (context) => AddClassroomPage()),
                       );
                     },
                     child: Row(
@@ -99,6 +112,7 @@ class ParentHomePage extends StatelessWidget {
                 child: StreamBuilder<QuerySnapshot>(
                   stream: _usersStream,
                   builder: (context, snapshot) {
+                    print("--------------------------------------");
                     if (snapshot.connectionState == ConnectionState.waiting) {
                       return CircularProgressIndicator();
                     }
@@ -106,6 +120,7 @@ class ParentHomePage extends StatelessWidget {
                     if (snapshot.hasError) {
                       return Text('Error: ${snapshot.error}');
                     }
+                    var itemcount = snapshot.data!.docs.length;
 
                     return ListView.builder(
                       itemCount: snapshot.data!.docs.length,
@@ -113,13 +128,16 @@ class ParentHomePage extends StatelessWidget {
                         var document = snapshot.data!.docs[index];
                         var className = document['className'];
                         var name = document['Firstname'];
+                        print(document);
 
                         return Padding(
-                          padding: const EdgeInsets.only(bottom: 8.0),
+                          padding: const EdgeInsets.only(
+                              bottom: 8.0), // Adjust the spacing as needed
                           child: ListTile(
                             leading: CircleAvatar(
                               radius: 27.0,
-                              backgroundImage: AssetImage('lib/assets/classlogo.png'),
+                              backgroundImage:
+                                  AssetImage('lib/assets/classlogo.png'),
                             ),
                             title: Column(
                               crossAxisAlignment: CrossAxisAlignment.start,
@@ -153,12 +171,13 @@ class ParentHomePage extends StatelessWidget {
                               ),
                               child: TextButton(
                                 onPressed: () {
+                                  print(document);
+                                  // Handle view class button press
                                   Navigator.push(
                                     context,
                                     MaterialPageRoute(
-                                      builder: (context) => ChildrenProfilePage(
-                                        document,
-                                      ),
+                                      builder: (context) =>
+                                          ChildrenProfilePage(document, "P"),
                                     ),
                                   );
                                 },
@@ -180,6 +199,50 @@ class ParentHomePage extends StatelessWidget {
             ],
           ),
         ),
+
+
+        // bottomNavigationBar: BottomNavigationBar(
+        //   items: const [
+        //     BottomNavigationBarItem(
+        //       icon: Icon(Icons.home),
+        //       label: 'Home',
+        //     ),
+        //     BottomNavigationBarItem(
+        //       icon: Icon(Icons.chat),
+        //       label: 'Chat',
+        //     ),
+        //     BottomNavigationBarItem(
+        //       icon: Icon(Icons.person),
+        //       label: 'Profile',
+        //     ),
+        //   ],
+        //   selectedItemColor: Colors.blue,
+        //   onTap: (index) {
+        //     // Handle bottom navigation item tap
+        //     switch (index) {
+        //       case 0:
+        //         break;
+        //       case 1:
+        //         // Navigate to Chat
+        //         Navigator.push(
+        //           context,
+        //           MaterialPageRoute(builder: (context) => ChatScreen()),
+        //         );
+        //         break;
+        //       case 2:
+        //         // Navigate to Profile
+        //         Navigator.push(
+        //           context,
+        //           MaterialPageRoute(
+        //               builder: (context) => TeacherProfilePage(
+        //                     uid: user?.uid,
+        //                   )),
+        //         );
+        //         break;
+        //     }
+        //   },
+        // ),
+        
         bottomNavigationBar: BottomNavigationBar(
           items: const [
             BottomNavigationBarItem(

lib/proggressReport.dart

 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:jema_app/teacherchat.dart';
-import 'package:jema_app/classroomview.dart';
-import 'package:jema_app/addclassroom.dart';
-import 'package:jema_app/teacherhome.dart';
+import 'package:mobile_application_kids/teacherchat.dart';
+import 'package:mobile_application_kids/classroomview.dart';
+import 'package:mobile_application_kids/addclassroom.dart';
+import 'package:mobile_application_kids/teacherhome.dart';
 import 'package:pie_chart/pie_chart.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/progressReport.dart

 import 'package:cloud_firestore/cloud_firestore.dart';
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
-import 'package:jema_app/teacherchat.dart';
-import 'package:jema_app/classroomview.dart';
-import 'package:jema_app/addclassroom.dart';
-import 'package:jema_app/teacherhome.dart';
+import 'package:mobile_application_kids/teacherchat.dart';
+import 'package:mobile_application_kids/classroomview.dart';
+import 'package:mobile_application_kids/addclassroom.dart';
+import 'package:mobile_application_kids/teacherhome.dart';
 import 'package:pie_chart/pie_chart.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:charts_flutter/flutter.dart' as charts;

lib/sign_in_up.dart

@@ -49,12 +49,12 @@ class SignInUpPage extends StatelessWidget {
                     child: Container(
                       width: 200,
                       decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(10.0),
+                        borderRadius: BorderRadius.circular(8.0),
                         color: Color.fromARGB(255, 96, 188, 99),
                       ),
                       child: Center(
                         child: Padding(
-                          padding: const EdgeInsets.all(10.0),
+                          padding: const EdgeInsets.all(12.0),
                           child: Text(
                             'Sign Up',
                             style: TextStyle(color: Colors.white),
@@ -83,12 +83,12 @@ class SignInUpPage extends StatelessWidget {
                     child: Container(
                       width: 200,
                       decoration: BoxDecoration(
-                        borderRadius: BorderRadius.circular(10.0),
-                        color: const Color.fromARGB(255, 213, 80, 236),
+                        borderRadius: BorderRadius.circular(8.0),
+                        color: Colors.blueAccent,
                       ),
                       child: Center(
                         child: Padding(
-                          padding: const EdgeInsets.all(10.0),
+                          padding: const EdgeInsets.all(12.0),
                           child: Text(
                             'Sign In',
                             style: TextStyle(color: Colors.white),

lib/teacherhome.dart

@@ -97,10 +97,10 @@ class TeacherHomePage extends StatelessWidget {
                           ),
                         ),
                         Container(
-                          margin: EdgeInsets.only(left: 8.0),
+                          margin: EdgeInsets.only(left: 20.0),
                           padding: EdgeInsets.all(8.0),
                           decoration: BoxDecoration(
-                            color: Color.fromARGB(203, 164, 88, 177),
+                            color: Colors.blueAccent,
                             borderRadius: BorderRadius.circular(8.0),
                           ),
                           child: Icon(
@@ -118,7 +118,7 @@ class TeacherHomePage extends StatelessWidget {
               Text(
                 'Class Rooms',
                 style: poppinsTextStyle.copyWith(
-                  fontSize: 16,
+                  fontSize: 18,
                   fontWeight: FontWeight.bold,
                 ),
               ),
@@ -169,18 +169,18 @@ class TeacherHomePage extends StatelessWidget {
                                     Text(
                                       'Class $index',
                                       style: poppinsTextStyle.copyWith(
-                                          fontSize: 12.0),
+                                          fontSize: 14.0),
                                     ),
                                   ],
                                 ),
                               ],
                             ),
                             trailing: Container(
-                              height: 35.0,
-                              width: 80.0,
+                              height: 40.0,
+                              width: 100.0,
                               decoration: BoxDecoration(
-                                color: Color.fromARGB(203, 164, 88, 177),
-                                borderRadius: BorderRadius.circular(4.0),
+                                color: Colors.blueAccent,
+                                borderRadius: BorderRadius.circular(8.0),
                               ),
                               child: TextButton(
                                 onPressed: () {

pubspec.yaml

-name: jema_app
+name: mobile_application_kids
 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.
@@ -96,7 +96,9 @@ flutter:
     - lib/assets/ac4.png
     - lib/assets/ac5.png
     - lib/assets/banner.png
-    
+    - lib/assets/ac6.png
+    - lib/assets/ac7.png
+