diff --git a/.gitignore b/.gitignore index 5178923f..7115609f 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ .pub-cache/ .pub/ /build/ +pubspec.lock # Except for application packages # Web related lib/generated_plugin_registrant.dart diff --git a/assets/images/ic_circle_arrow.png b/assets/images/ic_circle_arrow.png new file mode 100644 index 00000000..81c4a77b Binary files /dev/null and b/assets/images/ic_circle_arrow.png differ diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 10687fe4..0b176b65 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -242,10 +242,15 @@ const Map> localizedValues = { 'ar': 'لا يوجد اي نتائج' }, 'typeMedicineName': {'en': 'Type Medicine Name', 'ar': 'اكتب اسم الدواء'}, + 'moreThan3Letter': { 'en': 'Medicine Name Should Be More Than 3 letter', 'ar': 'يجب أن يكون اسم الدواء أكثر من 3 أحرف' }, 'gender2': {'en': 'Gender: ', 'ar': 'الجنس: '}, 'age2': {'en': 'Age: ', 'ar': 'العمر: '}, + 'replySuccessfully': { + 'en': 'Reply Successfully', + 'ar': 'تم الرد بنجاح' + }, }; diff --git a/lib/landing_page.dart b/lib/landing_page.dart index c79d29d9..f67957d3 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -39,7 +39,7 @@ class _LandingPageState extends State { return Scaffold( appBar: AppBar( elevation: 0, - backgroundColor: Hexcolor('#515B5D'), + backgroundColor: HexColor('#515B5D'), textTheme: TextTheme( headline6: TextStyle(color: Colors.white)), diff --git a/lib/main.dart b/lib/main.dart index 4628a5f8..1202c319 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -60,7 +60,7 @@ class MyApp extends StatelessWidget { theme: ThemeData( primarySwatch: Colors.grey, primaryColor: Colors.grey, - buttonColor: Hexcolor('#B8382C'), + buttonColor: HexColor('#B8382C'), fontFamily: 'WorkSans', dividerColor: Colors.grey[350], backgroundColor: Color.fromRGBO(255,255,255, 1) diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 32de96a7..33e39e9c 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -82,7 +82,7 @@ class _DashboardScreenState extends State { children: [ Container( height: 140, - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), width: double.infinity, child: FractionallySizedBox( widthFactor: 0.9, @@ -221,7 +221,7 @@ class _DashboardScreenState extends State { bottom: 19, child: Container( decoration: BoxDecoration( - color: Hexcolor("#DED8CF"), + color: HexColor("#DED8CF"), borderRadius: BorderRadius.all( Radius.circular(10.0), ), @@ -249,20 +249,20 @@ class _DashboardScreenState extends State { AppText("38", fontSize: SizeConfig.textMultiplier * 3.7, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), fontWeight: FontWeight.bold,), AppText(TranslationBase .of(context) .outPatients, fontWeight: FontWeight.normal, fontSize: SizeConfig.textMultiplier * 1.4, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), ), ], ), circularStrokeCap: CircularStrokeCap.butt, backgroundColor: Colors.blueGrey[100], - progressColor: Hexcolor('#B8382C'), + progressColor: HexColor('#B8382C'), ), ), Container( @@ -276,7 +276,7 @@ class _DashboardScreenState extends State { border: TableBorder.symmetric( inside: BorderSide( width: 0.5, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), ), ), children: [ @@ -290,13 +290,13 @@ class _DashboardScreenState extends State { TranslationBase.of(context).arrived, fontSize: SizeConfig.textMultiplier * 1.5, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), ), AppText( "23", fontSize: SizeConfig.textMultiplier * 2.7, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), fontWeight: FontWeight.bold, ), SizedBox( @@ -312,13 +312,13 @@ class _DashboardScreenState extends State { TranslationBase.of(context).er, fontSize: SizeConfig.textMultiplier * 1.5, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), ), AppText( "03", fontSize: SizeConfig.textMultiplier * 2.7, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), fontWeight: FontWeight.bold, ), SizedBox( @@ -341,13 +341,13 @@ class _DashboardScreenState extends State { TranslationBase.of(context).notArrived, fontSize: SizeConfig.textMultiplier * 1.5, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), ), AppText( "15", fontSize: SizeConfig.textMultiplier * 2.7, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), fontWeight: FontWeight.bold, ), ], @@ -363,13 +363,13 @@ class _DashboardScreenState extends State { TranslationBase.of(context).walkIn, fontSize: SizeConfig.textMultiplier * 1.5, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), ), AppText( "04", fontSize: SizeConfig.textMultiplier * 2.7, - color: Hexcolor('#5D4C35'), + color: HexColor('#5D4C35'), fontWeight: FontWeight.bold, ), ], @@ -553,7 +553,7 @@ class _DashboardScreenState extends State { ), ), imageName: '4.png', - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), hasBorder: false, width: MediaQuery .of(context) @@ -607,7 +607,7 @@ class _DashboardScreenState extends State { ), ), imageName: '5.png', - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), hasBorder: false, width: MediaQuery .of(context) @@ -1011,7 +1011,7 @@ class DashboardItem extends StatelessWidget { .height * 0.35, decoration: BoxDecoration( - color: !hasBorder ? color != null ? color : Hexcolor('#050705') + color: !hasBorder ? color != null ? color : HexColor('#050705') .withOpacity(opacity) : Colors .white, borderRadius: BorderRadius.circular(6.0), diff --git a/lib/screens/doctor/my_referral_patient_screen.dart b/lib/screens/doctor/my_referral_patient_screen.dart index c29ce606..960bbdd9 100644 --- a/lib/screens/doctor/my_referral_patient_screen.dart +++ b/lib/screens/doctor/my_referral_patient_screen.dart @@ -7,8 +7,14 @@ import 'package:flutter/material.dart'; import '../../widgets/shared/app_scaffold_widget.dart'; -class MyReferralPatient extends StatelessWidget { +class MyReferralPatient extends StatefulWidget { + int expandedItemIndex = -1; + @override + _MyReferralPatientState createState() => _MyReferralPatientState(); +} + +class _MyReferralPatientState extends State { @override Widget build(BuildContext context) { return BaseView( @@ -35,12 +41,28 @@ class MyReferralPatient extends StatelessWidget { ), Container( child: Column( - children: model.listMyReferralPatientModel - .map((item) { - return MyReferralPatientWidget( - myReferralPatientModel: item, model:model - ); - }).toList(), + children: [ + ...List.generate( + model.listMyReferralPatientModel.length, + (index) => MyReferralPatientWidget( + myReferralPatientModel: model + .listMyReferralPatientModel[index], + model: model, + expandClick: () { + setState(() { + if (widget.expandedItemIndex == + index) { + widget.expandedItemIndex = -1; + } else { + widget.expandedItemIndex = index; + } + }); + }, + isExpand: + widget.expandedItemIndex == index, + ), + ) + ], ), ), ], diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index ac5cbd84..44420140 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -176,7 +176,7 @@ class _PatientSearchScreenState extends State { side: BorderSide( width: 1.0, style: BorderStyle.solid, - color: Hexcolor("#CCCCCC")), + color: HexColor("#CCCCCC")), borderRadius: BorderRadius.all(Radius.circular(6.0)), ), @@ -255,7 +255,7 @@ class _PatientSearchScreenState extends State { borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( - width: 1.0, color: Hexcolor("#CCCCCC"))), + width: 1.0, color: HexColor("#CCCCCC"))), padding: EdgeInsets.only(top: 5), child: AppTextFormField( labelText: @@ -285,7 +285,7 @@ class _PatientSearchScreenState extends State { borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( - width: 1.0, color: Hexcolor("#CCCCCC"))), + width: 1.0, color: HexColor("#CCCCCC"))), padding: EdgeInsets.only(top: 5), child: AppTextFormField( labelText: @@ -315,7 +315,7 @@ class _PatientSearchScreenState extends State { borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( - width: 1.0, color: Hexcolor("#CCCCCC"))), + width: 1.0, color: HexColor("#CCCCCC"))), padding: EdgeInsets.only(top: 5), child: AppTextFormField( labelText: TranslationBase.of(context).lastName, @@ -340,7 +340,7 @@ class _PatientSearchScreenState extends State { borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( - width: 1.0, color: Hexcolor("#CCCCCC"))), + width: 1.0, color: HexColor("#CCCCCC"))), padding: EdgeInsets.only(top: 5), child: AppTextFormField( labelText: @@ -370,7 +370,7 @@ class _PatientSearchScreenState extends State { borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( - width: 1.0, color: Hexcolor("#CCCCCC"))), + width: 1.0, color: HexColor("#CCCCCC"))), padding: EdgeInsets.only(top: 5), child: AppTextFormField( labelText: @@ -397,7 +397,7 @@ class _PatientSearchScreenState extends State { borderRadius: BorderRadius.all(Radius.circular(6.0)), border: Border.all( - width: 1.0, color: Hexcolor("#CCCCCC"))), + width: 1.0, color: HexColor("#CCCCCC"))), padding: EdgeInsets.only(top: 5), child: AppTextFormField( labelText: @@ -423,7 +423,7 @@ class _PatientSearchScreenState extends State { side: BorderSide( width: 1.0, style: BorderStyle.solid, - color: Hexcolor("#CCCCCC")), + color: HexColor("#CCCCCC")), borderRadius: BorderRadius.all(Radius.circular(6.0)), ), @@ -505,12 +505,12 @@ class _PatientSearchScreenState extends State { Radius.circular(6.0)), border: Border.all( width: 1.0, - color: Hexcolor("#CCCCCC"))), + color: HexColor("#CCCCCC"))), height: 25, width: 25, child: Checkbox( value: true, - checkColor: Hexcolor("#2A930A"), + checkColor: HexColor("#2A930A"), activeColor: Colors.white, onChanged: (bool newValue) {}), ), diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 6ffc1f49..a451c963 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -529,6 +529,21 @@ class _PatientsScreenState extends State { ? Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ + Container( + height: 15, + width: 60, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(25), + color: HexColor("#20A169"), + ), + child: AppText( + item.startTime, + color: Colors.white, + fontSize: 1.5 * SizeConfig.textMultiplier, + textAlign: TextAlign.center, + fontWeight: FontWeight.bold, + ), + ), SizedBox( width: 3.5, ), @@ -611,6 +626,21 @@ class _PatientsScreenState extends State { ? Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ + Container( + height: 15, + width: 60, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(25), + color: HexColor("#20A169"), + ), + child: AppText( + item.startTime, + color: Colors.white, + fontSize: 1.5 * SizeConfig.textMultiplier, + textAlign: TextAlign.center, + fontWeight: FontWeight.bold, + ), + ), SizedBox( width: 3.5, ), @@ -676,7 +706,7 @@ class _PatientsScreenState extends State { hintStyle: TextStyle(fontSize: 1.66 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), @@ -716,7 +746,7 @@ class _PatientsScreenState extends State { topLeft: Radius.circular(9.5), bottomLeft: Radius.circular(9.5)), color: - _isActive ? Hexcolor("#B8382B") : Colors.white, + _isActive ? HexColor("#B8382B") : Colors.white, ), child: Center( child: Text( diff --git a/lib/screens/patients/profile/insurance_approvals_screen.dart b/lib/screens/patients/profile/insurance_approvals_screen.dart index 51619dc9..d6786a4b 100644 --- a/lib/screens/patients/profile/insurance_approvals_screen.dart +++ b/lib/screens/patients/profile/insurance_approvals_screen.dart @@ -447,7 +447,7 @@ class _InsuranceApprovalsState extends State { hintStyle: TextStyle(fontSize: 2 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), diff --git a/lib/screens/patients/profile/patient_orders_screen.dart b/lib/screens/patients/profile/patient_orders_screen.dart index 05cdbfea..5b30b487 100644 --- a/lib/screens/patients/profile/patient_orders_screen.dart +++ b/lib/screens/patients/profile/patient_orders_screen.dart @@ -174,7 +174,7 @@ class _PatientsOrdersState extends State { hintStyle: TextStyle(fontSize: 2 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(20)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(50.0)), diff --git a/lib/screens/patients/profile/progress_note_screen.dart b/lib/screens/patients/profile/progress_note_screen.dart index aba49d7b..25b14874 100644 --- a/lib/screens/patients/profile/progress_note_screen.dart +++ b/lib/screens/patients/profile/progress_note_screen.dart @@ -174,7 +174,7 @@ class _ProgressNoteState extends State { hintStyle: TextStyle(fontSize: 2 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), diff --git a/lib/screens/patients/profile/refer_patient_screen.dart b/lib/screens/patients/profile/refer_patient_screen.dart index e12a9240..6ab2bbdb 100644 --- a/lib/screens/patients/profile/refer_patient_screen.dart +++ b/lib/screens/patients/profile/refer_patient_screen.dart @@ -428,7 +428,7 @@ class _ReferPatientState extends State { width: 90, decoration: BoxDecoration( borderRadius: BorderRadius.circular(50), - color: _isActive ? Hexcolor("#B8382B") : Colors.white, + color: _isActive ? HexColor("#B8382B") : Colors.white, ), child: Center( child: Text( diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_item.dart b/lib/screens/patients/profile/vital_sign/vital_sign_item.dart index d84d8ca0..1e0ce2cf 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_item.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_item.dart @@ -48,7 +48,7 @@ class VitalSignItem extends StatelessWidget { des, style: TextStyle( fontSize: 1.7 * SizeConfig.textMultiplier, - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), fontWeight: FontWeight.bold), ), ), @@ -71,7 +71,7 @@ class VitalSignItem extends StatelessWidget { new TextSpan( text: ' ${unit}', style: TextStyle( - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), ), ), ], diff --git a/lib/screens/settings/settings_screen.dart b/lib/screens/settings/settings_screen.dart index c205f49d..631d639e 100644 --- a/lib/screens/settings/settings_screen.dart +++ b/lib/screens/settings/settings_screen.dart @@ -34,7 +34,7 @@ class SettingsScreen extends StatelessWidget { child: AnimatedContainer( duration: Duration(milliseconds: 350), decoration: BoxDecoration( - color: !projectsProvider.isArabic ? Hexcolor('#58434F') : Colors.transparent, + color: !projectsProvider.isArabic ? HexColor('#58434F') : Colors.transparent, border: Border(right: BorderSide(color: Colors.grey[200], width: 2.0)) ), child: Center(child: AppText(TranslationBase.of(context).lanEnglish, color: !projectsProvider.isArabic ? Colors.white : Colors.grey[500])) @@ -47,7 +47,7 @@ class SettingsScreen extends StatelessWidget { child: AnimatedContainer( duration: Duration(milliseconds: 350), decoration: BoxDecoration( - color: projectsProvider.isArabic ? Hexcolor('#58434F') : Colors.transparent, + color: projectsProvider.isArabic ? HexColor('#58434F') : Colors.transparent, border: Border(right: BorderSide(color: Colors.grey[200], width: 2.0)) ), child: Center(child: AppText(TranslationBase.of(context).lanArabic, color: projectsProvider.isArabic ? Colors.white : Colors.grey[500],)) diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 1ea3be74..1eabaea8 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -33,6 +33,8 @@ class TranslationBase { String get mobileNo => localizedValues['mobileNo'][locale.languageCode]; + String get replySuccessfully => localizedValues['replySuccessfully'][locale.languageCode]; + String get messagesScreenToolbarTitle => localizedValues['messagesScreenToolbarTitle'][locale.languageCode]; diff --git a/lib/widgets/auth/auth_header.dart b/lib/widgets/auth/auth_header.dart index fb2cf322..8ab79b5c 100644 --- a/lib/widgets/auth/auth_header.dart +++ b/lib/widgets/auth/auth_header.dart @@ -108,7 +108,7 @@ class AuthHeader extends StatelessWidget { Text( text2, style: TextStyle( - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), fontSize: textFontSize, fontWeight: FontWeight.w800), ) @@ -156,7 +156,7 @@ class AuthHeader extends StatelessWidget { fontSize: SizeConfig.isMobile ? 26 : SizeConfig.realScreenWidth * 0.030, fontWeight: FontWeight.w800, - color: Hexcolor('#B8382C')), + color: HexColor('#B8382C')), ), ); } @@ -172,7 +172,7 @@ class AuthHeader extends StatelessWidget { style: TextStyle( fontWeight: FontWeight.w800, fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth * 0.029, - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), ), ); } diff --git a/lib/widgets/auth/change_password.dart b/lib/widgets/auth/change_password.dart index 020c0472..3eb9b975 100644 --- a/lib/widgets/auth/change_password.dart +++ b/lib/widgets/auth/change_password.dart @@ -30,7 +30,7 @@ class ChangePassword extends StatelessWidget { TextStyle(fontSize: 2 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(20)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), @@ -69,7 +69,7 @@ class ChangePassword extends StatelessWidget { TextStyle(fontSize: 2 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(20)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), @@ -98,7 +98,7 @@ class ChangePassword extends StatelessWidget { TextStyle(fontSize: 2 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(20)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), @@ -137,7 +137,7 @@ class ChangePassword extends StatelessWidget { ), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), - side: BorderSide(width: 0.5, color: Hexcolor('#CCCCCC'))), + side: BorderSide(width: 0.5, color: HexColor('#CCCCCC'))), ), SizedBox( height: 10, diff --git a/lib/widgets/auth/known_user_login.dart b/lib/widgets/auth/known_user_login.dart index 317d7e39..a3330285 100644 --- a/lib/widgets/auth/known_user_login.dart +++ b/lib/widgets/auth/known_user_login.dart @@ -97,7 +97,7 @@ class _KnownUserLoginState extends State { Container( decoration: BoxDecoration( border: Border.all( - color: Hexcolor('#CCCCCC'), + color: HexColor('#CCCCCC'), ), borderRadius: BorderRadius.circular(50)), margin: const EdgeInsets.fromLTRB(0, 20.0, 30, 0), @@ -111,7 +111,7 @@ class _KnownUserLoginState extends State { // color: Colors.green, // border color shape: BoxShape.circle, border: - Border.all(color: Hexcolor('#CCCCCC'))), + Border.all(color: HexColor('#CCCCCC'))), child: CircleAvatar( child: Image.asset( 'assets/images/dr_avatar.png', @@ -129,7 +129,7 @@ class _KnownUserLoginState extends State { _loggedUser['List_MemberInformation'][0] ['MemberName'], style: TextStyle( - color: Hexcolor('515A5D'), + color: HexColor('515A5D'), fontSize: 2.5 * SizeConfig.textMultiplier, fontWeight: FontWeight.w800), @@ -137,7 +137,7 @@ class _KnownUserLoginState extends State { Text( 'ENT Spec', style: TextStyle( - color: Hexcolor('515A5D'), + color: HexColor('515A5D'), fontSize: 1.5 * SizeConfig.textMultiplier), ) @@ -203,7 +203,7 @@ class _KnownUserLoginState extends State { ), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), - side: BorderSide(width: 0.5, color: Hexcolor('#CCCCCC'))), + side: BorderSide(width: 0.5, color: HexColor('#CCCCCC'))), ), SizedBox( height: 10, diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart index b87cc800..dbdb853d 100644 --- a/lib/widgets/auth/login_form.dart +++ b/lib/widgets/auth/login_form.dart @@ -159,7 +159,7 @@ class _LoginFormState extends State { padding: const EdgeInsets.all(0.0), shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(10), - side: BorderSide(width: 0.5, color: Hexcolor('#CCCCCC'))), + side: BorderSide(width: 0.5, color: HexColor('#CCCCCC'))), child: Container( padding: const EdgeInsets.all(10.0), height: 50, @@ -199,7 +199,7 @@ class _LoginFormState extends State { hintStyle: TextStyle(fontSize: 2 * SizeConfig.textMultiplier), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(20)), - borderSide: BorderSide(color: Hexcolor('#CCCCCC')), + borderSide: BorderSide(color: HexColor('#CCCCCC')), ), focusedBorder: OutlineInputBorder( borderRadius: BorderRadius.all(Radius.circular(10.0)), diff --git a/lib/widgets/auth/show_timer_text.dart b/lib/widgets/auth/show_timer_text.dart index 1b77fd9a..c3f7a142 100644 --- a/lib/widgets/auth/show_timer_text.dart +++ b/lib/widgets/auth/show_timer_text.dart @@ -78,7 +78,7 @@ class _ShowTimerTextState extends State { timerText, style: TextStyle( fontSize: 3.0 * SizeConfig.textMultiplier, - color: Hexcolor('#B8382C'), + color: HexColor('#B8382C'), fontWeight: FontWeight.bold), ), ), diff --git a/lib/widgets/auth/verfiy_account.dart b/lib/widgets/auth/verfiy_account.dart index 8a43a42f..b4b5e31b 100644 --- a/lib/widgets/auth/verfiy_account.dart +++ b/lib/widgets/auth/verfiy_account.dart @@ -227,7 +227,7 @@ class _VerifyAccountState extends State { borderRadius: BorderRadius.circular(10), side: BorderSide( width: 0.5, - color: Hexcolor('#CCCCCC'))), + color: HexColor('#CCCCCC'))), ), buildSizedBox(20), ShowTimerText(model: model), diff --git a/lib/widgets/auth/verification_methods.dart b/lib/widgets/auth/verification_methods.dart index 6360c352..22fc5779 100644 --- a/lib/widgets/auth/verification_methods.dart +++ b/lib/widgets/auth/verification_methods.dart @@ -222,7 +222,7 @@ class _VerificationMethodsState extends State { decoration: BoxDecoration( border: Border.all( width: 1, - color: Hexcolor( + color: HexColor( '#CCCCCC') // <--- border width here ), borderRadius: BorderRadius.all(Radius.circular(10))), diff --git a/lib/widgets/doctor/doctor_reply_widget.dart b/lib/widgets/doctor/doctor_reply_widget.dart index 51f0e94d..e9126ba3 100644 --- a/lib/widgets/doctor/doctor_reply_widget.dart +++ b/lib/widgets/doctor/doctor_reply_widget.dart @@ -28,7 +28,7 @@ class _DoctorReplyWidgetState extends State { margin: EdgeInsets.symmetric(vertical: 10.0), width: double.infinity, decoration: BoxDecoration( - color: Hexcolor('#FFFFFF'), + color: HexColor('#FFFFFF'), borderRadius: BorderRadius.all( Radius.circular(20.0), ), diff --git a/lib/widgets/doctor/lab_result_widget.dart b/lib/widgets/doctor/lab_result_widget.dart index 3f6facce..8b2ab0c4 100644 --- a/lib/widgets/doctor/lab_result_widget.dart +++ b/lib/widgets/doctor/lab_result_widget.dart @@ -81,7 +81,7 @@ class _LabResultWidgetState extends State { Expanded( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -98,7 +98,7 @@ class _LabResultWidgetState extends State { ), Expanded( child: Container( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), child: Center( child: Texts( TranslationBase.of(context).value, @@ -109,7 +109,7 @@ class _LabResultWidgetState extends State { Expanded( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), diff --git a/lib/widgets/doctor/my_referral_patient_widget.dart b/lib/widgets/doctor/my_referral_patient_widget.dart index 46167975..98371a9f 100644 --- a/lib/widgets/doctor/my_referral_patient_widget.dart +++ b/lib/widgets/doctor/my_referral_patient_widget.dart @@ -10,13 +10,18 @@ import 'package:doctor_app_flutter/widgets/shared/TextFields.dart'; import 'package:doctor_app_flutter/widgets/shared/app_button.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/card_with_bgNew_widget.dart'; +import 'package:doctor_app_flutter/widgets/shared/expandable-widget-header-body.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; class MyReferralPatientWidget extends StatefulWidget { final MyReferralPatientModel myReferralPatientModel; final ReferralPatientViewModel model; - MyReferralPatientWidget({Key key, this.myReferralPatientModel, this.model}); + final bool isExpand; + final Function expandClick; + + MyReferralPatientWidget({Key key, this.myReferralPatientModel, this.model, this.isExpand, this.expandClick}); @override _MyReferralPatientWidgetState createState() => @@ -24,7 +29,6 @@ class MyReferralPatientWidget extends StatefulWidget { } class _MyReferralPatientWidgetState extends State { - bool _showDetails = false; bool _isLoading = false; final _formKey = GlobalKey(); String error; @@ -39,299 +43,416 @@ class _MyReferralPatientWidgetState extends State { @override Widget build(BuildContext context) { - return CardWithBgWidgetNew( - widget: Container( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - InkWell( - onTap: () { - setState(() { - _showDetails = !_showDetails; - }); - }, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - AppText( - '${widget.myReferralPatientModel.firstName} ${widget.myReferralPatientModel.lastName}', - fontSize: 2.5 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - Icon(_showDetails - ? Icons.keyboard_arrow_up - : Icons.keyboard_arrow_down), - ], - ), - ), - !_showDetails - ? Container() - : AnimatedContainer( - duration: Duration(milliseconds: 200), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: 5, - ), - Divider( - color: Color(0xFF000000), - height: 0.5, + return Container( + width: double.infinity, + margin: EdgeInsets.symmetric(horizontal: 8), + padding: EdgeInsets.only(left: 0, top: 8, right: 0, bottom: 0), + decoration: BoxDecoration( + shape: BoxShape.rectangle, + borderRadius: BorderRadius.circular(8), + border: Border.fromBorderSide(BorderSide( + color: Color(0xffCCCCCC), + width: 2, + )), + color: Color(0xffffffff), + ), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + HeaderBodyExpandableNotifier( + headerWidget: Column( + children: [ + Container( + padding: + EdgeInsets.only(left: 16, top: 8, right: 8, bottom: 0), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + color: Color(0xFFB8382C), + padding: EdgeInsets.symmetric( + vertical: 4, horizontal: 4), + child: AppText( + '${widget.myReferralPatientModel.priorityDescription}', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.white, + ), + ), + SizedBox( + height: 10, + ), + AppText( + '${widget.myReferralPatientModel.firstName} ${widget.myReferralPatientModel.middleName} ${widget.myReferralPatientModel.lastName}', + fontSize: 2 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.black, + ), + SizedBox( + height: 10, + ), + Row( + children: [ + AppText( + TranslationBase.of(context).fileNo, + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.black, + ), + SizedBox( + width: 20, + ), + AppText( + '${widget.myReferralPatientModel.referralDoctor}', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.normal, + textAlign: TextAlign.start, + color: Colors.black, + ), + ], + ), + ], ), - Table( - border: TableBorder.symmetric( - inside: BorderSide(width: 0.5), + ), + Container( + margin: + EdgeInsets.symmetric(horizontal: 8, vertical: 8), + child: InkWell( + onTap: widget.expandClick, + child: Image.asset( + "assets/images/ic_circle_arrow.png", + width: 25, + height: 25, + color: Colors.black, ), - children: [ - TableRow(children: [ - Container( - margin: EdgeInsets.all(2.5), - padding: EdgeInsets.all(5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).fileNo, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - SizedBox( - height: 5, - ), - AppText( - '${widget.myReferralPatientModel.referringDoctor}', - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + ), + ) + ], + ), + ), + SizedBox( + height: 10, + ), + ], + ), + bodyWidget: Container( + child: Column( + children: [ + const Divider( + color: Color(0xffCCCCCC), + height: 1, + thickness: 2, + indent: 0, + endIndent: 0, + ), + Container( + height: 1.8 * SizeConfig.textMultiplier * 6, + padding: + EdgeInsets.only(left: 16, top: 0, right: 8, bottom: 0), + child: Expanded( + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 8, ), - ), - Container( - margin: EdgeInsets.only( - left: 4, top: 2.5, right: 2.5, bottom: 2.5), - padding: EdgeInsets.all(5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context) - .referralDoctor, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - SizedBox( - height: 5, - ), - AppText( - widget.myReferralPatientModel - .referringClinicDescription, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + SizedBox( + child: AppText( + TranslationBase.of(context).referralDoctor, + fontSize: 1.9 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.black, + ), ), - ), - ]), - TableRow(children: [ - Container( - margin: EdgeInsets.all(2.5), - padding: EdgeInsets.all(5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context) - .referringClinic, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - SizedBox( - height: 5, - ), - AppText( - '${widget.myReferralPatientModel.referringClinicDescription}', - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + SizedBox( + height: 4, + ), + SizedBox( + child: AppText( + '${widget.myReferralPatientModel.referringDoctorName}', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.normal, + textAlign: TextAlign.start, + color: Colors.black, + ), ), + SizedBox( + height: 8, + ), + ], + ), + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: SizedBox( + child: Container( + color: Color(0xffCCCCCC), ), - Container( - margin: EdgeInsets.only( - left: 4, top: 2.5, right: 2.5, bottom: 2.5), - padding: EdgeInsets.all(5), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).frequency, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - SizedBox( - height: 5, - ), - AppText( - widget.myReferralPatientModel - .frequencyDescription, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + width: 1, + ), + ), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 8, ), - ) - ]), - TableRow( + SizedBox( + child: AppText( + TranslationBase.of(context).referringClinic, + fontSize: 1.9 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.black, + ), + ), + SizedBox( + height: 4, + ), + SizedBox( + child: AppText( + '${widget.myReferralPatientModel.referringClinicDescription}', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.normal, + textAlign: TextAlign.start, + color: Colors.black, + ), + ), + SizedBox( + height: 8, + ), + ], + ), + ), + ], + ), + ), + ), + const Divider( + color: Color(0xffCCCCCC), + height: 1, + thickness: 2, + indent: 0, + endIndent: 0, + ), + SizedBox( + height: 10, + ), + Container( + height: 1.8 * SizeConfig.textMultiplier * 6, + padding: + EdgeInsets.only(left: 16, top: 0, right: 8, bottom: 0), + child: Expanded( + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Container( - margin: EdgeInsets.all(2.5), - padding: EdgeInsets.all(5), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context).priority, - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - SizedBox( - height: 5, - ), - AppText( - '${widget.myReferralPatientModel.priorityDescription}', - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + SizedBox( + height: 8, + ), + SizedBox( + child: AppText( + TranslationBase.of(context).frequency, + fontSize: 1.9 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.black, ), ), - Container( - margin: EdgeInsets.only( - left: 4, - top: 2.5, - right: 2.5, - bottom: 2.5), - padding: EdgeInsets.all(5), - child: Column( - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context) - .maxResponseTime, - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - ), - SizedBox( - height: 5, - ), - AppText( - Helpers.getDateFormatted(widget - .myReferralPatientModel - .mAXResponseTime), - fontSize: - 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.w300, - ) - ], + SizedBox( + height: 4, + ), + SizedBox( + child: AppText( + '${widget.myReferralPatientModel.frequencyDescription}', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.normal, + textAlign: TextAlign.start, + color: Colors.black, ), - ) + ), + SizedBox( + height: 8, + ), ], ), - ], - ), - Divider( - color: Color(0xFF000000), - height: 0.5, - ), - SizedBox( - height: 5, - ), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AppText( - TranslationBase.of(context) - .clinicDetailsandRemarks, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - textAlign: TextAlign.start, + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: SizedBox( + child: Container( + color: Color(0xffCCCCCC), + ), + width: 1, ), - Texts( - '${widget.myReferralPatientModel.referringDoctorRemarks}', - style: "bodyText1", - readMore: true, - textAlign: TextAlign.start, - maxLength: 100) - ], - ), - SizedBox( - height: 5, - ), - AppText( - TranslationBase.of(context).answerSuggestions, - fontSize: 1.7 * SizeConfig.textMultiplier, - fontWeight: FontWeight.bold, - textAlign: TextAlign.start, - ), - SizedBox( - height: 5, - ), - Form( - key: _formKey, - child: TextFields( - controller:answerController, - - maxLines: 2, - minLines: 2, - hintText: - TranslationBase.of(context).answerThePatient, - fontWeight: FontWeight.normal, - readOnly: _isLoading, - validator: (value) { - if (value.isEmpty) - return TranslationBase.of(context) - .pleaseEnterAnswer; - else - return null; - }, ), - ), - SizedBox(height: 10.0), - SizedBox(height: 10.0), - Container( - width: double.infinity, - margin: EdgeInsets.only(left: 10, right: 10), - child: Button( - onTap: () async { - final form = _formKey.currentState; - if (form.validate()) { - - try { - await widget.model - .replay(answerController.text.toString(), - widget.myReferralPatientModel); - // TODO: Add Translation - DrAppToastMsg.showSuccesToast( - 'Reply Successfully'); - } catch (e) { - DrAppToastMsg.showErrorToast(e); - } - } - }, - title: TranslationBase.of(context).replay, - loading: widget.model.state == ViewState.BusyLocal, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 8, + ), + SizedBox( + child: AppText( + TranslationBase.of(context).maxResponseTime, + fontSize: 1.9 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.black, + ), + ), + SizedBox( + height: 4, + ), + SizedBox( + child: AppText( + '${DateFormat('dd/MM/yyyy').format(widget.myReferralPatientModel.mAXResponseTime)}', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.normal, + textAlign: TextAlign.start, + color: Colors.black, + ), + ), + SizedBox( + height: 8, + ), + ], + ), + ), + ], + ), + ), + ), + const Divider( + color: Color(0xffCCCCCC), + height: 1, + thickness: 2, + indent: 0, + endIndent: 0, + ), + SizedBox( + height: 10, + ), + Container( + padding: + EdgeInsets.only(left: 16, top: 0, right: 8, bottom: 0), + child: Expanded( + child: Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: 8, + ), + SizedBox( + child: AppText( + TranslationBase.of(context) + .clinicDetailsandRemarks, + fontSize: 1.9 * SizeConfig.textMultiplier, + fontWeight: FontWeight.bold, + textAlign: TextAlign.start, + color: Colors.black, + ), + ), + SizedBox( + height: 4, + ), + SizedBox( + child: AppText( + '${widget.myReferralPatientModel.referringDoctorRemarks}', + fontSize: 1.7 * SizeConfig.textMultiplier, + fontWeight: FontWeight.normal, + textAlign: TextAlign.start, + color: Colors.black, + ), + ), + SizedBox( + height: 8, + ), + ], + ), ), - ) - ], + ], + ), + ), + ), + const Divider( + color: Color(0xffCCCCCC), + height: 1, + thickness: 2, + indent: 0, + endIndent: 0, + ), + SizedBox( + height: 10, + ), + Container( + color: Colors.white, + padding: EdgeInsets.all(8), + child: Form( + key: _formKey, + child: TextFields( + controller: answerController, + maxLines: 3, + minLines: 2, + hintText: TranslationBase.of(context).answerThePatient, + fontWeight: FontWeight.normal, + readOnly: _isLoading, + validator: (value) { + if (value.isEmpty) + return TranslationBase.of(context) + .pleaseEnterAnswer; + else + return null; + }, + ), + ), + ), + Container( + width: double.infinity, + margin: EdgeInsets.only(left: 10, right: 10), + child: Button( + onTap: () async { + final form = _formKey.currentState; + if (form.validate()) { + try { + await widget.model.replay( + answerController.text.toString(), + widget.myReferralPatientModel); + DrAppToastMsg.showSuccesToast( + TranslationBase.of(context).replySuccessfully); + } catch (e) { + DrAppToastMsg.showErrorToast(e); + } + } + }, + title: TranslationBase.of(context).replay, + loading: widget.model.state == ViewState.BusyLocal, ), ) - ], - ), + ], + ), + ), + isExpand: widget.isExpand, + ), + ], ), ); } diff --git a/lib/widgets/patients/profile/profile_general_info_content_widget.dart b/lib/widgets/patients/profile/profile_general_info_content_widget.dart index 7ef4c8f2..713a98e1 100644 --- a/lib/widgets/patients/profile/profile_general_info_content_widget.dart +++ b/lib/widgets/patients/profile/profile_general_info_content_widget.dart @@ -30,11 +30,11 @@ class ProfileGeneralInfoContentWidget extends StatelessWidget { title, fontSize: SizeConfig.textMultiplier * 3, fontWeight: FontWeight.w700, - color: Hexcolor('#58434F'), + color: HexColor('#58434F'), ), AppText( info, - color: Hexcolor('#707070'), + color: HexColor('#707070'), fontSize: SizeConfig.textMultiplier * 2, ) ], diff --git a/lib/widgets/patients/profile/profile_header_widget.dart b/lib/widgets/patients/profile/profile_header_widget.dart index 1a5aec8a..df958106 100644 --- a/lib/widgets/patients/profile/profile_header_widget.dart +++ b/lib/widgets/patients/profile/profile_header_widget.dart @@ -33,7 +33,7 @@ class ProfileHeaderWidget extends StatelessWidget { des: patient.patientId.toString(), height: SizeConfig.heightMultiplier * 17, width: SizeConfig.heightMultiplier * 17, - color: Hexcolor('#58434F')), + color: HexColor('#58434F')), ); } } diff --git a/lib/widgets/patients/profile/profile_medical_info_widget.dart b/lib/widgets/patients/profile/profile_medical_info_widget.dart index 679d266d..092edb02 100644 --- a/lib/widgets/patients/profile/profile_medical_info_widget.dart +++ b/lib/widgets/patients/profile/profile_medical_info_widget.dart @@ -114,7 +114,7 @@ class CircleAvatarWidget extends StatelessWidget { decoration: new BoxDecoration( // color: Colors.green, // border color shape: BoxShape.circle, - border: Border.all(color: Hexcolor('#B7831A'), width: 1.5)), + border: Border.all(color: HexColor('#B7831A'), width: 1.5)), child: CircleAvatar( radius: SizeConfig.imageSizeMultiplier * 12, child: Image.asset(url), diff --git a/lib/widgets/patients/profile/profile_status_info_widget.dart b/lib/widgets/patients/profile/profile_status_info_widget.dart index c8983f83..d616c36f 100644 --- a/lib/widgets/patients/profile/profile_status_info_widget.dart +++ b/lib/widgets/patients/profile/profile_status_info_widget.dart @@ -32,11 +32,11 @@ class ProfileStatusInfoWidget extends StatelessWidget { 'Insurance approval', fontSize: SizeConfig.textMultiplier * 3, fontWeight: FontWeight.w700, - color: Hexcolor('#58434F'), + color: HexColor('#58434F'), ), AppText( 'Approved', - color: Hexcolor('#707070'), + color: HexColor('#707070'), fontSize: SizeConfig.textMultiplier * 2.5, ) ], diff --git a/lib/widgets/patients/vital_sign_details_wideget.dart b/lib/widgets/patients/vital_sign_details_wideget.dart index 166680ca..41af8e1d 100644 --- a/lib/widgets/patients/vital_sign_details_wideget.dart +++ b/lib/widgets/patients/vital_sign_details_wideget.dart @@ -54,7 +54,7 @@ class _VitalSignDetailsWidgetState extends State { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topLeft: Radius.circular(10.0), ), @@ -71,7 +71,7 @@ class _VitalSignDetailsWidgetState extends State { Container( child: Container( decoration: BoxDecoration( - color: Hexcolor('#515B5D'), + color: HexColor('#515B5D'), borderRadius: BorderRadius.only( topRight: Radius.circular(10.0), ), diff --git a/lib/widgets/shared/Text.dart b/lib/widgets/shared/Text.dart index 95b55127..9f6dfdf1 100644 --- a/lib/widgets/shared/Text.dart +++ b/lib/widgets/shared/Text.dart @@ -226,7 +226,7 @@ class _TextsState extends State { }, child: Text(hidden ? "Read More" : "Read less", style: _getFontStyle().copyWith( - color: Hexcolor('#FF0000'), + color: HexColor('#FF0000'), fontWeight: FontWeight.w800, fontFamily: "WorkSans" ) diff --git a/lib/widgets/shared/app_button.dart b/lib/widgets/shared/app_button.dart index 32f5b139..984d4350 100644 --- a/lib/widgets/shared/app_button.dart +++ b/lib/widgets/shared/app_button.dart @@ -95,7 +95,7 @@ class _ButtonState extends State