diff --git a/assets/images/rsg_logo.png b/assets/images/rsg_logo.png
new file mode 100644
index 00000000..33d2f4c1
Binary files /dev/null and b/assets/images/rsg_logo.png differ
diff --git a/assets/images/svgs/delete.svg b/assets/images/svgs/delete.svg
index 7cdd0f32..d5e27ab6 100644
--- a/assets/images/svgs/delete.svg
+++ b/assets/images/svgs/delete.svg
@@ -1,5 +1,5 @@
diff --git a/assets/images/svgs/male avatar.svg b/assets/images/svgs/male avatar.svg
index ff177416..4d802716 100644
--- a/assets/images/svgs/male avatar.svg
+++ b/assets/images/svgs/male avatar.svg
@@ -42,7 +42,7 @@
-
+
diff --git a/lib/config/config.dart b/lib/config/config.dart
index 3ab41298..ce30d36b 100755
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -11,9 +11,9 @@ const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
// const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'http://10.20.200.111:1010/';
-// const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://uat.hmgwebservices.com/';
-const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'https://webservices.hmg.com/';
//
@@ -430,7 +430,7 @@ const TIMER_MIN = 10;
class AppGlobal {
static var CONTEX;
- static Color appRedColor = Color(0xFFD02127);
+ static Color appRedColor = Color(0xFF14384B);
static Color appGreenColor = Color(0xFF359846);
static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A);
diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart
index 4188c144..e556211a 100644
--- a/lib/config/localized_values.dart
+++ b/lib/config/localized_values.dart
@@ -166,7 +166,7 @@ const Map> localizedValues = {
"ar": "الرجاء ادخال مستشفى"
},
"login": {"en": "Login", "ar": "تسجيل دخول"},
- "drSulaimanAlHabib": {"en": "Dr Sulaiman Al Habib", "ar": "د.سليمان الحبيب"},
+ "redSeaHealth": {"en": "Red Sea Health", "ar": "صحة البحر الأحمر"},
"welcomeTo": {"en": "Welcome to", "ar": "مرحبا بك"},
"welcomeBackTo": {"en": "Welcome Back to", "ar": "مرحبًا بعودتك الى "},
"home": {"en": "Home", "ar": "الرئيسية"},
diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart
index 07315d91..6f2dc7a7 100755
--- a/lib/screens/auth/login_screen.dart
+++ b/lib/screens/auth/login_screen.dart
@@ -74,12 +74,12 @@ class _LoginScreenState extends State {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, fontFamily: 'Poppins'),
),
Text(
- TranslationBase.of(context).drSulaimanAlHabib,
+ TranslationBase.of(context).redSeaHealth,
style: TextStyle(color: Color(0xFF2B353E), fontWeight: FontWeight.bold, fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth! * 0.029, fontFamily: 'Poppins'),
),
Text(
"Doctor App",
- style: TextStyle(fontSize: SizeConfig.isMobile ? 16 : SizeConfig.realScreenWidth! * 0.030, fontWeight: FontWeight.w600, color: Color(0xFFD02127)),
+ style: TextStyle(fontSize: SizeConfig.isMobile ? 16 : SizeConfig.realScreenWidth! * 0.030, fontWeight: FontWeight.w600, color: Color(0xFF14384B)),
),
]),
],
diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart
index e562c742..faf44ac6 100755
--- a/lib/screens/auth/verification_methods_screen.dart
+++ b/lib/screens/auth/verification_methods_screen.dart
@@ -344,7 +344,7 @@ class _VerificationMethodsScreenState extends State {
children: [
AppButton(
title: TranslationBase.of(context).useAnotherAccount ?? '',
- color: Color(0xFFD02127),
+ color: Color(0xFF14384B),
//fontWeight: FontWeight.w700,
onPressed: () {
authenticationViewModel.deleteUser();
diff --git a/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart b/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
index 69a362fe..c50bb653 100644
--- a/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
+++ b/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
@@ -37,7 +37,7 @@ class _DoctorReplyWidgetState extends State {
: widget.reply.infoStatus == 4
? AppGlobal.inProgressColor
: widget.reply.infoStatus == 3
- ? Color(0xFFD02127)
+ ? Color(0xFF14384B)
: AppGlobal.appGreenColor,
hasBorder: false,
widget: Container(
@@ -81,7 +81,7 @@ class _DoctorReplyWidgetState extends State {
: widget.reply.infoStatus == 4
? AppGlobal.inProgressColor
: widget.reply.infoStatus == 3
- ? Color(0xFFD02127)
+ ? Color(0xFF14384B)
: AppGlobal.appGreenColor,
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',
diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart
index 4be54f9e..b85a57c9 100644
--- a/lib/screens/home/home_screen.dart
+++ b/lib/screens/home/home_screen.dart
@@ -587,26 +587,26 @@ class _HomeScreenState extends State {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Icon(Icons.error_outline, color: Colors.red, size: 40),
- InkWell(
- onTap: () {
- Navigator.pop(context);
- },
- child: Padding(
- padding: const EdgeInsets.all(8.0),
- child: Icon(
- Icons.close,
- color: Colors.red,
- ),
- ),
- )
+ Icon(Icons.error_outline, color: const Color(0xFF14384B), size: 40),
+ InkWell(
+ onTap: () {
+ Navigator.pop(context);
+ },
+ child: Padding(
+ padding: const EdgeInsets.all(8.0),
+ child: Icon(
+ Icons.close,
+ color: const Color(0xFF14384B),
+ ),
+ ),
+ )
],
),
const SizedBox(height: 10),
- Text(
- TranslationBase.of(context).pharmacyIntervention,
- style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: Colors.red),
- ),
+Text(
+ TranslationBase.of(context).pharmacyIntervention,
+ style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold, color: const Color(0xFF14384B)),
+),
const SizedBox(height: 25),
Text(
errorMessage,
diff --git a/lib/screens/live_care/end_call_screen.dart b/lib/screens/live_care/end_call_screen.dart
index 7a9014b6..fa9968a1 100644
--- a/lib/screens/live_care/end_call_screen.dart
+++ b/lib/screens/live_care/end_call_screen.dart
@@ -115,7 +115,7 @@ class _EndCallScreenState extends State {
}
}, isDartIcon: true, dartIcon: DoctorApp.call),
PatientProfileCardModel(TranslationBase.of(context).endLC, TranslationBase.of(context).consultation, '', 'assets/images/svgs/profile_screen/vital signs.svg',
- isInPatient: isInpatient, color: Colors.red[800]!, onTap: () {
+ isInPatient: isInpatient, color: const Color(0xFF14384B), onTap: () {
Utils.showConfirmationDialog(context, "${TranslationBase.of(context).areYouSureYouWantTo} ${TranslationBase.of(context).endLC} ${TranslationBase.of(context).consultation} ?", () async {
Navigator.of(context).pop();
GifLoaderDialogUtils.showMyDialog(context);
@@ -271,7 +271,7 @@ class _EndCallScreenState extends State {
child: Center(
child: AppButton(
fontWeight: FontWeight.w700,
- color: Colors.red[600]!,
+ color: const Color(0xFF14384B),
title: "Close", //TranslationBase.of(context).close,
onPressed: () {
Navigator.of(context).pop();
@@ -325,7 +325,7 @@ class _EndCallScreenState extends State {
},
title: TranslationBase.of(context).cancel,
fontColor: Colors.white,
- color: Colors.red[600]!,
+ color: const Color(0xFF14384B),
),
],
),
@@ -369,7 +369,7 @@ class _CheckBoxListState extends State {
widget.model!.setSelectedCheckboxValues(element, newValue!);
});
},
- activeColor: Color(0xFFD02127),
+ activeColor: Color(0xFF14384B),
controlAffinity: ListTileControlAffinity.leading,
contentPadding: EdgeInsets.all(0),
),
diff --git a/lib/screens/live_care/panding_list.dart b/lib/screens/live_care/panding_list.dart
index b5c6b914..9013504f 100644
--- a/lib/screens/live_care/panding_list.dart
+++ b/lib/screens/live_care/panding_list.dart
@@ -59,7 +59,7 @@ class _LiveCarePandingListState extends State {
? Center(
child: Text(
_liveCareProvider.errorMsg,
- style: TextStyle(color: Colors.red),
+ style: TextStyle(color: const Color(0xFF14384B)),
),
)
: Column(
diff --git a/lib/screens/live_care/video_call.dart b/lib/screens/live_care/video_call.dart
index 6496e551..7b89bf15 100644
--- a/lib/screens/live_care/video_call.dart
+++ b/lib/screens/live_care/video_call.dart
@@ -169,14 +169,14 @@ class _VideoCallPageState extends State {
Navigator.of(context).pop();
},
elevation: 30.0,
- shape: CircleBorder(side: BorderSide(color: Colors.red)),
+ shape: CircleBorder(side: BorderSide(color: const Color(0xFF14384B))),
mini: false,
child: Icon(
Icons.call_end,
- color: Colors.red,
+ color: const Color(0xFF14384B),
size: 35,
),
- backgroundColor: Colors.red[100],
+ backgroundColor: const Color(0xFF14384B),
))
],
),
@@ -211,7 +211,7 @@ class _VideoCallPageState extends State {
},
child: CircleAvatar(
child: Icon(Icons.close),
- backgroundColor: Colors.red,
+ backgroundColor: const Color(0xFF14384B),
),
),
),
@@ -225,7 +225,7 @@ class _VideoCallPageState extends State {
child: ElevatedButton(
onPressed: () => {endCall()},
child: Text(TranslationBase.of(context).endcall),
- style: ElevatedButton.styleFrom(backgroundColor: Colors.red, textStyle: TextStyle(color: Colors.white))
+ style: ElevatedButton.styleFrom(backgroundColor: const Color(0xFF14384B), textStyle: TextStyle(color: Colors.white))
//color: Colors.red,
//textColor: Colors.white,
diff --git a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart
index 8903ed28..5f2124c2 100644
--- a/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart
+++ b/lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart
@@ -133,7 +133,7 @@ class _UCAFPagerScreenState extends State with TickerProviderSt
margin: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: AppButton(
title: TranslationBase.of(context).next,
- color: Color(0xFFD02127),
+ color: Color(0xFF14384B),
onPressed: () {
changePageViewIndex(1);
},
diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
index a94cdeac..6350136f 100644
--- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
+++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
@@ -202,7 +202,7 @@ class _AdmissionRequestThirdScreenState extends State {
bgColor: model.patientProgressNoteList[index].status == 1 && authenticationViewModel.doctorProfile!.doctorID != model.patientProgressNoteList[index].createdBy
? Color(0xFFCC9B14)
: model.patientProgressNoteList[index].status == 4
- ? Colors.red.shade700
+ ? const Color(0xFF14384B)
: model.patientProgressNoteList[index].status == 2
? AppGlobal.appGreenColor
: Color(0xFFCC9B14),
@@ -144,7 +144,7 @@ class _ProgressNoteState extends State {
AppText(
TranslationBase.of(context).noteCanceled,
fontWeight: FontWeight.bold,
- color: Colors.red.shade700,
+ color: const Color(0xFF14384B),
fontSize: 12,
),
if (model.patientProgressNoteList[index].status == 2)
@@ -284,7 +284,7 @@ class _ProgressNoteState extends State {
},
child: Container(
decoration: BoxDecoration(
- color: Colors.red[600],
+ color: const Color(0xFF14384B),
borderRadius: BorderRadius.circular(10),
),
// color:Colors.red[600],
@@ -491,7 +491,7 @@ class _ProgressNoteState extends State {
child: AppText(
TranslationBase.of(context).noteConfirm,
fontWeight: FontWeight.w600,
- color: Colors.red.shade700,
+ color: const Color(0xFF14384B),
fontSize: 16,
), //Text("Confirm", ),
onPressed: () async {
diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart
index 95ded378..062c505b 100644
--- a/lib/screens/patients/profile/radiology/radiology_home_page.dart
+++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart
@@ -83,7 +83,7 @@ class _RadiologyHomePageState extends State {
subTitle: TranslationBase.of(context).result,
),
SizedBox(height: 20,),
- !model.isPrincipalCovered_ ? Center(child: AppText(TranslationBase.of(context).principalCoveredOrNot,color: Colors.red, textAlign: TextAlign.center, )) :SizedBox(),
+ !model.isPrincipalCovered_ ? Center(child: AppText(TranslationBase.of(context).principalCoveredOrNot,color: const Color(0xFF14384B), textAlign: TextAlign.center, )) :SizedBox(),
if ((patient.patientStatusType != null && patient.patientStatusType == 43) || (isFromLiveCare && patient.appointmentNo != null))
AddNewOrder(
@@ -123,11 +123,11 @@ class _RadiologyHomePageState extends State {
height: 160,
decoration: BoxDecoration(
//Colors.red[900] Color(0xff404545)
- color: model.radiologyList[index].isLiveCareAppodynamicment ?? false
- ? Colors.red[900]
- : model.radiologyList[index].isInOutPatient !=null && model.radiologyList[index].isInOutPatient==false
- ? Colors.black
- : Color(0xffa9a089),
+ color: model.radiologyList[index].isLiveCareAppodynamicment ?? false
+ ? const Color(0xFF14384B)
+ : model.radiologyList[index].isInOutPatient !=null && model.radiologyList[index].isInOutPatient==false
+ ? Colors.black
+ : Color(0xffa9a089),
borderRadius: BorderRadius.only(
topLeft: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(8),
bottomLeft: projectViewModel.isArabic ? Radius.circular(0) : Radius.circular(8),
diff --git a/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart
index 64a03586..9aedee83 100644
--- a/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart
+++ b/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart
@@ -122,7 +122,7 @@ class ReferredPatientDetailScreen extends StatelessWidget {
TranslationBase.of(context).viewProfile,
fontWeight: FontWeight.w700,
fontSize: 1.7 * SizeConfig.textMultiplier!,
- color: Colors.red[700]!,
+ color: const Color(0xFF14384B),
)
],
),
@@ -145,7 +145,7 @@ class ReferredPatientDetailScreen extends StatelessWidget {
? AppGlobal.inProgressColor
: referredPatient.referralStatus == 46
? AppGlobal.appGreenColor
- : Colors.red[700]!,
+ : const Color(0xFF14384B),
),
AppText(
patientType == PatientType.IN_PATIENT
diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
index 6a7fdf88..cef1e174 100644
--- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
+++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
@@ -66,15 +66,15 @@ class _AddAssessmentDetailsState extends State {
fillColor: Colors.white,
contentPadding: EdgeInsets.symmetric(vertical: 15, horizontal: 10),
focusedBorder: OutlineInputBorder(
- borderSide: BorderSide(color: (validationError != null ? Colors.red.shade700 : Color(0xFFEFEFEF)), width: 2.5),
+ borderSide: BorderSide(color: (validationError != null ? const Color(0xFF14384B) : Color(0xFFEFEFEF)), width: 2.5),
borderRadius: BorderRadius.circular(8),
),
enabledBorder: OutlineInputBorder(
- borderSide: BorderSide(color: (validationError != null ? Colors.red.shade700 : Color(0xFFEFEFEF)), width: 2.5),
+ borderSide: BorderSide(color: (validationError != null ? const Color(0xFF14384B) : Color(0xFFEFEFEF)), width: 2.5),
borderRadius: BorderRadius.circular(8),
),
disabledBorder: OutlineInputBorder(
- borderSide: BorderSide(color: (validationError != null ? Colors.red.shade700 : Color(0xFFEFEFEF)), width: 2.5),
+ borderSide: BorderSide(color: (validationError != null ? const Color(0xFF14384B) : Color(0xFFEFEFEF)), width: 2.5),
borderRadius: BorderRadius.circular(8),
),
hintText: selectedText != null ? selectedText : hintText,
diff --git a/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart b/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
index c7f015f8..22d594bf 100644
--- a/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
+++ b/lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
@@ -219,7 +219,7 @@ class _AddExaminationWidgetState extends State {
),
child: Container(
decoration: BoxDecoration(
- color: status == 3 ? HexColor("#D02127") : Colors.white,
+ color: status == 3 ? HexColor("#14384b") : Colors.white,
shape: BoxShape.circle,
),
),
diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart
index c970f62a..2f06ce7b 100644
--- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart
+++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart
@@ -21,13 +21,13 @@ class RemoveButton extends StatelessWidget {
label ?? TranslationBase.of(context).remove,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5,
fontWeight: FontWeight.w700,
- color: HexColor("#D02127"),
+ color: HexColor("#14384b"),
letterSpacing: -0.48,
),
),
Icon(
FontAwesomeIcons.times,
- color: HexColor("#D02127"),
+ color: HexColor("#14384b"),
size: SizeConfig.getTextMultiplierBasedOnWidth() * 4,
),
],
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
index a4af47f0..6d191799 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
@@ -243,11 +243,11 @@ class _EditDiagnosisState extends State {
),
child: Container(
decoration: BoxDecoration(
- color: status.toLowerCase() ==
- model.conditionTypeList[index]
- .toLowerCase()
- ? HexColor("#D02127")
- : Colors.white,
+ color: status.toLowerCase() ==
+ model.conditionTypeList[index]
+ .toLowerCase()
+ ? HexColor("#14384b")
+ : Colors.white,
shape: BoxShape.circle,
),
),
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart
index c65d145e..a951fb40 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart
@@ -309,10 +309,10 @@ class _FavoriteDiagnosisState extends State {
),
child: Container(
decoration: BoxDecoration(
- color: status ==
- model.conditionTypeList[index]
- ? HexColor("#D02127")
- : Colors.white,
+ color: status ==
+ model.conditionTypeList[index]
+ ? HexColor("#14384b")
+ : Colors.white,
shape: BoxShape.circle,
),
),
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart
index 40de420b..f70735d9 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart
@@ -284,7 +284,7 @@ class _AddDetailsToExaminationVidaPlusState
),
child: Container(
decoration: BoxDecoration(
- color: status == 3 ? HexColor("#D02127") : Colors.white,
+ color: status == 3 ? HexColor("#14384b") : Colors.white,
shape: BoxShape.circle,
),
),
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart
index 126e84e1..264704ad 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart
@@ -131,7 +131,7 @@ class _ExaminationItemsState extends State {
currentIndex]
.conditionName ??
"-1")
- ? HexColor("#D02127")
+ ? HexColor("#14384b")
: Colors.white,
shape: BoxShape.circle,
),
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart
index 871537d5..c6476819 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart
@@ -130,11 +130,11 @@ class _ComplaintSelectionState extends State {
value: true,
enabled: false,
checkColor: Colors.white,
- activeColor: Color(0xFFD02127),
+ activeColor: Color(0xFF14384B),
side: MaterialStateBorderSide.resolveWith(
(Set states) {
if (states.contains(MaterialState.selected)) {
- return const BorderSide(color: Color(0xFFD02127));
+ return const BorderSide(color: Color(0xFF14384B));
}
return const BorderSide(color: Color(0xFFE6E6E6));
},
@@ -157,14 +157,14 @@ class _ComplaintSelectionState extends State {
horizontalTitleGap: 0,
child: CheckboxListTile(
value: true,
- activeColor: Color(0xFFD02127),
+ activeColor: Color(0xFF14384B),
checkColor: Colors.white,
controlAffinity: ListTileControlAffinity.leading,
side: MaterialStateBorderSide.resolveWith(
(Set states) {
if (states.contains(MaterialState.selected)) {
- return const BorderSide(color: Color(0xFFD02127));
+ return const BorderSide(color: Color(0xFF14384B));
}
return const BorderSide(color: Color(0xFFE6E6E6));
},
@@ -185,13 +185,13 @@ class _ComplaintSelectionState extends State {
ListTileTheme(
horizontalTitleGap: 0,
child: CheckboxListTile(
- activeColor: Color(0xFFD02127),
+ activeColor: Color(0xFF14384B),
checkColor: Colors.white,
contentPadding: EdgeInsets.zero,
side: MaterialStateBorderSide.resolveWith(
(Set states) {
if (states.contains(MaterialState.selected)) {
- return const BorderSide(color: Color(0xFFD02127));
+ return const BorderSide(color: Color(0xFF14384B));
}
return const BorderSide(color: Color(0xFFE6E6E6));
},
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart
index 97f8c846..676fa7a1 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart
@@ -60,13 +60,12 @@ class UpdatePresentIllnessState extends State {
horizontalTitleGap: 0,
child: CheckboxListTile(
value: this.isPatientSelected,
- activeColor: Color(0xFFD02127),
checkColor: Colors.white,
- controlAffinity: ListTileControlAffinity.leading,
+ activeColor: Color(0xFF14384B),
side: MaterialStateBorderSide.resolveWith(
- (Set states) {
+ (Set states) {
if (states.contains(MaterialState.selected)) {
- return const BorderSide(color: Color(0xFFD02127));
+ return const BorderSide(color: Color(0xFF14384B));
}
return const BorderSide(color: Color(0xFFE6E6E6));
},
@@ -132,7 +131,7 @@ class UpdatePresentIllnessState extends State {
onChanged: (value) {},
onFieldSubmitted: () {},
- suffixIcon: IconButton(icon:Icon(Icons.save_as_outlined, color: Colors.red, size: 25,), onPressed: (){
+ suffixIcon: IconButton(icon:Icon(Icons.save_as_outlined, color: Color(0xFF14384B), size: 25,), onPressed: (){
saveHopi(model);
},),
),
diff --git a/lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart b/lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
index be14191c..4d36c135 100644
--- a/lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
+++ b/lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
@@ -97,7 +97,7 @@ class LineChartCurvedBloodPressureNew extends StatelessWidget {
Container(
width: 16,
height: 16,
- decoration: containerRadius(Color(0xFFD02127), 100),
+ decoration: containerRadius(Color(0xFF14384B), 100),
),
SizedBox(
width: 5,
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 d5aac9ba..c82d8da9 100644
--- a/lib/screens/patients/profile/vital_sign/vital_sign_item.dart
+++ b/lib/screens/patients/profile/vital_sign/vital_sign_item.dart
@@ -63,7 +63,7 @@ class VitalSignItem extends StatelessWidget {
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier! * 1.2,
fontWeight: FontWeight.w700,
- color: Color(0xFFD02127),
+ color: Color(0xFF14384B),
margin: 0,
),
],
diff --git a/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart b/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
index 82873a2a..40f9903c 100644
--- a/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
+++ b/lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
@@ -453,7 +453,7 @@ class _RegisterConfirmationPatientPageState extends State {
vPadding: 12,
hPadding: 8,
borderColor: Color(0xFFB8382B),
- color: HexColor("#D02127"),
+ color: HexColor("#14384b"),
fontColor: Colors.white,
onPressed: () async {
GifLoaderDialogUtils.showMyDialog(context);
diff --git a/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart b/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart
index 8bd67c48..67c86708 100644
--- a/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart
+++ b/lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart
@@ -208,7 +208,18 @@ class _PharmacyInterventionDialogState
return Theme(
data: ThemeData.light().copyWith(
colorScheme: ColorScheme.fromSwatch(
- primarySwatch: Colors.red,
+ primarySwatch: MaterialColor(0xFF14384B, {
+ 50: Color(0xFF14384B),
+ 100: Color(0xFF14384B),
+ 200: Color(0xFF14384B),
+ 300: Color(0xFF14384B),
+ 400: Color(0xFF14384B),
+ 500: Color(0xFF14384B),
+ 600: Color(0xFF14384B),
+ 700: Color(0xFF14384B),
+ 800: Color(0xFF14384B),
+ 900: Color(0xFF14384B),
+ }),
accentColor: AppGlobal.appRedColor,
),
dialogBackgroundColor: Colors.white,
diff --git a/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart b/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart
index 46904954..4dfa2c1d 100644
--- a/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart
+++ b/lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart
@@ -73,7 +73,7 @@ class _DrugToDrug extends State {
padding: EdgeInsets.all(10),
child: AppText(
item['comment'],
- color: Colors.red[900]!,
+ color: const Color(0xFF14384B),
));
}).toList());
}))))
diff --git a/lib/screens/prescription/new_prescriptions_page.dart b/lib/screens/prescription/new_prescriptions_page.dart
index f88b2f9b..a706e2c0 100644
--- a/lib/screens/prescription/new_prescriptions_page.dart
+++ b/lib/screens/prescription/new_prescriptions_page.dart
@@ -76,7 +76,7 @@ class NewPrescriptionsPage extends StatelessWidget {
? Center(
child: AppText(
TranslationBase.of(context).principalCoveredOrNot,
- color: Colors.red,
+ color: const Color(0xFF14384B),
textAlign: TextAlign.center,
))
: SizedBox(),
diff --git a/lib/screens/procedures/entity_list_checkbox_search_widget.dart b/lib/screens/procedures/entity_list_checkbox_search_widget.dart
index 165d47ec..07662b98 100644
--- a/lib/screens/procedures/entity_list_checkbox_search_widget.dart
+++ b/lib/screens/procedures/entity_list_checkbox_search_widget.dart
@@ -159,7 +159,7 @@ class _EntityListCheckboxSearchWidgetState extends State(Color(0xFFD02127)),
+ valueColor: AlwaysStoppedAnimation(Color(0xFF14384B)),
),
),
)
diff --git a/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart b/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart
index 3ce2af78..1d4c1bec 100644
--- a/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart
+++ b/lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart
@@ -133,7 +133,7 @@ class _ProcedureCheckOutScreenState extends State {
fontWeight: FontWeight.w600,
),
Radio(
- activeColor: Color(0xFFD02127),
+ activeColor: Color(0xFF14384B),
groupValue: widget
.items![index].selectedType,
value: 1,
diff --git a/lib/screens/reschedule_leaves/add_reschedule_leave.dart b/lib/screens/reschedule_leaves/add_reschedule_leave.dart
index b5d85e6f..3961cf67 100644
--- a/lib/screens/reschedule_leaves/add_reschedule_leave.dart
+++ b/lib/screens/reschedule_leaves/add_reschedule_leave.dart
@@ -60,12 +60,12 @@ class AddRescheduleLeaveScreen extends StatelessWidget {
border: Border(
left: BorderSide(
color: item.status == 10
- ? Colors.red[800]!
+ ? const Color(0xFF14384B)
: item.status == 2
? HexColor('#CC9B14')
: item.status == 9
? AppGlobal.appGreenColor
- : Colors.red,
+ : const Color(0xFF14384B),
width: 5.0,
))),
padding: EdgeInsets.only(left: 10, right: 10),
diff --git a/lib/screens/splash/splash_screen.dart b/lib/screens/splash/splash_screen.dart
index 6681d954..dee40e48 100644
--- a/lib/screens/splash/splash_screen.dart
+++ b/lib/screens/splash/splash_screen.dart
@@ -112,8 +112,11 @@ class _SplashScreenState extends State {
Widget build(BuildContext context) {
return Scaffold(
backgroundColor: Color(0xffF8F8F8),
- body: Center(
- child: Image.asset('assets/images/dr_app_logo.png'),
+ body: Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 72),
+ child: Center(
+ child: Image.asset('assets/images/rsg_logo.png'),
+ ),
),
);
}
diff --git a/lib/update_page.dart b/lib/update_page.dart
index 38863596..95c2d328 100644
--- a/lib/update_page.dart
+++ b/lib/update_page.dart
@@ -58,7 +58,7 @@ class UpdatePage extends StatelessWidget {
// padding: const EdgeInsets.all(8.0),
margin: EdgeInsets.all(15),
child: AppButton(
- color: Colors.red[800]!,
+ color: const Color(0xFF14384B),
onPressed: () {
if (Platform.isIOS)
launchUrl(Uri.parse(iosLink!));
diff --git a/lib/utils/translations_delegate_base_utils.dart b/lib/utils/translations_delegate_base_utils.dart
index 6f228007..dea52a9b 100644
--- a/lib/utils/translations_delegate_base_utils.dart
+++ b/lib/utils/translations_delegate_base_utils.dart
@@ -335,8 +335,8 @@ class TranslationBase {
String get login => localizedValues['login']![locale.languageCode]!;
- String get drSulaimanAlHabib =>
- localizedValues['drSulaimanAlHabib']![locale.languageCode]!;
+ String get redSeaHealth =>
+ localizedValues['redSeaHealth']![locale.languageCode]!;
String get welcomeTo => localizedValues['welcomeTo']![locale.languageCode]!;
diff --git a/lib/widgets/auth/sms-popup.dart b/lib/widgets/auth/sms-popup.dart
index 98668ae1..0faa92ed 100644
--- a/lib/widgets/auth/sms-popup.dart
+++ b/lib/widgets/auth/sms-popup.dart
@@ -258,7 +258,7 @@ class SMSOTP {
),
AppText(
displayTime,
- color: Colors.red,
+ color: const Color(0xFF14384B),
textAlign: TextAlign.start,
fontWeight: FontWeight.bold,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: dialogWidth) * 3.5,
diff --git a/lib/widgets/dashboard/out_patient_stack.dart b/lib/widgets/dashboard/out_patient_stack.dart
index ebe568ca..bdc41f59 100644
--- a/lib/widgets/dashboard/out_patient_stack.dart
+++ b/lib/widgets/dashboard/out_patient_stack.dart
@@ -92,7 +92,7 @@ class GetOutPatientStack extends StatelessWidget {
begin: Alignment.topLeft,
end: Alignment(0.0, 1.0),
// 10% of the width, so there are ten blinds.
- colors: [Color(0x8FF5F6FA), Colors.red[100]!],
+ colors: [Color(0x8FF5F6FA), const Color(0xFF14384B)],
// red to yellow
tileMode: TileMode.mirror, // repeats the gradient over the canvas
),
@@ -110,7 +110,7 @@ class GetOutPatientStack extends StatelessWidget {
height: max != 0 ? ((barHeight) * value.value) / max : 0,
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(4),
- color: Color(0xFFD02127).withOpacity(0.39),
+ color: Color(0xFF14384B).withOpacity(0.39),
),
),
),
diff --git a/lib/widgets/dialog/AskPermissionDialog.dart b/lib/widgets/dialog/AskPermissionDialog.dart
index 3c3d74ba..3d67b64a 100644
--- a/lib/widgets/dialog/AskPermissionDialog.dart
+++ b/lib/widgets/dialog/AskPermissionDialog.dart
@@ -71,7 +71,7 @@ class _AskPermissionDialogState extends State {
),
AppButton(
// fontColor: Theme.of(context).backgroundColor,
- color: Colors.red[700]!,
+ color: const Color(0xFF14384B),
title: "Turn On Camera, Microphone",
onPressed: () async {
openAppSettings().then((value) {
diff --git a/lib/widgets/home/home_item.dart b/lib/widgets/home/home_item.dart
index 55175fab..ac839429 100644
--- a/lib/widgets/home/home_item.dart
+++ b/lib/widgets/home/home_item.dart
@@ -12,7 +12,7 @@ class HomeItem extends StatelessWidget {
Widget build(BuildContext context) {
return InkWell(
onTap: () => selectItem(context, link),
- splashColor: Colors.red,
+ splashColor: const Color(0xFF14384B),
child: Container(
padding: EdgeInsets.all(5),
decoration: BoxDecoration(
diff --git a/lib/widgets/patients/patient-referral-item-widget.dart b/lib/widgets/patients/patient-referral-item-widget.dart
index bf5ed9ea..0763daab 100644
--- a/lib/widgets/patients/patient-referral-item-widget.dart
+++ b/lib/widgets/patients/patient-referral-item-widget.dart
@@ -63,8 +63,8 @@ class PatientReferralItemWidget extends StatelessWidget {
: referralStatusCode == 46
? AppGlobal.appGreenColor
: referralStatusCode == 4
- ? Colors.red[700]!
- : Colors.red[900]!,
+ ? const Color(0xFF14384B)
+ : const Color(0xFF14384B),
hasBorder: false,
widget: Container(
// padding: EdgeInsets.only(left: 20, right: 0, bottom: 0),
@@ -88,8 +88,8 @@ class PatientReferralItemWidget extends StatelessWidget {
: referralStatusCode == 46
? AppGlobal.appGreenColor
: referralStatusCode == 4
- ? Colors.red[700]!
- : Colors.red[900]!,
+ ? const Color(0xFF14384B)
+ : const Color(0xFF14384B),
),
Column(
crossAxisAlignment: CrossAxisAlignment.end,
diff --git a/lib/widgets/patients/patient_card/PatientCard.dart b/lib/widgets/patients/patient_card/PatientCard.dart
index 16099da5..0027bfe2 100644
--- a/lib/widgets/patients/patient_card/PatientCard.dart
+++ b/lib/widgets/patients/patient_card/PatientCard.dart
@@ -70,7 +70,7 @@ class PatientCard extends StatelessWidget {
: isInpatient
? Colors.white
: !isFromSearch
- ? Colors.red[800]!
+ ? const Color(0xFF14384B)
: Colors.white,
widget: Container(
decoration: BoxDecoration(
@@ -122,7 +122,7 @@ class PatientCard extends StatelessWidget {
children: [
PatientStatus(
label: TranslationBase.of(context).notArrived,
- color: Colors.red[800]!,
+ color: const Color(0xFF14384B),
),
SizedBox(
width: 8,
@@ -148,7 +148,7 @@ class PatientCard extends StatelessWidget {
children: [
PatientStatus(
label: TranslationBase.of(context).notArrived,
- color: Colors.red[800],
+ color: const Color(0xFF14384B),
),
SizedBox(
width: 8,
diff --git a/lib/widgets/patients/patient_card/ShowTimer.dart b/lib/widgets/patients/patient_card/ShowTimer.dart
index e26bd3de..af6bb252 100644
--- a/lib/widgets/patients/patient_card/ShowTimer.dart
+++ b/lib/widgets/patients/patient_card/ShowTimer.dart
@@ -26,7 +26,7 @@ class _ShowTimerState extends State {
}
return AppText(
"$displayTime",
- color: Colors.red,
+ color: const Color(0xFF14384B),
textAlign: TextAlign.start,
fontWeight: FontWeight.bold,
fontSize: 11,
diff --git a/lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart b/lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart
index f64d1ff8..74d1b706 100644
--- a/lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart
+++ b/lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart
@@ -159,7 +159,7 @@ class PatientProfileAppBar extends StatelessWidget implements PreferredSizeWidge
)
: AppText(
TranslationBase.of(context).notArrived,
- color: Colors.red[800]!,
+ color: const Color(0xFF14384B),
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5,
diff --git a/lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart b/lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart
index 7bf903e2..6a308089 100644
--- a/lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart
+++ b/lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart
@@ -106,7 +106,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget implements Pre
return InkWell(
onTap: () {},
child: Container(
- decoration: BoxDecoration(color: Colors.red, borderRadius: BorderRadius.circular(20)),
+ decoration: BoxDecoration(color: const Color(0xFF14384B), borderRadius: BorderRadius.circular(20)),
padding: EdgeInsets.symmetric(vertical: 2, horizontal: 10),
child: Text(
snapshot.data!,
@@ -155,7 +155,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget implements Pre
)
: AppText(
TranslationBase.of(context).notArrived,
- color: Colors.red[800]!,
+ color: const Color(0xFF14384B),
fontWeight: FontWeight.bold,
fontFamily: 'Poppins',
fontSize: 12,
diff --git a/lib/widgets/shared/app_scaffold_widget.dart b/lib/widgets/shared/app_scaffold_widget.dart
index 52949bb0..4579e004 100644
--- a/lib/widgets/shared/app_scaffold_widget.dart
+++ b/lib/widgets/shared/app_scaffold_widget.dart
@@ -78,7 +78,7 @@ class AppScaffold extends StatelessWidget {
if (subtitle != null)
Text(
subtitle!,
- style: TextStyle(fontSize: 12, color: Colors.red),
+ style: TextStyle(fontSize: 12, color: const Color(0xFF14384B)),
),
],
),
diff --git a/lib/widgets/shared/app_texts_widget.dart b/lib/widgets/shared/app_texts_widget.dart
index 27e98074..bfe3de0d 100644
--- a/lib/widgets/shared/app_texts_widget.dart
+++ b/lib/widgets/shared/app_texts_widget.dart
@@ -131,7 +131,7 @@ class _AppTextState extends State {
},
child: Text(hidden ? "Read More" : "Read less",
style: _getFontStyle()!.copyWith(
- color: HexColor('#FF0000'),
+ color: HexColor('#14384b'),
fontWeight: FontWeight.w800,
fontFamily: "Poppins",
)),
diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart
index 3e142987..69a58f76 100644
--- a/lib/widgets/shared/bottom_navigation_item.dart
+++ b/lib/widgets/shared/bottom_navigation_item.dart
@@ -97,7 +97,7 @@ class BottomNavigationItem extends StatelessWidget {
position: BadgePosition.topEnd(),
badgeStyle: badge.BadgeStyle(
shape: BadgeShape.circle,
- badgeColor: Colors.red[800]!,
+ badgeColor: const Color(0xFF14384B),
borderRadius: BorderRadius.circular(8),
),
badgeContent: Container(
diff --git a/lib/widgets/shared/buttons/app_buttons_widget.dart b/lib/widgets/shared/buttons/app_buttons_widget.dart
index 0ab825f8..f0e3e970 100644
--- a/lib/widgets/shared/buttons/app_buttons_widget.dart
+++ b/lib/widgets/shared/buttons/app_buttons_widget.dart
@@ -75,7 +75,7 @@ class _AppButtonState extends State {
? Colors.grey
: widget.color != null
? widget.color
- : HexColor("#D02127"),
+ : HexColor("#14384b"),
splashColor: widget.color,
child: Padding(
padding: (widget.hPadding > 0 || widget.vPadding > 0)
diff --git a/lib/widgets/shared/loader/gif_loader_container.dart b/lib/widgets/shared/loader/gif_loader_container.dart
index 3871892f..15d30cec 100644
--- a/lib/widgets/shared/loader/gif_loader_container.dart
+++ b/lib/widgets/shared/loader/gif_loader_container.dart
@@ -1,4 +1,6 @@
+import 'package:doctor_app_flutter/config/config.dart';
import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
import 'package:gif/gif.dart';
class GifLoaderContainer extends StatefulWidget {
@@ -31,10 +33,13 @@ class _GifLoaderContainerState extends State with TickerProv
//progress-loading.gif
child: Container(
// 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"),
+ child: CircularProgressIndicator(
+ color: AppGlobal.appRedColor,
),
+ // Gif(
+ // controller: controller1,
+ // image: AssetImage("assets/images/progress-loading-red.gif"), //NetworkImage("http://img.mp.itc.cn/upload/20161107/5cad975eee9e4b45ae9d3c1238ccf91e.jpg"),
+ // ),
));
}
}
diff --git a/lib/widgets/shared/master_key_checkbox_search_widget.dart b/lib/widgets/shared/master_key_checkbox_search_widget.dart
index ce1c9d50..f4755142 100644
--- a/lib/widgets/shared/master_key_checkbox_search_widget.dart
+++ b/lib/widgets/shared/master_key_checkbox_search_widget.dart
@@ -104,7 +104,7 @@ class _MasterKeyCheckboxSearchWidgetState extends State {
child: Container(
margin: EdgeInsets.all(20),
padding: EdgeInsets.all(10),
- decoration: BoxDecoration(borderRadius: BorderRadius.circular(100), border: Border.all(width: 2, color: Colors.red)),
+ decoration: BoxDecoration(borderRadius: BorderRadius.circular(100), border: Border.all(width: 2, color: const Color(0xFF14384B))),
child: Icon(
Icons.mic,
color: Colors.blue,
diff --git a/lib/widgets/shared/text_fields/TextFields.dart b/lib/widgets/shared/text_fields/TextFields.dart
index 8bf82589..967ba1d3 100644
--- a/lib/widgets/shared/text_fields/TextFields.dart
+++ b/lib/widgets/shared/text_fields/TextFields.dart
@@ -279,11 +279,11 @@ class _TextFieldsState extends State {
prefixIcon: widget.prefixIcon,
errorStyle: TextStyle(fontSize: 12.0, fontWeight: widget.fontWeight, height: widget.borderOnlyError ? 0.0 : null),
errorBorder: OutlineInputBorder(
- borderSide: widget.hasBorder ? BorderSide(color:Colors.red.withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0),
+ borderSide: widget.hasBorder ? BorderSide(color: const Color(0xFF14384B).withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0),
borderRadius: widget.hasBorder ? BorderRadius.circular(widget.bare ? 0.0 : widget.borderRadius) : BorderRadius.circular(0.0),
),
focusedErrorBorder: OutlineInputBorder(
- borderSide: widget.hasBorder ? BorderSide(color: Colors.red.withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0),
+ borderSide: widget.hasBorder ? BorderSide(color: const Color(0xFF14384B).withOpacity(widget.bare ? 0.0 : 0.5), width: 1.0) : BorderSide(color: Colors.transparent, width: 0),
borderRadius: BorderRadius.circular(widget.bare ? 0.0 : widget.borderRadius)),
focusedBorder: OutlineInputBorder(
borderSide: widget.hasBorder ? BorderSide(color: widget.borderColor!, width: widget.borderWidth) : BorderSide(color: Colors.transparent, width: 0),
diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart
index fa8b1cd1..ffc4c56b 100644
--- a/lib/widgets/shared/text_fields/app-textfield-custom.dart
+++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart
@@ -111,7 +111,7 @@ class _AppTextFieldCustomState extends State {
Color(0Xffffffff),
widget.validationError == null
? Color(0xFFEFEFEF)
- : Colors.red.shade700,
+ : const Color(0xFF14384B),
)
: null,
padding:
diff --git a/lib/widgets/shared/text_fields/auto_complete_text_field.dart b/lib/widgets/shared/text_fields/auto_complete_text_field.dart
index 886ac264..597a3455 100644
--- a/lib/widgets/shared/text_fields/auto_complete_text_field.dart
+++ b/lib/widgets/shared/text_fields/auto_complete_text_field.dart
@@ -21,7 +21,7 @@ class CustomAutoCompleteTextField extends StatelessWidget {
Container(
decoration: TextFieldsUtils.containerBorderDecoration(
Color(0Xffffffff),
- isShowError ? Colors.red.shade700 : Color(0xFFEFEFEF),
+ isShowError ? const Color(0xFF14384B) : Color(0xFFEFEFEF),
),
padding:
EdgeInsets.only(top: 0.2, bottom: 2.0, left: 8.0, right: 0.0),
diff --git a/lib/widgets/shared/text_fields/text_field_error.dart b/lib/widgets/shared/text_fields/text_field_error.dart
index b1ff9abd..436ff28d 100644
--- a/lib/widgets/shared/text_fields/text_field_error.dart
+++ b/lib/widgets/shared/text_fields/text_field_error.dart
@@ -21,7 +21,7 @@ class TextFieldsError extends StatelessWidget {
Icon(
DoctorApp.warning,
size: 20,
- color: Colors.red.shade700,
+ color: const Color(0xFF14384B),
),
SizedBox(
width: 12,
@@ -31,7 +31,7 @@ class TextFieldsError extends StatelessWidget {
error,
fontFamily: 'Poppins',
fontSize: SizeConfig.textMultiplier! * 1.7,
- color: Colors.red.shade700,
+ color: const Color(0xFF14384B),
fontWeight: FontWeight.w700,
),
),
diff --git a/lib/widgets/shared/user-guid/custom_validation_error.dart b/lib/widgets/shared/user-guid/custom_validation_error.dart
index b4517861..aedee387 100644
--- a/lib/widgets/shared/user-guid/custom_validation_error.dart
+++ b/lib/widgets/shared/user-guid/custom_validation_error.dart
@@ -23,7 +23,7 @@ class CustomValidationError extends StatelessWidget {
margin: EdgeInsets.symmetric(horizontal: 3),
child: AppText(
error,
- color: Colors.red,
+ color: const Color(0xFF14384B),
fontSize: 14,
),
),
diff --git a/pubspec.lock b/pubspec.lock
index cb832c0c..21612441 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -121,14 +121,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.1"
- build_modules:
- dependency: transitive
- description:
- name: build_modules
- sha256: "0126ba5111c4b8f5b1f557beb23eb0bd9266f9114199ff42d9270c29c997b1be"
- url: "https://pub.dev"
- source: hosted
- version: "5.0.18"
build_resolvers:
dependency: transitive
description:
@@ -157,10 +149,10 @@ packages:
dependency: "direct dev"
description:
name: build_web_compilers
- sha256: e93b5d5af529269f52b691f7542d859fba82982cadec23b19680c15c70f65378
+ sha256: "3bc2bb8c72e571618847b7b2f835a78492a99ce44b55d53274a7d41aab076441"
url: "https://pub.dev"
source: hosted
- version: "4.3.0"
+ version: "4.5.1"
built_collection:
dependency: transitive
description:
@@ -205,10 +197,10 @@ packages:
dependency: transitive
description:
name: characters
- sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
+ sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
url: "https://pub.dev"
source: hosted
- version: "1.4.0"
+ version: "1.4.1"
charts_common:
dependency: transitive
description:
@@ -413,10 +405,10 @@ packages:
dependency: transitive
description:
name: file
- sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+ sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4
url: "https://pub.dev"
source: hosted
- version: "7.0.0"
+ version: "7.0.1"
file_picker:
dependency: "direct main"
description:
@@ -1057,18 +1049,18 @@ packages:
dependency: transitive
description:
name: matcher
- sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
+ sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861
url: "https://pub.dev"
source: hosted
- version: "0.12.17"
+ version: "0.12.19"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
+ sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
url: "https://pub.dev"
source: hosted
- version: "0.11.1"
+ version: "0.13.0"
meta:
dependency: transitive
description:
@@ -1377,10 +1369,10 @@ packages:
dependency: transitive
description:
name: scratch_space
- sha256: "8510fbff458d733a58fc427057d1ac86303b376d609d6e1bc43f240aad9aa445"
+ sha256: "3417e014d20b12cebc5bfb1c0b1f63806054177158596cc31cc4d9aaca767a60"
url: "https://pub.dev"
source: hosted
- version: "1.0.2"
+ version: "1.2.0"
shared_preferences:
dependency: "direct main"
description:
@@ -1598,10 +1590,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
+ sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
url: "https://pub.dev"
source: hosted
- version: "0.7.7"
+ version: "0.7.10"
timezone:
dependency: "direct main"
description:
@@ -1819,5 +1811,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
- dart: ">=3.8.0-0 <3.11.0-z"
+ dart: ">=3.9.0-0 <3.13.0-z"
flutter: ">=3.29.0"