scroll change

merge-requests/125/head
Salman Afzal 6 years ago
parent 50e9dc0980
commit 5f6e9104d0

@ -65,7 +65,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
flex: 2, flex: 2,
child: RoundedContainer( child: RoundedContainer(
child: CircularPercentIndicator( child: CircularPercentIndicator(
radius: 100.0, radius: 100,
animation: true, animation: true,
animationDuration: 1200, animationDuration: 1200,
lineWidth: 7.0, lineWidth: 7.0,
@ -78,7 +78,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
fontSize: SizeConfig.textMultiplier * 4), fontSize: SizeConfig.textMultiplier * 4),
AppText("Out-Patients", AppText("Out-Patients",
fontWeight: FontWeight.normal, fontWeight: FontWeight.normal,
fontSize: SizeConfig.textMultiplier * 1.2, fontSize: SizeConfig.textMultiplier * 1.1,
color: Colors.grey[800]), color: Colors.grey[800]),
], ],
), ),

@ -32,46 +32,61 @@ class PatientProfileWidget extends StatelessWidget {
// ProfileStatusInfoWidget() // ProfileStatusInfoWidget()
// ]); // ]);
return Container( return CustomScrollView(primary: false, slivers: <Widget>[
child: Column(children: <Widget>[ SliverList(
Expanded( delegate: SliverChildListDelegate(
flex: 1, [
child: Expanded(
Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[ flex: 1,
Column(children: <Widget>[ child: Row(
Container( mainAxisAlignment: MainAxisAlignment.center,
padding: EdgeInsets.only(top: 20), children: <Widget>[
child: ProfileImageWidget( Column(children: <Widget>[
url: Container(
"https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png", padding: EdgeInsets.only(top: 20),
name: patient.firstName + ' ' + patient.lastName, child: ProfileImageWidget(
fontsize: 24.0, url:
color: Colors.black, "https://hmgwebservices.com/Images/MobileImages/DUBAI/unkown_female.png",
), name: patient.firstName + ' ' + patient.lastName,
fontsize: 24.0,
color: Colors.black,
),
),
Container(
child: Column(
children: <Widget>[
AppText(
'File No: ' + patient.patientId.toString(),
fontWeight: FontWeight.normal,
fontSize: 16,
),
AppText(
patient.genderDescription.toString() +
', ' +
patient.age,
fontWeight: FontWeight.normal,
fontSize: 16,
)
],
),
)
]),
]),
), ),
Container( ],
child: Column( ),
children: <Widget>[
AppText(
'File No: ' + patient.patientId.toString(),
fontWeight: FontWeight.normal,
fontSize: 16,
),
AppText(
patient.genderDescription.toString() + ', ' + patient.age,
fontWeight: FontWeight.normal,
fontSize: 16,
)
],
),
)
]),
]),
), ),
Expanded( SliverPadding(
flex: 2, padding: const EdgeInsets.fromLTRB(20, 30, 15, 10),
child: ProfileMedicalInfoWidget(patient: patient), sliver: ProfileMedicalInfoWidget())
) ]);
]));
// Container(
// child: Column(children: <Widget>[
// Expanded(
// flex: 2,
// child: ,
// )
// ]));
} }
} }

@ -23,65 +23,61 @@ class ProfileMedicalInfoWidget extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
// final double contWidth = SizeConfig.realScreenWidth * 0.70; // final double contWidth = SizeConfig.realScreenWidth * 0.70;
// final double contHeight = SizeConfig.screenHeight * 0.30; // final double contHeight = SizeConfig.screenHeight * 0.30;
return CustomScrollView(primary: false, slivers: <Widget>[ return SliverGrid.count(
SliverPadding( crossAxisSpacing: 10,
padding: const EdgeInsets.fromLTRB(20, 30, 15, 10), mainAxisSpacing: 20,
sliver: SliverGrid.count( crossAxisCount: 2,
crossAxisSpacing: 10, childAspectRatio: 1.5,
mainAxisSpacing: 20, children: [
crossAxisCount: 2, PatientProfileButton(
childAspectRatio: 1.5, key: key,
children: [ patient: patient,
PatientProfileButton( name: 'Vital Sign',
key: key, route: VITAL_SIGN_DETAILS,
patient: patient, icon: 'heartbeat.png'),
name: 'Vital Sign', PatientProfileButton(
route: VITAL_SIGN_DETAILS, key: key,
icon: 'heartbeat.png'), patient: patient,
PatientProfileButton( route: LAB_ORDERS,
key: key, name: 'Lab Order',
patient: patient, icon: 'lab.png'),
route: LAB_ORDERS, PatientProfileButton(
name: 'Lab Order', key: key,
icon: 'lab.png'), patient: patient,
PatientProfileButton( route: PRESCRIPTIONS,
key: key, name: 'Prescription',
patient: patient, icon: 'note.png'),
route: PRESCRIPTIONS, PatientProfileButton(
name: 'Prescription', key: key,
icon: 'note.png'), patient: patient,
PatientProfileButton( route: RADIOLOGY,
key: key, name: 'Radiology',
patient: patient, icon: 'radiology-1.png'),
route: RADIOLOGY, PatientProfileButton(
name: 'Radiology', key: key,
icon: 'radiology-1.png'), patient: patient,
PatientProfileButton( route: PROGRESS_NOTE,
key: key, name: 'Progress Notes',
patient: patient, icon: 'heartbeat.png'),
route: PROGRESS_NOTE, PatientProfileButton(
name: 'Progress Notes', key: key,
icon: 'heartbeat.png'), patient: patient,
PatientProfileButton( route: PATIENT_INSURANCE_APPROVALS,
key: key, name: 'Insurance Aprovals',
patient: patient, icon: 'lab.png'),
route: PATIENT_INSURANCE_APPROVALS, PatientProfileButton(
name: 'Insurance Aprovals', key: key,
icon: 'lab.png'), patient: patient,
PatientProfileButton( route: PRESCRIPTIONS,
key: key, name: 'Refer Patient',
patient: patient, icon: 'note.png'),
route: PRESCRIPTIONS, PatientProfileButton(
name: 'Refer Patient', key: key,
icon: 'note.png'), patient: patient,
PatientProfileButton( route: PATIENT_ORDERS,
key: key, name: 'Orders',
patient: patient, icon: 'radiology-1.png'),
route: PATIENT_ORDERS, ]);
name: 'Orders',
icon: 'radiology-1.png'),
]))
]);
// child: ListView( // child: ListView(
// children: <Widget>[ // children: <Widget>[
// Padding( // Padding(

Loading…
Cancel
Save