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

splash screen fix

Browse Source
This commit is contained in:
yaso-meth
2024-08-26 15:29:30 +02:00
parent 7a2593468e
commit 3efa6f9df1
14 changed files with 282 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,62 +41,62 @@ class _HomeTileState extends State<HomeTile> {
super.initState();
}
Widget displayTile() {
return FittedBox(
child: Column(
mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.end,
children: [
GestureDetector(
onTap: widget.onTap,
onTapDown: (_) {
setState(() {
mainC = MzanziInnovationHub.of(context)!.theme.primaryColor();
secondC =
MzanziInnovationHub.of(context)!.theme.secondaryColor();
});
},
onTapUp: (_) {
setState(() {
mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
});
},
child: Container(
padding: const EdgeInsets.all(3.0),
decoration: BoxDecoration(
color: mainC,
borderRadius: BorderRadius.circular(10.0),
//border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0),
),
child: Icon(
widget.tileIcon,
color: secondC,
),
),
),
const SizedBox(height: 1),
Row(
children: [
Flexible(
child: Text(
widget.tileName,
textAlign: TextAlign.center,
softWrap: true,
overflow: TextOverflow.visible,
style: TextStyle(
color: mainC,
fontSize: 5.0,
fontWeight: FontWeight.bold,
),
),
),
],
)
],
),
);
}
// Widget displayTile() {
// return FittedBox(
// child: Column(
// mainAxisSize: MainAxisSize.min,
// mainAxisAlignment: MainAxisAlignment.end,
// children: [
// GestureDetector(
// onTap: widget.onTap,
// onTapDown: (_) {
// setState(() {
// mainC = MzanziInnovationHub.of(context)!.theme.primaryColor();
// secondC =
// MzanziInnovationHub.of(context)!.theme.secondaryColor();
// });
// },
// onTapUp: (_) {
// setState(() {
// mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
// secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
// });
// },
// child: Container(
// padding: const EdgeInsets.all(3.0),
// decoration: BoxDecoration(
// color: mainC,
// borderRadius: BorderRadius.circular(10.0),
// //border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0),
// ),
// child: Icon(
// widget.tileIcon,
// color: secondC,
// ),
// ),
// ),
// const SizedBox(height: 1),
// Row(
// children: [
// Flexible(
// child: Text(
// widget.tileName,
// textAlign: TextAlign.center,
// softWrap: true,
// overflow: TextOverflow.visible,
// style: TextStyle(
// color: mainC,
// fontSize: 5.0,
// fontWeight: FontWeight.bold,
// ),
// ),
// ),
// ],
// )
// ],
// ),
// );
// }
@override
Widget build(BuildContext context) {
@@ -107,31 +107,19 @@ class _HomeTileState extends State<HomeTile> {
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.end,
children: [
InkWell(
onTap: widget.onTap,
// onTapDown: (_) {
// setState(() {
// mainC = MzanziInnovationHub.of(context)!.theme.primaryColor();
// secondC =
// MzanziInnovationHub.of(context)!.theme.secondaryColor();
// });
// },
// onTapUp: (_) {
// setState(() {
// mainC = MzanziInnovationHub.of(context)!.theme.secondaryColor();
// secondC = MzanziInnovationHub.of(context)!.theme.primaryColor();
// });
// },
child: Ink(
padding: const EdgeInsets.all(3.0),
decoration: BoxDecoration(
color: mainC,
borderRadius: BorderRadius.circular(10.0),
//border: Border.all(color: MzanziInnovationHub.of(context)!.theme.secondaryColor(), width: 1.0),
),
child: Icon(
widget.tileIcon,
color: secondC,
Material(
color: mainC,
borderRadius: BorderRadius.circular(10),
child: InkWell(
onTap: widget.onTap,
borderRadius: BorderRadius.circular(10),
//highlightColor: secondC,
child: Ink(
padding: const EdgeInsets.all(3.0),
child: Icon(
widget.tileIcon,
color: secondC,
),
),
),
),
@@ -149,46 +137,5 @@ class _HomeTileState extends State<HomeTile> {
),
),
);
// child: Card(
// color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
// elevation: 20,
// child: Column(
// //mainAxisSize: MainAxisSize.min,
// children: [
// Expanded(
// child: ListTile(
// leading: Icon(
// widget.tileIcon,
// color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
// ),
// title: Text(
// widget.tileName,
// style: TextStyle(
// fontWeight: FontWeight.bold,
// color: MzanziInnovationHub.of(context)!.theme.primaryColor(),
// ),
// ),
// subtitle: Text(
// widget.tileDescription,
// style: TextStyle(color: MzanziInnovationHub.of(context)!.theme.primaryColor()),
// )),
// ),
// Expanded(
// child: Row(
// mainAxisAlignment: MainAxisAlignment.end,
// children: [
// Padding(
// padding: const EdgeInsets.symmetric(horizontal: 10),
// child: Icon(
// Icons.arrow_forward,
// color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
// ),
// ),
// ],
// ),
// )
// ],
// ),
// ),
}
}

273
Frontend/patient_manager/lib/components/homeTileGrid.dart
View File

@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:google_nav_bar/google_nav_bar.dart';
import 'package:patient_manager/components/homeTile.dart';
import 'package:patient_manager/components/mihAppBar.dart';
import 'package:patient_manager/components/mihAppDrawer.dart';
@@ -42,7 +43,12 @@ class _HomeTileGridState extends State<HomeTileGrid> {
tileList.add(HomeTile(
onTap: () {
Navigator.of(context)
.popAndPushNamed('/profile', arguments: widget.signedInUser);
.pushNamed('/profile', arguments: widget.signedInUser);
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/profile',
// (route) => false,
// arguments: widget.signedInUser,
// );
},
tileName: "Setup Profie",
tileIcon: Icons.perm_identity,
@@ -59,6 +65,11 @@ class _HomeTileGridState extends State<HomeTileGrid> {
'/business/add',
arguments: widget.signedInUser,
);
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/business/add',
// (route) => false,
// arguments: widget.signedInUser,
// );
},
tileName: "Setup Business",
tileIcon: Icons.add_business_outlined,
@@ -70,9 +81,20 @@ class _HomeTileGridState extends State<HomeTileGrid> {
void setAppsPersonal(List<HomeTile> tileList) {
tileList.add(HomeTile(
onTap: () {
Navigator.of(context).popAndPushNamed('/patient-profile',
Navigator.of(context).pushNamed('/patient-profile',
arguments: PatientViewArguments(
widget.signedInUser, null, null, null, "personal"));
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/patient-profile',
// (route) => false,
// arguments: PatientViewArguments(
// widget.signedInUser,
// null,
// null,
// null,
// "personal",
// ),
// );
},
tileName: "Patient Profile",
tileIcon: Icons.medication,
@@ -81,10 +103,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
));
tileList.add(HomeTile(
onTap: () {
Navigator.of(context).popAndPushNamed(
Navigator.of(context).pushNamed(
'/patient-access-review',
arguments: widget.signedInUser,
);
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/patient-access-review',
// (route) => false,
// arguments: widget.signedInUser,
// );
},
tileName: "Access Review",
tileIcon: Icons.check_box_outlined,
@@ -97,7 +124,7 @@ class _HomeTileGridState extends State<HomeTileGrid> {
if (widget.businessUser!.access == "Full") {
tileList.add(HomeTile(
onTap: () {
Navigator.of(context).popAndPushNamed(
Navigator.of(context).pushNamed(
'/business-profile',
arguments: BusinessArguments(
widget.signedInUser,
@@ -105,6 +132,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
widget.business,
),
);
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/business-profile',
// (route) => false,
// arguments: BusinessArguments(
// widget.signedInUser,
// widget.businessUser,
// widget.business,
// ),
// );
},
tileName: "Business Profile",
tileIcon: Icons.business,
@@ -115,7 +151,7 @@ class _HomeTileGridState extends State<HomeTileGrid> {
if (widget.business!.type == "Doctors Office") {
tileList.add(HomeTile(
onTap: () {
Navigator.of(context).popAndPushNamed(
Navigator.of(context).pushNamed(
'/patient-manager',
arguments: BusinessArguments(
widget.signedInUser,
@@ -123,6 +159,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
widget.business,
),
);
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/patient-manager',
// (route) => false,
// arguments: BusinessArguments(
// widget.signedInUser,
// widget.businessUser,
// widget.business,
// ),
// );
},
tileName: "Manage Patient",
tileIcon: Icons.medication,
@@ -150,10 +195,15 @@ class _HomeTileGridState extends State<HomeTileGrid> {
));
tileList.add(HomeTile(
onTap: () {
Navigator.of(context).popAndPushNamed(
Navigator.of(context).pushNamed(
'/business/add',
arguments: widget.signedInUser,
);
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/business/add',
// (route) => false,
// arguments: widget.signedInUser,
// );
},
tileName: "Setup Bus - Dev",
tileIcon: Icons.add_business_outlined,
@@ -162,8 +212,13 @@ class _HomeTileGridState extends State<HomeTileGrid> {
));
tileList.add(HomeTile(
onTap: () {
Navigator.of(context).popAndPushNamed('/patient-manager/add',
Navigator.of(context).pushNamed('/patient-manager/add',
arguments: widget.signedInUser);
// Navigator.of(context).pushNamedAndRemoveUntil(
// '/patient-manager/add',
// (route) => false,
// arguments: widget.signedInUser,
// );
},
tileName: "Add Pat - Dev",
tileIcon: Icons.add_circle_outline,
@@ -172,8 +227,13 @@ class _HomeTileGridState extends State<HomeTileGrid> {
));
tileList.add(HomeTile(
onTap: () {
Navigator.of(context)
.popAndPushNamed('/profile', arguments: widget.signedInUser);
// Navigator.of(context)
// .popAndPushNamed('/profile', arguments: widget.signedInUser);
Navigator.of(context).pushNamedAndRemoveUntil(
'/profile',
(route) => false,
arguments: widget.signedInUser,
);
},
tileName: "Upd Prof - Dev",
tileIcon: Icons.perm_identity,
@@ -305,103 +365,120 @@ class _HomeTileGridState extends State<HomeTileGrid> {
@override
Widget build(BuildContext context) {
final Size size = MediaQuery.sizeOf(context);
final double width = size.width;
//final double height = size.height;
return Scaffold(
appBar: const MIHAppBar(barTitle: "Mzansi Innovation\nHub"),
drawer: MIHAppDrawer(
signedInUser: widget.signedInUser,
),
body: Column(
children: [
Padding(
padding: const EdgeInsets.only(top: 10.0, right: 15.0),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
mainAxisAlignment: MainAxisAlignment.end,
children: [
IconButton(
onPressed: () {
if (!businessUserSwitch) {
setState(() {
businessUserSwitch = true;
_selectedIndex = 1;
});
} else {
setState(() {
businessUserSwitch = false;
_selectedIndex = 0;
});
}
},
icon: const Icon(
Icons.swap_horizontal_circle_outlined,
size: 35,
),
),
],
),
),
Text(
getHeading(_selectedIndex),
textAlign: TextAlign.center,
style: TextStyle(
fontWeight: FontWeight.bold,
fontSize: 35.0,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
),
),
const SizedBox(
height: 20,
),
Expanded(
child: GridView.builder(
itemCount: pbswitch[_selectedIndex].length,
gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 200),
itemBuilder: (context, index) {
return pbswitch[_selectedIndex][index];
},
),
),
],
body:
// Column(
// children: [
// Padding(
// padding: const EdgeInsets.only(top: 10.0, right: 15.0),
// child: Row(
// crossAxisAlignment: CrossAxisAlignment.end,
// mainAxisAlignment: MainAxisAlignment.end,
// children: [
// IconButton(
// onPressed: () {
// if (!businessUserSwitch) {
// setState(() {
// businessUserSwitch = true;
// _selectedIndex = 1;
// });
// } else {
// setState(() {
// businessUserSwitch = false;
// _selectedIndex = 0;
// });
// }
// },
// icon: const Icon(
// Icons.swap_horizontal_circle_outlined,
// size: 35,
// ),
// ),
// ],
// ),
// ),
// const SizedBox(
// height: 20,
// ),
// Text(
// getHeading(_selectedIndex),
// textAlign: TextAlign.center,
// style: TextStyle(
// fontWeight: FontWeight.bold,
// fontSize: 35.0,
// color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
// ),
// ),
// const SizedBox(
// height: 20,
// ),
//Expanded(
//child:
GridView.builder(
padding: EdgeInsets.only(
left: width / 7,
right: width / 7,
//bottom: height / 5,
top: 20,
),
// physics: ,
// shrinkWrap: true,
itemCount: pbswitch[_selectedIndex].length,
gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
maxCrossAxisExtent: 200),
itemBuilder: (context, index) {
return pbswitch[_selectedIndex][index];
},
),
// bottomNavigationBar: Visibility(
// visible: isBusinessUser(widget.signedInUser),
// child: Padding(
// padding: const EdgeInsets.all(15.0),
// child: GNav(
// //hoverColor: Colors.lightBlueAccent,
// color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
// iconSize: 35.0,
// activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
// tabBackgroundColor:
// MzanziInnovationHub.of(context)!.theme.secondaryColor(),
// //gap: 20,
// //padding: EdgeInsets.all(15),
// tabs: [
// GButton(
// icon: Icons.perm_identity,
// text: "Personal",
// onPressed: () {
// setState(() {
// _selectedIndex = 0;
// });
// },
// ),
// GButton(
// icon: Icons.business_center,
// text: "Business",
// onPressed: () {
// setState(() {
// _selectedIndex = 1;
// });
// },
// ),
// ],
// selectedIndex: _selectedIndex,
// ),
// ),
//),
// ],
// ),
bottomNavigationBar: Visibility(
visible: isBusinessUser(widget.signedInUser),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: GNav(
//hoverColor: Colors.lightBlueAccent,
color: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
iconSize: 35.0,
activeColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
tabBackgroundColor:
MzanziInnovationHub.of(context)!.theme.secondaryColor(),
//gap: 20,
//padding: EdgeInsets.all(15),
tabs: [
GButton(
icon: Icons.perm_identity,
text: "Personal",
onPressed: () {
setState(() {
_selectedIndex = 0;
});
},
),
GButton(
icon: Icons.business_center,
text: "Business",
onPressed: () {
setState(() {
_selectedIndex = 1;
});
},
),
],
selectedIndex: _selectedIndex,
),
),
),
);
}
}

27
Frontend/patient_manager/lib/components/mihAppBar.dart
View File

@@ -26,17 +26,22 @@ class _MIHAppBarState extends State<MIHAppBar> {
return AppBar(
elevation: 8,
shadowColor: MzanziInnovationHub.of(context)!.theme.secondaryColor(),
actions: [
IconButton(
icon: const Icon(
Icons.home,
size: 40,
),
onPressed: () {
Navigator.popAndPushNamed(context, '/home');
},
)
],
// actions: [
// IconButton(
// icon: const Icon(
// Icons.home,
// size: 40,
// ),
// onPressed: () {
// // Navigator.pushNamedAndRemoveUntil(
// // context,
// // '/home',
// // );
// Navigator.of(context)
// .pushNamedAndRemoveUntil('/home', (route) => false);
// },
// )
// ],
title: Text(
widget.barTitle,
textAlign: TextAlign.center,

3
Frontend/patient_manager/lib/components/mihAppDrawer.dart
View File

@@ -138,7 +138,8 @@ class _MIHAppDrawerState extends State<MIHAppDrawer> {
],
),
onTap: () {
Navigator.popAndPushNamed(context, '/home');
Navigator.of(context)
.pushNamedAndRemoveUntil('/home', (route) => false);
},
),
ListTile(

1
Frontend/patient_manager/lib/components/mihLoadingCircle.dart
View File

@@ -31,6 +31,7 @@ class _MihloadingcircleState extends State<Mihloadingcircle>
ImageProvider loading =
MzanziInnovationHub.of(context)!.theme.loadingImage();
return Dialog(
//backgroundColor: MzanziInnovationHub.of(context)!.theme.primaryColor(),
child: Container(
padding: const EdgeInsets.all(10.0),
width: 250,