diff --git a/assets/images/svgs/bottom_nav/qr reader-active.svg b/assets/images/svgs/bottom_nav/reader-active.svg similarity index 100% rename from assets/images/svgs/bottom_nav/qr reader-active.svg rename to assets/images/svgs/bottom_nav/reader-active.svg diff --git a/assets/images/svgs/bottom_nav/Dr reply-active.svg b/assets/images/svgs/bottom_nav/reply-active.svg similarity index 100% rename from assets/images/svgs/bottom_nav/Dr reply-active.svg rename to assets/images/svgs/bottom_nav/reply-active.svg diff --git a/assets/images/svgs/profile_screen/diagnosis.svg b/assets/images/svgs/profile_screen/diagnosis.svg new file mode 100644 index 00000000..b0c9b83c --- /dev/null +++ b/assets/images/svgs/profile_screen/diagnosis.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/svgs/profile_screen/operating report.svg b/assets/images/svgs/profile_screen/operating report.svg new file mode 100644 index 00000000..8d9766be --- /dev/null +++ b/assets/images/svgs/profile_screen/operating report.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/svgs/profile_screen/order sheets.svg b/assets/images/svgs/profile_screen/order sheets.svg new file mode 100644 index 00000000..c9e61e92 --- /dev/null +++ b/assets/images/svgs/profile_screen/order sheets.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/svgs/profile_screen/pending orders.svg b/assets/images/svgs/profile_screen/pending orders.svg new file mode 100644 index 00000000..ffe95e3b --- /dev/null +++ b/assets/images/svgs/profile_screen/pending orders.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/assets/images/svgs/profile_screen/sick leave.svg b/assets/images/svgs/profile_screen/sick leave.svg new file mode 100644 index 00000000..0774eb79 --- /dev/null +++ b/assets/images/svgs/profile_screen/sick leave.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 77994274..80868187 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -215,7 +215,6 @@ TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; - DevelopmentTeam = 3A359E86ZF; LastSwiftMigration = 1100; }; }; @@ -416,7 +415,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 4; - DEVELOPMENT_TEAM = 3A359E86ZF; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -551,7 +550,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = 4; - DEVELOPMENT_TEAM = 3A359E86ZF; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -582,7 +581,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements; CURRENT_PROJECT_VERSION = 4; - DEVELOPMENT_TEAM = 3A359E86ZF; + DEVELOPMENT_TEAM = ""; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cf..bfbb2561 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ - - - - + + - - > localizedValues = { "radiology": {"en": "Radiology", "ar": "الأشعة"}, "service": {"en": "Service", "ar": "خدمة"}, "referral": {"en": "Referral", "ar": "الإحالة"}, - "inPatient": {"en": "InPatients", "ar": "مرضاي"}, - "myInPatient": {"en": "My\nInPatients", "ar": "مرضاي\nالمنومين"}, - "myInPatientTitle": {"en": "My InPatients", "ar": "مرضاي المنومين"}, + "inPatient": {"en": "In Patients", "ar": "مرضاي"}, + "myInPatient": {"en": "My\n In Patients", "ar": "مرضاي\nالمنومين"}, + "myInPatientTitle": {"en": "My Patients", "ar": "مرضاي المنومين"}, "inPatientLabel": {"en": "InPatients", "ar": "المريض المنوم"}, - "inPatientAll": {"en": "All InPatients", "ar": "جميع المرضى المنومين"}, + "inPatientAll": {"en": "All Patients", "ar": "جميع المرضى المنومين"}, "operations": {"en": "Operations", "ar": "عمليات"}, "patientServices": {"en": "Patient Services", "ar": "خدمات المرضى"}, "searchMedicineDashboard": { diff --git a/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart b/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart index 8b51319c..4905da58 100644 --- a/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart +++ b/lib/screens/doctor/doctor_replay/doctor_reply_screen.dart @@ -81,38 +81,33 @@ class _DoctorReplyScreenState extends State preferredSize: Size.fromHeight( MediaQuery.of(context).size.height * 0.070), child: Container( - height: MediaQuery.of(context).size.height * 0.070, - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Theme.of(context).dividerColor, - width: 0.5), //width: 0.7 + child: TabBar( + isScrollable: false, + controller: _tabController, + indicatorColor: Colors.transparent, + indicatorWeight: 1.0, + indicatorSize: TabBarIndicatorSize.tab, + labelColor: Theme.of(context).primaryColor, + labelPadding: EdgeInsets.only( + top: 0, left: 0, right: 0, bottom: 0), + unselectedLabelColor: Colors.grey[800], + tabs: [ + tabWidget( + screenSize, + _activeTab == 0, + /// TODO Elham* Add Tran + "Not Replied", + isFirst: true, context: context ), - color: Colors.white), - child: Center( - child: TabBar( - isScrollable: false, - controller: _tabController, - indicatorColor: Colors.transparent, - indicatorWeight: 1.0, - indicatorSize: TabBarIndicatorSize.tab, - labelColor: Theme.of(context).primaryColor, - labelPadding: EdgeInsets.only( - top: 0, left: 0, right: 0, bottom: 0), - unselectedLabelColor: Colors.grey[800], - tabs: [ - tabWidget( - screenSize, - _activeTab == 0, - "Not Replied", - ), - tabWidget( - screenSize, - _activeTab == 1, - TranslationBase.of(context).all, - ), - ], - ), + tabWidget( + screenSize, + _activeTab == 1, + + TranslationBase.of(context).all, + isLast: true, + context: context + ), + ], ), ), ), @@ -140,44 +135,22 @@ class _DoctorReplyScreenState extends State } Widget tabWidget(Size screenSize, bool isActive, String title, - {int counter = -1}) { + {int counter = -1, bool isFirst = false, + bool isMiddle = false, + bool isLast = false,context}) { return Center( child: Container( - height: screenSize.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - isActive ? Color(0xFFD02127 /*B8382B*/) : Color(0xFFEAEAEA), - isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), + height: Helpers.getTabHeight(context), + decoration: Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - AppText( - title, - fontSize: SizeConfig.textMultiplier * 1.5, - color: isActive ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, - ), + Helpers.getTabText(title: title, isActive: isActive), if (counter != -1) - Container( - margin: EdgeInsets.all(4), - width: 15, - height: 15, - decoration: BoxDecoration( - color: isActive ? Colors.white : Color(0xFFD02127), - shape: BoxShape.circle, - ), - child: Center( - child: FittedBox( - child: AppText( - "$counter", - fontSize: SizeConfig.textMultiplier * 1.5, - color: !isActive ? Colors.white : Color(0xFFD02127), - fontWeight: FontWeight.w700, - ), - ), - ), - ), + Helpers.getTabCounter( + isActive: isActive, + counter:counter + ) ], ), ), diff --git a/lib/screens/home/home_page_card.dart b/lib/screens/home/home_page_card.dart index df4ae48f..7a0d5167 100644 --- a/lib/screens/home/home_page_card.dart +++ b/lib/screens/home/home_page_card.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; @@ -10,7 +11,7 @@ class HomePageCard extends StatelessWidget { Key key, this.color, this.opacity = 0.4, - this.margin, this.width}) + this.margin, this.width, this.gradient}) : super(key: key); final bool hasBorder; final String imageName; @@ -20,6 +21,8 @@ class HomePageCard extends StatelessWidget { final double opacity; final double width; final EdgeInsets margin; + final LinearGradient gradient; + @override Widget build(BuildContext context) { return InkWell( @@ -28,12 +31,13 @@ class HomePageCard extends StatelessWidget { width: width, margin: this.margin, decoration: BoxDecoration( - color: !hasBorder - ? color != null - ? color - : HexColor('#050705').withOpacity(opacity) - : Colors.white, - borderRadius: BorderRadius.circular(17.0), + // color: !hasBorder + // ? color != null + // ? color + // : HexColor('#050705').withOpacity(opacity) + // : Colors.white, + gradient: gradient, + borderRadius: BorderRadius.circular(20.0), border: hasBorder ? Border.all(width: 1.0, color: const Color(0xffcccccc)) : Border.all(width: 0.0, color: Colors.transparent), diff --git a/lib/screens/home/home_patient_card.dart b/lib/screens/home/home_patient_card.dart index 06ef380f..0180fc14 100644 --- a/lib/screens/home/home_patient_card.dart +++ b/lib/screens/home/home_patient_card.dart @@ -12,6 +12,7 @@ class HomePatientCard extends StatelessWidget { final Color textColor; final VoidCallback onTap; final double iconSize; + final LinearGradient gradient; HomePatientCard({ this.backgroundColor, @@ -21,7 +22,7 @@ class HomePatientCard extends StatelessWidget { this.text, this.textColor, this.onTap, - this.iconSize = 30, + this.iconSize = 30, this.gradient, }); @override @@ -31,6 +32,7 @@ class HomePatientCard extends StatelessWidget { return HomePageCard( color: backgroundColor, width: width, + gradient: gradient, margin: EdgeInsets.all(SizeConfig.widthMultiplier *1.121), child: Container( padding: EdgeInsets.all(8), @@ -94,6 +96,8 @@ class HomePatientCard extends StatelessWidget { text, color: textColor, textAlign: TextAlign.start, + letterSpacing: -0.33, + fontWeight: FontWeight.w600, fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width) * (SizeConfig.isHeightVeryShort ? 11 : 10), diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index f5b62368..4e577bb9 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -319,24 +319,39 @@ class _HomeScreenState extends State { DashboardViewModel model, projectsProvider) { colorIndex = 0; - List backgroundColors = List(3); - backgroundColors[0] = AppGlobal.appRedColor; - backgroundColors[1] = Colors.grey[300]; - backgroundColors[2] = Color(0xFF2B353E); + List backgroundColors = List(3); + backgroundColors[0] = LinearGradient( + begin: Alignment(-1.0, -2.0), + end: Alignment(1.0, 2.0), + colors: [ + AppGlobal.appRedColor,Color(0xFFAD3B3B), + ]);//AppGlobal.appRedColor; + backgroundColors[1] = LinearGradient( + begin: Alignment.center, + end: Alignment.center, + colors: [ + Color(0xFFC9C9C9),Color(0xFFC9C9C9), + ]); + backgroundColors[2] = LinearGradient( + begin: Alignment.center, + end: Alignment.center, + colors: [ + Color(0xFF71787E),AppGlobal.appTextColor + ]); List backgroundIconColors = List(3); backgroundIconColors[0] = Colors.white12; backgroundIconColors[1] = Colors.white38; backgroundIconColors[2] = Colors.white10; List textColors = List(3); textColors[0] = Colors.white; - textColors[1] = Colors.black; + textColors[1] = Color(0xFF353E47); textColors[2] = Colors.white; List patientCards = List(); if (model.hasVirtualClinic) { patientCards.add(HomePatientCard( - backgroundColor: backgroundColors[colorIndex], + gradient: backgroundColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex], cardIcon: DoctorApp.livecare, textColor: textColors[colorIndex], @@ -373,7 +388,7 @@ class _HomeScreenState extends State { } patientCards.add(HomePatientCard( - backgroundColor: backgroundColors[colorIndex], + gradient: backgroundColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex], cardIcon: DoctorApp.inpatient, textColor: textColors[colorIndex], @@ -393,7 +408,7 @@ class _HomeScreenState extends State { changeColorIndex(); patientCards.add(HomePatientCard( - backgroundColor: backgroundColors[colorIndex], + gradient: backgroundColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex], //TODO Elham* match the of the icon cardIcon: DoctorApp.arrival_patients, @@ -411,7 +426,7 @@ class _HomeScreenState extends State { changeColorIndex(); patientCards.add(HomePatientCard( - backgroundColor: backgroundColors[colorIndex], + gradient: backgroundColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex], cardIcon: DoctorApp.arrival_patients, textColor: textColors[colorIndex], @@ -438,7 +453,7 @@ class _HomeScreenState extends State { changeColorIndex(); patientCards.add(HomePatientCard( - backgroundColor: backgroundColors[colorIndex], + gradient: backgroundColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex], cardIcon: DoctorApp.referral_1, textColor: textColors[colorIndex], @@ -456,7 +471,7 @@ class _HomeScreenState extends State { changeColorIndex(); patientCards.add(HomePatientCard( - backgroundColor: backgroundColors[colorIndex], + gradient: backgroundColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex], cardIcon: DoctorApp.search, textColor: textColors[colorIndex], @@ -473,7 +488,7 @@ class _HomeScreenState extends State { changeColorIndex(); patientCards.add(HomePatientCard( - backgroundColor: backgroundColors[colorIndex], + gradient: backgroundColors[colorIndex], backgroundIconColor: backgroundIconColors[colorIndex], cardIcon: DoctorApp.search_medicines, textColor: textColors[colorIndex], diff --git a/lib/screens/live_care/end_call_screen.dart b/lib/screens/live_care/end_call_screen.dart index 060b3844..35c00beb 100644 --- a/lib/screens/live_care/end_call_screen.dart +++ b/lib/screens/live_care/end_call_screen.dart @@ -61,7 +61,7 @@ class _EndCallScreenState extends State { Widget build(BuildContext context) { final List cardsList = [ PatientProfileCardModel(TranslationBase.of(context).resume, - TranslationBase.of(context).theCall, '', 'patient/vital_signs.png', + TranslationBase.of(context).theCall, '', 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient, color: AppGlobal.appGreenColor, onTap: () async { @@ -122,7 +122,7 @@ class _EndCallScreenState extends State { TranslationBase.of(context).endLC, TranslationBase.of(context).consultation, '', - 'patient/vital_signs.png', + 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient, color: Colors.red[800], onTap: () { @@ -155,7 +155,7 @@ class _EndCallScreenState extends State { TranslationBase.of(context).sendLC, TranslationBase.of(context).instruction, "", - 'patient/health_summary.png', + 'assets/images/svgs/profile_screen/health summary.svg', onTap: () { Helpers.showConfirmationDialog(context, "${TranslationBase.of(context).areYouSureYouWantTo} ${TranslationBase.of(context).sendLC} ${TranslationBase.of(context).instruction} ?", @@ -179,7 +179,7 @@ class _EndCallScreenState extends State { TranslationBase.of(context).transferTo, TranslationBase.of(context).admin, '', - 'patient/health_summary.png', onTap: () { + 'assets/images/svgs/profile_screen/health summary.svg', onTap: () { Navigator.push( context, MaterialPageRoute( diff --git a/lib/screens/patients/In_patient/in_patient_screen.dart b/lib/screens/patients/In_patient/in_patient_screen.dart index ef9f8b03..5be1c1c5 100644 --- a/lib/screens/patients/In_patient/in_patient_screen.dart +++ b/lib/screens/patients/In_patient/in_patient_screen.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; @@ -111,6 +112,7 @@ class _InPatientScreenState extends State Expanded( child: Scaffold( extendBodyBehindAppBar: false, + appBar: PreferredSize( preferredSize: Size.fromHeight( MediaQuery.of(context).size.height * 0.070), @@ -123,26 +125,28 @@ class _InPatientScreenState extends State width: 0.5), //width: 0.7 ), color: Colors.white), - child: Center( + child: Container( + margin: EdgeInsets.only(top: 9), child: TabBar( isScrollable: false, controller: _tabController, - indicatorColor: Colors.transparent, - indicatorWeight: 1.0, - indicatorSize: TabBarIndicatorSize.tab, - labelColor: Theme.of(context).primaryColor, + indicatorColor: AppGlobal.appRedColor, + indicatorWeight: 0.001, + indicator:BoxDecoration(), + // indicatorSize: TabBarIndicatorSize.tab, + // labelColor: Theme.of(context).primaryColor, labelPadding: EdgeInsets.only( top: 0, left: 0, right: 0, bottom: 0), - unselectedLabelColor: Colors.grey[800], + // unselectedLabelColor: Colors.grey[800], tabs: [ tabWidget(screenSize, _activeTab == 0, TranslationBase.of(context).inPatientAll, - counter: model.inPatientList.length), + counter: model.inPatientList.length, isFirst: true), tabWidget(screenSize, _activeTab == 1, TranslationBase.of(context).myInPatientTitle, - counter: model.myIinPatientList.length), + counter: model.myIinPatientList.length, isMiddle: true), tabWidget(screenSize, _activeTab == 2, - TranslationBase.of(context).discharged), + TranslationBase.of(context).discharged, isLast:true), ], ), ), @@ -192,44 +196,20 @@ class _InPatientScreenState extends State } Widget tabWidget(Size screenSize, bool isActive, String title, - {int counter = -1}) { + {int counter = -1, + bool isFirst = false, + bool isMiddle = false, + bool isLast = false,}) { return Center( child: Container( - height: screenSize.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - isActive ? Color(0xFFD02127 /*B8382B*/) : Color(0xFFEAEAEA), - isActive ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), + height: Helpers.getTabHeight(context), + decoration:Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast), child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - AppText( - title, - fontSize: SizeConfig.textMultiplier * 1.5, - color: isActive ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, - ), + Helpers.getTabText(title:title, isActive:isActive), if (counter != -1) - Container( - margin: EdgeInsets.all(4), - width: 15, - height: 15, - decoration: BoxDecoration( - color: isActive ? Colors.white : Color(0xFFD02127), - shape: BoxShape.circle, - ), - child: Center( - child: FittedBox( - child: AppText( - "$counter", - fontSize: SizeConfig.textMultiplier * 1.5, - color: !isActive ? Colors.white : Color(0xFFD02127), - fontWeight: FontWeight.w700, - ), - ), - ), - ), + Helpers.getTabCounter(isActive:isActive,counter:counter) ], ), ), diff --git a/lib/screens/patients/out_patient/out_patient_screen.dart b/lib/screens/patients/out_patient/out_patient_screen.dart index 5a6a0083..ab320f07 100644 --- a/lib/screens/patients/out_patient/out_patient_screen.dart +++ b/lib/screens/patients/out_patient/out_patient_screen.dart @@ -11,6 +11,7 @@ import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; +import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/patients/patient_card/PatientCard.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; @@ -105,7 +106,7 @@ class _OutPatientsScreenState extends State { children: [ Container( // color: Colors.red, - height: screenSize.height * 0.070, + height: Helpers.getTabHeight(context), decoration: TextFieldsUtils.containerBorderDecoration( Color(0Xffffffff), Color(0xFFCCCCCC), borderRadius: 4, borderWidth: 0), @@ -143,52 +144,24 @@ class _OutPatientsScreenState extends State { child: Center( child: Container( height: screenSize.height * 0.070, - decoration: - TextFieldsUtils.containerBorderDecoration( - _isActive - ? Color(0xFFD02127 /*B8382B*/) - : Color(0xFFEAEAEA), - _isActive - ? Color(0xFFD02127) - : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), + decoration: Helpers.getBoxTabsBoxDecoration( + isActive: _isActive, + isFirst: _times.indexOf(item) == 0, + isLast: + _times.indexOf(item) == _times.length - 1, + isMiddle: _times.indexOf(item) != 0 && _times.indexOf(item) != _times.length - 1 + + ), child: Center( child: Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - AppText( - item, - fontSize: SizeConfig.textMultiplier * 1.8, - color: _isActive - ? Colors.white - : Color(0xFF2B353E), - fontWeight: FontWeight.w700, - ), + Helpers.getTabText(title: item, isActive: _isActive), _isActive && _activeLocation != 0 && model.state == ViewState.Idle - ? Container( - padding: EdgeInsets.all(2), - margin: EdgeInsets.symmetric( - horizontal: 5), - decoration: new BoxDecoration( - color: Colors.white, - borderRadius: - BorderRadius.circular(50), - ), - constraints: BoxConstraints( - minWidth: 20, - minHeight: 20, - ), - child: new Text( - model.filterData.length.toString(), - style: new TextStyle( - color: Colors.red, - fontSize: 10), - textAlign: TextAlign.center, - ), - ) + ? Helpers.getTabCounter(isActive:_isActive,counter: model.filterData.length) + : Container(), ], ), @@ -245,7 +218,6 @@ class _OutPatientsScreenState extends State { }, ), ), - Expanded( child: Container( child: model.filterData.isEmpty @@ -267,7 +239,8 @@ class _OutPatientsScreenState extends State { .patientStatusType == 43)) return Padding( - padding: EdgeInsets.symmetric(horizontal: 8, vertical: 0), + padding: EdgeInsets.symmetric( + horizontal: 8, vertical: 0), child: PatientCard( patientInfo: model.filterData[index], patientType: patientType, diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index 16a4f23c..b2261f4c 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -22,6 +22,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/buttons/app_buttons_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:quiver/async.dart'; @@ -251,8 +252,8 @@ class _PatientProfileScreenState extends State hPadding: 20, fontWeight: FontWeight.normal, fontSize: 1.6, - icon: Image.asset( - "assets/images/create-episod.png", + icon: SvgPicture.asset( + "assets/images/svgs/profile_screen/create episode.svg", color: Colors.white, height: 30, ), @@ -283,8 +284,8 @@ class _PatientProfileScreenState extends State hPadding: 20, fontWeight: FontWeight.normal, fontSize: 1.6, - icon: Image.asset( - "assets/images/modilfy-episode.png", + icon: SvgPicture.asset( + "assets/images/svgs/profile_screen/modify episode.svg", color: Colors.white, height: 30, ), diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart index 53d16291..6dc954c3 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart @@ -39,70 +39,70 @@ class ProfileGridForInPatient extends StatelessWidget { TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS, - 'patient/vital_signs.png', + 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, - 'patient/lab_results.png', + 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).lab, TranslationBase.of(context).special, ALL_SPECIAL_LAB_RESULT, - 'patient/lab_results.png', + 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).radiology, TranslationBase.of(context).result, RADIOLOGY_PATIENT, - 'patient/health_summary.png', + 'assets/images/svgs/profile_screen/Radiology.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).patient, TranslationBase.of(context).prescription, ORDER_PRESCRIPTION_NEW, - 'patient/order_prescription.png', + 'assets/images/svgs/profile_screen/order prescription.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).progress, TranslationBase.of(context).note, PROGRESS_NOTE, - 'patient/Progress_notes.png', + 'assets/images/svgs/profile_screen/Progress notes.svg', isInPatient: isInpatient, isDischargedPatient: isDischargedPatient), PatientProfileCardModel( TranslationBase.of(context).order, TranslationBase.of(context).sheet, ORDER_NOTE, - 'patient/Progress_notes.png', + 'assets/images/svgs/profile_screen/order sheets.svg', isInPatient: isInpatient, isDischargedPatient: isDischargedPatient), PatientProfileCardModel( TranslationBase.of(context).orders, TranslationBase.of(context).procedures, ORDER_PROCEDURE, - 'patient/Order_Procedures.png', + 'assets/images/svgs/profile_screen/Order Procedures.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, - 'patient/health_summary.png', + 'assets/images/svgs/profile_screen/health summary.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).medical, TranslationBase.of(context).report, PATIENT_MEDICAL_REPORT, - 'patient/health_summary.png', + 'assets/images/svgs/profile_screen/medical report.svg', isInPatient: isInpatient, isDisable: false), PatientProfileCardModel( TranslationBase.of(context).referral, TranslationBase.of(context).patient, REFER_IN_PATIENT_TO_DOCTOR, - 'patient/refer_patient.png', + 'assets/images/svgs/profile_screen/refer patient.svg', isInPatient: isInpatient, isDisable: isDischargedPatient || isFromSearch, ), @@ -110,62 +110,62 @@ class ProfileGridForInPatient extends StatelessWidget { TranslationBase.of(context).insurance, TranslationBase.of(context).approvals, PATIENT_INSURANCE_APPROVALS_NEW, - 'patient/vital_signs.png', + 'assets/images/svgs/profile_screen/insurance approval.svg', isInPatient: isInpatient), PatientProfileCardModel( TranslationBase.of(context).discharge, TranslationBase.of(context).report, DISCHARGE_SUMMARY, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/discharge summary.svg', isInPatient: isInpatient, ), PatientProfileCardModel( TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/patient sick leave.svg', isInPatient: isInpatient, ), PatientProfileCardModel( TranslationBase.of(context).operation, TranslationBase.of(context).report, GET_OPERATION_REPORT, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/operating report.svg', isInPatient: isInpatient, ), PatientProfileCardModel( TranslationBase.of(context).pending, TranslationBase.of(context).orders, PENDING_ORDERS, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/pending orders.svg', isInPatient: isInpatient, ), PatientProfileCardModel( TranslationBase.of(context).admission, TranslationBase.of(context).orders, ADMISSION_ORDERS, - 'patient/Progress_notes.png', + 'assets/images/svgs/profile_screen/admission req.svg', isInPatient: isInpatient, ), PatientProfileCardModel( "Nursing", TranslationBase.of(context).progressNote, NURSING_PROGRESS_NOTE, - 'patient/Progress_notes.png', + 'assets/images/svgs/profile_screen/Progress notes.svg', isInPatient: isInpatient, ), PatientProfileCardModel( TranslationBase.of(context).diagnosis, "", DIAGNOSIS_FOR_IN_PATIENT, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/diagnosis.svg', isInPatient: isInpatient, ), PatientProfileCardModel( TranslationBase.of(context).diabetic, TranslationBase.of(context).chart, DIABETIC_CHART_VALUES, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/diabetic chart.svg', isInPatient: isInpatient, ), ]; @@ -179,7 +179,7 @@ class ProfileGridForInPatient extends StatelessWidget { // if you want IOS bouncing effect, otherwise remove this line gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( crossAxisSpacing: 10, - mainAxisSpacing: 10, + mainAxisSpacing: 8, crossAxisCount: 3, ), //change the number as you want diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart index a374898c..dbdaf4a8 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart @@ -34,37 +34,37 @@ class ProfileGridForOther extends StatelessWidget { Widget build(BuildContext context) { final List cardsList = [ PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS, - 'patient/vital_signs.png', + 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient), PatientProfileCardModel( - TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png', + TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special, - ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png', + ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, - RADIOLOGY_PATIENT, 'patient/health_summary.png', + RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription, - ORDER_PRESCRIPTION_NEW, 'patient/order_prescription.png', + ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, - 'patient/health_summary.png', + 'assets/images/svgs/profile_screen/health summary.svg', isInPatient: isInpatient), - PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'patient/patient_sick_leave.png', + PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures, - ORDER_PROCEDURE, 'patient/Order_Procedures.png', + ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service, - PATIENT_INSURANCE_APPROVALS_NEW, 'patient/vital_signs.png', + PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/insurance approval.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/patient sick leave.svg', isInPatient: isInpatient), if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf, - PATIENT_UCAF_REQUEST, 'patient/ucaf.png', + PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg', isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null @@ -74,7 +74,7 @@ class ProfileGridForOther extends StatelessWidget { TranslationBase.of(context).referral, TranslationBase.of(context).patient, REFER_PATIENT_TO_DOCTOR, - 'patient/refer_patient.png', + 'assets/images/svgs/profile_screen/refer patient.svg', isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null @@ -82,7 +82,7 @@ class ProfileGridForOther extends StatelessWidget { ), if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, - PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png', + PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg', isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null @@ -96,8 +96,8 @@ class ProfileGridForOther extends StatelessWidget { child: StaggeredGridView.countBuilder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), - crossAxisSpacing: 10, - mainAxisSpacing: 10, + crossAxisSpacing: 8, + mainAxisSpacing: 8, crossAxisCount: 3, itemCount: cardsList.length, staggeredTileBuilder: (int index) => StaggeredTile.fit(1), diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart index 5bcc398d..b1438e70 100644 --- a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart +++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart @@ -24,45 +24,45 @@ class ProfileGridForSearch extends StatelessWidget { Widget build(BuildContext context) { final List cardsList = [ PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS, - 'patient/vital_signs.png', + 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient), PatientProfileCardModel( - TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'patient/lab_results.png', + TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special, - ALL_SPECIAL_LAB_RESULT, 'patient/lab_results.png', + ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, - RADIOLOGY_PATIENT, 'patient/health_summary.png', + RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription, - ORDER_PRESCRIPTION_NEW, 'patient/order_prescription.png', + ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, - 'patient/health_summary.png', + 'assets/images/svgs/profile_screen/health summary.svg', isInPatient: isInpatient), - PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'patient/patient_sick_leave.png', + PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures, - ORDER_PROCEDURE, 'patient/Order_Procedures.png', + ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service, - PATIENT_INSURANCE_APPROVALS_NEW, 'patient/vital_signs.png', + PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE, - 'patient/patient_sick_leave.png', + 'assets/images/svgs/profile_screen/patient sick leave.svg', isInPatient: isInpatient), if (patient.appointmentNo != null && patient.appointmentNo != 0) PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf, - PATIENT_UCAF_REQUEST, 'patient/ucaf.png', + PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg', isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false), if (patient.appointmentNo != null && patient.appointmentNo != 0) PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient, - REFER_PATIENT_TO_DOCTOR, 'patient/refer_patient.png', + REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg', isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false), if (patient.appointmentNo != null && patient.appointmentNo != 0) PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, - PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png', + PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg', isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false), ]; @@ -73,8 +73,8 @@ class ProfileGridForSearch extends StatelessWidget { child: StaggeredGridView.countBuilder( shrinkWrap: true, physics: NeverScrollableScrollPhysics(), - crossAxisSpacing: 10, - mainAxisSpacing: 10, + crossAxisSpacing: 8, + mainAxisSpacing: 8, crossAxisCount: 3, itemCount: cardsList.length, staggeredTileBuilder: (int index) => StaggeredTile.fit(1), diff --git a/lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart b/lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart index 29697dc1..b2242ff7 100644 --- a/lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart +++ b/lib/screens/patients/profile/referral/my-referral-inpatient-screen.dart @@ -37,19 +37,21 @@ class _MyReferralInPatientScreenState extends State { children: [ Container( margin: EdgeInsets.only(top: 70), - child: PatientTypeRadioWidget( - (patientType) async { - setState(() { - this.patientType = patientType; - }); - GifLoaderDialogUtils.showMyDialog(context); - if (patientType == PatientType.IN_PATIENT) { - await model.getMyReferralPatientService(localBusy: true); - } else { - await model.getMyReferralOutPatientService(localBusy: true); - } - GifLoaderDialogUtils.hideDialog(context); - }, + child: Container( + child: PatientTypeRadioWidget( + (patientType) async { + setState(() { + this.patientType = patientType; + }); + GifLoaderDialogUtils.showMyDialog(context); + if (patientType == PatientType.IN_PATIENT) { + await model.getMyReferralPatientService(localBusy: true); + } else { + await model.getMyReferralOutPatientService(localBusy: true); + } + GifLoaderDialogUtils.hideDialog(context); + }, + ), ), ), model.myReferralPatients.isEmpty @@ -74,91 +76,93 @@ class _MyReferralInPatientScreenState extends State { : Expanded( child: SingleChildScrollView( child: Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ListView.builder( - itemCount: model.myReferralPatients.length, - scrollDirection: Axis.vertical, - physics: ScrollPhysics(), - shrinkWrap: true, - itemBuilder: (context, index) { - return InkWell( - onTap: () { - if (patientType == - PatientType.OUT_PATIENT) { - Navigator.push( - context, - FadePage( - page: MyReferralDetailScreen( - referralPatient: model - .myReferralPatients[index]), - ), - ); - } else { - Navigator.push( - context, - FadePage( - page: ReferralPatientDetailScreen( - model.myReferralPatients[index], - model), - ), - ); - } - }, - child: PatientReferralItemWidget( - referralStatus: - model.getReferralStatusNameByCode( - model.myReferralPatients[index] - .referralStatus, - context), - referralStatusCode: model - .myReferralPatients[index] - .referralStatus, - patientName: model - .myReferralPatients[index] - .patientName, - patientGender: model - .myReferralPatients[index].gender, - referredDate: AppDateUtils - .getDayMonthYearDateFormatted(model - .myReferralPatients[index] - .referralDate), - referredTime: AppDateUtils.getTimeHHMMA( - model.myReferralPatients[index] - .referralDate), - patientID: - "${model.myReferralPatients[index].patientID}", - isSameBranch: false, - isReferral: true, - isReferralClinic: true, - referralClinic: - "${model.myReferralPatients[index].referringClinicDescription}", - remark: model.myReferralPatients[index] - .referringDoctorRemarks, - nationality: model - .myReferralPatients[index] - .nationalityName, - nationalityFlag: model - .myReferralPatients[index] - .nationalityFlagURL, - doctorAvatar: model - .myReferralPatients[index] - .doctorImageURL, - referralDoctorName: model - .myReferralPatients[index] - .referringDoctorName, - clinicDescription: model - .myReferralPatients[index] - .referringClinicDescription, - infoIcon: Icon( - FontAwesomeIcons.arrowRight, - size: 25, - color: Colors.black), - ), - ); - }) - ], + child: Container( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ListView.builder( + itemCount: model.myReferralPatients.length, + scrollDirection: Axis.vertical, + physics: ScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, index) { + return InkWell( + onTap: () { + if (patientType == + PatientType.OUT_PATIENT) { + Navigator.push( + context, + FadePage( + page: MyReferralDetailScreen( + referralPatient: model + .myReferralPatients[index]), + ), + ); + } else { + Navigator.push( + context, + FadePage( + page: ReferralPatientDetailScreen( + model.myReferralPatients[index], + model), + ), + ); + } + }, + child: PatientReferralItemWidget( + referralStatus: + model.getReferralStatusNameByCode( + model.myReferralPatients[index] + .referralStatus, + context), + referralStatusCode: model + .myReferralPatients[index] + .referralStatus, + patientName: model + .myReferralPatients[index] + .patientName, + patientGender: model + .myReferralPatients[index].gender, + referredDate: AppDateUtils + .getDayMonthYearDateFormatted(model + .myReferralPatients[index] + .referralDate), + referredTime: AppDateUtils.getTimeHHMMA( + model.myReferralPatients[index] + .referralDate), + patientID: + "${model.myReferralPatients[index].patientID}", + isSameBranch: false, + isReferral: true, + isReferralClinic: true, + referralClinic: + "${model.myReferralPatients[index].referringClinicDescription}", + remark: model.myReferralPatients[index] + .referringDoctorRemarks, + nationality: model + .myReferralPatients[index] + .nationalityName, + nationalityFlag: model + .myReferralPatients[index] + .nationalityFlagURL, + doctorAvatar: model + .myReferralPatients[index] + .doctorImageURL, + referralDoctorName: model + .myReferralPatients[index] + .referringDoctorName, + clinicDescription: model + .myReferralPatients[index] + .referringClinicDescription, + infoIcon: Icon( + FontAwesomeIcons.arrowRight, + size: 25, + color: Colors.black), + ), + ); + }) + ], + ), ), ), ), diff --git a/lib/screens/patients/profile/referral/patient_referral_screen.dart b/lib/screens/patients/profile/referral/patient_referral_screen.dart index 58ccde6a..bb9db904 100644 --- a/lib/screens/patients/profile/referral/patient_referral_screen.dart +++ b/lib/screens/patients/profile/referral/patient_referral_screen.dart @@ -3,6 +3,7 @@ import 'dart:ui'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/screens/patients/patient_search/patient_search_header.dart'; import 'package:doctor_app_flutter/screens/patients/profile/referral/referred-patient-screen.dart'; +import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; @@ -45,123 +46,79 @@ class _PatientReferralScreen extends State @override Widget build(BuildContext context) { return AppScaffold( - appBar: PatientSearchHeader( - title: TranslationBase.of(context).patientsreferral, - ), - body: Column( - children: [ - Container( - //height: MediaQuery.of(context).size.height * 0.050, - decoration: BoxDecoration( - border: Border( - bottom: BorderSide( - color: Theme.of(context).dividerColor, - width: 1), //width: 0.7 - ), - color: Colors.white), - child: TabBar( - isScrollable: false, - controller: _tabController, - indicatorColor: Colors.transparent, - indicatorWeight: 1.0, - indicatorSize: TabBarIndicatorSize.tab, - labelColor: Theme.of(context).primaryColor, - labelPadding: - EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0), - unselectedLabelColor: Colors.grey[800], - tabs: [ - Container( - width: MediaQuery.of(context).size.width * 0.33, - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - Color(0Xffffffff), Color(0xFFCCCCCC), - borderRadius: 4, borderWidth: 0), - child: Center( - child: Container( - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - index == 0 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: AppText( - TranslationBase.of(context).myReferredPatient, - fontSize: SizeConfig.textMultiplier * 1.8, - color: index == 0 ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, + isShowAppBar: true, + appBar: PatientSearchHeader( + title: TranslationBase.of(context).patientsreferral, + ), + appBarTitle: TranslationBase.of(context).patientsreferral, + body: Scaffold( + extendBodyBehindAppBar: true, + // backgroundColor: Colors.white, + appBar: PreferredSize( + preferredSize: + Size.fromHeight(MediaQuery.of(context).size.height * 0.070), + child: Center( + child: Container( + height: Helpers.getTabHeight(context), + child: Center( + child: TabBar( + isScrollable: false, + controller: _tabController, + indicatorColor: Colors.transparent, + indicatorWeight: 1.0, + indicatorSize: TabBarIndicatorSize.tab, + labelColor: Theme.of(context).primaryColor, + labelPadding: + EdgeInsets.only(top: 0, left: 0, right: 0, bottom: 0), + unselectedLabelColor: Colors.grey[800], + tabs: [ + Container( + decoration: Helpers.getBoxTabsBoxDecoration( + isActive: index == 0, isFirst: true), + child: Center( + child: Helpers.getTabText(title:TranslationBase.of(context).myReferredPatient, isActive:index == 0 ) ), ), - ), - ), - ), - Container( - width: MediaQuery.of(context).size.width * 0.34, - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - Color(0Xffffffff), Color(0xFFCCCCCC), - borderRadius: 4, borderWidth: 0), - child: Center( - child: Container( - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - index == 1 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: AppText( - TranslationBase.of(context).referral, - fontSize: SizeConfig.textMultiplier * 1.8, - color: index == 1 ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, + Center( + child: Container( + decoration:Helpers.getBoxTabsBoxDecoration( + isActive: index == 1, isMiddle: true), + child: Center( + child:Helpers.getTabText(title:TranslationBase.of(context).referral, isActive:index == 1 ) + ), ), ), - ), - ), - ), - Container( - width: MediaQuery.of(context).size.width * 0.33, - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - Color(0Xffffffff), Color(0xFFCCCCCC), - borderRadius: 4, borderWidth: 0), - child: Center( - child: Container( - height: MediaQuery.of(context).size.height * 0.070, - decoration: TextFieldsUtils.containerBorderDecoration( - index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - index == 2 ? Color(0xFFD02127) : Color(0xFFEAEAEA), - borderRadius: 4, - borderWidth: 0), - child: Center( - child: AppText( - TranslationBase.of(context).discharged, - fontSize: SizeConfig.textMultiplier * 1.8, - color: index == 2 ? Colors.white : Color(0xFF2B353E), - fontWeight: FontWeight.w700, + Center( + child: Container( + decoration:Helpers.getBoxTabsBoxDecoration( + isActive: index == 2, isLast: true), + child: Center( + child: Helpers.getTabText(title:TranslationBase.of(context).discharged, isActive:index == 2 ), + ), ), ), - ), + ], ), ), - ], + ), ), ), - Expanded( - child: TabBarView( - physics: BouncingScrollPhysics(), - controller: _tabController, - children: [ - ReferredPatientScreen(), - MyReferralInPatientScreen(), - ReferralDischargedPatientPage() - // MyReferredPatient(), - ], - ), - ) - ], - ), - ); + body: Column( + children: [ + Expanded( + child: TabBarView( + physics: BouncingScrollPhysics(), + controller: _tabController, + children: [ + ReferredPatientScreen(), + MyReferralInPatientScreen(), + ReferralDischargedPatientPage() + // MyReferredPatient(), + ], + ), + ) + ], + ), + )); } } diff --git a/lib/util/helpers.dart b/lib/util/helpers.dart index 86a09468..0d7cd088 100644 --- a/lib/util/helpers.dart +++ b/lib/util/helpers.dart @@ -188,7 +188,8 @@ class Helpers { static clearSharedPref() async { await sharedPref.clear(); } - static getCardBoxDecoration(){ + + static getCardBoxDecoration() { return BoxDecoration( borderRadius: BorderRadius.circular(10), color: Colors.white, @@ -328,5 +329,64 @@ class Helpers { return kpi; } + static getBoxTabsBoxDecoration( + { + bool isFirst = false, + bool isMiddle = false, + bool isLast = false, + bool isActive = false, + double radius = 6.0 + }) { + return BoxDecoration( + color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA), + shape: BoxShape.rectangle, + borderRadius: BorderRadius.only( + topRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0), + bottomRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0), + topLeft: Radius.circular(isActive?isLast|| isMiddle?radius:0:0), + bottomLeft: Radius.circular(isActive?isLast || isMiddle?radius:0:0) + ), + ); + } + + static getTabText({String title, bool isActive = false,}){ + return AppText( + title, + fontSize: SizeConfig.textMultiplier * 1.8, + color: isActive ? Colors.white : AppGlobal.appTextColor, + letterSpacing: -0.48, + fontWeight: FontWeight.w600, + ); + + } + + + static getTabHeight(BuildContext context){ + final screenSize = MediaQuery.of(context).size; + return screenSize.height * 0.07; + } + + static getTabCounter({bool isActive: false,int counter}){ + return Container( + margin: EdgeInsets.all(4), + width: 15, + height: 15, + decoration: BoxDecoration( + color: isActive ? Colors.white : AppGlobal.appRedColor, + shape: BoxShape.circle, + ), + child: Center( + child: FittedBox( + child: AppText( + "$counter", + fontSize: SizeConfig.textMultiplier * 1.5, + color: !isActive ? Colors.white : AppGlobal.appRedColor, + fontWeight: FontWeight.w700, + ), + ), + ), + ); + } + } diff --git a/lib/widgets/auth/method_type_card.dart b/lib/widgets/auth/method_type_card.dart index 34b5938c..9839d0ad 100644 --- a/lib/widgets/auth/method_type_card.dart +++ b/lib/widgets/auth/method_type_card.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:flutter/material.dart'; @@ -118,8 +119,9 @@ class MethodTypeCard extends StatelessWidget { AppText( label, fontSize: SizeConfig.getTextMultiplierBasedOnWidth()* (SizeConfig.isHeightVeryShort?3:3.7), - color: Color(0xFF2B353E), - fontWeight: FontWeight.w700, + color: AppGlobal.appTextColor, + fontWeight: FontWeight.w600, + letterSpacing: -0.48, ) ], ), diff --git a/lib/widgets/dashboard/activity_button.dart b/lib/widgets/dashboard/activity_button.dart index b28149b8..4a6e90cd 100644 --- a/lib/widgets/dashboard/activity_button.dart +++ b/lib/widgets/dashboard/activity_button.dart @@ -37,7 +37,9 @@ class GetActivityCard extends StatelessWidget { AppText( value.kPIParameter, textOverflow: TextOverflow.clip, - fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9), + fontHeight: 1.4, + + fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: width)* (SizeConfig.isHeightVeryShort?8: SizeConfig.isHeightShort?8: 9.3), color: AppGlobal.appTextColor, textAlign: TextAlign.start, fontWeight: FontWeight.w600, diff --git a/lib/widgets/dashboard/out_patient_stack.dart b/lib/widgets/dashboard/out_patient_stack.dart index 4fa6ac82..6b3d87d5 100644 --- a/lib/widgets/dashboard/out_patient_stack.dart +++ b/lib/widgets/dashboard/out_patient_stack.dart @@ -126,7 +126,7 @@ class GetOutPatientStack extends StatelessWidget { fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2.5, textAlign: TextAlign.center, color: Color(0xFF2B353E), - fontWeight: FontWeight.w700, + fontWeight: FontWeight.w500, letterSpacing: -0.3, ), AppText( diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart index cfa086b5..0e077895 100644 --- a/lib/widgets/patients/patient-referral-item-widget.dart +++ b/lib/widgets/patients/patient-referral-item-widget.dart @@ -55,7 +55,7 @@ class PatientReferralItemWidget extends StatelessWidget { ProjectViewModel projectViewModel = Provider.of(context); return Container( - margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 8.0), + margin: EdgeInsets.only(left: 16.0, right: 16.0, top: 0.0), child: Column( children: [ Container( diff --git a/lib/widgets/patients/profile/PatientProfileButton.dart b/lib/widgets/patients/profile/PatientProfileButton.dart index 073a6d51..a3c4492f 100644 --- a/lib/widgets/patients/profile/PatientProfileButton.dart +++ b/lib/widgets/patients/profile/PatientProfileButton.dart @@ -1,3 +1,4 @@ +import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; @@ -5,6 +6,7 @@ import 'package:doctor_app_flutter/util/date-utils.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/svg.dart'; import 'package:provider/provider.dart'; // ignore: must_be_immutable @@ -59,7 +61,7 @@ class PatientProfileButton extends StatelessWidget { return Container( margin: EdgeInsets.symmetric(horizontal: 0.0), - padding: EdgeInsets.symmetric(horizontal: 8, vertical: 16), + padding: EdgeInsets.symmetric(horizontal: 8, vertical: 0), child: InkWell( onTap: isDisable ? null @@ -68,7 +70,9 @@ class PatientProfileButton extends StatelessWidget { : () { navigator(context, this.route); }, - child: Column(children: [ + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ Container( padding: EdgeInsets.fromLTRB(8, 0, 8, 8), child: Row( @@ -81,11 +85,10 @@ class PatientProfileButton extends StatelessWidget { size: 30, color: color ?? Color(0xFF333C45), ) - : new Image.asset( - url + icon, + : new SvgPicture.asset( + icon, width: 30, height: 30, - fit: BoxFit.contain, ), ) ], @@ -98,17 +101,19 @@ class PatientProfileButton extends StatelessWidget { children: [ AppText( !projectsProvider.isArabic ? this.nameLine1 : nameLine2, - color: color ?? Color(0xFF2B353E), + color: color ?? AppGlobal.appTextColor, + letterSpacing: -0.33, fontWeight: FontWeight.w600, textAlign: TextAlign.left, - fontSize: SizeConfig.textMultiplier * 1.35, + fontSize: SizeConfig.textMultiplier * 1.30, ), AppText( !projectsProvider.isArabic ? this.nameLine2 : nameLine1, color: color ?? Color(0xFF2B353E), fontWeight: FontWeight.w600, textAlign: TextAlign.left, - fontSize: SizeConfig.textMultiplier * 1.35, + fontHeight: 1.4, + fontSize: SizeConfig.textMultiplier * 1.30, ), if (isLoading) DrAppCircularProgressIndeicator() ], @@ -119,9 +124,9 @@ class PatientProfileButton extends StatelessWidget { decoration: BoxDecoration( // border: Border.all(), color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white, - borderRadius: BorderRadius.all(Radius.circular(10)), + borderRadius: BorderRadius.all(Radius.circular(15)), border: Border.fromBorderSide(BorderSide( - color: color ?? Color(0xffBBBBBB), + color: color ?? Color(0xFFEFEFEF), width: 1, )), ), diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index a7832481..fec33a62 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -40,7 +40,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { nameLine1: TranslationBase.of(context).vital, nameLine2: TranslationBase.of(context).signs, route: VITAL_SIGN_DETAILS, - icon: 'patient/vital_signs.png'), + icon: 'assets/images/svgs/profile_screen/vital signs.svg'), // if (selectedPatientType != 7) PatientProfileButton( key: key, @@ -50,7 +50,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: HEALTH_SUMMARY, nameLine1: "Health", //TranslationBase.of(context).medicalReport, nameLine2: "Summary", //TranslationBase.of(context).summaryReport, - icon: 'patient/health_summary.png'), + icon: 'assets/images/svgs/profile_screen/health summary.svg'), PatientProfileButton( key: key, patient: patient, @@ -59,7 +59,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: LAB_RESULT, nameLine1: TranslationBase.of(context).lab, nameLine2: TranslationBase.of(context).result, - icon: 'patient/lab_results.png'), + icon: 'assets/images/svgs/profile_screen/lab results.svg'), PatientProfileButton( key: key, patient: patient, @@ -68,7 +68,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: ALL_SPECIAL_LAB_RESULT, nameLine1: TranslationBase.of(context).lab, nameLine2: TranslationBase.of(context).special, - icon: 'patient/lab_results.png'), + icon: 'assets/images/svgs/profile_screen/lab results.svg'), // if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -79,7 +79,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: RADIOLOGY_PATIENT, nameLine1: TranslationBase.of(context).radiology, nameLine2: TranslationBase.of(context).service, - icon: 'patient/health_summary.png'), + icon: 'assets/images/svgs/profile_screen/health summary.svg'), PatientProfileButton( key: key, patient: patient, @@ -88,7 +88,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: PATIENT_ECG, nameLine1: TranslationBase.of(context).patient, nameLine2: "ECG", - icon: 'patient/patient_sick_leave.png'), + icon: 'assets/images/svgs/profile_screen/ECG.svg'), PatientProfileButton( key: key, patient: patient, @@ -97,7 +97,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: ORDER_PRESCRIPTION_NEW, nameLine1: TranslationBase.of(context).orders, nameLine2: TranslationBase.of(context).prescription, - icon: 'patient/order_prescription.png'), + icon: 'assets/images/svgs/profile_screen/order prescription.svg'), // if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -107,7 +107,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: ORDER_PROCEDURE, nameLine1: TranslationBase.of(context).orders, nameLine2: TranslationBase.of(context).procedures, - icon: 'patient/Order_Procedures.png'), + icon: 'assets/images/svgs/profile_screen/Order Procedures.svg'), //if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -117,7 +117,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: PATIENT_INSURANCE_APPROVALS_NEW, nameLine1: TranslationBase.of(context).insurance, nameLine2: TranslationBase.of(context).service, - icon: 'patient/vital_signs.png'), + icon: 'assets/images/svgs/profile_screen/insurance approval.svg'), // if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -127,7 +127,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: ADD_SICKLEAVE, nameLine1: TranslationBase.of(context).patientSick, nameLine2: TranslationBase.of(context).leave, - icon: 'patient/patient_sick_leave.png'), + icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'), if (patient.appointmentNo != null && patient.appointmentNo != 0) PatientProfileButton( key: key, @@ -170,7 +170,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: PROGRESS_NOTE, nameLine1: TranslationBase.of(context).progress, nameLine2: TranslationBase.of(context).note, - icon: 'patient/Progress_notes.png'), + icon: 'assets/images/svgs/profile_screen/Progress notes.svg'), if (isInpatient) PatientProfileButton( key: key, @@ -180,7 +180,7 @@ class ProfileMedicalInfoWidget extends StatelessWidget { route: ORDER_NOTE, nameLine1: "Order", //"Text", nameLine2: "Sheet", - icon: 'patient/Progress_notes.png'), + icon: 'assets/images/svgs/profile_screen/Progress notes.svg'), ], ), ); diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart b/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart index 17feaf0a..a7ab2412 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_in_patient.dart @@ -49,7 +49,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { nameLine2: TranslationBase.of(context).signs, route: VITAL_SIGN_DETAILS, isInPatient: true, - icon: 'patient/vital_signs.png'), + icon: 'assets/images/svgs/profile_screen/vital signs.svg'), PatientProfileButton( key: key, patient: patient, @@ -59,7 +59,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { isInPatient: true, nameLine1: TranslationBase.of(context).lab, nameLine2: TranslationBase.of(context).result, - icon: 'patient/lab_results.png'), + icon: 'assets/images/svgs/profile_screen/lab results.svg'), PatientProfileButton( key: key, patient: patient, @@ -69,7 +69,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { route: RADIOLOGY_PATIENT, nameLine1: TranslationBase.of(context).radiology, nameLine2: TranslationBase.of(context).result, - icon: 'patient/health_summary.png'), + icon: 'assets/images/svgs/profile_screen/health summary.svg'), PatientProfileButton( key: key, patient: patient, @@ -78,7 +78,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { route: ORDER_PRESCRIPTION_NEW, nameLine1: TranslationBase.of(context).patient, nameLine2: TranslationBase.of(context).prescription, - icon: 'patient/order_prescription.png'), + icon: 'assets/images/svgs/profile_screen/order prescription.svg'), PatientProfileButton( key: key, patient: patient, @@ -88,7 +88,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { isDischargedPatient: isDischargedPatient, nameLine1: TranslationBase.of(context).progress, nameLine2: TranslationBase.of(context).note, - icon: 'patient/Progress_notes.png'), + icon: 'assets/images/svgs/profile_screen/Progress notes.svg'), PatientProfileButton( key: key, patient: patient, @@ -98,7 +98,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { isDischargedPatient: isDischargedPatient, nameLine1: "Order", //"Text", nameLine2: "Sheet", //TranslationBase.of(context).orders, - icon: 'patient/Progress_notes.png'), + icon: 'assets/images/svgs/profile_screen/Progress notes.svg'), PatientProfileButton( key: key, patient: patient, @@ -107,7 +107,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { route: ORDER_PROCEDURE, nameLine1: TranslationBase.of(context).orders, nameLine2: TranslationBase.of(context).procedures, - icon: 'patient/Order_Procedures.png'), + icon: 'assets/images/svgs/profile_screen/Order Procedures.svg'), PatientProfileButton( key: key, patient: patient, @@ -118,7 +118,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { //TranslationBase.of(context).medicalReport, nameLine2: "Summary", //TranslationBase.of(context).summaryReport, - icon: 'patient/health_summary.png'), + icon: 'assets/images/svgs/profile_screen/health summary.svg'), PatientProfileButton( key: key, patient: patient, @@ -130,7 +130,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { //TranslationBase.of(context).medicalReport, nameLine2: "Report", //Report //TranslationBase.of(context).summaryReport, - icon: 'patient/health_summary.png'), + icon: 'assets/images/svgs/profile_screen/health summary.svg'), PatientProfileButton( key: key, patient: patient, @@ -149,7 +149,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { route: PATIENT_INSURANCE_APPROVALS_NEW, nameLine1: TranslationBase.of(context).insurance, nameLine2: TranslationBase.of(context).approvals, - icon: 'patient/vital_signs.png'), + icon: 'assets/images/svgs/profile_screen/insurance approval.svg'), PatientProfileButton( key: key, patient: patient, @@ -159,7 +159,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { route: null, nameLine1: "Discharge", nameLine2: "Summery", - icon: 'patient/patient_sick_leave.png'), + icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'), PatientProfileButton( key: key, patient: patient, @@ -168,7 +168,7 @@ class ProfileMedicalInfoWidgetInPatient extends StatelessWidget { route: ADD_SICKLEAVE, nameLine1: TranslationBase.of(context).patientSick, nameLine2: TranslationBase.of(context).leave, - icon: 'patient/patient_sick_leave.png'), + icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'), ], ), ); diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart index 573ada32..a45f7cdc 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart @@ -64,7 +64,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { nameLine1: TranslationBase.of(context).vital, nameLine2: TranslationBase.of(context).signs, route: VITAL_SIGN_DETAILS, - icon: 'patient/vital_signs.png'), + icon: 'assets/images/svgs/profile_screen/vital signs.svg'), // if (selectedPatientType != 7) PatientProfileButton( key: key, @@ -76,7 +76,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { "Health", //TranslationBase.of(context).medicalReport, nameLine2: "Summary", //TranslationBase.of(context).summaryReport, - icon: 'patient/health_summary.png'), + icon: 'assets/images/svgs/profile_screen/health summary.svg'), PatientProfileButton( key: key, patient: patient, @@ -85,7 +85,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: LAB_RESULT, nameLine1: TranslationBase.of(context).lab, nameLine2: TranslationBase.of(context).result, - icon: 'patient/lab_results.png'), + icon: 'assets/images/svgs/profile_screen/lab results.svg'), // if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -96,7 +96,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: RADIOLOGY_PATIENT, nameLine1: TranslationBase.of(context).radiology, nameLine2: TranslationBase.of(context).service, - icon: 'patient/health_summary.png'), + icon: 'assets/images/svgs/profile_screen/health summary.svg'), PatientProfileButton( key: key, patient: patient, @@ -105,7 +105,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: PATIENT_ECG, nameLine1: TranslationBase.of(context).patient, nameLine2: "ECG", - icon: 'patient/patient_sick_leave.png'), + icon: 'assets/images/svgs/profile_screen/ECG.svg'), PatientProfileButton( key: key, patient: patient, @@ -114,7 +114,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: ORDER_PRESCRIPTION_NEW, nameLine1: TranslationBase.of(context).orders, nameLine2: TranslationBase.of(context).prescription, - icon: 'patient/order_prescription.png'), + icon: 'assets/images/svgs/profile_screen/order prescription.svg'), // if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -124,7 +124,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: ORDER_PROCEDURE, nameLine1: TranslationBase.of(context).orders, nameLine2: TranslationBase.of(context).procedures, - icon: 'patient/Order_Procedures.png'), + icon: 'assets/images/svgs/profile_screen/Order Procedures.svg'), //if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -134,7 +134,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: PATIENT_INSURANCE_APPROVALS_NEW, nameLine1: TranslationBase.of(context).insurance, nameLine2: TranslationBase.of(context).service, - icon: 'patient/vital_signs.png'), + icon: 'assets/images/svgs/profile_screen/insurance approval.svg'), // if (int.parse(patientType) == 7 || int.parse(patientType) == 6) PatientProfileButton( key: key, @@ -144,7 +144,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: ADD_SICKLEAVE, nameLine1: TranslationBase.of(context).patientSick, nameLine2: TranslationBase.of(context).leave, - icon: 'patient/patient_sick_leave.png'), + icon: 'assets/images/svgs/profile_screen/patient sick leave.svg'), if (patient.appointmentNo != null && patient.appointmentNo != 0) PatientProfileButton( @@ -157,7 +157,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { patient.patientStatusType != 43 ? true : false, nameLine1: TranslationBase.of(context).patient, nameLine2: TranslationBase.of(context).ucaf, - icon: 'patient/ucaf.png'), + icon: 'assets/images/svgs/profile_screen/UCAF.svg'), if (patient.appointmentNo != null && patient.appointmentNo != 0) PatientProfileButton( @@ -170,7 +170,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { patient.patientStatusType != 43 ? true : false, nameLine1: TranslationBase.of(context).referral, nameLine2: TranslationBase.of(context).patient, - icon: 'patient/refer_patient.png'), + icon: 'assets/images/svgs/profile_screen/refer patient.svg'), if (patient.appointmentNo != null && patient.appointmentNo != 0) PatientProfileButton( @@ -183,7 +183,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { patient.patientStatusType != 43 ? true : false, nameLine1: TranslationBase.of(context).admission, nameLine2: TranslationBase.of(context).request, - icon: 'patient/admission_req.png'), + icon: 'assets/images/svgs/profile_screen/admission req.svg'), if (isInpatient) PatientProfileButton( key: key, @@ -193,7 +193,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: PROGRESS_NOTE, nameLine1: TranslationBase.of(context).progress, nameLine2: TranslationBase.of(context).note, - icon: 'patient/Progress_notes.png'), + icon: 'assets/images/svgs/profile_screen/Progress notes.svg'), if (isInpatient) PatientProfileButton( key: key, @@ -203,7 +203,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget { route: ORDER_NOTE, nameLine1: "Order", //"Text", nameLine2: "Sheet", - icon: 'patient/Progress_notes.png'), + icon: 'assets/images/svgs/profile_screen/Progress notes.svg'), ], ), ), diff --git a/lib/widgets/shared/bottom_nav_bar.dart b/lib/widgets/shared/bottom_nav_bar.dart index 16988d82..bcce6818 100644 --- a/lib/widgets/shared/bottom_nav_bar.dart +++ b/lib/widgets/shared/bottom_nav_bar.dart @@ -50,6 +50,7 @@ class _BottomNavBarState extends State { BottomNavigationItem( icon: DoctorApp.home_1, activeIcon: DoctorApp.home_active_1, + svgPath: "assets/images/svgs/bottom_nav/home-active.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 0, @@ -59,6 +60,7 @@ class _BottomNavBarState extends State { BottomNavigationItem( icon: DoctorApp.schedule_1, activeIcon: DoctorApp.schedule_active_1, + svgPath: "assets/images/svgs/bottom_nav/schedule-active.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 1, @@ -69,6 +71,7 @@ class _BottomNavBarState extends State { BottomNavigationItem( icon: DoctorApp.qr_reader, activeIcon: DoctorApp.qr_reader_active_1, + svgPath: "assets/images/svgs/bottom_nav/reader-active.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 2, @@ -79,6 +82,7 @@ class _BottomNavBarState extends State { BottomNavigationItem( icon: DoctorApp.dr_reply_1, activeIcon: DoctorApp.dr_reply_active_1, + svgPath: "assets/images/svgs/bottom_nav/reply-active.svg", changeIndex: _changeIndex, index: widget.index, currentIndex: 3, diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart index 151855a0..37aff38f 100644 --- a/lib/widgets/shared/bottom_navigation_item.dart +++ b/lib/widgets/shared/bottom_navigation_item.dart @@ -5,6 +5,7 @@ import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/doctor_replay_view_model.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:provider/provider.dart'; import '../../locator.dart'; @@ -17,6 +18,8 @@ class BottomNavigationItem extends StatelessWidget { final int currentIndex; final String name; final DashboardViewModel dashboardViewModel; + final String svgPath; + BottomNavigationItem( {this.icon, @@ -25,7 +28,7 @@ class BottomNavigationItem extends StatelessWidget { this.index, this.currentIndex, this.name, - this.dashboardViewModel}); + this.dashboardViewModel, this.svgPath}); @override Widget build(BuildContext context) { @@ -58,8 +61,9 @@ class BottomNavigationItem extends StatelessWidget { height: 15, ), Container( - child: Icon(currentIndex == index ? activeIcon : icon, - color: AppGlobal.appTextColor, size: 22.0), + child: SvgPicture.asset(svgPath,width: SizeConfig.widthMultiplier* (10), height:SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier * + (SizeConfig.isHeightVeryShort ? 10:SizeConfig.isHeightShort ?8.5 : 7) ) * 40, + ), ), SizedBox( height: 8, @@ -71,6 +75,7 @@ class BottomNavigationItem extends StatelessWidget { fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2, + letterSpacing: 0.24, color: AppGlobal.appTextColor, fontWeight: FontWeight.w600) //#989898, ), diff --git a/pubspec.lock b/pubspec.lock index 6fcaaa5a..86ae6905 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -706,7 +706,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.3.0-nullsafety.4" + version: "1.3.0-nullsafety.3" mime: dependency: transitive description: @@ -1040,7 +1040,7 @@ packages: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.10.0-nullsafety.2" + version: "1.10.0-nullsafety.1" sticky_headers: dependency: "direct main" description: @@ -1245,5 +1245,5 @@ packages: source: hosted version: "2.2.1" sdks: - dart: ">=2.10.2 <=2.11.0-213.1.beta" + dart: ">=2.10.2 <2.11.0" flutter: ">=1.22.2 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index db678f9e..0f2d55e8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -131,6 +131,8 @@ flutter: - assets/images/dashboard/ - assets/images/login/ - assets/images/svgs/verification/ + - assets/images/svgs/profile_screen/ + - assets/images/svgs/bottom_nav/ - assets/images/patient/ - assets/images/patient/vital_signs/