From 5cee1cef4ed7016d14537a781abacc70f82b30e7 Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Tue, 11 Aug 2020 09:43:02 +0300 Subject: [PATCH] fix merge issues --- lib/config/config.dart | 2 +- lib/pages/medical/medical_profile_page.dart | 261 +++++++++++--------- 2 files changed, 139 insertions(+), 124 deletions(-) diff --git a/lib/config/config.dart b/lib/config/config.dart index e0e7ee12..100a493e 100644 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -4,7 +4,7 @@ import 'dart:io'; 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'; diff --git a/lib/pages/medical/medical_profile_page.dart b/lib/pages/medical/medical_profile_page.dart index b8c11b20..53c09727 100644 --- a/lib/pages/medical/medical_profile_page.dart +++ b/lib/pages/medical/medical_profile_page.dart @@ -1,6 +1,7 @@ import 'dart:math'; 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/others/app_scaffold_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/sliver_app_bar_delegate.dart'; @@ -23,122 +24,120 @@ class _MedicalProfilePageState extends State { Widget build(BuildContext context) { return AppScaffold( body: CustomScrollView( - physics: BouncingScrollPhysics(), - key: PageStorageKey("medical"), - slivers: [ - SliverPersistentHeader( - delegate: SliverAppBarDelegate( - maxHeight: 200.0, - minHeight: 200.0, - child: Container( - width: double.infinity, - height: 200, - color: Colors.grey, + physics: BouncingScrollPhysics(), + key: PageStorageKey("medical"), + slivers: [ + SliverPersistentHeader( + delegate: SliverAppBarDelegate( + maxHeight: 200.0, + minHeight: 200.0, + child: Container( + width: double.infinity, + height: 200, + color: Colors.grey, + ), ), ), - ), - SliverPersistentHeader( - delegate: SliverAppBarDelegate( - maxHeight: double.maxFinite, - minHeight: double.maxFinite, - child: Padding( - padding: EdgeInsets.symmetric(vertical: 12.0), - child: Column( - children: [ - Row( - children: [ - Expanded( - flex: 1, - child: InkWell( - onTap: () { - Navigator.push( - context, FadePage(page: DoctorHomePage())); - }, - child: MedicalProfileItem( - title: 'My Doctor', - imagePath: 'doctor_icon.png', - subTitle: 'List', + SliverPersistentHeader( + delegate: SliverAppBarDelegate( + maxHeight: double.maxFinite, + minHeight: double.maxFinite, + child: Padding( + padding: EdgeInsets.symmetric(vertical: 12.0), + child: Column( + children: [ + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, FadePage(page: DoctorHomePage())); + }, + child: MedicalProfileItem( + title: 'My Doctor', + imagePath: 'doctor_icon.png', + subTitle: 'List', + ), ), ), - ), - Expanded( - flex: 1, - child: InkWell( - onTap: (){ - - }, - child: MedicalProfileItem( - title: 'Lab', - imagePath: 'lab_result_icon.png', - subTitle: 'Result', + Expanded( + flex: 1, + child: InkWell( + onTap: () {}, + child: MedicalProfileItem( + title: 'Lab', + imagePath: 'lab_result_icon.png', + subTitle: 'Result', + ), ), - ), - ) - ], - ), - Row( - children: [ - Expanded( - flex: 1, - child: InkWell( - onTap: () => Navigator.push(context, FadePage(page: RadiologyHomePage())), - child: MedicalProfileItem( - title: 'Radiology', - imagePath: 'radiology_icon.png', - subTitle: 'Service', + ) + ], + ), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () => Navigator.push( + context, FadePage(page: RadiologyHomePage())), + child: MedicalProfileItem( + title: 'Radiology', + imagePath: 'radiology_icon.png', + subTitle: 'Service', + ), ), ), - ), - Expanded( - flex: 1, - child: InkWell( - onTap: () { - Navigator.push(context, - FadePage(page: HomePrescriptionsPage())); - }, - child: MedicalProfileItem( - title: 'Medicines', - imagePath: 'prescription_icon.png', - subTitle: 'Prescriptions', + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push(context, + FadePage(page: HomePrescriptionsPage())); + }, + child: MedicalProfileItem( + title: 'Medicines', + imagePath: 'prescription_icon.png', + subTitle: 'Prescriptions', + ), ), - ), - ) - ], - ), - Row( - children: [ - Expanded( - flex: 1, - child: InkWell( - onTap: () { - Navigator.push( - context, FadePage(page: InsuranceCard())); - }, - child: MedicalProfileItem( - title: 'Insurance', - imagePath: 'insurance_card_icon.png', - subTitle: 'Card', + ) + ], + ), + Row( + children: [ + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push( + context, FadePage(page: InsuranceCard())); + }, + child: MedicalProfileItem( + title: 'Insurance', + imagePath: 'insurance_card_icon.png', + subTitle: 'Card', + ), ), ), - ), - Expanded( - flex: 1, - child: InkWell( - onTap: () { - Navigator.push( - context, FadePage(page: InsuranceApproval())); - }, - child: MedicalProfileItem( - title: 'Insurance Approval', - imagePath: 'insurance_approvals_icon.png', - subTitle: 'Card', + Expanded( + flex: 1, + child: InkWell( + onTap: () { + Navigator.push(context, + FadePage(page: InsuranceApproval())); + }, + child: MedicalProfileItem( + title: 'Insurance Approval', + imagePath: 'insurance_approvals_icon.png', + subTitle: 'Card', + ), ), - ), - ) - ], - ), - Row( - children: [ + ) + ], + ), + Row(children: [ Expanded( flex: 1, child: MedicalProfileItem( @@ -154,28 +153,44 @@ class _MedicalProfilePageState extends State { imagePath: 'medical_history_icon.png', 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: [ + 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', + ), + ), + ) + ], + ) + ], + ), ), ), ), - ), - ], - ), + ]), ); } }