fix merge issues

merge-update-with-lab-changes
Mohammad Aljammal 6 years ago
parent 2e0afdb49c
commit 5cee1cef4e

@ -4,7 +4,7 @@ import 'dart:io';
const MAX_SMALL_SCREEN = 660; const MAX_SMALL_SCREEN = 660;
const BASE_URL = 'https://uat.hmgwebservices.com/Services'; const BASE_URL = 'https://hmgwebservices.com/Services';
const GET_PROJECT = '/Lists.svc/REST/GetProject'; const GET_PROJECT = '/Lists.svc/REST/GetProject';

@ -1,6 +1,7 @@
import 'dart:math'; import 'dart:math';
import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/prescriptions/prescriptions_home_page.dart';
import 'package:diplomaticquarterapp/pages/medical/radiology/radiology_home_page.dart';
import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart'; import 'package:diplomaticquarterapp/widgets/data_display/medical/medical_profile_item.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/sliver_app_bar_delegate.dart'; import 'package:diplomaticquarterapp/widgets/others/sliver_app_bar_delegate.dart';
@ -23,122 +24,120 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return AppScaffold( return AppScaffold(
body: CustomScrollView( body: CustomScrollView(
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
key: PageStorageKey("medical"), key: PageStorageKey("medical"),
slivers: <Widget>[ slivers: <Widget>[
SliverPersistentHeader( SliverPersistentHeader(
delegate: SliverAppBarDelegate( delegate: SliverAppBarDelegate(
maxHeight: 200.0, maxHeight: 200.0,
minHeight: 200.0, minHeight: 200.0,
child: Container( child: Container(
width: double.infinity, width: double.infinity,
height: 200, height: 200,
color: Colors.grey, color: Colors.grey,
),
), ),
), ),
), SliverPersistentHeader(
SliverPersistentHeader( delegate: SliverAppBarDelegate(
delegate: SliverAppBarDelegate( maxHeight: double.maxFinite,
maxHeight: double.maxFinite, minHeight: double.maxFinite,
minHeight: double.maxFinite, child: Padding(
child: Padding( padding: EdgeInsets.symmetric(vertical: 12.0),
padding: EdgeInsets.symmetric(vertical: 12.0), child: Column(
child: Column( children: <Widget>[
children: <Widget>[ Row(
Row( children: <Widget>[
children: <Widget>[ Expanded(
Expanded( flex: 1,
flex: 1, child: InkWell(
child: InkWell( onTap: () {
onTap: () { Navigator.push(
Navigator.push( context, FadePage(page: DoctorHomePage()));
context, FadePage(page: DoctorHomePage())); },
}, child: MedicalProfileItem(
child: MedicalProfileItem( title: 'My Doctor',
title: 'My Doctor', imagePath: 'doctor_icon.png',
imagePath: 'doctor_icon.png', subTitle: 'List',
subTitle: 'List', ),
), ),
), ),
), Expanded(
Expanded( flex: 1,
flex: 1, child: InkWell(
child: InkWell( onTap: () {},
onTap: (){ child: MedicalProfileItem(
title: 'Lab',
}, imagePath: 'lab_result_icon.png',
child: MedicalProfileItem( subTitle: 'Result',
title: 'Lab', ),
imagePath: 'lab_result_icon.png',
subTitle: 'Result',
), ),
), )
) ],
], ),
), Row(
Row( children: <Widget>[
children: <Widget>[ Expanded(
Expanded( flex: 1,
flex: 1, child: InkWell(
child: InkWell( onTap: () => Navigator.push(
onTap: () => Navigator.push(context, FadePage(page: RadiologyHomePage())), context, FadePage(page: RadiologyHomePage())),
child: MedicalProfileItem( child: MedicalProfileItem(
title: 'Radiology', title: 'Radiology',
imagePath: 'radiology_icon.png', imagePath: 'radiology_icon.png',
subTitle: 'Service', subTitle: 'Service',
),
), ),
), ),
), Expanded(
Expanded( flex: 1,
flex: 1, child: InkWell(
child: InkWell( onTap: () {
onTap: () { Navigator.push(context,
Navigator.push(context, FadePage(page: HomePrescriptionsPage()));
FadePage(page: HomePrescriptionsPage())); },
}, child: MedicalProfileItem(
child: MedicalProfileItem( title: 'Medicines',
title: 'Medicines', imagePath: 'prescription_icon.png',
imagePath: 'prescription_icon.png', subTitle: 'Prescriptions',
subTitle: 'Prescriptions', ),
), ),
), )
) ],
], ),
), Row(
Row( children: <Widget>[
children: <Widget>[ Expanded(
Expanded( flex: 1,
flex: 1, child: InkWell(
child: InkWell( onTap: () {
onTap: () { Navigator.push(
Navigator.push( context, FadePage(page: InsuranceCard()));
context, FadePage(page: InsuranceCard())); },
}, child: MedicalProfileItem(
child: MedicalProfileItem( title: 'Insurance',
title: 'Insurance', imagePath: 'insurance_card_icon.png',
imagePath: 'insurance_card_icon.png', subTitle: 'Card',
subTitle: 'Card', ),
), ),
), ),
), Expanded(
Expanded( flex: 1,
flex: 1, child: InkWell(
child: InkWell( onTap: () {
onTap: () { Navigator.push(context,
Navigator.push( FadePage(page: InsuranceApproval()));
context, FadePage(page: InsuranceApproval())); },
}, child: MedicalProfileItem(
child: MedicalProfileItem( title: 'Insurance Approval',
title: 'Insurance Approval', imagePath: 'insurance_approvals_icon.png',
imagePath: 'insurance_approvals_icon.png', subTitle: 'Card',
subTitle: 'Card', ),
), ),
), )
) ],
], ),
), Row(children: <Widget>[
Row(
children: <Widget>[
Expanded( Expanded(
flex: 1, flex: 1,
child: MedicalProfileItem( child: MedicalProfileItem(
@ -154,28 +153,44 @@ class _MedicalProfilePageState extends State<MedicalProfilePage> {
imagePath: 'medical_history_icon.png', imagePath: 'medical_history_icon.png',
subTitle: 'Reports', subTitle: 'Reports',
), ),
)
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: InsuranceUpdate()));
},
child: MedicalProfileItem(
title: 'Insurance Update',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
),
),
), ),
], ]),
), Row(
], children: <Widget>[
Expanded(
flex: 1,
child: InkWell(
onTap: () {
Navigator.push(
context, FadePage(page: InsuranceUpdate()));
},
child: MedicalProfileItem(
title: 'Insurance Update',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
),
),
), Expanded(
flex: 1,
child: InkWell(
onTap: () {
},
child: MedicalProfileItem(
title: 'new',
imagePath: 'insurance_card_icon.png',
subTitle: 'Card',
),
),
)
],
)
],
),
), ),
), ),
), ),
), ]),
],
),
); );
} }
} }

Loading…
Cancel
Save