Commit 8ece126f authored by Sandunika Senavirathna's avatar Sandunika Senavirathna

Merge branch 'IT20639280' into 'master'

It20639280

See merge request !5
parents 338dce19 985775c7
No preview for this file type
...@@ -493,6 +493,12 @@ ...@@ -493,6 +493,12 @@
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "2.19" "languageVersion": "2.19"
}, },
{
"name": "simple_gesture_detector",
"rootUri": "file:///Users/avishkanew/.pub-cache/hosted/pub.dev/simple_gesture_detector-0.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{ {
"name": "sky_engine", "name": "sky_engine",
"rootUri": "file:///Users/avishka/Desktop/FLUTTER/flutter/bin/cache/pkg/sky_engine", "rootUri": "file:///Users/avishka/Desktop/FLUTTER/flutter/bin/cache/pkg/sky_engine",
...@@ -547,6 +553,12 @@ ...@@ -547,6 +553,12 @@
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "3.0" "languageVersion": "3.0"
}, },
{
"name": "table_calendar",
"rootUri": "file:///Users/avishkanew/.pub-cache/hosted/pub.dev/table_calendar-3.0.8",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{ {
"name": "term_glyph", "name": "term_glyph",
"rootUri": "file:///Users/avishkanew/.pub-cache/hosted/pub.dev/term_glyph-1.2.1", "rootUri": "file:///Users/avishkanew/.pub-cache/hosted/pub.dev/term_glyph-1.2.1",
...@@ -668,13 +680,13 @@ ...@@ -668,13 +680,13 @@
"languageVersion": "3.0" "languageVersion": "3.0"
}, },
{ {
"name": "jema_app", "name": "mobile_application_kids",
"rootUri": "../", "rootUri": "../",
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "3.0" "languageVersion": "3.0"
} }
], ],
"generated": "2024-03-09T19:18:50.460515Z", "generated": "2024-03-18T12:13:20.503381Z",
"generator": "pub", "generator": "pub",
"generatorVersion": "3.0.1" "generatorVersion": "3.0.1"
} }
...@@ -330,6 +330,10 @@ shared_preferences_windows ...@@ -330,6 +330,10 @@ shared_preferences_windows
2.19 2.19
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/lib/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/shared_preferences_windows-2.3.2/lib/
simple_gesture_detector
2.12
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/simple_gesture_detector-0.2.1/
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/simple_gesture_detector-0.2.1/lib/
source_span source_span
2.14 2.14
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/source_span-1.9.1/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/source_span-1.9.1/
...@@ -362,6 +366,10 @@ synchronized ...@@ -362,6 +366,10 @@ synchronized
3.0 3.0
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/synchronized-3.1.0+1/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/synchronized-3.1.0+1/
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/synchronized-3.1.0+1/lib/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/synchronized-3.1.0+1/lib/
table_calendar
2.12
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/table_calendar-3.0.8/
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/table_calendar-3.0.8/lib/
term_glyph term_glyph
2.12 2.12
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/term_glyph-1.2.1/
...@@ -442,8 +450,8 @@ xdg_directories ...@@ -442,8 +450,8 @@ xdg_directories
3.0 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/
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/xdg_directories-1.0.4/lib/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/xdg_directories-1.0.4/lib/
jema_app mobile_application_kids
3.0 3.0
file:///Users/avishkanew/Desktop/Avishk678/monitoring-and-recommendations-for-early-childhood-development/ file:///Users/avishkanew/Documents/Jema678/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/lib/
2 2
This diff is collapsed.
...@@ -77,19 +77,19 @@ class _AttendanceState extends State<Attendance> { ...@@ -77,19 +77,19 @@ class _AttendanceState extends State<Attendance> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( // Text(
'Bright Sparkle ', // ' ',
style: TextStyle( // style: TextStyle(
color: Color(0xFF11324D), // color: Color(0xFF11324D),
fontSize: 24, // fontSize: 24,
fontFamily: 'Poppins', // fontFamily: 'Poppins',
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
height: 0.04, // height: 0.04,
letterSpacing: -0.96, // letterSpacing: -0.96,
), // ),
), // ),
Padding( Padding(
padding: const EdgeInsets.fromLTRB(5, 40, 5, 5), padding: const EdgeInsets.fromLTRB(5, 20, 5, 5),
child: Container( child: Container(
width: 358, width: 358,
height: 76, height: 76,
...@@ -676,30 +676,32 @@ class _AttendanceState extends State<Attendance> { ...@@ -676,30 +676,32 @@ class _AttendanceState extends State<Attendance> {
label: 'Profile', label: 'Profile',
), ),
], ],
selectedItemColor: Colors.blue, selectedItemColor: Color.fromARGB(255, 103, 103, 103),
onTap: (index) async { onTap: (index) {
final prefs = await SharedPreferences.getInstance();
String rool = prefs.get('rool').toString();
// Handle bottom navigation item tap // Handle bottom navigation item tap
switch (index) {
if (index == 0) { case 0:
// Navigate to Home
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => TeacherHomePage()), MaterialPageRoute(builder: (context) => TeacherHomePage()),
); );
} break;
if (index == 1) { case 1:
// Navigate to Chat
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => ChatScreen()), MaterialPageRoute(builder: (context) => ChatScreen()),
); );
} break;
if (index == 2) { case 2:
// Navigate to Profile
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => TeacherProfilePage(uid: user?.uid)), builder: (context) => TeacherProfilePage(uid: user?.uid)),
); );
break;
} }
}, },
), ),
......
...@@ -5,6 +5,8 @@ import 'package:image_picker/image_picker.dart'; ...@@ -5,6 +5,8 @@ import 'package:image_picker/image_picker.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_storage/firebase_storage.dart'; import 'package:firebase_storage/firebase_storage.dart';
import 'package:mobile_application_kids/TeacherProfile.dart';
import 'package:mobile_application_kids/teacherhome.dart';
class ChatScreen extends StatefulWidget { class ChatScreen extends StatefulWidget {
@override @override
...@@ -93,7 +95,23 @@ class _ChatScreenState extends State<ChatScreen> { ...@@ -93,7 +95,23 @@ class _ChatScreenState extends State<ChatScreen> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Chat '), title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text('Chat',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
), ),
body: Column( body: Column(
children: <Widget>[ children: <Widget>[
...@@ -170,6 +188,7 @@ class _ChatScreenState extends State<ChatScreen> { ...@@ -170,6 +188,7 @@ class _ChatScreenState extends State<ChatScreen> {
), ),
], ],
), ),
); );
} }
...@@ -214,7 +233,9 @@ class MessageBubble extends StatelessWidget { ...@@ -214,7 +233,9 @@ class MessageBubble extends StatelessWidget {
alignment: isCurrentUser ? Alignment.centerRight : Alignment.centerLeft, alignment: isCurrentUser ? Alignment.centerRight : Alignment.centerLeft,
child: Container( child: Container(
decoration: BoxDecoration( 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), borderRadius: BorderRadius.circular(12.0),
), ),
padding: EdgeInsets.all(12.0), padding: EdgeInsets.all(12.0),
...@@ -228,12 +249,18 @@ class MessageBubble extends StatelessWidget { ...@@ -228,12 +249,18 @@ class MessageBubble extends StatelessWidget {
imageUrl!, imageUrl!,
width: 200, width: 200,
), ),
if (message.isNotEmpty) Text(message), if (message.isNotEmpty)
Text(
message,
style: TextStyle(
fontSize: 18,
),
),
Text( Text(
userName, userName,
style: TextStyle( style: TextStyle(
color: Color.fromARGB(255, 248, 4, 4), color: Color.fromARGB(255, 29, 51, 243),
fontSize: 8, fontSize: 12,
), ),
) )
], ],
......
...@@ -58,18 +58,19 @@ class CheckKidsPage extends StatelessWidget { ...@@ -58,18 +58,19 @@ class CheckKidsPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( // Text(
'Bright Sparkle ', // 'Bright Sparkle ',
style: TextStyle(
color: Color(0xFF11324D), // style: TextStyle(
fontSize: 24, // color: Color(0xFF11324D),
fontFamily: 'Poppins', // fontSize: 24,
fontWeight: FontWeight.w500, // fontFamily: 'Poppins',
height: 0.04, // fontWeight: FontWeight.w500,
letterSpacing: -0.96, // height: 0.04,
), // letterSpacing: -0.96,
), // ),
SizedBox(height: 30), // ),
SizedBox(height: 20), // space between titles at the top of the page
Text( Text(
'Select Kids ', 'Select Kids ',
style: TextStyle( style: TextStyle(
...@@ -86,7 +87,7 @@ class CheckKidsPage extends StatelessWidget { ...@@ -86,7 +87,7 @@ class CheckKidsPage extends StatelessWidget {
stream: _usersStream, stream: _usersStream,
builder: (context, snapshot) { builder: (context, snapshot) {
print("--------------------------------------"); print("--------------------------------------");
print(snapshot.data!.docs.length); // print(snapshot.data!.docs.length);
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState == ConnectionState.waiting) {
return CircularProgressIndicator(); return CircularProgressIndicator();
} }
...@@ -234,10 +235,12 @@ class CheckKidsPage extends StatelessWidget { ...@@ -234,10 +235,12 @@ class CheckKidsPage extends StatelessWidget {
label: 'Profile', label: 'Profile',
), ),
], ],
selectedItemColor: Colors.blue, selectedItemColor: Color.fromARGB(255, 103, 103, 103),
onTap: (index) { onTap: (index) {
// Handle bottom navigation item tap
switch (index) { switch (index) {
case 0: case 0:
// Navigate to Home
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => TeacherHomePage()), MaterialPageRoute(builder: (context) => TeacherHomePage()),
...@@ -255,9 +258,7 @@ class CheckKidsPage extends StatelessWidget { ...@@ -255,9 +258,7 @@ class CheckKidsPage extends StatelessWidget {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => TeacherProfilePage( builder: (context) => TeacherProfilePage(uid: user?.uid)),
uid: user?.uid,
)),
); );
break; break;
} }
......
...@@ -5,8 +5,11 @@ import 'package:firebase_auth/firebase_auth.dart'; ...@@ -5,8 +5,11 @@ import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';
import 'package:mobile_application_kids/Attendance.dart'; import 'package:mobile_application_kids/Attendance.dart';
import 'package:mobile_application_kids/ChatScreen.dart';
import 'package:mobile_application_kids/ChildrenVideo.dart'; import 'package:mobile_application_kids/ChildrenVideo.dart';
import 'package:mobile_application_kids/ReportKids.dart'; import 'package:mobile_application_kids/ReportKids.dart';
import 'package:mobile_application_kids/TeacherProfile.dart';
import 'package:mobile_application_kids/teacherhome.dart';
import 'CheckKids.dart'; import 'CheckKids.dart';
import 'ChildrenActiPhone.dart'; import 'ChildrenActiPhone.dart';
import 'ChildrenHomePage.dart'; import 'ChildrenHomePage.dart';
...@@ -116,9 +119,9 @@ class ChildrenActivity extends StatelessWidget { ...@@ -116,9 +119,9 @@ class ChildrenActivity extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage( image: AssetImage(
'lib/assets/ac1.png'), // Replace 'path/to/your/image.jpg' with your image path 'lib/assets/ac1.png'),
fit: BoxFit fit: BoxFit
.cover, // Adjust this according to your needs .cover,
)), )),
), ),
), ),
...@@ -136,9 +139,9 @@ class ChildrenActivity extends StatelessWidget { ...@@ -136,9 +139,9 @@ class ChildrenActivity extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage( image: AssetImage(
'lib/assets/ac2.png'), // Replace 'path/to/your/image.jpg' with your image path 'lib/assets/ac2.png'),
fit: BoxFit fit: BoxFit
.cover, // Adjust this according to your needs .cover,
)), )),
), ),
), ),
...@@ -158,9 +161,9 @@ class ChildrenActivity extends StatelessWidget { ...@@ -158,9 +161,9 @@ class ChildrenActivity extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage( image: AssetImage(
'lib/assets/ac3.png'), // Replace 'path/to/your/image.jpg' with your image path 'lib/assets/ac7.png'),
fit: BoxFit fit: BoxFit
.cover, // Adjust this according to your needs .cover,
)), )),
), ),
), ),
...@@ -180,9 +183,9 @@ class ChildrenActivity extends StatelessWidget { ...@@ -180,9 +183,9 @@ class ChildrenActivity extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage( image: AssetImage(
'lib/assets/ac4.png'), // Replace 'path/to/your/image.jpg' with your image path 'lib/assets/ac4.png'),
fit: BoxFit fit: BoxFit
.cover, // Adjust this according to your needs .cover,
)), )),
), ),
), ),
...@@ -202,9 +205,9 @@ class ChildrenActivity extends StatelessWidget { ...@@ -202,9 +205,9 @@ class ChildrenActivity extends StatelessWidget {
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage( image: AssetImage(
'lib/assets/ac5.png'), // Replace 'path/to/your/image.jpg' with your image path 'lib/assets/ac6.png'),
fit: BoxFit fit: BoxFit
.cover, // Adjust this according to your needs .cover,
)), )),
), ),
), ),
...@@ -214,6 +217,50 @@ class ChildrenActivity extends StatelessWidget { ...@@ -214,6 +217,50 @@ class ChildrenActivity 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: Color.fromARGB(255, 103, 103, 103),
onTap: (index) {
// Handle bottom navigation item tap
switch (index) {
case 0:
// Navigate to Home
Navigator.push(
context,
MaterialPageRoute(builder: (context) => TeacherHomePage()),
);
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;
}
},
),
); );
} }
......
...@@ -3,9 +3,12 @@ import 'dart:async'; ...@@ -3,9 +3,12 @@ import 'dart:async';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mobile_application_kids/ChatScreen.dart';
import 'package:mobile_application_kids/TeacherProfile.dart';
import 'package:mobile_application_kids/teacherchat.dart'; import 'package:mobile_application_kids/teacherchat.dart';
import 'package:mobile_application_kids/classroomview.dart'; import 'package:mobile_application_kids/classroomview.dart';
import 'package:mobile_application_kids/addclassroom.dart'; import 'package:mobile_application_kids/addclassroom.dart';
import 'package:mobile_application_kids/teacherhome.dart';
import 'childrenProfile.dart'; import 'childrenProfile.dart';
...@@ -86,7 +89,7 @@ class ChildrenHomePage extends StatelessWidget { ...@@ -86,7 +89,7 @@ class ChildrenHomePage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Text(
'Bright Sparkle ', '$classroom',
style: TextStyle( style: TextStyle(
color: Color(0xFF11324D), color: Color(0xFF11324D),
fontSize: 24, fontSize: 24,
...@@ -138,7 +141,7 @@ class ChildrenHomePage extends StatelessWidget { ...@@ -138,7 +141,7 @@ class ChildrenHomePage extends StatelessWidget {
stream: _usersStream, stream: _usersStream,
builder: (context, snapshot) { builder: (context, snapshot) {
print("--------------------------------------"); print("--------------------------------------");
print(snapshot.data!.docs.length); // print(snapshot.data!.docs.length);
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState == ConnectionState.waiting) {
return CircularProgressIndicator(); return CircularProgressIndicator();
} }
...@@ -185,31 +188,28 @@ class ChildrenHomePage extends StatelessWidget { ...@@ -185,31 +188,28 @@ class ChildrenHomePage extends StatelessWidget {
], ],
), ),
trailing: Container( trailing: Container(
height: 35.0, height: 40.0,
width: 80.0, width: 100.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color.fromARGB(203, 164, 88, 177), color: Colors.blueAccent,
borderRadius: BorderRadius.circular(4.0), borderRadius: BorderRadius.circular(8.0),
), ),
child: TextButton( child: TextButton(
onPressed: () { onPressed: () {
print(document); print(document);
// Handle view class button press // Handle view class button press
Navigator.of(context).push( Navigator.push(
context,
MaterialPageRoute( MaterialPageRoute(
builder: (_) => builder: (context) =>
ChildrenProfilePage(document), ChildrenProfilePage(document, "C"),
), ),
); );
}, },
child: Text( child: Text(
'View', 'View',
style: TextStyle( style: poppinsTextStyle.copyWith(
color: Colors.white, color: Colors.white,
fontSize: 14,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
height: 1,
), ),
), ),
), ),
...@@ -224,6 +224,50 @@ class ChildrenHomePage extends StatelessWidget { ...@@ -224,6 +224,50 @@ class ChildrenHomePage 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: Color.fromARGB(255, 103, 103, 103),
onTap: (index) {
// Handle bottom navigation item tap
switch (index) {
case 0:
// Navigate to Home
Navigator.push(
context,
MaterialPageRoute(builder: (context) => TeacherHomePage()),
);
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;
}
},
),
), ),
); );
} }
......
This diff is collapsed.
...@@ -26,7 +26,7 @@ class _ParentLoginPage extends State<ParentLoginPage> { ...@@ -26,7 +26,7 @@ class _ParentLoginPage extends State<ParentLoginPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: Colors.transparent, backgroundColor: Colors.white,
elevation: 0, elevation: 0,
leading: IconButton( leading: IconButton(
icon: const Icon( icon: const Icon(
...@@ -135,15 +135,16 @@ class _ParentLoginPage extends State<ParentLoginPage> { ...@@ -135,15 +135,16 @@ class _ParentLoginPage extends State<ParentLoginPage> {
child: Container( child: Container(
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(8.0),
color: Colors.green, color: Colors.blueAccent,
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
'Login', 'Login',
style: TextStyle(color: Colors.black), style:
TextStyle(color: Colors.white, fontSize: 18),
), ),
), ),
), ),
......
...@@ -61,18 +61,18 @@ class ReportKidsPage extends StatelessWidget { ...@@ -61,18 +61,18 @@ class ReportKidsPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( // Text(
'Bright Sparkle ', // 'Bright Sparkle ',
style: TextStyle( // style: TextStyle(
color: Color(0xFF11324D), // color: Color(0xFF11324D),
fontSize: 24, // fontSize: 24,
fontFamily: 'Poppins', // fontFamily: 'Poppins',
fontWeight: FontWeight.w500, // fontWeight: FontWeight.w500,
height: 0.04, // height: 0.04,
letterSpacing: -0.96, // letterSpacing: -0.96,
), // ),
), // ),
SizedBox(height: 30), SizedBox(height: 20), // sspace here between texts
Text( Text(
'Select Kids ', 'Select Kids ',
style: TextStyle( style: TextStyle(
...@@ -89,7 +89,7 @@ class ReportKidsPage extends StatelessWidget { ...@@ -89,7 +89,7 @@ class ReportKidsPage extends StatelessWidget {
stream: _usersStream, stream: _usersStream,
builder: (context, snapshot) { builder: (context, snapshot) {
print("--------------------------------------"); print("--------------------------------------");
print(snapshot.data!.docs.length); // print(snapshot.data!.docs.length);
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState == ConnectionState.waiting) {
return CircularProgressIndicator(); return CircularProgressIndicator();
} }
...@@ -229,10 +229,12 @@ class ReportKidsPage extends StatelessWidget { ...@@ -229,10 +229,12 @@ class ReportKidsPage extends StatelessWidget {
label: 'Profile', label: 'Profile',
), ),
], ],
selectedItemColor: Colors.blue, selectedItemColor: Color.fromARGB(255, 103, 103, 103),
onTap: (index) { onTap: (index) {
// Handle bottom navigation item tap
switch (index) { switch (index) {
case 0: case 0:
// Navigate to Home
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => TeacherHomePage()), MaterialPageRoute(builder: (context) => TeacherHomePage()),
...@@ -250,9 +252,7 @@ class ReportKidsPage extends StatelessWidget { ...@@ -250,9 +252,7 @@ class ReportKidsPage extends StatelessWidget {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => TeacherProfilePage( builder: (context) => TeacherProfilePage(uid: user?.uid)),
uid: user?.uid,
)),
); );
break; break;
} }
......
This diff is collapsed.
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mobile_application_kids/ChatScreen.dart';
import 'package:mobile_application_kids/TeacherProfile.dart';
import 'package:mobile_application_kids/teacherhome.dart';
class ActivitiesPage extends StatelessWidget { class ActivitiesPage extends StatelessWidget {
@override @override
...@@ -44,7 +47,7 @@ class ActivitiesPage extends StatelessWidget { ...@@ -44,7 +47,7 @@ class ActivitiesPage extends StatelessWidget {
children: [ children: [
Expanded( Expanded(
child: ActivityBox( child: ActivityBox(
title: 'Social Activities', title: 'Coloring Book',
icon: Icons.group, icon: Icons.group,
), ),
), ),
...@@ -62,7 +65,7 @@ class ActivitiesPage extends StatelessWidget { ...@@ -62,7 +65,7 @@ class ActivitiesPage extends StatelessWidget {
children: [ children: [
Expanded( Expanded(
child: ActivityBox( child: ActivityBox(
title: 'Kid Activity', title: 'Environment',
icon: Icons.child_care, icon: Icons.child_care,
), ),
), ),
...@@ -168,6 +171,51 @@ class CameraScreen extends StatelessWidget { ...@@ -168,6 +171,51 @@ class CameraScreen extends StatelessWidget {
body: Center( body: Center(
child: Text('Camera Screen Placeholder'), child: Text('Camera Screen Placeholder'),
), ),
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: Color.fromARGB(255, 103, 103, 103),
onTap: (index) {
// Handle bottom navigation item tap
switch (index) {
case 0:
// Navigate to Home
Navigator.push(
context,
MaterialPageRoute(builder: (context) => TeacherHomePage()),
);
break;
case 1:
// Navigate to Chat
Navigator.push(
context,
MaterialPageRoute(builder: (context) => ChatScreen()),
);
break;
case 2:
// Navigate to Profile
var user;
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => TeacherProfilePage(uid: user?.uid)),
);
break;
}
},
),
); );
} }
} }
\ No newline at end of file
...@@ -68,11 +68,11 @@ class _AddClassroomPageState extends State<AddClassroomPage> { ...@@ -68,11 +68,11 @@ class _AddClassroomPageState extends State<AddClassroomPage> {
), ),
SizedBox(height: 20), SizedBox(height: 20),
Container( Container(
height: 50.0, height: 48.0,
width: 150.0, width: 200.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color.fromARGB(203, 164, 88, 177), color: Colors.blueAccent,
borderRadius: BorderRadius.circular(4.0), borderRadius: BorderRadius.circular(8.0),
), ),
child: TextButton( child: TextButton(
onPressed: () { onPressed: () {
......
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:table_calendar/table_calendar.dart';
class CalendarScreen extends StatefulWidget {
@override
_CalendarScreenState createState() => _CalendarScreenState();
}
class _CalendarScreenState extends State<CalendarScreen> {
late CalendarFormat _calendarFormat;
late DateTime _focusedDay;
late DateTime _selectedDay;
@override
void initState() {
super.initState();
_calendarFormat = CalendarFormat.month;
_focusedDay = DateTime.now();
_selectedDay = DateTime.now();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text('Calendar',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
),
body: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Text(
DateFormat.yMMMM().format(_focusedDay),
style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
),
),
SizedBox(height: 20),
TableCalendar(
firstDay: DateTime.utc(2020),
lastDay: DateTime.utc(2030),
focusedDay: _focusedDay,
calendarFormat: _calendarFormat,
selectedDayPredicate: (day) {
return isSameDay(_selectedDay, day);
},
onDaySelected: (selectedDay, focusedDay) {
setState(() {
_selectedDay = selectedDay;
_focusedDay = focusedDay;
});
},
onPageChanged: (focusedDay) {
setState(() {
_focusedDay = focusedDay;
});
},
headerVisible: false, // This removes the button next to the month name
calendarStyle: CalendarStyle(
defaultTextStyle: TextStyle(fontSize: 16),
selectedDecoration: BoxDecoration(
color: Colors.blue,
shape: BoxShape.circle,
),
todayDecoration: BoxDecoration(
color: Colors.transparent,
shape: BoxShape.circle,
border: Border.all(color: Colors.blue, width: 2),
),
),
daysOfWeekStyle: DaysOfWeekStyle(
weekdayStyle: TextStyle(color: Colors.black87),
weekendStyle: TextStyle(color: Colors.red),
),
),
SizedBox(height: 20),
Container(
margin: EdgeInsets.symmetric(horizontal: 16),
child: Text(
'Special Notes',
style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
),
),
],
),
),
);
}
}
This diff is collapsed.
This diff is collapsed.
...@@ -78,7 +78,23 @@ class _KidsReportPageState extends State<KidsReportPage> { ...@@ -78,7 +78,23 @@ class _KidsReportPageState extends State<KidsReportPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Student Report'), title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text('Student Report',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Center( child: Center(
...@@ -305,8 +321,10 @@ class _KidsReportPageState extends State<KidsReportPage> { ...@@ -305,8 +321,10 @@ class _KidsReportPageState extends State<KidsReportPage> {
dialogType: DialogType.success, dialogType: DialogType.success,
animType: AnimType.rightSlide, animType: AnimType.rightSlide,
title: 'Successfully Created', title: 'Successfully Created',
btnOkOnPress: () {}, btnOkOnPress: () {
// Navigate back to the previous page
Navigator.pop(context);
},
)..show(); )..show();
}
} }
}
\ No newline at end of file
This diff is collapsed.
...@@ -22,17 +22,26 @@ class KidsReportsPage extends StatelessWidget { ...@@ -22,17 +22,26 @@ class KidsReportsPage extends StatelessWidget {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
// Text(
// 'Bright Sparkle ',
// style: TextStyle(
// color: Color(0xFF11324D),
// fontSize: 24,
// fontFamily: 'Poppins',
// fontWeight: FontWeight.w500,
// height: 0.04,
// letterSpacing: -0.96,
// ),
// ),
SizedBox(height: 20), // Add space here
Text( Text(
'Bright Sparkle ', 'Select Kids ',
style: TextStyle( style: TextStyle(
fontSize: 18, color: Color(0xFF21205B),
fontWeight: FontWeight.bold, fontSize: 16,
), fontFamily: 'Poppins',
), fontWeight: FontWeight.w500,
Text( height: 0.06,
'Select Kid',
style: TextStyle(
fontSize: 18,
), ),
), ),
SizedBox(height: 16), SizedBox(height: 16),
......
This diff is collapsed.
...@@ -25,7 +25,7 @@ class _LoginPage extends State<LoginPage> { ...@@ -25,7 +25,7 @@ class _LoginPage extends State<LoginPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
backgroundColor: Colors.transparent, backgroundColor: Colors.white,
elevation: 0, elevation: 0,
leading: IconButton( leading: IconButton(
icon: const Icon( icon: const Icon(
...@@ -135,14 +135,15 @@ class _LoginPage extends State<LoginPage> { ...@@ -135,14 +135,15 @@ class _LoginPage extends State<LoginPage> {
width: double.infinity, width: double.infinity,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
color: Colors.green, color: Colors.blueAccent,
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(15.0),
child: Text( child: Text(
'Login', 'Login',
style: TextStyle(color: Colors.black), style:
TextStyle(color: Colors.white, fontSize: 16),
), ),
), ),
), ),
...@@ -193,8 +194,8 @@ class _LoginPage extends State<LoginPage> { ...@@ -193,8 +194,8 @@ class _LoginPage extends State<LoginPage> {
context: context, context: context,
dialogType: DialogType.info, dialogType: DialogType.info,
animType: AnimType.rightSlide, animType: AnimType.rightSlide,
title: ' login Perent', title: ' login Parent',
desc: ' Go to your home page', desc: ' Go to your parent home page',
btnCancelOnPress: () {}, btnCancelOnPress: () {},
btnOkOnPress: () { btnOkOnPress: () {
Navigator.pushReplacement( Navigator.pushReplacement(
......
...@@ -61,14 +61,14 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -61,14 +61,14 @@ class _MyHomePageState extends State<MyHomePage> {
@override @override
void initState() { void initState() {
super.initState(); super.initState();
Timer.periodic(Duration(milliseconds: 500), (timer) { Timer.periodic(Duration(milliseconds: 700), (timer) {
setState(() { setState(() {
// Toggle between zoom in and zoom out // Toggle between zoom in and zoom out
scaleFactor = scaleFactor == 1.0 ? 1.05 : 1.0; scaleFactor = scaleFactor == 1.0 ? 1.05 : 1.0;
}); });
}); });
Future.delayed(Duration(seconds: 3), () { Future.delayed(Duration(seconds: 2), () {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
......
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:mobile_application_kids/sign_in_up.dart';
import 'ParentLogin.dart'; import 'ParentLogin.dart';
import 'login.dart'; import 'login.dart';
...@@ -20,7 +21,11 @@ class ParentTeacherPage extends StatelessWidget { ...@@ -20,7 +21,11 @@ class ParentTeacherPage extends StatelessWidget {
color: const Color.fromARGB(255, 0, 0, 0), color: const Color.fromARGB(255, 0, 0, 0),
), ),
onPressed: () { onPressed: () {
Navigator.pop(context); Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (context) => SignInUpPage(backgroundColor: Colors.white,)),
(Route<dynamic> route) => false,
);
}, },
), ),
), ),
...@@ -67,12 +72,12 @@ class ParentTeacherPage extends StatelessWidget { ...@@ -67,12 +72,12 @@ class ParentTeacherPage extends StatelessWidget {
child: Container( child: Container(
width: 200, width: 200,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(8.0),
color: Color.fromARGB(220, 164, 68, 215), color: Colors.blueAccent,
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
'Parent', 'Parent',
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
...@@ -100,12 +105,12 @@ class ParentTeacherPage extends StatelessWidget { ...@@ -100,12 +105,12 @@ class ParentTeacherPage extends StatelessWidget {
child: Container( child: Container(
width: 200, width: 200,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(8.0),
color: Color.fromARGB(220, 164, 68, 215), color: Colors.blueAccent,
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
'Teacher', 'Teacher',
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
......
...@@ -16,15 +16,6 @@ class ParentTeacherSignUpPage extends StatelessWidget { ...@@ -16,15 +16,6 @@ class ParentTeacherSignUpPage extends StatelessWidget {
appBar: AppBar( appBar: AppBar(
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
elevation: 0, elevation: 0,
leading: IconButton(
icon: Icon(
Icons.arrow_back,
color: const Color.fromARGB(255, 0, 0, 0),
),
onPressed: () {
Navigator.pop(context);
},
),
), ),
body: Container( body: Container(
color: backgroundColor, color: backgroundColor,
...@@ -67,12 +58,12 @@ class ParentTeacherSignUpPage extends StatelessWidget { ...@@ -67,12 +58,12 @@ class ParentTeacherSignUpPage extends StatelessWidget {
child: Container( child: Container(
width: 200, width: 200,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(8.0),
color: Color.fromARGB(220, 164, 68, 215), color: Colors.blueAccent,
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
'Parent', 'Parent',
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
...@@ -98,12 +89,12 @@ class ParentTeacherSignUpPage extends StatelessWidget { ...@@ -98,12 +89,12 @@ class ParentTeacherSignUpPage extends StatelessWidget {
child: Container( child: Container(
width: 200, width: 200,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(8.0),
color: Color.fromARGB(220, 164, 68, 215), color: Colors.blueAccent,
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
'Teacher', 'Teacher',
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
......
This diff is collapsed.
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
import 'package:mobile_application_kids/ChatScreen.dart';
import 'package:mobile_application_kids/p_or_t.dart';
import 'package:mobile_application_kids/parenthome.dart';
class ParentProfilePage extends StatefulWidget {
final String? uid;
final String phoneNo;
final String role;
ParentProfilePage({required this.uid, required this.phoneNo, required this.role, Key? key});
@override
_ParentProfilePageState createState() => _ParentProfilePageState(uid!, phoneNo, role);
}
class _ParentProfilePageState extends State<ParentProfilePage> {
late User? user;
late String fullName = "";
late String email = "";
late String phoneNo = "";
final FirebaseAuth _auth = FirebaseAuth.instance;
late String uid;
late String role;
_ParentProfilePageState(this.uid, this.phoneNo, this.role);
@override
void initState() {
super.initState();
user = FirebaseAuth.instance.currentUser;
getUserData();
}
Future<void> getUserData() async {
try {
DocumentSnapshot documentSnapshot = await FirebaseFirestore.instance
.collection('users')
.doc(uid)
.get();
if (documentSnapshot.exists) {
Map<String, dynamic> targetDoc = documentSnapshot.data() as Map<String, dynamic>;
setState(() {
fullName = targetDoc['fullName'];
email = targetDoc['email'];
phoneNo = targetDoc['phoneNo'];
});
print("Full Name: $fullName, Email: $email, Phone Number: $phoneNo");
} else {
print("Document does not exist");
}
} catch (error) {
print("Error getting document: $error");
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text('Parent Profile',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
),
body: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 20),
Container(
decoration: BoxDecoration(
image: DecorationImage(
image: AssetImage('lib/assets/parentprof.PNG'),
fit: BoxFit.fitHeight,
),
),
height: 300, // Adjust height as needed
),
Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 10),
ListTile(
leading: Icon(Icons.person),
title: Text(
'Full Name: $fullName',
style: TextStyle(
fontSize: 18,
fontFamily: 'Poppins',
fontWeight: FontWeight.w400,
),
),
),
ListTile(
leading: Icon(Icons.email),
title: Text(
'Email: $email',
style: TextStyle(
fontSize: 18,
fontFamily: 'Poppins',
fontWeight: FontWeight.w400,
),
),
),
ListTile(
leading: Icon(Icons.phone),
title: Text(
'Phone Number: $phoneNo',
style: TextStyle(
fontSize: 18,
fontFamily: 'Poppins',
fontWeight: FontWeight.w400,
),
),
),
],
),
),
SizedBox(height: 20),
Center(
child: ElevatedButton(
onPressed: () => _signOut(context),
style: ElevatedButton.styleFrom(
primary: Colors.blueAccent,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
),
child: Padding(
padding: const EdgeInsets.all(10.0),
child: Text(
'Sign Out',
style: TextStyle(color: const Color.fromARGB(255, 255, 255, 255)),
),
),
),
),
],
),
),
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,
currentIndex: 2,
onTap: (index) {
if (index == 0) {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => ParentHomePage(phoneNo, role)),
);
}
if (index == 1) {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => ChatScreen()),
);
}
},
),
);
}
Future<void> _signOut(BuildContext context) async {
try {
await _auth.signOut();
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(builder: (BuildContext context) => ParentTeacherPage(backgroundColor: Color.fromARGB(255, 255, 255, 255))),
(route) => false,
);
} catch (e) {
print('Error signing out: $e');
}
}
}
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:jema_app/teacherchat.dart'; import 'package:mobile_application_kids/teacherchat.dart';
import 'package:jema_app/classroomview.dart'; import 'package:mobile_application_kids/classroomview.dart';
import 'package:jema_app/addclassroom.dart'; import 'package:mobile_application_kids/addclassroom.dart';
import 'package:jema_app/teacherhome.dart'; import 'package:mobile_application_kids/teacherhome.dart';
import 'package:pie_chart/pie_chart.dart'; import 'package:pie_chart/pie_chart.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
......
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:jema_app/teacherchat.dart'; import 'package:mobile_application_kids/teacherchat.dart';
import 'package:jema_app/classroomview.dart'; import 'package:mobile_application_kids/classroomview.dart';
import 'package:jema_app/addclassroom.dart'; import 'package:mobile_application_kids/addclassroom.dart';
import 'package:jema_app/teacherhome.dart'; import 'package:mobile_application_kids/teacherhome.dart';
import 'package:pie_chart/pie_chart.dart'; import 'package:pie_chart/pie_chart.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:charts_flutter/flutter.dart' as charts; import 'package:charts_flutter/flutter.dart' as charts;
......
...@@ -49,12 +49,12 @@ class SignInUpPage extends StatelessWidget { ...@@ -49,12 +49,12 @@ class SignInUpPage extends StatelessWidget {
child: Container( child: Container(
width: 200, width: 200,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(8.0),
color: Color.fromARGB(255, 96, 188, 99), color: Color.fromARGB(255, 96, 188, 99),
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
'Sign Up', 'Sign Up',
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
...@@ -83,12 +83,12 @@ class SignInUpPage extends StatelessWidget { ...@@ -83,12 +83,12 @@ class SignInUpPage extends StatelessWidget {
child: Container( child: Container(
width: 200, width: 200,
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(8.0),
color: const Color.fromARGB(255, 213, 80, 236), color: Colors.blueAccent,
), ),
child: Center( child: Center(
child: Padding( child: Padding(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(12.0),
child: Text( child: Text(
'Sign In', 'Sign In',
style: TextStyle(color: Colors.white), style: TextStyle(color: Colors.white),
......
...@@ -37,15 +37,16 @@ class TeacherHomePage extends StatelessWidget { ...@@ -37,15 +37,16 @@ class TeacherHomePage extends StatelessWidget {
}, },
child: Scaffold( child: Scaffold(
appBar: AppBar( appBar: AppBar(
// leading: Padding( automaticallyImplyLeading: false,
// padding: const EdgeInsets.only(left: 20), centerTitle: false,
// child: SizedBox( title: Container(
// child: Image.asset( width: 230,
// 'lib/assets/logo.png', child: Image.asset(
// fit: BoxFit.contain, 'lib/assets/i2.png',
// ), fit: BoxFit.fitHeight,
// ), alignment: Alignment.topLeft,
// ), ),
),
actions: [ actions: [
IconButton( IconButton(
icon: Icon(Icons.notifications), icon: Icon(Icons.notifications),
...@@ -56,11 +57,11 @@ class TeacherHomePage extends StatelessWidget { ...@@ -56,11 +57,11 @@ class TeacherHomePage extends StatelessWidget {
], ],
), ),
body: Padding( body: Padding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(12.0),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
SizedBox(height: 20), SizedBox(height: 10),
Text( Text(
'Explore, learn, and play in our magical world of wonder!', 'Explore, learn, and play in our magical world of wonder!',
style: poppinsTextStyle.copyWith( style: poppinsTextStyle.copyWith(
...@@ -68,11 +69,14 @@ class TeacherHomePage extends StatelessWidget { ...@@ -68,11 +69,14 @@ class TeacherHomePage extends StatelessWidget {
fontSize: 13, fontSize: 13,
), ),
), ),
SizedBox(height: 10), SizedBox(height: 12),
Expanded( Expanded(
child: ClipRRect(
borderRadius: BorderRadius.circular(10),
child: Image.asset( child: Image.asset(
'lib/assets/teacherhome.png', 'lib/assets/teacherhome.png',
fit: BoxFit.contain, fit: BoxFit.fitHeight,
),
), ),
), ),
Row( Row(
...@@ -89,6 +93,7 @@ class TeacherHomePage extends StatelessWidget { ...@@ -89,6 +93,7 @@ class TeacherHomePage extends StatelessWidget {
}, },
child: Row( child: Row(
children: [ children: [
SizedBox(height: 12),
Text( Text(
'Create New Class Room Here', 'Create New Class Room Here',
style: poppinsTextStyle.copyWith( style: poppinsTextStyle.copyWith(
...@@ -96,11 +101,12 @@ class TeacherHomePage extends StatelessWidget { ...@@ -96,11 +101,12 @@ class TeacherHomePage extends StatelessWidget {
fontSize: 16, fontSize: 16,
), ),
), ),
SizedBox(height: 12),
Container( Container(
margin: EdgeInsets.only(left: 8.0), margin: EdgeInsets.only(left: 23.0),
padding: EdgeInsets.all(8.0), padding: EdgeInsets.all(8.0),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color.fromARGB(203, 164, 88, 177), color: Colors.blueAccent,
borderRadius: BorderRadius.circular(8.0), borderRadius: BorderRadius.circular(8.0),
), ),
child: Icon( child: Icon(
...@@ -114,11 +120,11 @@ class TeacherHomePage extends StatelessWidget { ...@@ -114,11 +120,11 @@ class TeacherHomePage extends StatelessWidget {
], ],
), ),
Divider(), Divider(),
SizedBox(height: 10), SizedBox(height: 8),
Text( Text(
'Class Rooms', 'Class Rooms',
style: poppinsTextStyle.copyWith( style: poppinsTextStyle.copyWith(
fontSize: 16, fontSize: 18,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),
...@@ -169,18 +175,18 @@ class TeacherHomePage extends StatelessWidget { ...@@ -169,18 +175,18 @@ class TeacherHomePage extends StatelessWidget {
Text( Text(
'Class $index', 'Class $index',
style: poppinsTextStyle.copyWith( style: poppinsTextStyle.copyWith(
fontSize: 12.0), fontSize: 14.0),
), ),
], ],
), ),
], ],
), ),
trailing: Container( trailing: Container(
height: 35.0, height: 40.0,
width: 80.0, width: 100.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Color.fromARGB(203, 164, 88, 177), color: Colors.blueAccent,
borderRadius: BorderRadius.circular(4.0), borderRadius: BorderRadius.circular(8.0),
), ),
child: TextButton( child: TextButton(
onPressed: () { onPressed: () {
......
...@@ -648,6 +648,14 @@ packages: ...@@ -648,6 +648,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.3.2" version: "2.3.2"
simple_gesture_detector:
dependency: transitive
description:
name: simple_gesture_detector
sha256: ba2cd5af24ff20a0b8d609cec3f40e5b0744d2a71804a2616ae086b9c19d19a3
url: "https://pub.dev"
source: hosted
version: "0.2.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
...@@ -717,6 +725,14 @@ packages: ...@@ -717,6 +725,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.1.0+1" version: "3.1.0+1"
table_calendar:
dependency: "direct main"
description:
name: table_calendar
sha256: "7f1270313c0cdb245b583ed8518982c01d4a7e95869b3c30abcbae3b642c45d0"
url: "https://pub.dev"
source: hosted
version: "3.0.8"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
......
name: jema_app name: mobile_application_kids
description: A new Flutter project. description: A new Flutter project.
# The following line prevents the package from being accidentally published to # The following line prevents the package from being accidentally published to
# pub.dev using `flutter pub publish`. This is preferred for private packages. # pub.dev using `flutter pub publish`. This is preferred for private packages.
...@@ -47,6 +47,7 @@ dependencies: ...@@ -47,6 +47,7 @@ dependencies:
url_launcher: ^6.1.14 url_launcher: ^6.1.14
cached_network_image: ^3.3.1 cached_network_image: ^3.3.1
charts_flutter: ^0.12.0 charts_flutter: ^0.12.0
table_calendar: ^3.0.8
dev_dependencies: dev_dependencies:
...@@ -96,6 +97,8 @@ flutter: ...@@ -96,6 +97,8 @@ flutter:
- lib/assets/ac4.png - lib/assets/ac4.png
- lib/assets/ac5.png - lib/assets/ac5.png
- lib/assets/banner.png - lib/assets/banner.png
- lib/assets/ac6.png
- lib/assets/ac7.png
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment