diff --git a/lib/config/config.dart b/lib/config/config.dart index 6b291526..430e4b19 100755 --- a/lib/config/config.dart +++ b/lib/config/config.dart @@ -430,7 +430,7 @@ const TIMER_MIN = 10; class AppGlobal { static var CONTEX; - static Color appRedColor = Color(0xFF1E8CC8); + static Color appColor = Color(0xFF1E8CC8); static Color appGreenColor = Color(0xFF1E8CC8); static Color appTextColor = Color(0xFF2B353E); static Color scheduleTextColor = Color(0xFF2E303A); diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index 0ad11698..f5e6d834 100755 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -167,7 +167,7 @@ class _LoginScreenState extends State { children: [ AppButton( title: TranslationBase.of(context).login, - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, fontWeight: FontWeight.w600, disabled: authenticationViewModel.userInfo.userID == null || authenticationViewModel.userInfo.password == null, onPressed: () { diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index c4f448d5..cf8bab79 100755 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -343,7 +343,7 @@ class _VerificationMethodsScreenState extends State { children: [ AppButton( title: TranslationBase.of(context).useAnotherAccount ?? '', - color: Color(0xFFD02127), + color: AppGlobal.appColor, //fontWeight: FontWeight.w700, onPressed: () { authenticationViewModel.deleteUser(); diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index c0b7e303..985c19f8 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -172,7 +172,7 @@ class _HomeScreenState extends State { padding: EdgeInsets.all(0), margin: EdgeInsets.all(2), decoration: new BoxDecoration( - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, borderRadius: BorderRadius.circular(20), ), constraints: BoxConstraints( @@ -349,7 +349,7 @@ class _HomeScreenState extends State { List backgroundColors = []; backgroundColors.add(LinearGradient(begin: Alignment(-1.0, -2.0), end: Alignment(1.0, 2.0), colors: [ - AppGlobal.appRedColor, + AppGlobal.appColor, Color(0xFFAD3B3B), ])); //AppGlobal.appRedColor; backgroundColors.add(LinearGradient(begin: Alignment.center, end: Alignment.center, colors: [ diff --git a/lib/screens/medicine/medicine_search_screen.dart b/lib/screens/medicine/medicine_search_screen.dart index 8c591b6f..739dd55d 100644 --- a/lib/screens/medicine/medicine_search_screen.dart +++ b/lib/screens/medicine/medicine_search_screen.dart @@ -178,7 +178,7 @@ class _MedicineSearchState extends State { onPressed: () async { await searchMedicine(context, model); }, - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, ), ), ), diff --git a/lib/screens/patients/In_patient/filter_date_page.dart b/lib/screens/patients/In_patient/filter_date_page.dart index 7a41af63..6abd6cdb 100644 --- a/lib/screens/patients/In_patient/filter_date_page.dart +++ b/lib/screens/patients/In_patient/filter_date_page.dart @@ -188,7 +188,7 @@ class _FilterDatePageState extends State { child: AppButton( title: TranslationBase.of(context).reset, padding: 10, - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, onPressed: () async { this.widget.patientSearchViewModel.selectedToDate = null; this.widget.patientSearchViewModel.selectedFromDate = null; diff --git a/lib/screens/patients/In_patient/in_patient_list_page.dart b/lib/screens/patients/In_patient/in_patient_list_page.dart index f95f7581..2b22b28c 100644 --- a/lib/screens/patients/In_patient/in_patient_list_page.dart +++ b/lib/screens/patients/In_patient/in_patient_list_page.dart @@ -180,7 +180,7 @@ class _InPatientListPageState extends State { height: 25, width: 25, child: CircularProgressIndicator( - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, ), ), ), diff --git a/lib/screens/patients/In_patient/in_patient_screen.dart b/lib/screens/patients/In_patient/in_patient_screen.dart index 7ec5b3cf..b251aa64 100644 --- a/lib/screens/patients/In_patient/in_patient_screen.dart +++ b/lib/screens/patients/In_patient/in_patient_screen.dart @@ -153,7 +153,7 @@ class _InPatientScreenState extends State with SingleTickerProv child: TabBar( isScrollable: false, controller: _tabController, - indicatorColor: AppGlobal.appRedColor, + indicatorColor: AppGlobal.appColor, indicatorWeight: 0.001, indicator: BoxDecoration(), // indicatorSize: TabBarIndicatorSize.tab, diff --git a/lib/screens/patients/patient_search/patient_search_screen.dart b/lib/screens/patients/patient_search/patient_search_screen.dart index dc5f3b71..770c423b 100644 --- a/lib/screens/patients/patient_search/patient_search_screen.dart +++ b/lib/screens/patients/patient_search/patient_search_screen.dart @@ -109,7 +109,7 @@ class _PatientSearchScreenState extends State { onPressed: () { onSubmitSearch(); }, - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, ), ), ), diff --git a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart index 8903ed28..336184cf 100644 --- a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart +++ b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart @@ -173,7 +173,7 @@ class _UCAFPagerScreenState extends State with TickerProviderSt vPadding: 8, hPadding: 8, borderColor: Color(0xFFB8382B), - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, fontColor: Colors.white, onPressed: () { model.saveUCAFOnTap!(); diff --git a/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart b/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart index 83d57923..68e3eb69 100644 --- a/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart +++ b/lib/screens/patients/profile/UCAF/widgets/pocedures_widget.dart @@ -62,7 +62,7 @@ class ProceduresWidget extends StatelessWidget { labelSize: SizeConfig.textMultiplier! * 1.6, valueColor: procedure.isCovered! ? AppGlobal.appGreenColor - : AppGlobal.appRedColor, + : AppGlobal.appColor, ), CustomRow( label: "${TranslationBase.of(context).approvalRequired}: ", @@ -87,7 +87,7 @@ class ProceduresWidget extends StatelessWidget { labelSize: SizeConfig.textMultiplier! * 1.6, valueColor: procedure.isCovered! ? AppGlobal.appGreenColor - : AppGlobal.appRedColor, + : AppGlobal.appColor, ), SizedBox( height: 16, diff --git a/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart index 313c8e28..e9279023 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_second_screen.dart @@ -454,7 +454,7 @@ class _AdmissionRequestSecondScreenState extends State().logEvent( diff --git a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart index d8a976bb..42834cba 100644 --- a/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart +++ b/lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart @@ -253,7 +253,7 @@ class _InterventionMedicationHistoryScreenState extends State { Container( width: 120, height: 4, - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, ) ], ), diff --git a/lib/screens/patients/register_patient/RegisterPatientPage.dart b/lib/screens/patients/register_patient/RegisterPatientPage.dart index 8acb10ad..9e34e0a4 100644 --- a/lib/screens/patients/register_patient/RegisterPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterPatientPage.dart @@ -200,7 +200,7 @@ class _RegisterPatientPageState extends State vPadding: 12, hPadding: 8, borderColor: Color(0xFFB8382B), - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, fontColor: Colors.white, onPressed: () { changePageViewIndex(_currentIndex + 1); diff --git a/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart b/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart index 0c29b02a..51638dc4 100644 --- a/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart +++ b/lib/screens/patients/register_patient/RegisterSearchPatientPage.dart @@ -342,7 +342,7 @@ class _RegisterSearchPatientPageState extends State { title: TranslationBase.of(context).next, hasBorder: true, borderColor: Color(0xFFB8382B), - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, fontColor: Colors.white, onPressed: () async { setState(() { diff --git a/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart b/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart index 8bd67c48..3c9be739 100644 --- a/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart +++ b/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart @@ -148,7 +148,7 @@ class _PharmacyInterventionDialogState .search, hasBorder: true, borderColor: Color(0xFFB8382B), - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, fontColor: Colors.white, onPressed: () async { //(dateFrom, dateTo, admissionNumber, patientId, nursingStation) @@ -209,7 +209,7 @@ class _PharmacyInterventionDialogState data: ThemeData.light().copyWith( colorScheme: ColorScheme.fromSwatch( primarySwatch: Colors.red, - accentColor: AppGlobal.appRedColor, + accentColor: AppGlobal.appColor, ), dialogBackgroundColor: Colors.white, ), @@ -295,7 +295,7 @@ class _PharmacyInterventionDialogState ) ) ), - dropdownButtonProps: DropdownButtonProps(color: AppGlobal.appRedColor,), + dropdownButtonProps: DropdownButtonProps(color: AppGlobal.appColor,), dropdownDecoratorProps: DropDownDecoratorProps( textAlignVertical: TextAlignVertical.center, dropdownSearchDecoration: InputDecoration( diff --git a/lib/screens/pharmacy_intervention/widgets/intervention_history_item.dart b/lib/screens/pharmacy_intervention/widgets/intervention_history_item.dart index b9b5a578..4c46d476 100644 --- a/lib/screens/pharmacy_intervention/widgets/intervention_history_item.dart +++ b/lib/screens/pharmacy_intervention/widgets/intervention_history_item.dart @@ -84,7 +84,7 @@ class InterventionHistoryItem extends StatelessWidget { .reject, hasBorder: true, borderColor: Color(0xFFB8382B), - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, fontColor: Colors.white, onPressed: () async { if(remarksController.text.isEmpty == true) { diff --git a/lib/screens/prescription/prescription_checkout_screen.dart b/lib/screens/prescription/prescription_checkout_screen.dart index 9802c65c..5f9b1203 100644 --- a/lib/screens/prescription/prescription_checkout_screen.dart +++ b/lib/screens/prescription/prescription_checkout_screen.dart @@ -316,7 +316,7 @@ class _PrescriptionCheckOutScreenState extends State fontWeight: FontWeight.w600, ), Radio( - activeColor: AppGlobal.appRedColor, + activeColor: AppGlobal.appColor, value: 1, groupValue: selectedType, onChanged: (value) { diff --git a/lib/screens/procedures/entity_list_checkbox_search_widget.dart b/lib/screens/procedures/entity_list_checkbox_search_widget.dart index 165d47ec..c5862443 100644 --- a/lib/screens/procedures/entity_list_checkbox_search_widget.dart +++ b/lib/screens/procedures/entity_list_checkbox_search_widget.dart @@ -294,7 +294,7 @@ class _EntityListCheckboxSearchWidgetState extends State 0 && procedureName.text.length < 3) diff --git a/lib/screens/procedures/favorite_procedure/entity_list_fav_procedure.dart b/lib/screens/procedures/favorite_procedure/entity_list_fav_procedure.dart index 75bc2ca8..6ee4a5b5 100644 --- a/lib/screens/procedures/favorite_procedure/entity_list_fav_procedure.dart +++ b/lib/screens/procedures/favorite_procedure/entity_list_fav_procedure.dart @@ -123,7 +123,7 @@ class _EntityListCheckboxSearchFavProceduresWidgetState extends State { children: [ AppText(TranslationBase.of(context).orderType), Radio( - activeColor: AppGlobal.appRedColor, + activeColor: AppGlobal.appColor, value: 0, groupValue: widget.selectedType, onChanged: (value) { @@ -120,7 +120,7 @@ class _UpdateProcedureWidgetState extends State { ), Text('routine'), Radio( - activeColor: AppGlobal.appRedColor, + activeColor: AppGlobal.appColor, groupValue: widget.selectedType, value: 1, onChanged: (value) { diff --git a/lib/utils/tab_utils.dart b/lib/utils/tab_utils.dart index 283ff73f..0e5bda2b 100644 --- a/lib/utils/tab_utils.dart +++ b/lib/utils/tab_utils.dart @@ -14,7 +14,7 @@ class TabUtils { double radius = 6.0, required ProjectViewModel projectViewModel}) { return BoxDecoration( - color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA), + color: isActive ? AppGlobal.appColor : Color(0xFFEAEAEA), shape: BoxShape.rectangle, borderRadius: BorderRadius.only( topRight: projectViewModel.isArabic @@ -92,7 +92,7 @@ class TabUtils { width: 15, height: 15, decoration: BoxDecoration( - color: isActive ? Colors.white : AppGlobal.appRedColor, + color: isActive ? Colors.white : AppGlobal.appColor, shape: BoxShape.circle, ), child: Center( @@ -100,7 +100,7 @@ class TabUtils { child: AppText( "$counter", fontSize: SizeConfig.textMultiplier! * 1.5, - color: !isActive ? Colors.white : AppGlobal.appRedColor, + color: !isActive ? Colors.white : AppGlobal.appColor, fontWeight: FontWeight.w700, ), ), diff --git a/lib/widgets/patients/profile/prescription_in_patinets_widget.dart b/lib/widgets/patients/profile/prescription_in_patinets_widget.dart index ec192073..2aabc7e6 100644 --- a/lib/widgets/patients/profile/prescription_in_patinets_widget.dart +++ b/lib/widgets/patients/profile/prescription_in_patinets_widget.dart @@ -30,7 +30,7 @@ class PrescriptionInPatientWidget extends StatelessWidget { padding: EdgeInsets.all(40), decoration: BoxDecoration( border: - Border.all(color: AppGlobal.appRedColor, width: 4), + Border.all(color: AppGlobal.appColor, width: 4), borderRadius: BorderRadius.all(Radius.circular(100))), child: IconButton( icon: Icon( diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 6cf5708a..cba2c9ab 100755 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -49,7 +49,7 @@ class _AppDrawerState extends State { Container( child: Image.asset( 'assets/images/dr_app_logo.png', - width: MediaQuery.of(context).size.width * 0.16, + width: MediaQuery.of(context).size.width * 0.3, height: MediaQuery.of(context).size.height * 0.16, ), margin: EdgeInsets.only(top: 10, bottom: 10), diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart index 3e142987..8cd0204b 100644 --- a/lib/widgets/shared/bottom_navigation_item.dart +++ b/lib/widgets/shared/bottom_navigation_item.dart @@ -46,7 +46,7 @@ class BottomNavigationItem extends StatelessWidget { Positioned( top: 0, child: Container( - color: AppGlobal.appRedColor, + color: AppGlobal.appColor, width: 100, height: 3, )), diff --git a/lib/widgets/shared/dialogs/dailog-list-select.dart b/lib/widgets/shared/dialogs/dailog-list-select.dart index 65ff02bb..a3c2342f 100644 --- a/lib/widgets/shared/dialogs/dailog-list-select.dart +++ b/lib/widgets/shared/dialogs/dailog-list-select.dart @@ -97,7 +97,7 @@ class _ListSelectDialogState extends State { title: Text(Utils.convertToTitleCase(item[widget.attributeName].toString())), groupValue: widget.selectedValue[widget.attributeValueId].toString().toLowerCase(), value: item[widget.attributeValueId].toString().toLowerCase(), - activeColor: AppGlobal.appRedColor, + activeColor: AppGlobal.appColor, selected: item[widget.attributeValueId].toString() == widget.selectedValue[widget.attributeValueId].toString(), onChanged: (val) { setState(() { diff --git a/lib/widgets/shared/loader/gif_loader_container.dart b/lib/widgets/shared/loader/gif_loader_container.dart index 3871892f..02ac044e 100644 --- a/lib/widgets/shared/loader/gif_loader_container.dart +++ b/lib/widgets/shared/loader/gif_loader_container.dart @@ -33,7 +33,9 @@ class _GifLoaderContainerState extends State with TickerProv // margin: EdgeInsets.only(bottom: 40), child: Gif( controller: controller1, - image: AssetImage("assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"), + width: 72, + height: 72, + image: AssetImage("assets/images/progress-loading-red.gif", ), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"), ), )); }