Skip to content

M
Monitoring and Recommendations For Early Childhood Development
Commit b4eb8f7b authored by Uditha Prabhasha 's avatar Uditha Prabhasha
Browse files
Options

final update

parent 985775c7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1351 additions and 202 deletions
.dart_tool/package_config.json
View file @ b4eb8f7b
...@@ -43,6 +43,12 @@ ...@@ -43,6 +43,12 @@
"packageUri": "lib/", "packageUri": "lib/",
"languageVersion": "3.0" "languageVersion": "3.0"
}, },
{
"name": "carousel_slider",
"rootUri": "file:///Users/avishkanew/.pub-cache/hosted/pub.dev/carousel_slider-4.2.1",
"packageUri": "lib/",
"languageVersion": "2.12"
},
{ {
"name": "characters", "name": "characters",
"rootUri": "file:///Users/avishkanew/.pub-cache/hosted/pub.dev/characters-1.3.0", "rootUri": "file:///Users/avishkanew/.pub-cache/hosted/pub.dev/characters-1.3.0",
...@@ -686,7 +692,7 @@ ...@@ -686,7 +692,7 @@
"languageVersion": "3.0" "languageVersion": "3.0"
} }
], ],
"generated": "2024-03-18T12:13:20.503381Z", "generated": "2024-03-18T20:49:16.239934Z",
"generator": "pub", "generator": "pub",
"generatorVersion": "3.0.1" "generatorVersion": "3.0.1"
} }
.dart_tool/package_config_subset
View file @ b4eb8f7b
...@@ -42,6 +42,10 @@ cached_network_image_web ...@@ -42,6 +42,10 @@ cached_network_image_web
3.0 3.0
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/cached_network_image_web-1.1.1/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/cached_network_image_web-1.1.1/
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/cached_network_image_web-1.1.1/lib/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/cached_network_image_web-1.1.1/lib/
carousel_slider
2.12
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/carousel_slider-4.2.1/
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/carousel_slider-4.2.1/lib/
characters characters
2.12 2.12
file:///Users/avishkanew/.pub-cache/hosted/pub.dev/characters-1.3.0/ file:///Users/avishkanew/.pub-cache/hosted/pub.dev/characters-1.3.0/
......
.flutter-plugins-dependencies
View file @ b4eb8f7b
This diff is collapsed.
lib/ActivitiesView _old.dart 0 → 100644
View file @ b4eb8f7b
// import 'package:flutter/material.dart';
// import 'package:cloud_firestore/cloud_firestore.dart';
// import 'package:cached_network_image/cached_network_image.dart';
// import 'package:video_player/video_player.dart';
// class UserActivitiesScreen extends StatelessWidget {
// final String userId;
// UserActivitiesScreen({required this.userId});
// @override
// Widget build(BuildContext context) {
// return Scaffold(
// appBar: AppBar(
// title: Text('User Activities'),
// ),
// body: StreamBuilder<QuerySnapshot>(
// stream: FirebaseFirestore.instance
// .collection('activities')
// .where('user', isEqualTo: userId)
// .snapshots(),
// builder: (context, snapshot) {
// if (snapshot.connectionState == ConnectionState.waiting) {
// return CircularProgressIndicator(); // Loading indicator
// }
// if (snapshot.hasError) {
// return Text('Error: ${snapshot.error}'); // Error handling
// }
// if (snapshot.data == null || snapshot.data!.docs.isEmpty) {
// return Center(
// child: Text('No activities found for this user.'),
// ); // No activities found
// }
// return ListView(
// children: snapshot.data!.docs.map((document) {
// final videoUrl = document['videoUrl'];
// final imageUrl = document['imageUrl'];
// if (videoUrl != null) {
// return _buildVideoItem(videoUrl);
// } else if (imageUrl != null) {
// return _buildImageItem(imageUrl);
// } else {
// return SizedBox(); // Return an empty widget if neither video nor image URL is available
// }
// }).toList(),
// );
// },
// ),
// );
// }
// Widget _buildVideoItem(String videoUrl) {
// return ListTile(
// title: Text('Activity Video'),
// leading: FutureBuilder(
// future: VideoPlayerController.network(videoUrl).initialize(),
// builder: (context, snapshot) {
// if (snapshot.connectionState == ConnectionState.waiting) {
// return CircularProgressIndicator(); // Placeholder while video loads
// }
// if (snapshot.hasError) {
// return Text('Error: ${snapshot.error}');
// }
// if (snapshot.connectionState == ConnectionState.done) {
// try {
// final controller = VideoPlayerController.network(videoUrl);
// return AspectRatio(
// aspectRatio: controller.value.aspectRatio,
// child: VideoPlayer(controller),
// );
// } catch (e) {
// return Text('Error playing video: $e');
// }
// } else {
// return SizedBox(); // Return empty widget if still loading
// }
// },
// ),
// onTap: () {
// // Handle tap, e.g., navigate to a detail screen
// },
// );
// }
// Widget _buildImageItem(String imageUrl) {
// return ListTile(
// title: Text('Activity Image'),
// leading: CachedNetworkImage(
// imageUrl: imageUrl,
// placeholder: (context, url) =>
// CircularProgressIndicator(), // Placeholder while image loads
// errorWidget: (context, url, error) => Icon(Icons.error),
// ),
// onTap: () {
// // Handle tap, e.g., navigate to a detail screen
// },
// );
// }
// }
\ No newline at end of file
lib/ActivitiesView.dart
View file @ b4eb8f7b
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:cached_network_image/cached_network_image.dart'; import 'package:cached_network_image/cached_network_image.dart';
import 'package:video_player/video_player.dart';
class UserActivitiesScreen extends StatelessWidget { class UserActivitiesScreen extends StatelessWidget {
final String userId; final String userId;
...@@ -12,16 +11,37 @@ class UserActivitiesScreen extends StatelessWidget { ...@@ -12,16 +11,37 @@ class UserActivitiesScreen extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('User Activities'), title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text(
'Activities',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
), ),
body: StreamBuilder<QuerySnapshot>( ),
),
],
),
body: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: StreamBuilder<QuerySnapshot>(
stream: FirebaseFirestore.instance stream: FirebaseFirestore.instance
.collection('activities') .collection('activities')
.where('user', isEqualTo: userId) .where('user', isEqualTo: userId)
.snapshots(), .snapshots(),
builder: (context, snapshot) { builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) { if (snapshot.connectionState == ConnectionState.waiting) {
return CircularProgressIndicator(); // Loading indicator return Center(
child:
CircularProgressIndicator()); // Loading indicator
} }
if (snapshot.hasError) { if (snapshot.hasError) {
return Text('Error: ${snapshot.error}'); // Error handling return Text('Error: ${snapshot.error}'); // Error handling
...@@ -32,70 +52,113 @@ class UserActivitiesScreen extends StatelessWidget { ...@@ -32,70 +52,113 @@ class UserActivitiesScreen extends StatelessWidget {
); // No activities found ); // No activities found
} }
return ListView( final imageDocs = snapshot.data!.docs
children: snapshot.data!.docs.map((document) { .where((doc) => doc['imageUrl'] != null)
final videoUrl = document['videoUrl']; .toList();
final imageUrl = document['imageUrl'];
if (videoUrl != null) { return ImageWall(
return _buildVideoItem(videoUrl); imageDocs: imageDocs,
} else if (imageUrl != null) {
return _buildImageItem(imageUrl);
} else {
return SizedBox(); // Return an empty widget if neither video nor image URL is available
}
}).toList(),
); );
}, },
), ),
),
); );
} }
}
Widget _buildVideoItem(String videoUrl) { class ImageWall extends StatelessWidget {
return ListTile( final List<DocumentSnapshot> imageDocs;
title: Text('Activity Video'),
leading: FutureBuilder( ImageWall({required this.imageDocs});
future: VideoPlayerController.network(videoUrl).initialize(),
builder: (context, snapshot) { @override
if (snapshot.connectionState == ConnectionState.waiting) { Widget build(BuildContext context) {
return CircularProgressIndicator(); // Placeholder while video loads // Sort the imageDocs based on timestamp in descending order
} imageDocs.sort((a, b) => b['timestamp'].compareTo(a['timestamp']));
if (snapshot.hasError) {
return Text('Error: ${snapshot.error}'); return ListView.separated(
} itemCount: imageDocs.length,
if (snapshot.connectionState == ConnectionState.done) { itemBuilder: (context, index) {
try { final imageUrl = imageDocs[index]['imageUrl'];
final controller = VideoPlayerController.network(videoUrl); final timestamp = imageDocs[index]['timestamp'];
return AspectRatio( return Padding(
aspectRatio: controller.value.aspectRatio, padding: const EdgeInsets.symmetric(vertical: 8.0),
child: VideoPlayer(controller), child: ImageItem(
); imageUrl: imageUrl,
} catch (e) { timestamp: timestamp,
return Text('Error playing video: $e');
}
} else {
return SizedBox(); // Return empty widget if still loading
}
},
), ),
onTap: () { );
// Handle tap, e.g., navigate to a detail screen
}, },
separatorBuilder: (context, index) => SizedBox(height: 16.0),
); );
} }
}
class ImageItem extends StatelessWidget {
final String imageUrl;
final Timestamp timestamp;
final double imageHeight = 200.0;
ImageItem({required this.imageUrl, required this.timestamp});
Widget _buildImageItem(String imageUrl) { @override
return ListTile( Widget build(BuildContext context) {
title: Text('Activity Image'), return Column(
leading: CachedNetworkImage( crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Container(
height: imageHeight,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.0), // Rounded corners
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 2,
blurRadius: 5,
offset: Offset(0, 2), // Drop shadow
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(16.0), // Clip rounded corners
child: CachedNetworkImage(
imageUrl: imageUrl, imageUrl: imageUrl,
placeholder: (context, url) => fit: BoxFit.cover,
CircularProgressIndicator(), // Placeholder while image loads placeholder: (context, url) => Center(
child: CircularProgressIndicator(),
),
errorWidget: (context, url, error) => Icon(Icons.error), errorWidget: (context, url, error) => Icon(Icons.error),
), ),
onTap: () { ),
// Handle tap, e.g., navigate to a detail screen ),
Container(
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.7), // Semi-transparent background
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(16.0), // Round only bottom corners
bottomRight: Radius.circular(16.0),
),
),
child: Row(
children: [
Expanded(
child: Text(
'Uploaded: ${timestamp.toDate()}',
style: TextStyle(color: Colors.white),
),
),
IconButton(
icon: Icon(Icons.date_range),
color: Colors.white,
onPressed: () {
}, },
),
],
),
),
],
); );
} }
} }
lib/ActivitiesView_parent.dart 0 → 100644
View file @ b4eb8f7b
import 'package:flutter/material.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:cached_network_image/cached_network_image.dart';
class pUserActivitiesScreen extends StatelessWidget {
final String pUser;
pUserActivitiesScreen({required this.pUser});
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text(
'Activities',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
),
body: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: StreamBuilder<QuerySnapshot>(
stream: FirebaseFirestore.instance
.collection('activities')
// .where('pUser', isEqualTo: pUser)
.snapshots(),
builder: (context, snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) {
return Center(
child:
CircularProgressIndicator()); // Loading indicator
}
if (snapshot.hasError) {
return Text('Error: ${snapshot.error}'); // Error handling
}
if (snapshot.data == null || snapshot.data!.docs.isEmpty) {
return Center(
child: Text('No activities found for this user.'),
); // No activities found
}
final imageDocs = snapshot.data!.docs
.where((doc) => doc['imageUrl'] != null)
.toList();
return ImageWall(
imageDocs: imageDocs,
);
},
),
),
);
}
}
class ImageWall extends StatelessWidget {
final List<DocumentSnapshot> imageDocs;
ImageWall({required this.imageDocs});
@override
Widget build(BuildContext context) {
// Sort the imageDocs based on timestamp in descending order
imageDocs.sort((a, b) => b['timestamp'].compareTo(a['timestamp']));
return ListView.separated(
itemCount: imageDocs.length,
itemBuilder: (context, index) {
final imageUrl = imageDocs[index]['imageUrl'];
final timestamp = imageDocs[index]['timestamp'];
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: ImageItem(
imageUrl: imageUrl,
timestamp: timestamp,
),
);
},
separatorBuilder: (context, index) => SizedBox(height: 16.0),
);
}
}
class ImageItem extends StatelessWidget {
final String imageUrl;
final Timestamp timestamp;
final double imageHeight = 200.0;
ImageItem({required this.imageUrl, required this.timestamp});
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Container(
height: imageHeight,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.0), // Rounded corners
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 2,
blurRadius: 5,
offset: Offset(0, 2), // Drop shadow
),
],
),
child: ClipRRect(
borderRadius: BorderRadius.circular(16.0), // Clip rounded corners
child: CachedNetworkImage(
imageUrl: imageUrl,
fit: BoxFit.cover,
placeholder: (context, url) => Center(
child: CircularProgressIndicator(),
),
errorWidget: (context, url, error) => Icon(Icons.error),
),
),
),
Container(
padding: EdgeInsets.all(8.0),
decoration: BoxDecoration(
color: Colors.black.withOpacity(0.7), // Semi-transparent background
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(16.0), // Round only bottom corners
bottomRight: Radius.circular(16.0),
),
),
child: Row(
children: [
Expanded(
child: Text(
'Uploaded: ${timestamp.toDate()}',
style: TextStyle(color: Colors.white),
),
),
IconButton(
icon: Icon(Icons.date_range),
color: Colors.white,
onPressed: () {
// Implement your comment functionality here
// You can navigate to a comment screen or show a dialog
// to add comments for the current image.
},
),
],
),
),
],
);
}
}
lib/ChildrenActivity _old.dart 0 → 100644
View file @ b4eb8f7b
This diff is collapsed.
lib/ChildrenActivity.dart
View file @ b4eb8f7b
...@@ -273,11 +273,13 @@ class ChildrenActivity extends StatelessWidget { ...@@ -273,11 +273,13 @@ class ChildrenActivity extends StatelessWidget {
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => ChildrenActiPhone(image: imagePath)), builder: (context) => ChildrenActiPhone(
image: imagePath,
// userId: user?.uid, // Pass the user ID to the next screen
),
),
); );
// Use the picked file, for example, display it in an Image widget
// Image.file(File(pickedFile.path))
print('Image selected: ${pickedFile.path}'); print('Image selected: ${pickedFile.path}');
} else { } else {
print('No image selected'); print('No image selected');
...@@ -289,15 +291,17 @@ class ChildrenActivity extends StatelessWidget { ...@@ -289,15 +291,17 @@ class ChildrenActivity extends StatelessWidget {
final pickedFile = await picker.pickVideo(source: ImageSource.camera); final pickedFile = await picker.pickVideo(source: ImageSource.camera);
if (pickedFile != null) { if (pickedFile != null) {
String imagePath = pickedFile.path; String videoPath = pickedFile.path;
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => ChildrenVideo(video: imagePath)), builder: (context) => ChildrenVideo(
video: videoPath,
// userId: user?.uid, // Pass the user ID to the next screen
),
),
); );
// Use the picked file, for example, display it in a Video widget
// Video.file(File(pickedFile.path))
print('Video selected: ${pickedFile.path}'); print('Video selected: ${pickedFile.path}');
} else { } else {
print('No video selected'); print('No video selected');
......
lib/ChildrenProfile_parent.dart
View file @ b4eb8f7b
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/ActivitiesView_parent.dart';
import 'package:mobile_application_kids/progressReport.dart'; import 'package:mobile_application_kids/progressReport.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';
...@@ -19,7 +20,7 @@ class pChildrenProfilePage extends StatelessWidget { ...@@ -19,7 +20,7 @@ class pChildrenProfilePage extends StatelessWidget {
int _age = 10; int _age = 10;
String role = ''; String role = '';
late final userDetails; late final userDetails;
pChildrenProfilePage(document, role) { pChildrenProfilePage(document, role, {required String pUser}) {
print(role); print(role);
this.role = role; this.role = role;
this.userDetails = document; this.userDetails = document;
...@@ -477,8 +478,8 @@ class pChildrenProfilePage extends StatelessWidget { ...@@ -477,8 +478,8 @@ class pChildrenProfilePage extends StatelessWidget {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
UserActivitiesScreen( pUserActivitiesScreen(pUser: user!.uid)
userId: user!.uid)), )
); );
}, },
child: Container( child: Container(
...@@ -738,7 +739,7 @@ class pChildrenProfilePage extends StatelessWidget { ...@@ -738,7 +739,7 @@ class pChildrenProfilePage extends StatelessWidget {
TextSpan( TextSpan(
children: [ children: [
TextSpan( TextSpan(
text: 'Monthly \npsycholo. report \n ', text: 'Monthly progress report \n',
style: TextStyle( style: TextStyle(
color: color:
Color(0xFF403572), Color(0xFF403572),
...@@ -760,7 +761,7 @@ class pChildrenProfilePage extends StatelessWidget { ...@@ -760,7 +761,7 @@ class pChildrenProfilePage extends StatelessWidget {
child: Opacity( child: Opacity(
opacity: 0.70, opacity: 0.70,
child: Text( child: Text(
'Some short description of this type of report.', "Progress of kid's learning and behavior",
style: TextStyle( style: TextStyle(
color: Color(0xFF8DAEAE), color: Color(0xFF8DAEAE),
fontSize: 9.55, fontSize: 9.55,
...@@ -847,7 +848,7 @@ class pChildrenProfilePage extends StatelessWidget { ...@@ -847,7 +848,7 @@ class pChildrenProfilePage extends StatelessWidget {
TextSpan( TextSpan(
children: [ children: [
TextSpan( TextSpan(
text: 'Monthly prediction report \n', text: 'Monthly \nPsychology Report \n',
style: TextStyle( style: TextStyle(
color: color:
Color(0xFF479696), Color(0xFF479696),
...@@ -868,7 +869,7 @@ class pChildrenProfilePage extends StatelessWidget { ...@@ -868,7 +869,7 @@ class pChildrenProfilePage extends StatelessWidget {
child: Opacity( child: Opacity(
opacity: 0.70, opacity: 0.70,
child: Text( child: Text(
'Some short description of this type of report.', 'Monthly insights of activity reports',
style: TextStyle( style: TextStyle(
color: Color(0xFF8DAEAE), color: Color(0xFF8DAEAE),
fontSize: 9.55, fontSize: 9.55,
......
lib/addstudent.dart
View file @ b4eb8f7b
...@@ -5,6 +5,8 @@ import 'package:firebase_storage/firebase_storage.dart'; ...@@ -5,6 +5,8 @@ import 'package:firebase_storage/firebase_storage.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 'dart:io'; import 'dart:io';
import 'package:intl/intl.dart';
class AddStudentPage extends StatefulWidget { class AddStudentPage extends StatefulWidget {
const AddStudentPage({required this.classname}); const AddStudentPage({required this.classname});
...@@ -17,6 +19,7 @@ class AddStudentPage extends StatefulWidget { ...@@ -17,6 +19,7 @@ class AddStudentPage extends StatefulWidget {
class _AddStudentState extends State<AddStudentPage> { class _AddStudentState extends State<AddStudentPage> {
final _formkey = GlobalKey<FormState>(); final _formkey = GlobalKey<FormState>();
final _auth = FirebaseAuth.instance; final _auth = FirebaseAuth.instance;
//Bio Part //Bio Part
TextEditingController _firstnameController = TextEditingController(); TextEditingController _firstnameController = TextEditingController();
TextEditingController _lastnameController = TextEditingController(); TextEditingController _lastnameController = TextEditingController();
...@@ -50,6 +53,9 @@ class _AddStudentState extends State<AddStudentPage> { ...@@ -50,6 +53,9 @@ class _AddStudentState extends State<AddStudentPage> {
XFile? _selectedImage; XFile? _selectedImage;
String classname; String classname;
String? _selectedSex;
DateTime? _selectedBirthday;
_AddStudentState(String classname) : this.classname = classname; _AddStudentState(String classname) : this.classname = classname;
@override @override
...@@ -163,6 +169,31 @@ class _AddStudentState extends State<AddStudentPage> { ...@@ -163,6 +169,31 @@ class _AddStudentState extends State<AddStudentPage> {
), ),
), ),
// SizedBox(height: 20),
// GestureDetector(
// onTap: () => _selectDate(context),
// child: Container(
// padding: EdgeInsets.symmetric(horizontal: 10, vertical: 15),
// decoration: BoxDecoration(
// color: Color.fromARGB(107, 196, 196, 196),
// borderRadius: BorderRadius.circular(10.0),
// ),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // Aligns children to both ends
// children: [
// Expanded( // Text takes up all available space, pushing the icon to the right
// child: Text(
// _selectedBirthday != null ? DateFormat('yyyy-MM-dd').format(_selectedBirthday!) : 'Select Birthday',
// style: TextStyle(fontSize: 14.0, color: Colors.black54),
// ),
// ),
// Icon(Icons.cake, size: 23.0, color: Color.fromARGB(132, 12, 12, 12)), // Icon on the right
// ],
// ),
// ),
// ),
SizedBox(height: 20), SizedBox(height: 20),
Container( Container(
height: 55.0, height: 55.0,
...@@ -186,25 +217,34 @@ class _AddStudentState extends State<AddStudentPage> { ...@@ -186,25 +217,34 @@ class _AddStudentState extends State<AddStudentPage> {
SizedBox(height: 20), SizedBox(height: 20),
Container( Container(
height: 55.0, height: 55.0,
child: TextField( padding: EdgeInsets.symmetric(horizontal: 10, vertical: 2),
controller: _sexController, decoration: BoxDecoration(
decoration: InputDecoration( color: Color.fromARGB(107, 196, 196, 196), // Background color
hintText: 'Male/Female', borderRadius: BorderRadius.circular(10.0), // Border radius
filled: true,
fillColor: Color.fromARGB(107, 196, 196, 196),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.0),
borderSide: BorderSide.none,
), ),
suffixIcon: Icon(Icons.people, child: DropdownButtonFormField<String>(
size: 23.0, color: Color.fromARGB(132, 12, 12, 12)), value: _selectedSex, // This should be a variable in your state class initialized to null or the default value
hintStyle: TextStyle(fontSize: 14.0), // Add border here decoration: InputDecoration(
border: InputBorder.none,
// contentPadding: EdgeInsets.zero,
suffixIcon: Icon(Icons.people, size: 23.0, color: Color.fromARGB(132, 12, 12, 12)),
), ),
hint: Text('Gender', style: TextStyle(fontSize: 14.0)), // Placeholder text
onChanged: (String? newValue) {
setState(() {
_selectedSex = newValue; // Update the state with the new value
});
},
items: <String>['Male', 'Female'].map<DropdownMenuItem<String>>((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value),
);
}).toList(),
), ),
), ),
//Medicine Part //Medicine Part
SizedBox(height: 50), SizedBox(height: 50),
Row( Row(
children: [ children: [
...@@ -586,7 +626,7 @@ class _AddStudentState extends State<AddStudentPage> { ...@@ -586,7 +626,7 @@ class _AddStudentState extends State<AddStudentPage> {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
TextButton( ElevatedButton(
onPressed: () async { onPressed: () async {
if (Image == null) { if (Image == null) {
AwesomeDialog( AwesomeDialog(
...@@ -664,36 +704,38 @@ class _AddStudentState extends State<AddStudentPage> { ...@@ -664,36 +704,38 @@ class _AddStudentState extends State<AddStudentPage> {
} }
}, },
style: style:
TextButton.styleFrom(backgroundColor: Colors.green), ElevatedButton.styleFrom(
primary: const Color.fromARGB(255, 48, 206, 53),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
),
child: Padding(
padding: const EdgeInsets.all(10.0),
child: Text( child: Text(
'Save', 'Save',
style: TextStyle( style: TextStyle(color: const Color.fromARGB(255, 255, 255, 255)),
color: Colors.white,
fontSize: 14,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
height: 1,
), ),
), ),
), ),
TextButton( ElevatedButton(
onPressed: () { onPressed: () {
// Handle signup logic here
Navigator.pop(context); Navigator.pop(context);
}, },
style: TextButton.styleFrom( style: ElevatedButton.styleFrom(
backgroundColor: Colors.grey.shade200), primary: const Color.fromARGB(255, 255, 255, 255),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
),
child: Padding(
padding: const EdgeInsets.all(10.0),
child: Text( child: Text(
'Cancel', 'Cancel',
style: TextStyle( style: TextStyle(color: Colors.black),
color: Colors.black, ),
fontSize: 14,
fontFamily: 'Poppins',
fontWeight: FontWeight.w600,
height: 1,
), ),
), ),
)
], ],
), ),
], ],
...@@ -766,3 +808,18 @@ class _AddStudentState extends State<AddStudentPage> { ...@@ -766,3 +808,18 @@ class _AddStudentState extends State<AddStudentPage> {
)..show(); )..show();
} }
} }
Future<void> _selectDate(BuildContext context) async {
final DateTime? pickedDate = await showDatePicker(
context: context,
initialDate: DateTime.now(), // Initial date set to current date
firstDate: DateTime(1900), // Earliest allowable date
lastDate: DateTime.now(), // Latest allowable date is today
);
// if (pickedDate != null && pickedDate != DateTime.now()) {
// setState(() {
// // Format the date and update the text field
// _birthdayController.text = DateFormat('yyyy-MM-dd').format(pickedDate);
// });
// }
}
lib/addstudent_old.dart 0 → 100644
View file @ b4eb8f7b
This diff is collapsed.
lib/childrenProfile.dart
View file @ b4eb8f7b
...@@ -738,7 +738,7 @@ child: Container( ...@@ -738,7 +738,7 @@ child: Container(
TextSpan( TextSpan(
children: [ children: [
TextSpan( TextSpan(
text: 'Monthly \npsycholo. report \n ', text: 'Monthly progress report \n',
style: TextStyle( style: TextStyle(
color: color:
Color(0xFF403572), Color(0xFF403572),
...@@ -760,7 +760,7 @@ child: Container( ...@@ -760,7 +760,7 @@ child: Container(
child: Opacity( child: Opacity(
opacity: 0.70, opacity: 0.70,
child: Text( child: Text(
'Some short description of this type of report.', "Progress of kid's learning and behavior.",
style: TextStyle( style: TextStyle(
color: Color(0xFF8DAEAE), color: Color(0xFF8DAEAE),
fontSize: 9.55, fontSize: 9.55,
...@@ -847,7 +847,7 @@ child: Container( ...@@ -847,7 +847,7 @@ child: Container(
TextSpan( TextSpan(
children: [ children: [
TextSpan( TextSpan(
text: 'Monthly prediction report \n', text: 'Monthly \nPsychology Report \n ',
style: TextStyle( style: TextStyle(
color: color:
Color(0xFF479696), Color(0xFF479696),
...@@ -868,7 +868,7 @@ child: Container( ...@@ -868,7 +868,7 @@ child: Container(
child: Opacity( child: Opacity(
opacity: 0.70, opacity: 0.70,
child: Text( child: Text(
'Some short description of this type of report.', 'Monthly insights of activity reports',
style: TextStyle( style: TextStyle(
color: Color(0xFF8DAEAE), color: Color(0xFF8DAEAE),
fontSize: 9.55, fontSize: 9.55,
......
lib/classroomview.dart
View file @ b4eb8f7b
...@@ -125,7 +125,7 @@ class ClassroomViewPage extends StatelessWidget { ...@@ -125,7 +125,7 @@ class ClassroomViewPage extends StatelessWidget {
} }
// Use the result of getStudentCount // Use the result of getStudentCount
return Text( return Text(
'Children Count ' + (snapshot.data ?? '0'), // Default to '0' if data is null 'Kids Count: ' + (snapshot.data ?? '0'), // Default to '0' if data is null
style: TextStyle( style: TextStyle(
color: Colors.black, color: Colors.black,
fontSize: 15, fontSize: 15,
......
lib/games.dart
View file @ b4eb8f7b
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:mobile_application_kids/ChatScreen.dart';
import 'package:mobile_application_kids/parentHome.dart';
import 'package:mobile_application_kids/parentProfile.dart';
class GamesPage extends StatelessWidget { class GamesPage extends StatelessWidget {
final List<Map<String, String>> gameData = [ final List<Map<String, String>> gameData = [
{'game': 'Game 1', 'description': 'Description for Game 1'}, {'game': 'Game 1', 'description': 'Description for Game 1'},
{'game': 'Game 2', 'description': 'Description for Game 2'}, {'game': 'Game 2', 'description': 'Description for Game 2'},
// add list {'game': 'Game 3', 'description': 'Description for Game 1'},
{'game': 'Game 4', 'description': 'Description for Game 2'},
// add more games as needed
]; ];
final String commonImagePath = 'assets/act_photo.png'; final String commonImagePath = 'lib/assets/act_photo.png';
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Games'), title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text(
'Games',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
), ),
body: Column( body: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -69,7 +93,7 @@ class GamesPage extends StatelessWidget { ...@@ -69,7 +93,7 @@ class GamesPage extends StatelessWidget {
label: 'Chat', label: 'Chat',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.games), icon: Icon(Icons.sports_baseball),
label: 'Games', label: 'Games',
), ),
BottomNavigationBarItem( BottomNavigationBarItem(
...@@ -77,36 +101,35 @@ class GamesPage extends StatelessWidget { ...@@ -77,36 +101,35 @@ class GamesPage extends StatelessWidget {
label: 'Profile', label: 'Profile',
), ),
], ],
selectedItemColor: Color(0xFF7A1FA0), selectedItemColor: Colors.blueAccent,
unselectedItemColor: Color(0xFFA9ABAD), unselectedItemColor: Colors.grey,
selectedLabelStyle: TextStyle(color: Color(0xFF7A1FA0)),
unselectedLabelStyle: TextStyle(color: Color.fromARGB(0, 197, 16, 16)),
currentIndex: 2, currentIndex: 2,
onTap: (index) { onTap: (index) {
switch (index) { switch (index) {
case 0: case 0:
// Navigate to Home // Navigate to Home
// Replace the code below with your home navigation logic
// Navigator.push( // Navigator.push(
// // context, // context,
// // MaterialPageRoute(builder: (context) => AddClassroom()), // MaterialPageRoute(builder: (context) => ParentHomePage(phoneNo, role)),
// ); // );
break; break;
case 1: case 1:
// Navigate to Chat // Navigate to Chat
// Navigator.push( Navigator.push(
// // context, context,
// // MaterialPageRoute(builder: (context) => ChatScreen()), MaterialPageRoute(builder: (context) => ChatScreen()),
// ); );
break; break;
case 2: case 2:
// Already on Games Page // Do nothing, we are already on the Games page
break; break;
case 3: case 3:
// Navigate to Profile // Navigate to Profile
// Navigator.push( // Navigator.push(
// // context, // context,
// // MaterialPageRoute(builder: (context) => TeacherProfile()), // MaterialPageRoute(
// builder: (context) => ParentProfilePage(uid: uid, phoneNo: phoneNo, role: role),
// ),
// ); // );
break; break;
} }
......
lib/kidsReport.dart
View file @ b4eb8f7b
...@@ -172,7 +172,8 @@ class _KidsReportPageState extends State<KidsReportPage> { ...@@ -172,7 +172,8 @@ class _KidsReportPageState extends State<KidsReportPage> {
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
child: Text( child: Text(
'Save', 'Save',
style: TextStyle(color: const Color.fromARGB(255, 255, 255, 255)), style: TextStyle(
color: const Color.fromARGB(255, 255, 255, 255)),
), ),
), ),
), ),
......
lib/kidsReportView.dart
View file @ b4eb8f7b
...@@ -20,7 +20,24 @@ class ReportKidsViewPage extends StatelessWidget { ...@@ -20,7 +20,24 @@ class ReportKidsViewPage extends StatelessWidget {
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: StreamBuilder<QuerySnapshot>( body: StreamBuilder<QuerySnapshot>(
stream: _reportsStream, stream: _reportsStream,
...@@ -55,9 +72,9 @@ Widget _buildReportItem(String title, Map<String, dynamic> data) { ...@@ -55,9 +72,9 @@ Widget _buildReportItem(String title, Map<String, dynamic> data) {
data.remove('sId'); data.remove('sId');
return Card( return Card(
margin: EdgeInsets.symmetric(vertical: 8, horizontal: 16), margin: EdgeInsets.symmetric(vertical: 8, horizontal: 14),
child: Padding( child: Padding(
padding: EdgeInsets.all(16), padding: EdgeInsets.all(8),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
...@@ -80,7 +97,7 @@ Widget _buildReportItem(String title, Map<String, dynamic> data) { ...@@ -80,7 +97,7 @@ Widget _buildReportItem(String title, Map<String, dynamic> data) {
Text( Text(
entry.key, entry.key,
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
), ),
), ),
Text(entry.value ?? 'Not provided'), Text(entry.value ?? 'Not provided'),
......
lib/kidsreports.dart
View file @ b4eb8f7b
...@@ -33,7 +33,7 @@ class KidsReportsPage extends StatelessWidget { ...@@ -33,7 +33,7 @@ class KidsReportsPage extends StatelessWidget {
// letterSpacing: -0.96, // letterSpacing: -0.96,
// ), // ),
// ), // ),
SizedBox(height: 20), // Add space here SizedBox(height: 20),
Text( Text(
'Select Kids ', 'Select Kids ',
style: TextStyle( style: TextStyle(
......
lib/login.dart
View file @ b4eb8f7b
...@@ -192,7 +192,7 @@ class _LoginPage extends State<LoginPage> { ...@@ -192,7 +192,7 @@ class _LoginPage extends State<LoginPage> {
} else { } else {
AwesomeDialog( AwesomeDialog(
context: context, context: context,
dialogType: DialogType.info, dialogType: DialogType.success,
animType: AnimType.rightSlide, animType: AnimType.rightSlide,
title: ' login Parent', title: ' login Parent',
desc: ' Go to your parent home page', desc: ' Go to your parent home page',
......
lib/parentHome.dart
View file @ b4eb8f7b
...@@ -186,7 +186,7 @@ class ParentHomePage extends StatelessWidget { ...@@ -186,7 +186,7 @@ class ParentHomePage extends StatelessWidget {
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: (context) => builder: (context) =>
pChildrenProfilePage(document, "P"), pChildrenProfilePage(document, "P", pUser: 'user',),
), ),
); );
}, },
...@@ -253,7 +253,6 @@ class ParentHomePage extends StatelessWidget { ...@@ -253,7 +253,6 @@ class ParentHomePage extends StatelessWidget {
context, context,
MaterialPageRoute(builder: (context) => GamesPage()), MaterialPageRoute(builder: (context) => GamesPage()),
); );
break; break;
case 3: case 3:
// Navigate to Profile // Navigate to Profile
......
lib/parentProfile.dart
View file @ b4eb8f7b
...@@ -2,6 +2,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; ...@@ -2,6 +2,7 @@ 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/ChatScreen.dart';
import 'package:mobile_application_kids/games.dart';
import 'package:mobile_application_kids/p_or_t.dart'; import 'package:mobile_application_kids/p_or_t.dart';
import 'package:mobile_application_kids/parenthome.dart'; import 'package:mobile_application_kids/parenthome.dart';
...@@ -169,25 +170,46 @@ class _ParentProfilePageState extends State<ParentProfilePage> { ...@@ -169,25 +170,46 @@ class _ParentProfilePageState extends State<ParentProfilePage> {
icon: Icon(Icons.chat), icon: Icon(Icons.chat),
label: 'Chat', label: 'Chat',
), ),
BottomNavigationBarItem(
icon: Icon(Icons.sports_baseball),
label: 'Games',
),
BottomNavigationBarItem( BottomNavigationBarItem(
icon: Icon(Icons.person), icon: Icon(Icons.person),
label: 'Profile', label: 'Profile',
), ),
], ],
selectedItemColor: Colors.blue, selectedItemColor: Colors.blueAccent,
currentIndex: 2, unselectedItemColor: Colors.grey,
currentIndex: 3,
onTap: (index) { onTap: (index) {
if (index == 0) { switch (index) {
case 0:
// Navigate to Home
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => ParentHomePage(phoneNo, role)), MaterialPageRoute(builder: (context) => ParentHomePage(phoneNo, role)),
); );
} break;
if (index == 1) { case 1:
// Navigate to Chat
Navigator.push( Navigator.push(
context, context,
MaterialPageRoute(builder: (context) => ChatScreen()), MaterialPageRoute(builder: (context) => ChatScreen()),
); );
break;
case 2:
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => GamesPage(),
),
);
break;
case 3:
// Navigate to Profile
// Do nothing, we are already on the Games page
break;
} }
}, },
), ),
......
lib/parentSignUp.dart
View file @ b4eb8f7b
...@@ -32,7 +32,23 @@ class _ParentSignupPageState extends State<ParentSignupPage> { ...@@ -32,7 +32,23 @@ class _ParentSignupPageState extends State<ParentSignupPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Parent Signup'), title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text('Parent Register',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
...@@ -73,15 +89,39 @@ class _ParentSignupPageState extends State<ParentSignupPage> { ...@@ -73,15 +89,39 @@ class _ParentSignupPageState extends State<ParentSignupPage> {
obscureText: true, obscureText: true,
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
ElevatedButton( Center(
child: ElevatedButton(
onPressed: () { onPressed: () {
// Logic to navigate to the next page with additional information // Logic to navigate to the next page with additional information
signUp(emailController.text, passwordController.text, 'parent', context);
signUp(emailController.text, passwordController.text,
'parent', context);
}, },
child: Text('Finish'), style: ElevatedButton.styleFrom(
primary: Color.fromARGB(255, 48, 206, 53), // Note: 'const' was removed for consistency
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
), ),
child: Padding(
padding: EdgeInsets.all(12.0), // Note: 'const' was removed for consistency
child: Text(
'Finish',
style: TextStyle(
color: Color.fromARGB(255, 255, 255, 255), // Note: 'const' was removed for consistency
),
),
),
),
)
// ElevatedButton(
// onPressed: () {
// // Logic to navigate to the next page with additional information
// signUp(emailController.text, passwordController.text,
// 'parent', context);
// },
// child: Text('Finish'),
// ),
], ],
), ),
), ),
......
lib/teacherhome.dart
View file @ b4eb8f7b
...@@ -148,6 +148,7 @@ class TeacherHomePage extends StatelessWidget { ...@@ -148,6 +148,7 @@ class TeacherHomePage extends StatelessWidget {
itemBuilder: (context, index) { itemBuilder: (context, index) {
var document = snapshot.data!.docs[index]; var document = snapshot.data!.docs[index];
var className = document['className']; var className = document['className'];
print(document); print(document);
return Padding( return Padding(
padding: const EdgeInsets.only( padding: const EdgeInsets.only(
...@@ -173,7 +174,7 @@ class TeacherHomePage extends StatelessWidget { ...@@ -173,7 +174,7 @@ class TeacherHomePage extends StatelessWidget {
Row( Row(
children: [ children: [
Text( Text(
'Class $index', 'Class ${index + 1}',
style: poppinsTextStyle.copyWith( style: poppinsTextStyle.copyWith(
fontSize: 14.0), fontSize: 14.0),
), ),
......
lib/teachersignup.dart
View file @ b4eb8f7b
...@@ -30,7 +30,23 @@ class _TeacherSignupPageState extends State<TeacherSignupPage> { ...@@ -30,7 +30,23 @@ class _TeacherSignupPageState extends State<TeacherSignupPage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Teacher Signup'), title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text('Teacher Register',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Column( child: Column(
...@@ -71,7 +87,8 @@ class _TeacherSignupPageState extends State<TeacherSignupPage> { ...@@ -71,7 +87,8 @@ class _TeacherSignupPageState extends State<TeacherSignupPage> {
obscureText: true, obscureText: true,
), ),
const SizedBox(height: 20), const SizedBox(height: 20),
ElevatedButton( Center(
child:ElevatedButton(
onPressed: () { onPressed: () {
// Logic to navigate to the next page with additional information // Logic to navigate to the next page with additional information
Navigator.push( Navigator.push(
...@@ -87,8 +104,20 @@ class _TeacherSignupPageState extends State<TeacherSignupPage> { ...@@ -87,8 +104,20 @@ class _TeacherSignupPageState extends State<TeacherSignupPage> {
), ),
); );
}, },
child: Text('Next'), style: ElevatedButton.styleFrom(
primary: Color.fromARGB(255, 48, 206, 53), // Green background color
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0), // Rounded corners
),
padding: EdgeInsets.all(12.0), // Padding inside the button
), ),
child: Text(
'Next',
style: TextStyle(
color: Color.fromARGB(255, 255, 255, 255), // White text color
),
),
),),
], ],
), ),
), ),
...@@ -157,7 +186,23 @@ class AdditionalInfoPage extends StatelessWidget { ...@@ -157,7 +186,23 @@ class AdditionalInfoPage extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: Text('Additional Information'), title: Text(' '),
actions: [
Container(
alignment: Alignment.centerRight,
padding: EdgeInsets.only(right: 16),
child: Text('Additional Information',
style: TextStyle(
color: Color(0xFF554994),
fontSize: 24,
fontFamily: 'Poppins',
fontWeight: FontWeight.w700,
height: 0.04,
letterSpacing: -0.96,
),
),
),
],
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
...@@ -200,20 +245,38 @@ class AdditionalInfoPage extends StatelessWidget { ...@@ -200,20 +245,38 @@ class AdditionalInfoPage extends StatelessWidget {
// }, // },
// ), // ),
Text( Text(
'By checking the box you agree to our Terms and Conditions.', 'By finishing the form you agree to our Terms and Conditions.',
style: TextStyle(fontSize: 12), style: TextStyle(fontSize: 12),
), ),
], ],
), ),
const SizedBox(height: 20), const SizedBox(height: 12),
ElevatedButton( Align(
alignment: Alignment.center, // Align the button to the right
child: Container(
height: 48.0, // Reduced height
child: ElevatedButton(
onPressed: () { onPressed: () {
// Logic to finish the teacher registration // Logic to finish the teacher registration
signUp(emailController.text, passwordController.text, rool, signUp(emailController.text, passwordController.text, rool, context);
context);
}, },
child: Text('Finish'), style: ElevatedButton.styleFrom(
primary: Color.fromARGB(255, 48, 206, 53), // Green background color
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0), // Rounded corners
),
padding: EdgeInsets.symmetric(horizontal: 10.0), // Reduced padding
),
child: Text(
'Finish',
style: TextStyle(
color: Color.fromARGB(255, 255, 255, 255), // White text color
fontSize: 14, // Reduced font size to accommodate the reduced button height
),
),
),
), ),
)
], ],
), ),
), ),
......
pubspec.lock
View file @ b4eb8f7b
...@@ -57,6 +57,14 @@ packages: ...@@ -57,6 +57,14 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.1.1" version: "1.1.1"
carousel_slider:
dependency: "direct main"
description:
name: carousel_slider
sha256: "9c695cc963bf1d04a47bd6021f68befce8970bcd61d24938e1fb0918cf5d9c42"
url: "https://pub.dev"
source: hosted
version: "4.2.1"
characters: characters:
dependency: transitive dependency: transitive
description: description:
...@@ -417,7 +425,7 @@ packages: ...@@ -417,7 +425,7 @@ packages:
source: hosted source: hosted
version: "0.2.1+1" version: "0.2.1+1"
intl: intl:
dependency: transitive dependency: "direct main"
description: description:
name: intl name: intl
sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
......
pubspec.yaml
View file @ b4eb8f7b
...@@ -47,7 +47,9 @@ dependencies: ...@@ -47,7 +47,9 @@ 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 table_calendar: ^3.0.3
carousel_slider: ^4.0.0
intl: ^0.17.0
dev_dependencies: dev_dependencies:
...@@ -99,6 +101,13 @@ flutter: ...@@ -99,6 +101,13 @@ flutter:
- lib/assets/banner.png - lib/assets/banner.png
- lib/assets/ac6.png - lib/assets/ac6.png
- lib/assets/ac7.png - lib/assets/ac7.png
- lib/assets/parentprofile.JPG
- lib/assets/parentprof.PNG
- lib/assets/teacherprof.png
- lib/assets/I.png
- lib/assets/i2.png
- lib/assets/act_photo.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