From 591e9e9a4cfc99f80b8b0a172078bb6ac9460345 Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 27 Sep 2020 09:35:46 +0300 Subject: [PATCH] updated --- lib/pages/landing/home_page.dart | 12 ++++++------ lib/widgets/data_display/text.dart | 2 +- lib/widgets/others/bottom_bar.dart | 28 +++++++++++++++++++++++----- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/lib/pages/landing/home_page.dart b/lib/pages/landing/home_page.dart index 7d7138d0..24a6f714 100644 --- a/lib/pages/landing/home_page.dart +++ b/lib/pages/landing/home_page.dart @@ -362,7 +362,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -420,7 +420,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context).emergencyService, @@ -460,7 +460,7 @@ class _HomePageState extends State { height: 55, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -492,7 +492,7 @@ class _HomePageState extends State { height: 55, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -532,7 +532,7 @@ class _HomePageState extends State { height: 50, ), SizedBox( - height: 15, + height: 5, ), Texts( TranslationBase.of(context) @@ -595,7 +595,7 @@ class _HomePageState extends State { ), ), height: 100, - imageName: 'hmg_services_bg .png', + imageName: 'hmg_services_bg.png', opacity: 0.5, color: Colors.grey[700], width: MediaQuery.of(context).size.width * 0.45, diff --git a/lib/widgets/data_display/text.dart b/lib/widgets/data_display/text.dart index 17ddf05b..4b9fc551 100644 --- a/lib/widgets/data_display/text.dart +++ b/lib/widgets/data_display/text.dart @@ -225,7 +225,7 @@ class _TextsState extends State { fontStyle: widget.italic ? FontStyle.italic : null, color: widget.color ?? Colors.black, fontSize: widget.fontSize ?? _getFontSize(), - letterSpacing: widget.variant == "overline" ? 1.5 : null, + letterSpacing: widget.variant == "overline" ? 1 : null, fontWeight: widget.fontWeight ?? _getFontWeight(), ), ), diff --git a/lib/widgets/others/bottom_bar.dart b/lib/widgets/others/bottom_bar.dart index f5d4d8bf..4de9efdf 100644 --- a/lib/widgets/others/bottom_bar.dart +++ b/lib/widgets/others/bottom_bar.dart @@ -11,13 +11,16 @@ import 'package:diplomaticquarterapp/pages/BookAppointment/DoctorProfile.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/Search.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/SearchResults.dart'; import 'package:diplomaticquarterapp/pages/BookAppointment/widgets/BranchView.dart'; +import 'package:diplomaticquarterapp/pages/ErService/NearestEr.dart'; import 'package:diplomaticquarterapp/pages/MyAppointments/MyAppointments.dart'; import 'package:diplomaticquarterapp/pages/insurance/insurance_approval_screen.dart'; import 'package:diplomaticquarterapp/pages/landing/landing_page.dart'; +import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; import 'package:diplomaticquarterapp/pages/medical/doctor/doctor_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/labs/labs_home_page.dart'; import 'package:diplomaticquarterapp/pages/medical/medical_profile_page.dart'; import 'package:diplomaticquarterapp/pages/medical/my_admissions_page.dart'; +import 'package:diplomaticquarterapp/pages/medical/patient_sick_leave_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/pages/medical/reports/report_home_page.dart'; @@ -370,12 +373,27 @@ class _SearchBot extends State { Navigator.push(context, FadePage(page: HomeReportPage())); } break; + case '5': + { + Navigator.push(context, FadePage(page: NearestEr())); + } + break; + case '15': + { + Navigator.push(context, FadePage(page: PatientSickLeavePage())); + } + break; + case '16': + { + Navigator.push(context, FadePage(page: LiveCareHome())); + } + break; - // case '12': - // { - // Navigator.push(context, FadePage(page: FeedbackHomePage())); - // } - // break; + case '200': + { + Navigator.push(context, FadePage(page: FeedbackHomePage())); + } + break; default: Navigator.of(context).pushNamed(HOME);