yaso_meth/mih-project
2
4
Fork 2
Code Issues 8 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Theme Switcher added to drawers all files updated

Browse Source
This commit is contained in:
yaso-meth
2024-07-10 15:58:37 +02:00
parent c1493012c9
commit f227af0d81
31 changed files with 1127 additions and 722 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Frontend/patient_manager/lib/components/buildFilesList.dart
View File

@@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/components/BuildFileView.dart'; import 'package:patient_manager/components/BuildFileView.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/files.dart'; import 'package:patient_manager/objects/files.dart';
import 'package:patient_manager/theme/mihTheme.dart';
//import 'dart:js' as js; //import 'dart:js' as js;
import "package:universal_html/html.dart" as html; import "package:universal_html/html.dart" as html;
@@ -32,10 +32,12 @@ class _BuildFilesListState extends State<BuildFilesList> {
width: 800.0, width: 800.0,
//height: 475.0, //height: 475.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 5.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -44,7 +46,9 @@ class _BuildFilesListState extends State<BuildFilesList> {
filename, filename,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 35.0, fontSize: 35.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -62,8 +66,11 @@ class _BuildFilesListState extends State<BuildFilesList> {
'http://localhost:9000/mih/$filename', 'download'); 'http://localhost:9000/mih/$filename', 'download');
}, },
buttonText: "Dowload", buttonText: "Dowload",
buttonColor: MyTheme().secondaryColor(), buttonColor: MzanziInnovationHub.of(context)!
textColor: MyTheme().primaryColor(), .theme
.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
) )
], ],
@@ -80,7 +87,7 @@ class _BuildFilesListState extends State<BuildFilesList> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -100,7 +107,7 @@ class _BuildFilesListState extends State<BuildFilesList> {
shrinkWrap: true, shrinkWrap: true,
separatorBuilder: (BuildContext context, int index) { separatorBuilder: (BuildContext context, int index) {
return Divider( return Divider(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
); );
}, },
itemCount: widget.files.length, itemCount: widget.files.length,
@@ -109,18 +116,20 @@ class _BuildFilesListState extends State<BuildFilesList> {
title: Text( title: Text(
widget.files[index].file_name, widget.files[index].file_name,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
subtitle: Text( subtitle: Text(
widget.files[index].insert_date, widget.files[index].insert_date,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
trailing: Icon( trailing: Icon(
Icons.arrow_forward, Icons.arrow_forward,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
onTap: () { onTap: () {
viewFilePopUp(widget.files[index].file_name); viewFilePopUp(widget.files[index].file_name);

10
Frontend/patient_manager/lib/components/buildMedList.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/medicine.dart'; import 'package:patient_manager/objects/medicine.dart';
import 'package:patient_manager/theme/mihTheme.dart';
class BuildMedicinesList extends StatefulWidget { class BuildMedicinesList extends StatefulWidget {
final TextEditingController contoller; final TextEditingController contoller;
@@ -26,7 +26,7 @@ class _BuildMedicinesListState extends State<BuildMedicinesList> {
return ListView.separated( return ListView.separated(
separatorBuilder: (BuildContext context, int index) { separatorBuilder: (BuildContext context, int index) {
return Divider( return Divider(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
); );
}, },
itemCount: widget.medicines.length, itemCount: widget.medicines.length,
@@ -36,13 +36,13 @@ class _BuildMedicinesListState extends State<BuildMedicinesList> {
title: Text( title: Text(
widget.medicines[index].name, widget.medicines[index].name,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
subtitle: Text( subtitle: Text(
"${widget.medicines[index].unit} - ${widget.medicines[index].form}", "${widget.medicines[index].unit} - ${widget.medicines[index].form}",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
onTap: () { onTap: () {
@@ -54,7 +54,7 @@ class _BuildMedicinesListState extends State<BuildMedicinesList> {
}, },
trailing: Icon( trailing: Icon(
Icons.arrow_forward, Icons.arrow_forward,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
); );
}, },

26
Frontend/patient_manager/lib/components/buildNotesList.dart
View File

@@ -1,8 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/components/myMLTextInput.dart'; import 'package:patient_manager/components/myMLTextInput.dart';
import 'package:patient_manager/main.dart';
//import 'package:patient_manager/components/mybutton.dart'; //import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/objects/notes.dart'; import 'package:patient_manager/objects/notes.dart';
import 'package:patient_manager/theme/mihTheme.dart';
class BuildNotesList extends StatefulWidget { class BuildNotesList extends StatefulWidget {
final List<Note> notes; final List<Note> notes;
@@ -34,10 +34,12 @@ class _BuildNotesListState extends State<BuildNotesList> {
width: 700.0, width: 700.0,
//height: 475.0, //height: 475.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 5.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: Column( child: Column(
//mainAxisSize: MainAxisSize.max, //mainAxisSize: MainAxisSize.max,
@@ -46,7 +48,9 @@ class _BuildNotesListState extends State<BuildNotesList> {
title, title,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 35.0, fontSize: 35.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -87,7 +91,7 @@ class _BuildNotesListState extends State<BuildNotesList> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -107,7 +111,7 @@ class _BuildNotesListState extends State<BuildNotesList> {
shrinkWrap: true, shrinkWrap: true,
separatorBuilder: (BuildContext context, int index) { separatorBuilder: (BuildContext context, int index) {
return Divider( return Divider(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
); );
}, },
itemCount: widget.notes.length, itemCount: widget.notes.length,
@@ -116,18 +120,20 @@ class _BuildNotesListState extends State<BuildNotesList> {
title: Text( title: Text(
widget.notes[index].note_name, widget.notes[index].note_name,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
subtitle: Text( subtitle: Text(
"${widget.notes[index].insert_date}:\n${widget.notes[index].note_text}", "${widget.notes[index].insert_date}:\n${widget.notes[index].note_text}",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), //Text(widget.notes[index].note_text), ), //Text(widget.notes[index].note_text),
trailing: Icon( trailing: Icon(
Icons.arrow_forward, Icons.arrow_forward,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
onTap: () { onTap: () {
viewNotePopUp(widget.notes[index].note_name, viewNotePopUp(widget.notes[index].note_name,

14
Frontend/patient_manager/lib/components/buildPatientList.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/patients.dart'; import 'package:patient_manager/objects/patients.dart';
import 'package:patient_manager/theme/mihTheme.dart';
class BuildPatientsList extends StatefulWidget { class BuildPatientsList extends StatefulWidget {
final List<Patient> patients; final List<Patient> patients;
@@ -24,12 +24,12 @@ class _BuildPatientsListState extends State<BuildPatientsList> {
children: [ children: [
Icon( Icon(
Icons.star_border_rounded, Icons.star_border_rounded,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
Text( Text(
"${widget.patients[index].first_name} ${widget.patients[index].last_name}", "${widget.patients[index].first_name} ${widget.patients[index].last_name}",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
], ],
@@ -38,7 +38,7 @@ class _BuildPatientsListState extends State<BuildPatientsList> {
return Text( return Text(
"${widget.patients[index].first_name} ${widget.patients[index].last_name}", "${widget.patients[index].first_name} ${widget.patients[index].last_name}",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
); );
} }
@@ -49,7 +49,7 @@ class _BuildPatientsListState extends State<BuildPatientsList> {
return ListView.separated( return ListView.separated(
separatorBuilder: (BuildContext context, index) { separatorBuilder: (BuildContext context, index) {
return Divider( return Divider(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
); );
}, },
itemCount: widget.patients.length, itemCount: widget.patients.length,
@@ -61,7 +61,7 @@ class _BuildPatientsListState extends State<BuildPatientsList> {
subtitle: Text( subtitle: Text(
"ID No.: ${widget.patients[index].id_no}\nMedical Aid No.: ${widget.patients[index].medical_aid_no}", "ID No.: ${widget.patients[index].id_no}\nMedical Aid No.: ${widget.patients[index].medical_aid_no}",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
onTap: () { onTap: () {
@@ -72,7 +72,7 @@ class _BuildPatientsListState extends State<BuildPatientsList> {
}, },
trailing: Icon( trailing: Icon(
Icons.arrow_forward, Icons.arrow_forward,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
); );
}, },

49
Frontend/patient_manager/lib/components/homeAppDrawer.dart
View File

@@ -1,7 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:patient_manager/main.dart'; import 'package:patient_manager/main.dart';
import 'package:patient_manager/theme/mihTheme.dart';
class HomeAppDrawer extends StatefulWidget { class HomeAppDrawer extends StatefulWidget {
final String userEmail; final String userEmail;
@@ -15,18 +13,22 @@ class HomeAppDrawer extends StatefulWidget {
class _HomeAppDrawerState extends State<HomeAppDrawer> { class _HomeAppDrawerState extends State<HomeAppDrawer> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
//print(MzanziInnovationHub.of(context)?.theme.mode);
return Drawer( return Drawer(
backgroundColor: MyTheme().primaryColor(), //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
child: ListView( child: Stack(children: [
ListView(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
children: [ children: [
DrawerHeader( DrawerHeader(
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
child: Text( child: Text(
widget.userEmail, widget.userEmail,
style: TextStyle(color: MyTheme().primaryColor()), style: TextStyle(
color:
MzanziInnovationHub.of(context)!.theme.primaryColor()),
), ),
), ),
ListTile( ListTile(
@@ -34,12 +36,16 @@ class _HomeAppDrawerState extends State<HomeAppDrawer> {
children: [ children: [
Icon( Icon(
Icons.logout, Icons.logout,
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
SizedBox(width: 25.0), SizedBox(width: 25.0),
Text( Text(
"Sign Out", "Sign Out",
style: TextStyle(color: MyTheme().secondaryColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor()),
), ),
], ],
), ),
@@ -50,6 +56,33 @@ class _HomeAppDrawerState extends State<HomeAppDrawer> {
) )
], ],
), ),
Positioned(
top: 1,
right: 1,
width: 50,
height: 50,
child: IconButton(
onPressed: () {
setState(() {
if (MzanziInnovationHub.of(context)?.theme.mode == "Dark") {
//darkm = !darkm;
MzanziInnovationHub.of(context)!.changeTheme(ThemeMode.light);
//print("Dark Mode: $darkm");
} else {
//darkm = !darkm;
MzanziInnovationHub.of(context)!.changeTheme(ThemeMode.dark);
//print("Dark Mode: $darkm");
}
});
},
icon: Icon(
Icons.light_mode,
color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
size: 35,
),
),
),
]),
); );
} }
} }

29
Frontend/patient_manager/lib/components/homeTile.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class HomeTile extends StatefulWidget { class HomeTile extends StatefulWidget {
final String tileName; final String tileName;
@@ -26,8 +26,8 @@ class _HomeTileState extends State<HomeTile> {
@override @override
void initState() { void initState() {
mainC = MyTheme().secondaryColor(); mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
secondC = MyTheme().primaryColor(); secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
super.initState(); super.initState();
} }
@@ -41,14 +41,15 @@ class _HomeTileState extends State<HomeTile> {
onTap: widget.onTap, onTap: widget.onTap,
onTapDown: (_) { onTapDown: (_) {
setState(() { setState(() {
mainC = MyTheme().primaryColor(); mainC = MzanziInnovationHub.of(context)!.theme.primaryColor();
secondC = MyTheme().secondaryColor(); secondC =
MzanziInnovationHub.of(context)!.theme.secondaryColor();
}); });
}, },
onTapUp: (_) { onTapUp: (_) {
setState(() { setState(() {
mainC = MyTheme().secondaryColor(); mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
secondC = MyTheme().primaryColor(); secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
}); });
}, },
child: Container( child: Container(
@@ -56,7 +57,7 @@ class _HomeTileState extends State<HomeTile> {
decoration: BoxDecoration( decoration: BoxDecoration(
color: mainC, color: mainC,
borderRadius: BorderRadius.circular(10.0), borderRadius: BorderRadius.circular(10.0),
//border: Border.all(color: MyTheme().secondaryColor(), width: 1.0), //border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0),
), ),
child: Icon( child: Icon(
widget.tileIcon, widget.tileIcon,
@@ -69,7 +70,7 @@ class _HomeTileState extends State<HomeTile> {
widget.tileName, widget.tileName,
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontSize: 5.0, fontSize: 5.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -83,7 +84,7 @@ class _HomeTileState extends State<HomeTile> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return displayTile(); return displayTile();
// child: Card( // child: Card(
// color: MyTheme().secondaryColor(), // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
// elevation: 20, // elevation: 20,
// child: Column( // child: Column(
// //mainAxisSize: MainAxisSize.min, // //mainAxisSize: MainAxisSize.min,
@@ -92,18 +93,18 @@ class _HomeTileState extends State<HomeTile> {
// child: ListTile( // child: ListTile(
// leading: Icon( // leading: Icon(
// widget.tileIcon, // widget.tileIcon,
// color: MyTheme().primaryColor(), // color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
// ), // ),
// title: Text( // title: Text(
// widget.tileName, // widget.tileName,
// style: TextStyle( // style: TextStyle(
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
// color: MyTheme().primaryColor(), // color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
// ), // ),
// ), // ),
// subtitle: Text( // subtitle: Text(
// widget.tileDescription, // widget.tileDescription,
// style: TextStyle(color: MyTheme().primaryColor()), // style: TextStyle(color: MzanziInnovationHub.of(context)!.theme.primaryColor()),
// )), // )),
// ), // ),
// Expanded( // Expanded(
@@ -114,7 +115,7 @@ class _HomeTileState extends State<HomeTile> {
// padding: const EdgeInsets.symmetric(horizontal: 10), // padding: const EdgeInsets.symmetric(horizontal: 10),
// child: Icon( // child: Icon(
// Icons.arrow_forward, // Icons.arrow_forward,
// color: MyTheme().secondaryColor(), // color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
// ), // ),
// ), // ),
// ], // ],

12
Frontend/patient_manager/lib/components/medicineSearch.dart
View File

@@ -3,9 +3,9 @@ import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/components/buildMedList.dart'; import 'package:patient_manager/components/buildMedList.dart';
import 'package:patient_manager/components/myErrorMessage.dart'; import 'package:patient_manager/components/myErrorMessage.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/medicine.dart'; import 'package:patient_manager/objects/medicine.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:patient_manager/theme/mihTheme.dart';
class MedicineSearch extends StatefulWidget { class MedicineSearch extends StatefulWidget {
final TextEditingController searchVlaue; final TextEditingController searchVlaue;
@@ -66,9 +66,12 @@ class _MedicineSearchState extends State<MedicineSearch> {
width: 700.0, width: 700.0,
//height: 475.0, //height: 475.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().secondaryColor(), width: 5.0), border: Border.all(
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@@ -79,7 +82,8 @@ class _MedicineSearchState extends State<MedicineSearch> {
"Select Medicine", "Select Medicine",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontSize: 35.0, fontSize: 35.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),

21
Frontend/patient_manager/lib/components/myAppBar.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MyAppBar extends StatelessWidget implements PreferredSizeWidget { class MyAppBar extends StatelessWidget implements PreferredSizeWidget {
@override @override
@@ -12,27 +12,10 @@ class MyAppBar extends StatelessWidget implements PreferredSizeWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppBar( return AppBar(
//backgroundColor: Colors.blueAccent,
elevation: 8, elevation: 8,
shadowColor: MyTheme().secondaryColor(), shadowColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
iconTheme: IconThemeData(color: MyTheme().primaryColor()),
// actions: [
// IconButton(
// onPressed: () {
// client.auth.signOut();
// Navigator.of(context).pushNamed('/');
// },
// icon: const Icon(Icons.logout),
// iconSize: 35,
// color: Colors.black,
// ),
// ],
title: Text( title: Text(
barTitle, barTitle,
style: TextStyle(
fontWeight: FontWeight.bold,
color: MyTheme().primaryColor(),
),
), ),
centerTitle: true, centerTitle: true,
); );

31
Frontend/patient_manager/lib/components/myDateInput.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MyDateField extends StatefulWidget { class MyDateField extends StatefulWidget {
final controller; final controller;
@@ -43,18 +43,22 @@ class _MyDateFieldState extends State<MyDateField> {
children: [ children: [
Text( Text(
"*", "*",
style: TextStyle(color: MyTheme().errorColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.errorColor()),
), ),
const SizedBox( const SizedBox(
width: 8.0, width: 8.0,
), ),
Text(widget.LableText, Text(widget.LableText,
style: TextStyle(color: MyTheme().secondaryColor())), style: TextStyle(
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor())),
], ],
); );
} else { } else {
return Text(widget.LableText, return Text(widget.LableText,
style: TextStyle(color: MyTheme().secondaryColor())); style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
} }
} }
@@ -89,7 +93,8 @@ class _MyDateFieldState extends State<MyDateField> {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(horizontal: 25.0), padding: const EdgeInsets.symmetric(horizontal: 25.0),
child: TextField( child: TextField(
style: TextStyle(color: MyTheme().secondaryColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
controller: widget.controller, controller: widget.controller,
readOnly: true, readOnly: true,
obscureText: false, obscureText: false,
@@ -100,38 +105,40 @@ class _MyDateFieldState extends State<MyDateField> {
decoration: InputDecoration( decoration: InputDecoration(
errorText: _errorText, errorText: _errorText,
errorStyle: TextStyle( errorStyle: TextStyle(
color: MyTheme().errorColor(), fontWeight: FontWeight.bold), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fontWeight: FontWeight.bold),
label: setRequiredText(), label: setRequiredText(),
//labelText: widget.LableText, //labelText: widget.LableText,
//labelStyle: const TextStyle(color: Colors.blueAccent), //labelStyle: const TextStyle(color: Colors.blueAccent),
prefixIcon: Icon( prefixIcon: Icon(
Icons.calendar_today, Icons.calendar_today,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
fillColor: MyTheme().primaryColor(), fillColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
filled: true, filled: true,
//hintText: hintText, //hintText: hintText,
//hintStyle: TextStyle(color: Colors.blueGrey[400]), //hintStyle: TextStyle(color: Colors.blueGrey[400]),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: MyTheme().secondaryColor()), borderSide: BorderSide(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
), ),
), ),
onTap: () { onTap: () {

50
Frontend/patient_manager/lib/components/myDropdownInput.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MyDropdownField extends StatefulWidget { class MyDropdownField extends StatefulWidget {
final TextEditingController controller; final TextEditingController controller;
@@ -35,18 +35,22 @@ class _MyDropdownFieldState extends State<MyDropdownField> {
children: [ children: [
Text( Text(
"*", "*",
style: TextStyle(color: MyTheme().errorColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.errorColor()),
), ),
const SizedBox( const SizedBox(
width: 8.0, width: 8.0,
), ),
Text(widget.hintText, Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())), style: TextStyle(
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor())),
], ],
); );
} else { } else {
return Text(widget.hintText, return Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())); style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
} }
} }
@@ -77,8 +81,8 @@ class _MyDropdownFieldState extends State<MyDropdownField> {
value: i, value: i,
label: i, label: i,
style: ButtonStyle( style: ButtonStyle(
foregroundColor: foregroundColor: WidgetStatePropertyAll(
WidgetStatePropertyAll(MyTheme().secondaryColor())))); MzanziInnovationHub.of(context)!.theme.secondaryColor()))));
} }
return menueList; return menueList;
} }
@@ -98,13 +102,14 @@ class _MyDropdownFieldState extends State<MyDropdownField> {
child: DropdownMenu( child: DropdownMenu(
trailingIcon: Icon( trailingIcon: Icon(
Icons.arrow_drop_down, Icons.arrow_drop_down,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
selectedTrailingIcon: Icon( selectedTrailingIcon: Icon(
Icons.arrow_drop_up, Icons.arrow_drop_up,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
textStyle: TextStyle(color: MyTheme().secondaryColor()), textStyle: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
menuHeight: 300, menuHeight: 300,
controller: widget.controller, controller: widget.controller,
expandedInsets: EdgeInsets.zero, expandedInsets: EdgeInsets.zero,
@@ -124,42 +129,49 @@ class _MyDropdownFieldState extends State<MyDropdownField> {
}, },
icon: Icon( icon: Icon(
Icons.delete_outline_rounded, Icons.delete_outline_rounded,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
menuStyle: MenuStyle( menuStyle: MenuStyle(
backgroundColor: WidgetStatePropertyAll(MyTheme().primaryColor()), backgroundColor: WidgetStatePropertyAll(
MzanziInnovationHub.of(context)!.theme.primaryColor()),
side: WidgetStatePropertyAll( side: WidgetStatePropertyAll(
BorderSide(color: MyTheme().secondaryColor(), width: 2.0), BorderSide(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 2.0),
), ),
), ),
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
filled: true, filled: true,
errorStyle: TextStyle( errorStyle: TextStyle(
color: MyTheme().errorColor(), fontWeight: FontWeight.bold), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fillColor: MyTheme().primaryColor(), fontWeight: FontWeight.bold),
fillColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: MyTheme().secondaryColor())), borderSide: BorderSide(
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor())),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 2.0, width: 2.0,
), ),
), ),
outlineBorder: BorderSide(color: MyTheme().secondaryColor()), outlineBorder: BorderSide(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
), ),
dropdownMenuEntries: menu, dropdownMenuEntries: menu,
// const <DropdownMenuEntry<String>>[ // const <DropdownMenuEntry<String>>[

129
Frontend/patient_manager/lib/components/myErrorMessage.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MyErrorMessage extends StatefulWidget { class MyErrorMessage extends StatefulWidget {
final String errorType; final String errorType;
@@ -14,33 +14,39 @@ class MyErrorMessage extends StatefulWidget {
class _MyErrorMessageState extends State<MyErrorMessage> { class _MyErrorMessageState extends State<MyErrorMessage> {
var messageTypes = <String, Widget>{}; var messageTypes = <String, Widget>{};
// late double width = 50;
// late double height = 50;
Size? size;
void setInputError() { void setInputError() {
messageTypes["Input Error"] = Stack( messageTypes["Input Error"] = Stack(
children: [ children: [
Container( Container(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
width: 500.0, width: 500,
height: 375.0, height: 450,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().errorColor(), width: 5.0), border: Border.all(
color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 5.0),
), ),
child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Icon( Icon(
Icons.warning_amber_rounded, Icons.warning_amber_rounded,
size: 100, size: 100,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
), ),
const SizedBox(height: 15), const SizedBox(height: 15),
Text( Text(
"Oops! Looks like some fields are missing.", "Oops! Looks like some fields are missing.",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fontSize: 25.0, fontSize: 25.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -51,7 +57,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
child: Text( child: Text(
"We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.", "We noticed that some required fields are still empty. To ensure your request is processed smoothly, please fill out all the highlighted fields before submitting the form again.",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -63,7 +71,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
child: RichText( child: RichText(
text: TextSpan( text: TextSpan(
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -72,12 +82,17 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
text: "Here's a quick tip: ", text: "Here's a quick tip: ",
style: TextStyle( style: TextStyle(
fontStyle: FontStyle.italic, fontStyle: FontStyle.italic,
color: MyTheme().errorColor())), color: MzanziInnovationHub.of(context)!
.theme
.errorColor())),
const TextSpan( const TextSpan(
text: "Look for fields with an asterisk ("), text: "Look for fields with an asterisk ("),
TextSpan( TextSpan(
text: "*", text: "*",
style: TextStyle(color: MyTheme().errorColor())), style: TextStyle(
color: MzanziInnovationHub.of(context)!
.theme
.errorColor())),
const TextSpan( const TextSpan(
text: ") next to them, as these are mandatory."), text: ") next to them, as these are mandatory."),
], ],
@@ -87,6 +102,7 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
], ],
), ),
), ),
),
Positioned( Positioned(
top: 5, top: 5,
right: 5, right: 5,
@@ -98,7 +114,7 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -112,27 +128,30 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
children: [ children: [
Container( Container(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
width: 500.0, width: 500,
height: 450.0, height: 450,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().errorColor(), width: 5.0), border: Border.all(
color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 5.0),
), ),
child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Icon( Icon(
Icons.warning_amber_rounded, Icons.warning_amber_rounded,
size: 100, size: 100,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
), ),
SizedBox(height: 15), SizedBox(height: 15),
Text( Text(
"Uh oh! Login attempt unsuccessful.", "Uh oh! Login attempt unsuccessful.",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fontSize: 25.0, fontSize: 25.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -143,7 +162,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
child: Text( child: Text(
"The email address or password you entered doesn't seem to match our records. Please double-check your information and try again.", "The email address or password you entered doesn't seem to match our records. Please double-check your information and try again.",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -155,7 +176,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
child: Text( child: Text(
"Here are some things to keep in mind:", "Here are some things to keep in mind:",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 20.0, fontSize: 20.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -168,7 +191,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
"1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.", "1) Are you sure you're using the correct email address associated with your account?\n2) Is your caps lock key on? Passwords are case-sensitive.\n3) If you've forgotten your password, no worries! Click on \"Forgot Password?\" to reset it.",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -177,6 +202,7 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
], ],
), ),
), ),
),
Positioned( Positioned(
top: 5, top: 5,
right: 5, right: 5,
@@ -188,7 +214,7 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -202,27 +228,30 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
children: [ children: [
Container( Container(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
width: 500.0, width: 500,
height: 450.0, height: 450,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().errorColor(), width: 5.0), border: Border.all(
color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 5.0),
), ),
child: SingleChildScrollView(
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Icon( Icon(
Icons.warning_amber_rounded, Icons.warning_amber_rounded,
size: 100, size: 100,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
), ),
const SizedBox(height: 15), const SizedBox(height: 15),
Text( Text(
"Internet Connection Lost!", "Internet Connection Lost!",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fontSize: 25.0, fontSize: 25.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -233,7 +262,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
child: Text( child: Text(
"We seem to be having some trouble connecting you to the internet. This could be due to a temporary outage or an issue with your device's connection.", "We seem to be having some trouble connecting you to the internet. This could be due to a temporary outage or an issue with your device's connection.",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -245,7 +276,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
child: Text( child: Text(
"Here are a few things you can try:", "Here are a few things you can try:",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 20.0, fontSize: 20.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -258,7 +291,9 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
"1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.", "1) Check your Wi-Fi signal strength or try connecting to a different network.\n2) Restart your device (computer, phone, etc.) and your router/modem.\n3) If you're using cellular data, ensure you have a strong signal and haven't reached your data limit.",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -267,6 +302,7 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
], ],
), ),
), ),
),
Positioned( Positioned(
top: 5, top: 5,
right: 5, right: 5,
@@ -278,7 +314,7 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -291,16 +327,31 @@ class _MyErrorMessageState extends State<MyErrorMessage> {
return messageTypes[type]; return messageTypes[type];
} }
@override // void initialiseSizes() {
void initState() {
setInputError(); // }
setinvalidCredError();
setInternetError(); // @override
super.initState(); // void initState() {
} // size = MediaQuery.of(context).size;
// setInputError();
// setinvalidCredError();
// setInternetError();
// //initialiseSizes();
// super.initState();
// }
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
size = MediaQuery.of(context).size;
setInputError();
setinvalidCredError();
setInternetError();
//print(size);
// setState(() {
// width = size.width;
// height = size.height;
// });
return Dialog(child: getErrorMessage(widget.errorType)); return Dialog(child: getErrorMessage(widget.errorType));
} }
} }

32
Frontend/patient_manager/lib/components/myMLTextInput.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MyMLTextField extends StatefulWidget { class MyMLTextField extends StatefulWidget {
final controller; final controller;
@@ -58,18 +58,22 @@ class _MyMLTextFieldState extends State<MyMLTextField> {
children: [ children: [
Text( Text(
"*", "*",
style: TextStyle(color: MyTheme().errorColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.errorColor()),
), ),
const SizedBox( const SizedBox(
width: 8.0, width: 8.0,
), ),
Text(widget.hintText, Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())), style: TextStyle(
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor())),
], ],
); );
} else { } else {
return Text(widget.hintText, return Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())); style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
} }
} }
@@ -84,7 +88,8 @@ class _MyMLTextFieldState extends State<MyMLTextField> {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(horizontal: 25.0), padding: const EdgeInsets.symmetric(horizontal: 25.0),
child: TextField( child: TextField(
style: TextStyle(color: MyTheme().secondaryColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
textAlign: TextAlign.start, textAlign: TextAlign.start,
textAlignVertical: TextAlignVertical.top, textAlignVertical: TextAlignVertical.top,
expands: true, expands: true,
@@ -100,33 +105,36 @@ class _MyMLTextFieldState extends State<MyMLTextField> {
label: setRequiredText(), label: setRequiredText(),
errorText: _errorText, errorText: _errorText,
errorStyle: TextStyle( errorStyle: TextStyle(
color: MyTheme().errorColor(), fontWeight: FontWeight.bold), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
labelStyle: TextStyle(color: MyTheme().secondaryColor()), fontWeight: FontWeight.bold),
labelStyle: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
alignLabelWithHint: true, alignLabelWithHint: true,
fillColor: MyTheme().primaryColor(), fillColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
filled: true, filled: true,
//hintText: hintText, //hintText: hintText,
//hintStyle: TextStyle(color: Colors.blueGrey[400]), //hintStyle: TextStyle(color: Colors.blueGrey[400]),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: MyTheme().secondaryColor()), borderSide: BorderSide(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
), ),
), ),
), ),

31
Frontend/patient_manager/lib/components/myPassInput.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MyPassField extends StatefulWidget { class MyPassField extends StatefulWidget {
final controller; final controller;
@@ -54,18 +54,22 @@ class _MyPassFieldState extends State<MyPassField> {
children: [ children: [
Text( Text(
"*", "*",
style: TextStyle(color: MyTheme().errorColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.errorColor()),
), ),
const SizedBox( const SizedBox(
width: 8.0, width: 8.0,
), ),
Text(widget.hintText, Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())), style: TextStyle(
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor())),
], ],
); );
} else { } else {
return Text(widget.hintText, return Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())); style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
} }
} }
@@ -87,42 +91,45 @@ class _MyPassFieldState extends State<MyPassField> {
padding: const EdgeInsets.symmetric(horizontal: 25.0), padding: const EdgeInsets.symmetric(horizontal: 25.0),
child: TextField( child: TextField(
controller: widget.controller, controller: widget.controller,
style: TextStyle(color: MyTheme().secondaryColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
obscureText: _obscured, obscureText: _obscured,
focusNode: textFieldFocusNode, focusNode: textFieldFocusNode,
onChanged: (_) => setState(() { onChanged: (_) => setState(() {
startup = false; startup = false;
}), }),
decoration: InputDecoration( decoration: InputDecoration(
fillColor: MyTheme().primaryColor(), fillColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
filled: true, filled: true,
label: setRequiredText(), label: setRequiredText(),
//labelStyle: const TextStyle(color: Colors.blueAccent), //labelStyle: const TextStyle(color: Colors.blueAccent),
errorText: _errorText, errorText: _errorText,
errorStyle: TextStyle( errorStyle: TextStyle(
color: MyTheme().errorColor(), fontWeight: FontWeight.bold), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fontWeight: FontWeight.bold),
//hintText: widget.hintText, //hintText: widget.hintText,
//hintStyle: TextStyle(color: Colors.blueGrey[400]), //hintStyle: TextStyle(color: Colors.blueGrey[400]),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: MyTheme().secondaryColor()), borderSide: BorderSide(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
), ),
suffixIcon: Padding( suffixIcon: Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 4, 0), padding: const EdgeInsets.fromLTRB(0, 0, 4, 0),
@@ -133,7 +140,7 @@ class _MyPassFieldState extends State<MyPassField> {
? Icons.visibility_rounded ? Icons.visibility_rounded
: Icons.visibility_off_rounded, : Icons.visibility_off_rounded,
size: 24, size: 24,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
), ),

31
Frontend/patient_manager/lib/components/mySearchInput.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MySearchField extends StatefulWidget { class MySearchField extends StatefulWidget {
final TextEditingController controller; final TextEditingController controller;
@@ -62,7 +62,8 @@ class _MySearchFieldState extends State<MySearchField> {
children: [ children: [
Text( Text(
"*", "*",
style: TextStyle(color: MyTheme().errorColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.errorColor()),
), ),
const SizedBox( const SizedBox(
width: 8.0, width: 8.0,
@@ -70,14 +71,15 @@ class _MySearchFieldState extends State<MySearchField> {
Text( Text(
widget.hintText, widget.hintText,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
], ],
); );
} else { } else {
return Text(widget.hintText, return Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())); style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
} }
} }
@@ -92,19 +94,20 @@ class _MySearchFieldState extends State<MySearchField> {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(horizontal: 25.0), padding: const EdgeInsets.symmetric(horizontal: 25.0),
child: TextField( child: TextField(
style: TextStyle(color: MyTheme().secondaryColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
onChanged: widget.onChanged, onChanged: widget.onChanged,
controller: widget.controller, controller: widget.controller,
//style: TextStyle(color: MyTheme().secondaryColor()), //style: TextStyle(color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
readOnly: makeEditable(), readOnly: makeEditable(),
focusNode: _focus, focusNode: _focus,
obscureText: false, obscureText: false,
decoration: InputDecoration( decoration: InputDecoration(
fillColor: MyTheme().primaryColor(), fillColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
prefixIcon: IconButton( prefixIcon: IconButton(
icon: Icon( icon: Icon(
Icons.search, Icons.search,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
onPressed: () { onPressed: () {
setState(() { setState(() {
@@ -119,27 +122,29 @@ class _MySearchFieldState extends State<MySearchField> {
label: setRequiredText(), label: setRequiredText(),
errorText: _errorText, errorText: _errorText,
errorStyle: TextStyle( errorStyle: TextStyle(
color: MyTheme().errorColor(), fontWeight: FontWeight.bold), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fontWeight: FontWeight.bold),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: MyTheme().secondaryColor()), borderSide: BorderSide(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
), ),
), ),
), ),

21
Frontend/patient_manager/lib/components/mySuccessMessage.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MySuccessMessage extends StatefulWidget { class MySuccessMessage extends StatefulWidget {
final String successType; final String successType;
@@ -27,9 +27,11 @@ class _MySuccessMessageState extends State<MySuccessMessage> {
width: 500.0, width: 500.0,
// height: 375.0, // height: 375.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().successColor(), width: 5.0), border: Border.all(
color: MzanziInnovationHub.of(context)!.theme.successColor(),
width: 5.0),
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -37,14 +39,14 @@ class _MySuccessMessageState extends State<MySuccessMessage> {
Icon( Icon(
Icons.check_circle_outline_rounded, Icons.check_circle_outline_rounded,
size: 100, size: 100,
color: MyTheme().successColor(), color: MzanziInnovationHub.of(context)!.theme.successColor(),
), ),
const SizedBox(height: 15), const SizedBox(height: 15),
Text( Text(
"Success!", "Success!",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().successColor(), color: MzanziInnovationHub.of(context)!.theme.successColor(),
fontSize: 25.0, fontSize: 25.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -55,7 +57,8 @@ class _MySuccessMessageState extends State<MySuccessMessage> {
child: Text( child: Text(
message, message,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -70,8 +73,10 @@ class _MySuccessMessageState extends State<MySuccessMessage> {
Navigator.pop(context); Navigator.pop(context);
}, },
buttonText: "Dismiss", buttonText: "Dismiss",
buttonColor: MyTheme().successColor(), buttonColor:
textColor: MyTheme().primaryColor(), MzanziInnovationHub.of(context)!.theme.successColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), ),
], ],

31
Frontend/patient_manager/lib/components/myTextInput.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class MyTextField extends StatefulWidget { class MyTextField extends StatefulWidget {
final controller; final controller;
@@ -58,18 +58,22 @@ class _MyTextFieldState extends State<MyTextField> {
children: [ children: [
Text( Text(
"*", "*",
style: TextStyle(color: MyTheme().errorColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.errorColor()),
), ),
const SizedBox( const SizedBox(
width: 8.0, width: 8.0,
), ),
Text(widget.hintText, Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())), style: TextStyle(
color:
MzanziInnovationHub.of(context)!.theme.secondaryColor())),
], ],
); );
} else { } else {
return Text(widget.hintText, return Text(widget.hintText,
style: TextStyle(color: MyTheme().secondaryColor())); style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()));
} }
} }
@@ -84,7 +88,8 @@ class _MyTextFieldState extends State<MyTextField> {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(horizontal: 25.0), padding: const EdgeInsets.symmetric(horizontal: 25.0),
child: TextField( child: TextField(
style: TextStyle(color: MyTheme().secondaryColor()), style: TextStyle(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
controller: widget.controller, controller: widget.controller,
focusNode: _focus, focusNode: _focus,
readOnly: makeEditable(), readOnly: makeEditable(),
@@ -94,35 +99,37 @@ class _MyTextFieldState extends State<MyTextField> {
}), }),
decoration: InputDecoration( decoration: InputDecoration(
label: setRequiredText(), label: setRequiredText(),
//labelStyle: TextStyle(color: MyTheme().primaryColor()), //labelStyle: TextStyle(color: MzanziInnovationHub.of(context)!.theme.primaryColor()),
fillColor: MyTheme().primaryColor(), fillColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
filled: true, filled: true,
errorText: _errorText, errorText: _errorText,
errorStyle: TextStyle( errorStyle: TextStyle(
color: MyTheme().errorColor(), fontWeight: FontWeight.bold), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
fontWeight: FontWeight.bold),
//errorBorder: const InputBorder(), //errorBorder: const InputBorder(),
//hintText: hintText, //hintText: hintText,
//hintStyle: TextStyle(color: Colors.blueGrey[400]), //hintStyle: TextStyle(color: Colors.blueGrey[400]),
enabledBorder: OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedErrorBorder: OutlineInputBorder( focusedErrorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
errorBorder: OutlineInputBorder( errorBorder: OutlineInputBorder(
borderSide: BorderSide( borderSide: BorderSide(
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
width: 2.0, width: 2.0,
), ),
), ),
focusedBorder: OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: MyTheme().secondaryColor()), borderSide: BorderSide(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
), ),
), ),
), ),

82
Frontend/patient_manager/lib/components/patManAppDrawer.dart
View File

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
import 'package:patient_manager/main.dart'; import 'package:patient_manager/main.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/appUser.dart';
import 'package:patient_manager/theme/mihTheme.dart';
class PatManAppDrawer extends StatefulWidget { class PatManAppDrawer extends StatefulWidget {
final String userEmail; final String userEmail;
@@ -45,13 +44,15 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
future: signedInUser, future: signedInUser,
builder: (BuildContext context, AsyncSnapshot<AppUser> snapshot) { builder: (BuildContext context, AsyncSnapshot<AppUser> snapshot) {
return Drawer( return Drawer(
backgroundColor: MyTheme().primaryColor(), //backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
child: ListView( child: Stack(children: [
ListView(
padding: EdgeInsets.zero, padding: EdgeInsets.zero,
children: [ children: [
DrawerHeader( DrawerHeader(
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
child: SizedBox( child: SizedBox(
height: 400, height: 400,
@@ -64,7 +65,9 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 20.0, fontSize: 20.0,
color: MyTheme().primaryColor()), color: MzanziInnovationHub.of(context)!
.theme
.primaryColor()),
), ),
const SizedBox( const SizedBox(
height: 50.0, height: 50.0,
@@ -76,7 +79,9 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
"Name: ", "Name: ",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
), ),
), ),
const SizedBox(width: 15), const SizedBox(width: 15),
@@ -84,7 +89,9 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
"${snapshot.data?.fname} ${snapshot.data?.lname}", "${snapshot.data?.fname} ${snapshot.data?.lname}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
), ),
), ),
], ],
@@ -96,7 +103,9 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
"Email: ", "Email: ",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
), ),
), ),
const SizedBox(width: 16), const SizedBox(width: 16),
@@ -104,7 +113,9 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
"${snapshot.data?.email}", "${snapshot.data?.email}",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
), ),
), ),
], ],
@@ -119,14 +130,18 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
children: [ children: [
Icon( Icon(
Icons.home_outlined, Icons.home_outlined,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
const SizedBox(width: 25.0), const SizedBox(width: 25.0),
Text( Text(
"Home", "Home",
style: TextStyle( style: TextStyle(
//fontWeight: FontWeight.bold, //fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
), ),
], ],
@@ -141,14 +156,18 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
children: [ children: [
Icon( Icon(
Icons.perm_identity, Icons.perm_identity,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
const SizedBox(width: 25.0), const SizedBox(width: 25.0),
Text( Text(
"Profile", "Profile",
style: TextStyle( style: TextStyle(
//fontWeight: FontWeight.bold, //fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
), ),
], ],
@@ -166,14 +185,18 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
children: [ children: [
Icon( Icon(
Icons.logout, Icons.logout,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
const SizedBox(width: 25.0), const SizedBox(width: 25.0),
Text( Text(
"Sign Out", "Sign Out",
style: TextStyle( style: TextStyle(
//fontWeight: FontWeight.bold, //fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
), ),
], ],
@@ -185,6 +208,35 @@ class _PatManAppDrawerState extends State<PatManAppDrawer> {
) )
], ],
), ),
Positioned(
top: 1,
right: 1,
width: 50,
height: 50,
child: IconButton(
onPressed: () {
setState(() {
if (MzanziInnovationHub.of(context)?.theme.mode == "Dark") {
//darkm = !darkm;
MzanziInnovationHub.of(context)!
.changeTheme(ThemeMode.light);
//print("Dark Mode: $darkm");
} else {
//darkm = !darkm;
MzanziInnovationHub.of(context)!
.changeTheme(ThemeMode.dark);
//print("Dark Mode: $darkm");
}
});
},
icon: Icon(
Icons.light_mode,
color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
size: 35,
),
),
),
]),
); );
}, },
); );

21
Frontend/patient_manager/lib/components/patientDetails.dart
View File

@@ -1,7 +1,7 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/myTextInput.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/patients.dart'; import 'package:patient_manager/objects/patients.dart';
import 'package:patient_manager/theme/mihTheme.dart';
class PatientDetails extends StatefulWidget { class PatientDetails extends StatefulWidget {
final Patient selectedPatient; final Patient selectedPatient;
@@ -62,9 +62,11 @@ class _PatientDetailsState extends State<PatientDetails> {
return Container( return Container(
padding: const EdgeInsets.only(left: 20, right: 20, bottom: 10), padding: const EdgeInsets.only(left: 20, right: 20, bottom: 10),
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().secondaryColor(), width: 3.0), border: Border.all(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 3.0),
), ),
//constraints: const BoxConstraints.expand(height: 250.0), //constraints: const BoxConstraints.expand(height: 250.0),
child: Column( child: Column(
@@ -79,13 +81,14 @@ class _PatientDetailsState extends State<PatientDetails> {
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
IconButton( IconButton(
icon: const Icon(Icons.edit), icon: const Icon(Icons.edit),
alignment: Alignment.topRight, alignment: Alignment.topRight,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
onPressed: () { onPressed: () {
Navigator.of(context).pushNamed( Navigator.of(context).pushNamed(
'/patient-manager/patient/edit', '/patient-manager/patient/edit',
@@ -94,7 +97,8 @@ class _PatientDetailsState extends State<PatientDetails> {
) )
], ],
), ),
Divider(color: MyTheme().secondaryColor()), Divider(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
const SizedBox(height: 10), const SizedBox(height: 10),
Column( Column(
children: [ children: [
@@ -158,10 +162,11 @@ class _PatientDetailsState extends State<PatientDetails> {
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
Divider(color: MyTheme().secondaryColor()), Divider(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor()),
const SizedBox(height: 10), const SizedBox(height: 10),
Column( Column(
children: [ children: [

93
Frontend/patient_manager/lib/components/patientFiles.dart
View File

@@ -15,7 +15,6 @@ import 'package:patient_manager/objects/appUser.dart';
import 'package:patient_manager/objects/files.dart'; import 'package:patient_manager/objects/files.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:patient_manager/theme/mihTheme.dart';
import '../objects/patients.dart'; import '../objects/patients.dart';
@@ -241,10 +240,12 @@ class _PatientFilesState extends State<PatientFiles> {
width: 700.0, width: 700.0,
//height: 475.0, //height: 475.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 5.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -253,7 +254,9 @@ class _PatientFilesState extends State<PatientFiles> {
"Create Medical Certificate", "Create Medical Certificate",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 35.0, fontSize: 35.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -269,8 +272,11 @@ class _PatientFilesState extends State<PatientFiles> {
height: 100, height: 100,
child: MyButton( child: MyButton(
buttonText: "Generate", buttonText: "Generate",
buttonColor: MyTheme().secondaryColor(), buttonColor: MzanziInnovationHub.of(context)!
textColor: MyTheme().primaryColor(), .theme
.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
onTap: () { onTap: () {
if (isMedCertFieldsFilled()) { if (isMedCertFieldsFilled()) {
generateMedCert(); generateMedCert();
@@ -301,7 +307,7 @@ class _PatientFilesState extends State<PatientFiles> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -324,10 +330,12 @@ class _PatientFilesState extends State<PatientFiles> {
width: 900.0, width: 900.0,
//height: 475.0, //height: 475.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 5.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
@@ -338,7 +346,9 @@ class _PatientFilesState extends State<PatientFiles> {
"Create Precrition", "Create Precrition",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 35.0, fontSize: 35.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -373,7 +383,7 @@ class _PatientFilesState extends State<PatientFiles> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -396,10 +406,12 @@ class _PatientFilesState extends State<PatientFiles> {
width: 700.0, width: 700.0,
//height: 475.0, //height: 475.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 5.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
@@ -408,7 +420,9 @@ class _PatientFilesState extends State<PatientFiles> {
"Upload File", "Upload File",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 35.0, fontSize: 35.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -418,8 +432,11 @@ class _PatientFilesState extends State<PatientFiles> {
width: 700, width: 700,
child: MyButton( child: MyButton(
buttonText: "Select File", buttonText: "Select File",
buttonColor: MyTheme().secondaryColor(), buttonColor: MzanziInnovationHub.of(context)!
textColor: MyTheme().primaryColor(), .theme
.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
onTap: () async { onTap: () async {
FilePickerResult? result = FilePickerResult? result =
await FilePicker.platform.pickFiles( await FilePicker.platform.pickFiles(
@@ -449,8 +466,11 @@ class _PatientFilesState extends State<PatientFiles> {
height: 100, height: 100,
child: MyButton( child: MyButton(
buttonText: "Add File", buttonText: "Add File",
buttonColor: MyTheme().secondaryColor(), buttonColor: MzanziInnovationHub.of(context)!
textColor: MyTheme().primaryColor(), .theme
.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
onTap: () { onTap: () {
if (isFileFieldsFilled()) { if (isFileFieldsFilled()) {
uploadSelectedFile(selected); uploadSelectedFile(selected);
@@ -481,7 +501,7 @@ class _PatientFilesState extends State<PatientFiles> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -541,10 +561,12 @@ class _PatientFilesState extends State<PatientFiles> {
child: Container( child: Container(
//height: 300.0, //height: 300.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 3.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 3.0),
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.only(top: 5.0), padding: const EdgeInsets.only(top: 5.0),
@@ -558,7 +580,9 @@ class _PatientFilesState extends State<PatientFiles> {
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
), ),
IconButton( IconButton(
@@ -567,7 +591,9 @@ class _PatientFilesState extends State<PatientFiles> {
}, },
icon: Icon( icon: Icon(
Icons.sick_outlined, Icons.sick_outlined,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
), ),
IconButton( IconButton(
@@ -576,7 +602,9 @@ class _PatientFilesState extends State<PatientFiles> {
}, },
icon: Icon( icon: Icon(
Icons.medication_outlined, Icons.medication_outlined,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
), ),
IconButton( IconButton(
@@ -585,14 +613,19 @@ class _PatientFilesState extends State<PatientFiles> {
}, },
icon: Icon( icon: Icon(
Icons.add, Icons.add,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
) )
], ],
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 20.0), padding: const EdgeInsets.symmetric(horizontal: 20.0),
child: Divider(color: MyTheme().secondaryColor()), child: Divider(
color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor()),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
BuildFilesList(files: filesList), BuildFilesList(files: filesList),

46
Frontend/patient_manager/lib/components/patientNotes.dart
View File

@@ -7,9 +7,9 @@ import 'package:patient_manager/components/myMLTextInput.dart';
import 'package:patient_manager/components/mySuccessMessage.dart'; import 'package:patient_manager/components/mySuccessMessage.dart';
import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/myTextInput.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/notes.dart'; import 'package:patient_manager/objects/notes.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:patient_manager/theme/mihTheme.dart';
class PatientNotes extends StatefulWidget { class PatientNotes extends StatefulWidget {
final int patientIndex; final int patientIndex;
@@ -110,10 +110,12 @@ class _PatientNotesState extends State<PatientNotes> {
width: 700.0, width: 700.0,
//height: 500.0, //height: 500.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 5.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: Column( child: Column(
//mainAxisSize: MainAxisSize.max, //mainAxisSize: MainAxisSize.max,
@@ -122,7 +124,9 @@ class _PatientNotesState extends State<PatientNotes> {
"Add Note", "Add Note",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 35.0, fontSize: 35.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -165,8 +169,11 @@ class _PatientNotesState extends State<PatientNotes> {
} }
}, },
buttonText: "Add Note", buttonText: "Add Note",
buttonColor: MyTheme().secondaryColor(), buttonColor: MzanziInnovationHub.of(context)!
textColor: MyTheme().primaryColor(), .theme
.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
) )
], ],
@@ -185,7 +192,7 @@ class _PatientNotesState extends State<PatientNotes> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -224,10 +231,12 @@ class _PatientNotesState extends State<PatientNotes> {
child: Container( child: Container(
//height: 300.0, //height: 300.0,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 3.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 3.0),
), ),
child: Padding( child: Padding(
padding: const EdgeInsets.only(top: 5.0), padding: const EdgeInsets.only(top: 5.0),
@@ -241,20 +250,27 @@ class _PatientNotesState extends State<PatientNotes> {
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor()), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor()),
), ),
IconButton( IconButton(
onPressed: () { onPressed: () {
addNotePopUp(); addNotePopUp();
}, },
icon: icon: Icon(Icons.add,
Icon(Icons.add, color: MyTheme().secondaryColor()), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor()),
) )
], ],
), ),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 20.0), padding: const EdgeInsets.symmetric(horizontal: 20.0),
child: Divider(color: MyTheme().secondaryColor()), child: Divider(
color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor()),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
BuildNotesList(notes: notesList), BuildNotesList(notes: notesList),

26
Frontend/patient_manager/lib/components/prescipInput.dart
View File

@@ -4,7 +4,7 @@ import 'package:patient_manager/components/myDropdownInput.dart';
import 'package:patient_manager/components/myErrorMessage.dart'; import 'package:patient_manager/components/myErrorMessage.dart';
import 'package:patient_manager/components/mySearchInput.dart'; import 'package:patient_manager/components/mySearchInput.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/theme/mihTheme.dart'; import 'package:patient_manager/main.dart';
class PrescripInput extends StatefulWidget { class PrescripInput extends StatefulWidget {
final TextEditingController medicineController; final TextEditingController medicineController;
@@ -189,8 +189,9 @@ class _PrescripInputState extends State<PrescripInput> {
width: 300, width: 300,
child: MyButton( child: MyButton(
buttonText: "Add", buttonText: "Add",
buttonColor: MyTheme().secondaryColor(), buttonColor:
textColor: MyTheme().primaryColor(), MzanziInnovationHub.of(context)!.theme.secondaryColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
onTap: () { onTap: () {
if (isFieldsFilled()) { if (isFieldsFilled()) {
setState(() { setState(() {
@@ -226,9 +227,11 @@ class _PrescripInputState extends State<PrescripInput> {
width: 550, width: 550,
height: 400, height: 400,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().secondaryColor(), width: 3.0), border: Border.all(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 3.0),
), ),
child: ListView.separated( child: ListView.separated(
separatorBuilder: (BuildContext context, int index) { separatorBuilder: (BuildContext context, int index) {
@@ -241,20 +244,23 @@ class _PrescripInputState extends State<PrescripInput> {
title: Text( title: Text(
getPerscTitle(index), getPerscTitle(index),
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
subtitle: Text( subtitle: Text(
getPerscSubtitle(index), getPerscSubtitle(index),
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
//onTap: () {}, //onTap: () {},
trailing: IconButton( trailing: IconButton(
icon: Icon( icon: Icon(
Icons.delete_forever_outlined, Icons.delete_forever_outlined,
color: MyTheme().primaryColor(), color:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
onPressed: () { onPressed: () {
setState(() { setState(() {
@@ -285,8 +291,8 @@ class _PrescripInputState extends State<PrescripInput> {
// } // }
}, },
buttonText: "Generate", buttonText: "Generate",
buttonColor: MyTheme().successColor(), buttonColor: MzanziInnovationHub.of(context)!.theme.successColor(),
textColor: MyTheme().primaryColor(), textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
) )
], ],

8
Frontend/patient_manager/lib/components/profileUserUpdate.dart
View File

@@ -3,6 +3,7 @@ import 'package:patient_manager/components/myDropdownInput.dart';
import 'package:patient_manager/components/myErrorMessage.dart'; import 'package:patient_manager/components/myErrorMessage.dart';
import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/myTextInput.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/appUser.dart';
class ProfileUserUpdate extends StatefulWidget { class ProfileUserUpdate extends StatefulWidget {
@@ -78,6 +79,10 @@ class _ProfileUserUpdateState extends State<ProfileUserUpdate> {
width: 500.0, width: 500.0,
height: 100.0, height: 100.0,
child: MyButton( child: MyButton(
buttonText: "Update",
buttonColor:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
textColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
onTap: () { onTap: () {
if (isFieldsFilled()) { if (isFieldsFilled()) {
} else { } else {
@@ -89,9 +94,6 @@ class _ProfileUserUpdateState extends State<ProfileUserUpdate> {
); );
} }
}, },
buttonText: "Update",
buttonColor: Colors.blueAccent,
textColor: Colors.white,
), ),
), ),
], ],

47
Frontend/patient_manager/lib/main.dart
View File

@@ -15,14 +15,57 @@ void main() async {
final client = Supabase.instance.client; final client = Supabase.instance.client;
class MzanziInnovationHub extends StatelessWidget { class MzanziInnovationHub extends StatefulWidget {
const MzanziInnovationHub({super.key}); const MzanziInnovationHub({super.key});
@override
State<MzanziInnovationHub> createState() => _MzanziInnovationHubState();
static _MzanziInnovationHubState? of(BuildContext context) =>
context.findAncestorStateOfType<_MzanziInnovationHubState>();
}
class _MzanziInnovationHubState extends State<MzanziInnovationHub> {
late ThemeMode _themeMode;
late MyTheme theme;
Color getPrimany() {
return theme.primaryColor();
}
void changeTheme(ThemeMode themeMode) {
setState(() {
_themeMode = themeMode;
//print(_themeMode);
if (_themeMode == ThemeMode.light) {
setState(() {
theme.mode = "Light";
});
//print(theme.mode);
} else {
setState(() {
theme.mode = "Dark";
});
//print(theme.mode);
}
});
}
@override
void initState() {
_themeMode = ThemeMode.dark;
theme = MyTheme();
theme.mode = "Dark";
super.initState();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MaterialApp( return MaterialApp(
title: 'Mzansi Innovation Hub', title: 'Mzansi Innovation Hub',
theme: MyTheme().data, themeMode: _themeMode,
theme: theme.darkMode(),
darkTheme: theme.lightMode(),
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
initialRoute: '/', initialRoute: '/',
onGenerateRoute: RouteGenerator.generateRoute, onGenerateRoute: RouteGenerator.generateRoute,

43
Frontend/patient_manager/lib/pages/home.dart
View File

@@ -1,14 +1,15 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/components/homeTileGrid.dart'; import 'package:patient_manager/components/homeTileGrid.dart';
import 'package:patient_manager/components/myAppBar.dart'; import 'package:patient_manager/components/myAppBar.dart';
import 'package:patient_manager/components/homeAppDrawer.dart'; import 'package:patient_manager/components/homeAppDrawer.dart';
//import 'package:patient_manager/components/myErrorMessage.dart';
//import 'package:patient_manager/components/mySuccessMessage.dart'; //import 'package:patient_manager/components/mySuccessMessage.dart';
import 'package:patient_manager/main.dart';
//import 'package:patient_manager/theme/mihTheme.dart'; bool darkm = false;
class Home extends StatefulWidget { class Home extends StatefulWidget {
//final String userEmail; //final String userEmail;
const Home({ const Home({
super.key, super.key,
}); });
@@ -49,26 +50,36 @@ class _HomeState extends State<Home> {
// floatingActionButton: Padding( // floatingActionButton: Padding(
// padding: const EdgeInsets.only(top: 65, right: 5), // padding: const EdgeInsets.only(top: 65, right: 5),
// child: FloatingActionButton.extended( // child: FloatingActionButton.extended(
// label: Text( // label: const Text(
// "Add Patient", // "Test Pop Up",
// style: TextStyle( // style: TextStyle(
// fontWeight: FontWeight.bold, // fontWeight: FontWeight.bold,
// color: MyTheme().primaryColor(),
// ), // ),
// ), // ),
// //backgroundColor: Colors.blueAccent, // //backgroundColor: Colors.blueAccent,
// onPressed: () { // onPressed: () {
// showDatePicker( // setState(() {
// context: context, // if (darkm) {
// initialDate: DateTime.now(), // darkm = !darkm;
// firstDate: DateTime(2000), // MzanziInnovationHub.of(context)!
// lastDate: DateTime(2100), // .changeTheme(ThemeMode.light);
// ); // //print("Dark Mode: $darkm");
// } else {
// darkm = !darkm;
// MzanziInnovationHub.of(context)!
// .changeTheme(ThemeMode.dark);
// //print("Dark Mode: $darkm");
// }
// });
// // showDialog(
// // context: context,
// // builder: (context) =>
// // const MyErrorMessage(errorType: "Input Error"),
// // );
// }, // },
// icon: Icon( // icon: const Icon(
// Icons.add, // Icons.warning,
// color: MyTheme().primaryColor(), // //color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
// ),
// ), // ),
// ), // ),
); );

14
Frontend/patient_manager/lib/pages/patientAdd.dart
View File

@@ -6,8 +6,8 @@ import 'package:patient_manager/components/myErrorMessage.dart';
import 'package:patient_manager/components/mySuccessMessage.dart'; import 'package:patient_manager/components/mySuccessMessage.dart';
import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/myTextInput.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/appUser.dart';
import 'package:patient_manager/theme/mihTheme.dart';
import '../components/myAppBar.dart'; import '../components/myAppBar.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
@@ -183,7 +183,7 @@ class _AddPatientState extends State<AddPatient> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 25.0, fontSize: 25.0,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
Row( Row(
@@ -270,7 +270,7 @@ class _AddPatientState extends State<AddPatient> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 25.0, fontSize: 25.0,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
const SizedBox(height: 10.0), const SizedBox(height: 10.0),
@@ -361,7 +361,7 @@ class _AddPatientState extends State<AddPatient> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
width: 500.0, width: 400.0,
height: 100.0, height: 100.0,
child: MyButton( child: MyButton(
onTap: () { onTap: () {
@@ -378,8 +378,10 @@ class _AddPatientState extends State<AddPatient> {
} }
}, },
buttonText: "Add", buttonText: "Add",
buttonColor: MyTheme().secondaryColor(), buttonColor:
textColor: MyTheme().primaryColor(), MzanziInnovationHub.of(context)!.theme.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), ),
], ],

71
Frontend/patient_manager/lib/pages/patientEdit.dart
View File

@@ -6,8 +6,8 @@ import 'package:patient_manager/components/myErrorMessage.dart';
import 'package:patient_manager/components/mySuccessMessage.dart'; import 'package:patient_manager/components/mySuccessMessage.dart';
import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/myTextInput.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/appUser.dart';
import 'package:patient_manager/theme/mihTheme.dart';
import 'package:supabase_flutter/supabase_flutter.dart'; import 'package:supabase_flutter/supabase_flutter.dart';
import '../components/myAppBar.dart'; import '../components/myAppBar.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
@@ -46,6 +46,9 @@ class _EditPatientState extends State<EditPatient> {
late String userEmail; late String userEmail;
late bool medRequired; late bool medRequired;
late double width;
late double height;
Future getOfficeIdByUser(String endpoint) async { Future getOfficeIdByUser(String endpoint) async {
final response = await http.get(Uri.parse(endpoint)); final response = await http.get(Uri.parse(endpoint));
if (response.statusCode == 200) { if (response.statusCode == 200) {
@@ -169,28 +172,35 @@ class _EditPatientState extends State<EditPatient> {
children: [ children: [
Container( Container(
padding: const EdgeInsets.all(10.0), padding: const EdgeInsets.all(10.0),
width: 500.0, width: width / 3,
height: 475.0, height: height / 2,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: border: Border.all(
Border.all(color: MyTheme().secondaryColor(), width: 5.0), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 5.0),
), ),
child: SingleChildScrollView(
child: Column( child: Column(
//mainAxisSize: MainAxisSize.max, //mainAxisSize: MainAxisSize.max,
children: [ children: [
Icon( Icon(
Icons.warning_amber_rounded, Icons.warning_amber_rounded,
size: 100, size: 100,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
), ),
const SizedBox(height: 15), const SizedBox(height: 15),
Text( Text(
"Are you sure you want to delete this?", "Are you sure you want to delete this?",
textAlign: TextAlign.center, textAlign: TextAlign.center,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 25.0, fontSize: 25.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -201,7 +211,9 @@ class _EditPatientState extends State<EditPatient> {
child: Text( child: Text(
"This action is permanent! Deleting ${fnameController.text} ${lnameController.text} will remove him\\her from your account. You won't be able to recover it once it's gone.", "This action is permanent! Deleting ${fnameController.text} ${lnameController.text} will remove him\\her from your account. You won't be able to recover it once it's gone.",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -213,7 +225,9 @@ class _EditPatientState extends State<EditPatient> {
child: Text( child: Text(
"Here's what you'll be deleting:", "Here's what you'll be deleting:",
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 20.0, fontSize: 20.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -228,7 +242,9 @@ class _EditPatientState extends State<EditPatient> {
"1) Patient Profile Information.\n2) Patient Notes\n3) Patient Files.", "1) Patient Profile Information.\n2) Patient Notes\n3) Patient Files.",
textAlign: TextAlign.left, textAlign: TextAlign.left,
style: TextStyle( style: TextStyle(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontSize: 15.0, fontSize: 15.0,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
@@ -241,12 +257,17 @@ class _EditPatientState extends State<EditPatient> {
child: MyButton( child: MyButton(
onTap: deletePatientApiCall, onTap: deletePatientApiCall,
buttonText: "Delete", buttonText: "Delete",
buttonColor: MyTheme().secondaryColor(), buttonColor: MzanziInnovationHub.of(context)!
textColor: MyTheme().primaryColor(), .theme
.secondaryColor(),
textColor: MzanziInnovationHub.of(context)!
.theme
.primaryColor(),
)) ))
], ],
), ),
), ),
),
Positioned( Positioned(
top: 5, top: 5,
right: 5, right: 5,
@@ -258,7 +279,7 @@ class _EditPatientState extends State<EditPatient> {
}, },
icon: Icon( icon: Icon(
Icons.close, Icons.close,
color: MyTheme().errorColor(), color: MzanziInnovationHub.of(context)!.theme.errorColor(),
size: 35, size: 35,
), ),
), ),
@@ -342,12 +363,14 @@ class _EditPatientState extends State<EditPatient> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 25.0, fontSize: 25.0,
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
IconButton( IconButton(
icon: const Icon(Icons.delete), icon: const Icon(Icons.delete),
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
alignment: Alignment.topRight, alignment: Alignment.topRight,
onPressed: () { onPressed: () {
deletePatientPopUp(); deletePatientPopUp();
@@ -439,7 +462,7 @@ class _EditPatientState extends State<EditPatient> {
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
fontSize: 25.0, fontSize: 25.0,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
const SizedBox(height: 10.0), const SizedBox(height: 10.0),
@@ -530,7 +553,7 @@ class _EditPatientState extends State<EditPatient> {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
SizedBox( SizedBox(
width: 500.0, width: 400.0,
height: 100.0, height: 100.0,
child: MyButton( child: MyButton(
onTap: () { onTap: () {
@@ -547,8 +570,10 @@ class _EditPatientState extends State<EditPatient> {
} }
}, },
buttonText: "Update", buttonText: "Update",
buttonColor: MyTheme().secondaryColor(), buttonColor:
textColor: MyTheme().primaryColor(), MzanziInnovationHub.of(context)!.theme.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), ),
], ],
@@ -594,6 +619,12 @@ class _EditPatientState extends State<EditPatient> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
var size = MediaQuery.of(context).size;
setState(() {
width = size.width;
height = size.height;
});
return Scaffold( return Scaffold(
appBar: const MyAppBar(barTitle: "Edit Patient"), appBar: const MyAppBar(barTitle: "Edit Patient"),
body: displayForm(), body: displayForm(),

21
Frontend/patient_manager/lib/pages/patientManager.dart
View File

@@ -7,8 +7,8 @@ import 'package:patient_manager/components/myAppBar.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:patient_manager/components/mySearchInput.dart'; import 'package:patient_manager/components/mySearchInput.dart';
import 'package:patient_manager/components/patManAppDrawer.dart'; import 'package:patient_manager/components/patManAppDrawer.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/patients.dart'; import 'package:patient_manager/objects/patients.dart';
import 'package:patient_manager/theme/mihTheme.dart';
class PatientManager extends StatefulWidget { class PatientManager extends StatefulWidget {
final String userEmail; final String userEmail;
@@ -73,10 +73,10 @@ class _PatientManagerState extends State<PatientManager> {
child: Container( child: Container(
height: 500, height: 500,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all( border: Border.all(
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 3.0, width: 3.0,
), ),
), ),
@@ -96,14 +96,19 @@ class _PatientManagerState extends State<PatientManager> {
child: Container( child: Container(
height: 500, height: 500,
decoration: BoxDecoration( decoration: BoxDecoration(
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
borderRadius: BorderRadius.circular(25.0), borderRadius: BorderRadius.circular(25.0),
border: Border.all(color: MyTheme().secondaryColor(), width: 3.0), border: Border.all(
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
width: 3.0),
), ),
child: Center( child: Center(
child: Text( child: Text(
"Enter ID or Medical Aid No. of Patient", "Enter ID or Medical Aid No. of Patient",
style: TextStyle(fontSize: 25, color: MyTheme().messageTextColor()), style: TextStyle(
fontSize: 25,
color:
MzanziInnovationHub.of(context)!.theme.messageTextColor()),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
), ),
@@ -181,7 +186,7 @@ class _PatientManagerState extends State<PatientManager> {
"Add Patient", "Add Patient",
style: TextStyle( style: TextStyle(
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), ),
//backgroundColor: Colors.blueAccent, //backgroundColor: Colors.blueAccent,
@@ -191,7 +196,7 @@ class _PatientManagerState extends State<PatientManager> {
}, },
icon: Icon( icon: Icon(
Icons.add, Icons.add,
color: MyTheme().primaryColor(), color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), ),
), ),

14
Frontend/patient_manager/lib/pages/profileUpdate.dart
View File

@@ -3,6 +3,7 @@ import 'package:google_nav_bar/google_nav_bar.dart';
import 'package:patient_manager/components/myAppBar.dart'; import 'package:patient_manager/components/myAppBar.dart';
import 'package:patient_manager/components/profileOfficeUpdate.dart'; import 'package:patient_manager/components/profileOfficeUpdate.dart';
import 'package:patient_manager/components/profileUserUpdate.dart'; import 'package:patient_manager/components/profileUserUpdate.dart';
import 'package:patient_manager/main.dart';
import 'package:patient_manager/objects/appUser.dart'; import 'package:patient_manager/objects/appUser.dart';
class ProfileUpdate extends StatefulWidget { class ProfileUpdate extends StatefulWidget {
@@ -43,14 +44,14 @@ class _ProfileUpdateState extends State<ProfileUpdate> {
body: Center( body: Center(
child: _widgetOptions.elementAt(_selectedIndex), child: _widgetOptions.elementAt(_selectedIndex),
), ),
bottomNavigationBar: Padding( bottomNavigationBar: GNav(
padding: const EdgeInsets.symmetric(horizontal: 150.0, vertical: 5.0),
child: GNav(
//hoverColor: Colors.lightBlueAccent, //hoverColor: Colors.lightBlueAccent,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
iconSize: 35.0, iconSize: 35.0,
activeColor: Colors.white, activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
tabBackgroundColor: Colors.blueAccent, tabBackgroundColor:
gap: 20, MzanziInnovationHub.of(context)!.theme.secondaryColor(),
//gap: 20,
//padding: EdgeInsets.all(15), //padding: EdgeInsets.all(15),
tabs: const [ tabs: const [
GButton( GButton(
@@ -69,7 +70,6 @@ class _ProfileUpdateState extends State<ProfileUpdate> {
}); });
}, },
), ),
),
); );
} }
} }

17
Frontend/patient_manager/lib/pages/register.dart
View File

@@ -3,7 +3,6 @@ import 'package:patient_manager/components/myPassInput.dart';
import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/myTextInput.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/main.dart'; import 'package:patient_manager/main.dart';
import 'package:patient_manager/theme/mihTheme.dart';
import 'package:supabase_auth_ui/supabase_auth_ui.dart'; import 'package:supabase_auth_ui/supabase_auth_ui.dart';
class Register extends StatefulWidget { class Register extends StatefulWidget {
@@ -75,7 +74,8 @@ class _RegisterState extends State<Register> {
Icon( Icon(
Icons.lock, Icons.lock,
size: 100, size: 100,
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
//spacer //spacer
const SizedBox(height: 10), const SizedBox(height: 10),
@@ -85,7 +85,8 @@ class _RegisterState extends State<Register> {
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
//spacer //spacer
@@ -143,8 +144,10 @@ class _RegisterState extends State<Register> {
child: MyButton( child: MyButton(
onTap: () {}, onTap: () {},
buttonText: "Sign Up", buttonText: "Sign Up",
buttonColor: MyTheme().secondaryColor(), buttonColor:
textColor: MyTheme().primaryColor(), MzanziInnovationHub.of(context)!.theme.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
), ),
), ),
//register text //register text
@@ -167,7 +170,9 @@ class _RegisterState extends State<Register> {
'Sign In', 'Sign In',
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),

17
Frontend/patient_manager/lib/pages/signin.dart
View File

@@ -4,7 +4,6 @@ import 'package:patient_manager/components/myPassInput.dart';
import 'package:patient_manager/components/myTextInput.dart'; import 'package:patient_manager/components/myTextInput.dart';
import 'package:patient_manager/components/mybutton.dart'; import 'package:patient_manager/components/mybutton.dart';
import 'package:patient_manager/main.dart'; import 'package:patient_manager/main.dart';
import 'package:patient_manager/theme/mihTheme.dart';
import 'package:supabase_auth_ui/supabase_auth_ui.dart'; import 'package:supabase_auth_ui/supabase_auth_ui.dart';
class SignIn extends StatefulWidget { class SignIn extends StatefulWidget {
@@ -65,7 +64,8 @@ class _SignInState extends State<SignIn> {
Icon( Icon(
Icons.lock, Icons.lock,
size: 100, size: 100,
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
//spacer //spacer
const SizedBox(height: 10), const SizedBox(height: 10),
@@ -75,7 +75,8 @@ class _SignInState extends State<SignIn> {
style: TextStyle( style: TextStyle(
fontSize: 25, fontSize: 25,
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
color: MyTheme().secondaryColor(), color:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
), ),
), ),
//spacer //spacer
@@ -109,8 +110,10 @@ class _SignInState extends State<SignIn> {
height: 100.0, height: 100.0,
child: MyButton( child: MyButton(
buttonText: "Sign In", buttonText: "Sign In",
buttonColor: MyTheme().secondaryColor(), buttonColor:
textColor: MyTheme().primaryColor(), MzanziInnovationHub.of(context)!.theme.secondaryColor(),
textColor:
MzanziInnovationHub.of(context)!.theme.primaryColor(),
onTap: () { onTap: () {
if (emailController.text.isEmpty || if (emailController.text.isEmpty ||
passwordController.text.isEmpty) { passwordController.text.isEmpty) {
@@ -155,7 +158,9 @@ class _SignInState extends State<SignIn> {
'Register Now', 'Register Now',
style: TextStyle( style: TextStyle(
fontSize: 18, fontSize: 18,
color: MyTheme().secondaryColor(), color: MzanziInnovationHub.of(context)!
.theme
.secondaryColor(),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
), ),
), ),

65
Frontend/patient_manager/lib/theme/mihTheme.dart
View File

@@ -6,7 +6,9 @@ class MyTheme {
late int _errColor; late int _errColor;
late int _succColor; late int _succColor;
late int _mesColor; late int _mesColor;
late ThemeData data; // late ThemeData _dark;
// late ThemeData _light;
late String mode;
// Options:- // Options:-
// f3f9d2 = Cream // f3f9d2 = Cream
@@ -19,12 +21,18 @@ class MyTheme {
// a63446 = red // a63446 = red
MyTheme() { MyTheme() {
_mainColor = 0XFF3A4454; mode = "Light";
_secondColor = 0XFFbedcfe; // _mainColor = 0XFF3A4454;
// _secondColor = 0XFFbedcfe;
_errColor = 0xffD87E8B; _errColor = 0xffD87E8B;
_succColor = 0xffB0F2B4; _succColor = 0xffB0F2B4;
_mesColor = 0xffc8c8c8d9; _mesColor = 0xffc8c8c8d9;
data = ThemeData( // _dark = darkMode();
// _light = lightMode();
}
ThemeData getData() {
return ThemeData(
scaffoldBackgroundColor: primaryColor(), scaffoldBackgroundColor: primaryColor(),
colorScheme: ColorScheme.dark( colorScheme: ColorScheme.dark(
primary: messageTextColor(), primary: messageTextColor(),
@@ -49,10 +57,39 @@ class MyTheme {
), ),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
color: secondaryColor(), color: secondaryColor(),
foregroundColor: primaryColor(),
titleTextStyle: TextStyle(
color: primaryColor(),
fontSize: 25,
fontWeight: FontWeight.bold,
), ),
floatingActionButtonTheme: ),
FloatingActionButtonThemeData(backgroundColor: secondaryColor()), floatingActionButtonTheme: FloatingActionButtonThemeData(
); backgroundColor: secondaryColor(),
foregroundColor: primaryColor(),
extendedTextStyle: TextStyle(color: primaryColor()),
),
drawerTheme: DrawerThemeData(
backgroundColor: primaryColor(),
));
}
void setMode(String m) {
mode;
}
ThemeData darkMode() {
//mode = "Dark";
// _mainColor = 0XFF3A4454;
// _secondColor = 0XFFbedcfe;
return getData();
}
ThemeData lightMode() {
//mode = "Light";
// _secondColor = 0XFF3A4454;
// _mainColor = 0XFFbedcfe;
return getData();
} }
Color messageTextColor() { Color messageTextColor() {
@@ -68,10 +105,24 @@ class MyTheme {
} }
Color primaryColor() { Color primaryColor() {
if (mode == "Dark") {
_mainColor = 0XFF3A4454;
//_secondColor = 0XFFbedcfe;
} else {
//_secondColor = 0XFF3A4454;
_mainColor = 0XFFbedcfe;
}
return Color(_mainColor); return Color(_mainColor);
} }
Color secondaryColor() { Color secondaryColor() {
if (mode == "Dark") {
//_mainColor = 0XFF3A4454;
_secondColor = 0XFFbedcfe;
} else {
_secondColor = 0XFF3A4454;
//_mainColor = 0XFFbedcfe;
}
return Color(_secondColor); return Color(_secondColor);
} }
} }