From 38465eaafb5740bdc8ada7d081a87f15c4f33533 Mon Sep 17 00:00:00 2001 From: "Mirza.Shafique" Date: Wed, 11 Aug 2021 16:30:22 +0300 Subject: [PATCH] Home page icons and drawer --- assets/images/new/E_Referral.svg | 9 + assets/images/new/HHC.svg | 11 +- assets/images/new/Live_Care.svg | 15 +- assets/images/new/comprehensive_checkup.svg | 9 +- assets/images/new/covid_test_drive_thru.svg | 26 +- assets/images/new/emergency.svg | 28 ++ assets/images/new/h2o.svg | 6 + assets/images/new/menu.svg | 6 + assets/images/new/payment.png | Bin 0 -> 2049 bytes assets/images/new/reach_us.svg | 6 + assets/images/new/visa.png | Bin 0 -> 27987 bytes lib/config/localized_values.dart | 2 + .../fragments/home_page_fragment2.dart | 44 ++- lib/pages/landing/landing_page.dart | 159 +++++----- lib/pages/landing/widgets/services_view.dart | 44 ++- lib/uitl/translations_delegate_base.dart | 2 +- lib/widgets/drawer/app_drawer_widget.dart | 286 +++++++++--------- lib/widgets/drawer/drawer_item_widget.dart | 59 ++-- lib/widgets/text/app_texts_widget.dart | 20 +- 19 files changed, 425 insertions(+), 307 deletions(-) create mode 100644 assets/images/new/E_Referral.svg create mode 100644 assets/images/new/emergency.svg create mode 100644 assets/images/new/h2o.svg create mode 100644 assets/images/new/menu.svg create mode 100644 assets/images/new/payment.png create mode 100644 assets/images/new/reach_us.svg create mode 100644 assets/images/new/visa.png diff --git a/assets/images/new/E_Referral.svg b/assets/images/new/E_Referral.svg new file mode 100644 index 00000000..fb6b8591 --- /dev/null +++ b/assets/images/new/E_Referral.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/images/new/HHC.svg b/assets/images/new/HHC.svg index 5c0aacd1..692623c2 100644 --- a/assets/images/new/HHC.svg +++ b/assets/images/new/HHC.svg @@ -1,8 +1,9 @@ - - - - - + + + + + + diff --git a/assets/images/new/Live_Care.svg b/assets/images/new/Live_Care.svg index 84349a70..b5a367d7 100644 --- a/assets/images/new/Live_Care.svg +++ b/assets/images/new/Live_Care.svg @@ -1,8 +1,11 @@ - - - - - + + + + + + + + + - diff --git a/assets/images/new/comprehensive_checkup.svg b/assets/images/new/comprehensive_checkup.svg index a22c960c..b3f2feb1 100644 --- a/assets/images/new/comprehensive_checkup.svg +++ b/assets/images/new/comprehensive_checkup.svg @@ -1,7 +1,6 @@ - - - - - + + + + diff --git a/assets/images/new/covid_test_drive_thru.svg b/assets/images/new/covid_test_drive_thru.svg index 09de0045..563de151 100644 --- a/assets/images/new/covid_test_drive_thru.svg +++ b/assets/images/new/covid_test_drive_thru.svg @@ -1,10 +1,20 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/assets/images/new/emergency.svg b/assets/images/new/emergency.svg new file mode 100644 index 00000000..a1a0178a --- /dev/null +++ b/assets/images/new/emergency.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/images/new/h2o.svg b/assets/images/new/h2o.svg new file mode 100644 index 00000000..cab6a705 --- /dev/null +++ b/assets/images/new/h2o.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/new/menu.svg b/assets/images/new/menu.svg new file mode 100644 index 00000000..05654cdb --- /dev/null +++ b/assets/images/new/menu.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/new/payment.png b/assets/images/new/payment.png new file mode 100644 index 0000000000000000000000000000000000000000..0bdb006bceb787b08565ae4acbb32ce548618147 GIT binary patch literal 2049 zcmV+c2>$npP)Px#IAvH#W=%~1DgXcg2mk?xX#fNO00031000^Q000000-yo_1ONa40RR91FQ5Ye z1ONa40RR91761SM0B5Z}IsgC%cS%G+R9Fe^S9@@j)fGSY-tXJZ?q)ZSZ4&YzY$Q)y zbZadgu_KSd)S}c_A28xnY@NZ%v_q(6=nT_Fies&GY->^ba4MZLXv+-Hv0?=TDT*!a zkPt{To4^Lhi%s_Z{=V4ymHQa_G5j^ zt#|C$;mKq&zP7fukepu)(W^1a*)U)&T!^3dd%L$I_YwiMgu|_|SgxT6=CfU%?HoVo>2m)P+l)@pU}+{PV3shz^HMkcXI}XTxh$1nAT(cY7}T4RaqVGHwj+WH_jL1mq*{0oaeWph8D;v?XawkcP>x!KF9hrHu_G4c&Tm6*$6Myd@f+Cxcfw=Ph4$Gy zdQHL0oBnrz76iQ++w=YMQs<>kFf$}d7Qk4|*TBN8P=>mEe6m%X!G`e^9ECmPPhg;r z|DW7n+PSK3;jTGX>){kYEpGUYX@CR4h)hnfDpshCo`Z63OaU&pU?_3p@4&q72bNcStC*2P(zcn`6vz(c%VZ~%`=YqQhXa7VWkckZcLIRh> z3~e>Cso+=K<1o#dRbBEqe3Qi@kU8-V@G(D#LI==_A}Df3F^n+DB$E)R@<6!J4dz5I z6d7I+=@1B|5HjW(JF!+(0z8d}aD~omU)Z$aVE90SUc|^EkdBUSlqw<$wq#P#AIY(x zN(a|9iyQ;zCdp18`KG*Buwdn1?u?E1&W^^%!d%Z3m70s@OL;!Un?FnS>MBKb-vkDN zjydbWR$C3mxStr|2x#R_;5IvC;t43=eNcJ%&u}4D30nPDusdu(5<^gs?4uQI5YGvJ zT650(Pi}g{WU|8#4$ZMuU%z>4G%#Re=A!=2qhCKRv}DtS9X)24olmOP(jG%kS<-L&iP7yrKW2y(JTf-c3xTm-*TkCt{M8Bzc{;7@A@6yJWdx{p8>B`?A)#R| zoaHclaSTE|UWj*`g22B9V5s;32o$dX!Zk3$K1hd$z-qU0NDk`K>tyET#A0*$!@+1- zz<*|ofo0NC+O$^64LylBpF-DLmNx;G$oIrNtn&?t@TF%V6|Q&RzUPL>aA(ta;2ab? z#ZMSh!9Uu?s&CkG@8Iced!!FZ>eD}zbup|7UeD2A9PMN~k&jGa(M8!j0+uEPEJ})4 z$~k1tSm86+AK3+5OLcsdakNz8)RY{N{yqeL*1>Sl_kgaah}BlE%dFSjylp|i->;OG z&5c#f@BD5&yygjWfn)g6z`M3&d<^ + + + + + diff --git a/assets/images/new/visa.png b/assets/images/new/visa.png new file mode 100644 index 0000000000000000000000000000000000000000..a2836f136b5ed52f87e64f92ea222e8336d83575 GIT binary patch literal 27987 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 literal 0 HcmV?d00001 diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 616e7c44..fa910242 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -435,11 +435,13 @@ const Map localizedValues = { "StartDay": {"en": "Start Day", "ar": "يوم البداية"}, "EndDay": {"en": "End Day", "ar": "يوم الانتهاء"}, "Days": {"en": "Days ", "ar": "أيام"}, + "please-verify": {"en": "Please Verify ", "ar": "ارجوك تحقق"}, "ScheduleTime": {"en": "Schedule time", "ar": "الجدول الزمني"}, "AskDoctor": {"en": "Ask Doctor", "ar": "اسأل طبيبك"}, "DoctorResponses": {"en": "Doctor Responses", "ar": "ردود الأطباء"}, "New": {"en": "New", "ar": "جديد"}, "All": {"en": "All", "ar": "الكل"}, + "dailyWater": {"en": "Daily Water Check", "ar": "فحص المياه اليومي"}, "QuestionHere": {"en": "Enter the question here...", "ar": "اضف الاستفسار هنا"}, "ViewDoctorResponses": {"en": "View Doctor Responses", "ar": "الاطلاع على ردود الأطباء"}, "ServiceInformationButton": {"en": "LOGIN / REGISTER", "ar": "دخول / تسجيل"}, diff --git a/lib/pages/landing/fragments/home_page_fragment2.dart b/lib/pages/landing/fragments/home_page_fragment2.dart index 6d6d28c5..4416062b 100644 --- a/lib/pages/landing/fragments/home_page_fragment2.dart +++ b/lib/pages/landing/fragments/home_page_fragment2.dart @@ -47,10 +47,13 @@ class _HomePageFragment2State extends State { hmgServices.clear(); hmgServices.add(new HmgServices(0, TranslationBase.of(context).liveCare, TranslationBase.of(context).onlineConsulting, "assets/images/new/Live_Care.svg", isLogin)); hmgServices.add(new HmgServices(1, TranslationBase.of(context).covidTest, TranslationBase.of(context).driveThru, "assets/images/new/covid_test_drive_thru.svg", isLogin)); - hmgServices.add(new HmgServices(2, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin)); + hmgServices.add(new HmgServices(2, TranslationBase.of(context).online, TranslationBase.of(context).payment, "assets/images/new/visa.png", isLogin)); hmgServices.add(new HmgServices(3, TranslationBase.of(context).hhcHome, TranslationBase.of(context).healthCare, "assets/images/new/HHC.svg", isLogin)); - hmgServices.add(new HmgServices(4, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Refferal.svg", isLogin)); - hmgServices.add(new HmgServices(5, "RRT", TranslationBase.of(context).emergency, "assets/images/new/RRT.svg", isLogin)); + hmgServices.add(new HmgServices(4, TranslationBase.of(context).checkup, TranslationBase.of(context).comprehensive, "assets/images/new/comprehensive_checkup.svg", isLogin)); + hmgServices.add(new HmgServices(5, "RRT", TranslationBase.of(context).emergency, "assets/images/new/emergency.svg", isLogin)); + hmgServices.add(new HmgServices(6, TranslationBase.of(context).refferal, TranslationBase.of(context).services2, "assets/images/new/E_Referral.svg", isLogin)); + hmgServices.add(new HmgServices(7, "H\u2082O", TranslationBase.of(context).dailyWater, "assets/images/new/h2o.svg", isLogin)); + hmgServices.add(new HmgServices(8, TranslationBase.of(context).reachUs, TranslationBase.of(context).findUs, "assets/images/new/reach_us.svg", isLogin)); } @override @@ -65,9 +68,9 @@ class _HomePageFragment2State extends State { children: [ projectViewModel.isLogin ? AspectRatio( - aspectRatio: 2.5, + aspectRatio: 2.7, child: Padding( - padding: const EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 6), + padding: const EdgeInsets.only(left: 20, right: 20, top: 8, bottom: 6), child: LoggedSliderView( projectViewModel, new SliderData(TranslationBase.of(context).fileno + ": " + projectViewModel.user.patientID.toString(), projectViewModel.user.firstName + ' ' + projectViewModel.user.lastName, @@ -75,9 +78,9 @@ class _HomePageFragment2State extends State { ), ) : AspectRatio( - aspectRatio: 2.5, + aspectRatio: 2.7, child: Container( - margin: EdgeInsets.only(left: 20, right: 20, top: 16, bottom: 6), + margin: EdgeInsets.only(left: 20, right: 20, top: 8, bottom: 6), child: SliderView( onLoginClick: () { widget.onLoginClick(); @@ -279,6 +282,29 @@ class _HomePageFragment2State extends State { ], ), ), + projectViewModel.isArabic + ? Positioned( + left: 20, + top: 12, + child: Opacity( + opacity: 0.04, + child: SvgPicture.asset( + "assets/images/new/logo.svg", + height: MediaQuery.of(context).size.width * 0.14, + ), + ), + ) + : Positioned( + right: 20, + top: 12, + child: Opacity( + opacity: 0.04, + child: SvgPicture.asset( + "assets/images/new/logo.svg", + height: MediaQuery.of(context).size.width * 0.14, + ), + ), + ), projectViewModel.isArabic ? Positioned( right: -16, @@ -404,7 +430,7 @@ class _HomePageFragment2State extends State { left: 20, top: 12, child: Opacity( - opacity: 0.1, + opacity: 0.04, child: SvgPicture.asset( "assets/images/new/Pharmacy.svg", height: MediaQuery.of(context).size.width * 0.15, @@ -415,7 +441,7 @@ class _HomePageFragment2State extends State { right: 20, top: 12, child: Opacity( - opacity: 0.1, + opacity: 0.04, child: SvgPicture.asset( "assets/images/new/Pharmacy.svg", height: MediaQuery.of(context).size.width * 0.15, diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index e98636da..c4a7391e 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -20,6 +20,7 @@ import 'package:diplomaticquarterapp/pages/medical/medical_profile_page_new.dart import 'package:diplomaticquarterapp/services/authentication/auth_provider.dart'; import 'package:diplomaticquarterapp/services/family_files/family_files_provider.dart' as family; import 'package:diplomaticquarterapp/services/robo_search/event_provider.dart'; +import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/CalendarUtils.dart'; import 'package:diplomaticquarterapp/uitl/HMGNetworkConnectivity.dart'; import 'package:diplomaticquarterapp/uitl/HMG_Geofence.dart'; @@ -40,6 +41,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:permission_handler/permission_handler.dart'; import 'package:provider/provider.dart'; import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart'; @@ -498,85 +500,90 @@ class _LandingPageState extends State with WidgetsBindingObserver { projectViewModel = Provider.of(context); return Scaffold( - appBar: AppBar( - elevation: 0, - textTheme: TextTheme( - headline6: TextStyle(color: Theme.of(context).textTheme.headline1.color, fontWeight: FontWeight.bold), - ), - title: Text( - getText(currentTab).toUpperCase(), - style: TextStyle(fontWeight: FontWeight.bold, color: Theme.of(context).textTheme.headline1.color, fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans'), - // bold: true, - // color: Colors.white, - ), - leading: Builder( - builder: (BuildContext context) { - return new Stack( - children: [ - currentTab == 0 - ? IconButton( - icon: Icon(Icons.menu), - color: Theme.of(context).textTheme.headline1.color, - onPressed: () => Scaffold.of(context).openDrawer(), - ) - : IconButton( - icon: Icon(Icons.arrow_back), - color: Theme.of(context).textTheme.headline1.color, - onPressed: () { - setState(() { - currentTab = 0; - }); - - pageController.jumpToPage(0); - }, - ), - notificationCount != '' - ? new Positioned( - right: projectViewModel.isArabic ? 35 : 0, - top: 5, - child: new Container( - padding: EdgeInsets.all(4), - decoration: new BoxDecoration( - color: Colors.red, - borderRadius: BorderRadius.circular(20), - ), - constraints: BoxConstraints( - minWidth: 20, - minHeight: 20, - ), - child: new Text( - notificationCount, - style: new TextStyle( - color: Colors.white, - fontSize: projectViewModel.isArabic ? 8 : 9, + appBar: PreferredSize( + preferredSize: Size.fromHeight(currentTab == 0 ? 45 : 0.0), + child: AppBar( + elevation: 0, + backgroundColor: CustomColors.backgroudGreyColor , + textTheme: TextTheme( + headline6: TextStyle(color: Theme.of(context).textTheme.headline1.color, fontWeight: FontWeight.bold), + ), + title: Text( + getText(currentTab).toUpperCase(), + style: TextStyle( + fontWeight: FontWeight.bold, + color: currentTab == 0 ? CustomColors.backgroudGreyColor : Theme.of(context).textTheme.headline1.color, + fontFamily: projectViewModel.isArabic ? 'Cairo' : 'WorkSans'), + // bold: true, + ), + leading: Builder( + builder: (BuildContext context) { + return new Stack( + children: [ + currentTab == 0 + ? IconButton( + icon: SvgPicture.asset("assets/images/new/menu.svg"), + color: Theme.of(context).textTheme.headline1.color, + onPressed: () => Scaffold.of(context).openDrawer(), + ) + : IconButton( + icon: Icon(Icons.arrow_back), + onPressed: () { + setState(() { + currentTab = 0; + }); + + pageController.jumpToPage(0); + }, + ), + notificationCount != '' + ? new Positioned( + right: projectViewModel.isArabic ? 35 : 0, + top: 5, + child: new Container( + padding: EdgeInsets.all(4), + decoration: new BoxDecoration( + color: Colors.red, + borderRadius: BorderRadius.circular(20), + ), + constraints: BoxConstraints( + minWidth: 20, + minHeight: 20, + ), + child: new Text( + notificationCount, + style: new TextStyle( + color: Colors.white, + fontSize: projectViewModel.isArabic ? 8 : 9, + ), + textAlign: TextAlign.center, ), - textAlign: TextAlign.center, ), - ), - ) - : SizedBox() - ], - ); - }, + ) + : SizedBox() + ], + ); + }, + ), + actions: [ + // IconButton( + // //iconSize: 70, + // icon: Icon( + // projectViewModel.isLogin ? Icons.settings : Icons.login, + // color: Theme.of(context).textTheme.headline1.color, + // ), + // onPressed: () { + // if (projectViewModel.isLogin) + // Navigator.of(context).pushNamed( + // SETTINGS, + // ); + // else + // login(); + // }, //do something, + // ) + ], + centerTitle: true, ), - actions: [ - IconButton( - //iconSize: 70, - icon: Icon( - projectViewModel.isLogin ? Icons.settings : Icons.login, - color: Theme.of(context).textTheme.headline1.color, - ), - onPressed: () { - if (projectViewModel.isLogin) - Navigator.of(context).pushNamed( - SETTINGS, - ); - else - login(); - }, //do something, - ) - ], - centerTitle: true, ), drawer: SafeArea(child: AppDrawer()), extendBody: true, diff --git a/lib/pages/landing/widgets/services_view.dart b/lib/pages/landing/widgets/services_view.dart index 6180ae3a..6ebf8a05 100644 --- a/lib/pages/landing/widgets/services_view.dart +++ b/lib/pages/landing/widgets/services_view.dart @@ -4,9 +4,12 @@ import 'package:diplomaticquarterapp/models/hmg_services.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/E-Referral/e_referral_page.dart'; import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/HomeHealthCare/home_health_care_page.dart'; +import 'package:diplomaticquarterapp/pages/AlHabibMedicalService/h2o/h2o_page.dart'; +import 'package:diplomaticquarterapp/pages/ContactUs/findus/findus_page.dart'; import 'package:diplomaticquarterapp/pages/Covid-DriveThru/covid-drivethru-location.dart'; import 'package:diplomaticquarterapp/pages/ErService/ErOptions.dart'; import 'package:diplomaticquarterapp/pages/livecare/livecare_home.dart'; +import 'package:diplomaticquarterapp/pages/paymentService/payment_service.dart'; import 'package:diplomaticquarterapp/theme/colors.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; @@ -28,13 +31,19 @@ class ServicesView extends StatelessWidget { } else if (index == 1) { Navigator.push(context, FadePage(page: CovidDrivethruLocation())); } else if (index == 2) { - Navigator.push(context, FadePage(page: CMCPage())); + Navigator.push(context, FadePage(page: PaymentService())); } else if (index == 3) { Navigator.push(context, FadePage(page: HomeHealthCarePage())); } else if (index == 4) { - Navigator.push(context, FadePage(page: EReferralPage())); + Navigator.push(context, FadePage(page: CMCPage())); } else if (index == 5) { Navigator.push(context, FadePage(page: ErOptions(isAppbar: true))); + } else if (index == 6) { + Navigator.push(context, FadePage(page: EReferralPage())); + } else if (index == 7) { + Navigator.push(context, FadePage(page: H2OPage())); + } else if (index == 8) { + Navigator.push(context, FadePage(page: FindUsPage())); } }, child: Container( @@ -60,12 +69,18 @@ class ServicesView extends StatelessWidget { child: Padding( padding: const EdgeInsets.all(12.0), child: Opacity( - opacity: 0.07, - child: SvgPicture.asset( - hmgServices.icon, - width: double.infinity, - height: double.infinity, - ), + opacity: 0.04, + child: hmgServices.action == 2 + ? Image.asset( + hmgServices.icon, + width: double.infinity, + height: double.infinity, + ) + : SvgPicture.asset( + hmgServices.icon, + width: double.infinity, + height: double.infinity, + ), ), ), ), @@ -84,10 +99,15 @@ class ServicesView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ mFlex(1), - SvgPicture.asset( - hmgServices.icon, - height: index == 0 ? MediaQuery.of(context).size.width / 18 : MediaQuery.of(context).size.width / 14, - ), + hmgServices.action == 2 + ? Image.asset( + hmgServices.icon, + height: index == 0 ? MediaQuery.of(context).size.width / 18 : MediaQuery.of(context).size.width / 14, + ) + : SvgPicture.asset( + hmgServices.icon, + height: index == 0 ? MediaQuery.of(context).size.width / 18 : MediaQuery.of(context).size.width / 14, + ), mFlex(4), AutoSizeText( hmgServices.title, diff --git a/lib/uitl/translations_delegate_base.dart b/lib/uitl/translations_delegate_base.dart index d25ce6cc..0ea4b4dd 100644 --- a/lib/uitl/translations_delegate_base.dart +++ b/lib/uitl/translations_delegate_base.dart @@ -192,7 +192,7 @@ class TranslationBase { String get pendingPayment => localizedValues['pendingPayment'][locale.languageCode]; String get payNow => localizedValues['payNow'][locale.languageCode]; - + String get dailyWater => localizedValues['dailyWater'][locale.languageCode]; String get viewQR => localizedValues['viewQR'][locale.languageCode]; String get instruction => localizedValues['instruction'][locale.languageCode]; diff --git a/lib/widgets/drawer/app_drawer_widget.dart b/lib/widgets/drawer/app_drawer_widget.dart index 63031263..a00d19ea 100644 --- a/lib/widgets/drawer/app_drawer_widget.dart +++ b/lib/widgets/drawer/app_drawer_widget.dart @@ -61,6 +61,10 @@ class _AppDrawerState extends State { @override Widget build(BuildContext context) { projectProvider = Provider.of(context); + // (user.isFamily == null || user.isFamily == false) && projectProvider.havePrivilege(2) + print(user.isFamily.toString()); + print(user.isFamily.toString()); + print(projectProvider.havePrivilege(2).toString()); return Container( width: MediaQuery.of(context).size.width * 0.75, color: Theme.of(context).scaffoldBackgroundColor, @@ -78,7 +82,8 @@ class _AppDrawerState extends State { Container( height: SizeConfig.screenHeight * .30, child: InkWell( - child: DrawerHeader( + child: Padding( + padding: const EdgeInsets.all(14.0), child: Column( children: [ Container( @@ -97,64 +102,31 @@ class _AppDrawerState extends State { ], ), ), - (user != null && projectProvider.isLogin) - ? Padding( - padding: EdgeInsets.all(15), - child: Column(mainAxisAlignment: MainAxisAlignment.start, children: [ - Row( - children: [ - Padding( - padding: EdgeInsets.only(right: 5), - child: Icon( - Icons.account_circle, - color: Color(0xFF40ACC9), - )), - AppText( - user.firstName + ' ' + user.lastName, - color: Color(0xFF40ACC9), - ) - ], - ), - Row(children: [ - Padding( - padding: EdgeInsets.only(left: 30, top: 5), - child: Column( - children: [ - AppText( - TranslationBase.of(context).fileno + ": " + user.patientID.toString(), - color: Color(0xFF40ACC9), - fontSize: SizeConfig.textMultiplier * 1.5, - ), - AppText( - user.bloodGroup != null ? 'Blood Group: ' + user.bloodGroup : '', - fontSize: SizeConfig.textMultiplier * 1.5, - ), - ], - )) - ]) - ])) - : Container( - width: double.infinity, - margin: EdgeInsets.only(top: 12), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.start, - children: [ - Text( - TranslationBase.of(context).cantSeeProfile, - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 18, - ), - ), - Text( - TranslationBase.of(context).loginRegisterNow, - style: TextStyle(color: Colors.black, fontSize: 14), - ), - ], + mHeight(12), + Container( + width: double.infinity, + margin: EdgeInsets.only(top: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Text( + (user != null && projectProvider.isLogin) ? user.firstName + ' ' + user.lastName : TranslationBase.of(context).cantSeeProfile, + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 18, ), ), + Text( + (user != null && projectProvider.isLogin) + ? TranslationBase.of(context).fileno + ": " + user.patientID.toString() + : TranslationBase.of(context).loginRegisterNow, + style: TextStyle(color: Colors.black, fontSize: 14), + ), + ], + ), + ), ], ), ), @@ -164,34 +136,37 @@ class _AppDrawerState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.start, children: [ - InkWell( - child: DrawerItem( - TranslationBase.of(context).arabicChange, - Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.all(3)), - isImageIcon: true, - bottomLine: false, - ), - onTap: () { - sharedPref.setBool(IS_ROBOT_INIT, null); - if (projectProvider.isArabic) { - projectProvider.changeLanguage('en'); - } else { - projectProvider.changeLanguage('ar'); - } - }, - ), + (user != null && projectProvider.isLogin) + ? Container() + : InkWell( + child: DrawerItem( + TranslationBase.of(context).arabicChange, + Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.all(3)), + isImageIcon: true, + bottomLine: false, + ), + onTap: () { + sharedPref.setBool(IS_ROBOT_INIT, null); + if (projectProvider.isArabic) { + projectProvider.changeLanguage('en'); + } else { + projectProvider.changeLanguage('ar'); + } + }, + ), (user != null && projectProvider.isLogin) ? Column( mainAxisAlignment: MainAxisAlignment.start, children: [ - (user.isFamily == null || user.isFamily == false) && projectProvider.havePrivilege(2) + (user.isFamily == null || user.isFamily == false) ? InkWell( child: DrawerItem( TranslationBase.of(context).family, - Icons.group, + SvgPicture.asset("assets/images/new/family_files.svg"), + isImageIcon: true, + bottomLine: false, textColor: Theme.of(context).textTheme.bodyText1.color, iconColor: Theme.of(context).textTheme.bodyText1.color, - bottomLine: false, sideArrow: true, ), onTap: () { @@ -213,73 +188,99 @@ class _AppDrawerState extends State { return Padding(padding: EdgeInsets.all(10), child: Text(snapshot.error)); else return Container( - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - // <--- left side - color: Colors.grey[200], - width: 1.0, - ), - )), child: Column( - children: [ - user.isFamily == true - ? Container( - padding: EdgeInsets.only(bottom: 5), - child: InkWell( + children: [ + user.isFamily == true + ? Container( + padding: EdgeInsets.only(bottom: 5, left: 4), + child: InkWell( + onTap: () { + switchUser(mainUser, context); + }, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: SvgPicture.asset("assets/images/new/family_files.svg"), + ), + Expanded( + flex: 7, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText(mainUser.firstName + ' ' + mainUser.lastName, color: Theme.of(context).textTheme.bodyText1.color), + AppText( + TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString(), + color: Theme.of(context).textTheme.bodyText1.color, + ), + ], + ), + ), + ], + ), + ), + ) + : SizedBox(), + Column( + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.min, + children: snapshot.data.getAllSharedRecordsByStatusList.map((result) { + return result.status == 3 + ? Container( + padding: EdgeInsets.only(bottom: 5), + child: InkWell( onTap: () { - switchUser(mainUser, context); + switchUser(result, context); }, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ Expanded( - child: Icon(Icons.person), + child: Icon(Icons.person, color: result.responseID == user.patientID ? Colors.transparent : Colors.transparent), ), Expanded( - flex: 7, - child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText(mainUser.firstName + ' ' + mainUser.lastName, color: Theme.of(context).textTheme.bodyText1.color), - AppText( - TranslationBase.of(context).fileno + ": " + mainUser.patientID.toString(), - color: Theme.of(context).textTheme.bodyText1.color, - ), - ])), + flex: 7, + child: Padding( + padding: EdgeInsets.only(left: 5, right: 5), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black), + AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(), + color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black), + Divider( + color: Colors.grey[400], + ), + ], + ), + ), + ), ], - ))) - : SizedBox(), - Column( - mainAxisAlignment: MainAxisAlignment.start, - mainAxisSize: MainAxisSize.min, - children: snapshot.data.getAllSharedRecordsByStatusList.map((result) { - return result.status == 3 - ? Container( - padding: EdgeInsets.only(bottom: 5), - child: InkWell( - onTap: () { - switchUser(result, context); - }, - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - child: Icon(Icons.person, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black), - ), - Expanded( - flex: 7, - child: Padding( - padding: EdgeInsets.only(left: 5, right: 5), - child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [ - AppText(result.patientName, color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black), - AppText(TranslationBase.of(context).fileno + ": " + result.responseID.toString(), - color: result.responseID == user.patientID ? Color(0xFF40ACC9) : Colors.black), - ]))), - ], - ))) - : SizedBox(); - }).toList()) - ], - )); + ), + ), + ) + : SizedBox(); + }).toList()) + ], + )); + } + }, + ), + mHeight(20), + InkWell( + child: DrawerItem( + TranslationBase.of(context).arabicChange, + Padding(child: Image.asset('assets/images/lang.png'), padding: EdgeInsets.only(left: 3, right: 3, top: 3, bottom: projectProvider.isArabic ? 3 : 0)), + isImageIcon: true, + bottomLine: false, + fontHeight: projectProvider.isArabic ? 1 : 0.8, + ), + onTap: () { + sharedPref.setBool(IS_ROBOT_INIT, null); + if (projectProvider.isArabic) { + projectProvider.changeLanguage('en'); + } else { + projectProvider.changeLanguage('ar'); } }, ), @@ -288,7 +289,9 @@ class _AppDrawerState extends State { children: [ DrawerItem( TranslationBase.of(context).notification, - Icons.notifications, + SvgPicture.asset("assets/images/new/notifications.svg"), + isImageIcon: true, + bottomLine: false, count: notificationCount != null ? new Container( padding: EdgeInsets.all(4), @@ -323,7 +326,12 @@ class _AppDrawerState extends State { ), if (projectProvider.havePrivilege(3)) InkWell( - child: DrawerItem(TranslationBase.of(context).appsetting, Icons.settings_input_composite), + child: DrawerItem( + TranslationBase.of(context).appsetting, + SvgPicture.asset("assets/images/new/app_setting.svg"), + isImageIcon: true, + bottomLine: false, + ), onTap: () { Navigator.of(context).pushNamed( SETTINGS, @@ -331,7 +339,11 @@ class _AppDrawerState extends State { }, ), InkWell( - child: DrawerItem(TranslationBase.of(context).rateApp, Icons.star), + child: DrawerItem( + TranslationBase.of(context).rateApp, + Icons.star, + bottomLine: false, + ), onTap: () { if (Platform.isIOS) { launch("https://apps.apple.com/sa/app/dr-suliaman-alhabib/id733503978"); @@ -345,6 +357,7 @@ class _AppDrawerState extends State { TranslationBase.of(context).logout, SvgPicture.asset("assets/images/new/logout.svg"), isImageIcon: true, + bottomLine: false, ), onTap: () { logout(); @@ -468,6 +481,7 @@ class _AppDrawerState extends State { GifLoaderDialogUtils.showMyDialog(context); this.familyFileProvider.silentLoggin(user is AuthenticatedUser ? null : user, mainUser: user is AuthenticatedUser).then((value) { GifLoaderDialogUtils.hideDialog(context); + Navigator.of(context).pop(); loginAfter(value, context); }).catchError((err) { GifLoaderDialogUtils.hideDialog(context); diff --git a/lib/widgets/drawer/drawer_item_widget.dart b/lib/widgets/drawer/drawer_item_widget.dart index beb6ef4a..2f0508f0 100644 --- a/lib/widgets/drawer/drawer_item_widget.dart +++ b/lib/widgets/drawer/drawer_item_widget.dart @@ -16,14 +16,9 @@ class DrawerItem extends StatefulWidget { final bool sideArrow; final Widget count; final bool isImageIcon; - DrawerItem(this.title, this.icon, - {this.textColor, - this.iconColor, - this.subTitle = '', - this.bottomLine = true, - this.count, - this.sideArrow = false, - this.isImageIcon = false}); + final double fontHeight; + + DrawerItem(this.title, this.icon, {this.textColor, this.iconColor, this.subTitle = '', this.bottomLine = true, this.count, this.sideArrow = false, this.isImageIcon = false,this.fontHeight}); @override _DrawerItemState createState() => _DrawerItemState(); @@ -53,39 +48,31 @@ class _DrawerItemState extends State { ? widget.icon : Icon( widget.icon, - color: widget.iconColor == null - ? Theme.of(context).textTheme.bodyText1.color - : widget.iconColor, + color: widget.iconColor == null ? Theme.of(context).textTheme.bodyText1.color : widget.iconColor, size: SizeConfig.imageSizeMultiplier * 5, )), Expanded( flex: 7, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Row( - children: [ - AppText( - widget.title, - fontSize: SizeConfig.textMultiplier * 2.3, - ), - widget.count ?? SizedBox(), - ], + child: Column(crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.center, children: [ + Row( + children: [ + AppText( + widget.title, + fontWeight: FontWeight.bold, + fontSize: SizeConfig.textMultiplier * 2.3, + height: widget.fontHeight, ), - widget.subTitle != '' - ? AppText( - widget.subTitle, - fontSize: SizeConfig.textMultiplier * 2.5, - ) - : SizedBox(), - ])), - widget.sideArrow == true - ? Expanded( - flex: 1, - child: - Icon(Icons.keyboard_arrow_right, color: Colors.red)) - : Expanded(flex: 1, child: SizedBox()), + widget.count ?? SizedBox(), + ], + ), + widget.subTitle != '' + ? AppText( + widget.subTitle, + fontSize: SizeConfig.textMultiplier * 2.5, + ) + : SizedBox(), + ])), + widget.sideArrow == true ? Expanded(flex: 1, child: Icon(Icons.keyboard_arrow_right, color: Colors.black)) : Expanded(flex: 1, child: SizedBox()), ], ), )); diff --git a/lib/widgets/text/app_texts_widget.dart b/lib/widgets/text/app_texts_widget.dart index e3c6af9a..898ea15d 100644 --- a/lib/widgets/text/app_texts_widget.dart +++ b/lib/widgets/text/app_texts_widget.dart @@ -23,6 +23,8 @@ class AppText extends StatefulWidget { final TextAlign textAlign; final Color backGroundcolor; final bool underline; + final double height; + AppText(this.data, {this.color, this.fontWeight = FontWeight.normal, @@ -37,6 +39,7 @@ class AppText extends StatefulWidget { this.visibility = true, this.textAlign, this.underline = false, + this.height, this.backGroundcolor = Colors.white}); @override @@ -50,31 +53,22 @@ class _AppTextState extends State { return Visibility( visible: widget.visibility, child: Container( - margin: widget.margin != null - ? EdgeInsets.all(widget.margin) - : EdgeInsets.only( - top: widget.marginTop, - right: widget.marginRight, - bottom: widget.marginBottom, - left: widget.marginLeft), + margin: widget.margin != null ? EdgeInsets.all(widget.margin) : EdgeInsets.only(top: widget.marginTop, right: widget.marginRight, bottom: widget.marginBottom, left: widget.marginLeft), child: Text( widget.data, textAlign: widget.textAlign, overflow: TextOverflow.clip, style: TextStyle( - color: widget.color == null - ? Theme.of(context).textTheme.bodyText1.color - : widget.color, + color: widget.color == null ? Theme.of(context).textTheme.bodyText1.color : widget.color, fontWeight: widget.fontWeight, fontSize: widget.fontSize ?? (SizeConfig.textMultiplier * 2), + height: widget.height, fontFamily: widget.fontFamily == null ? projectViewModel.isArabic ? 'Cairo' : 'WorkSans' : widget.fontFamily, - decoration: widget.underline == true - ? TextDecoration.underline - : TextDecoration.none + decoration: widget.underline == true ? TextDecoration.underline : TextDecoration.none // backgroundColor:widget.backGroundcolor ), ),