Haroon6138
/
RSGDoctorApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RSG CHANGES

Browse Source
ipd-changes-for-vida-plus
tahaalam 1 month ago
parent 0487d5f09f
commit d7338776c8
63 changed files with 168 additions and 158 deletions
Show Stats Download Patch File Download Diff File

BIN
assets/images/rsg_logo.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 KiB

6
assets/images/svgs/delete.svg
Unescape Escape View File

@ -1,5 +1,5 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7.91667 14.375C7.57149 14.375 7.29167 14.0951 7.29167 13.75L7.29167 8.74996C7.29167 8.40478 7.57149 8.12496 7.91667 8.12496C8.26184 8.12496 8.54167 8.40478 8.54167 8.74996L8.54167 13.75C8.54167 14.0951 8.26184 14.375 7.91667 14.375Z" fill="#D02127"/>
<path d="M12.7083 8.74996C12.7083 8.40478 12.4285 8.12496 12.0833 8.12496C11.7382 8.12496 11.4583 8.40478 11.4583 8.74996V13.75C11.4583 14.0951 11.7382 14.375 12.0833 14.375C12.4285 14.375 12.7083 14.0951 12.7083 13.75V8.74996Z" fill="#D02127"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.0552 1.04163H10.0018C9.58075 1.04161 9.22356 1.04161 8.92715 1.06859C8.61261 1.09722 8.31962 1.15924 8.03631 1.30989C7.92449 1.36934 7.8178 1.43797 7.71732 1.51505C7.46273 1.71036 7.28477 1.95124 7.12826 2.22557C6.98076 2.48408 6.83263 2.80908 6.65799 3.19223L6.30879 3.95829H2.5C2.15482 3.95829 1.875 4.23812 1.875 4.58329C1.875 4.92847 2.15482 5.20829 2.5 5.20829H3.16161L3.63194 12.9992C3.6948 14.0406 3.74469 14.8669 3.84847 15.5271C3.95489 16.204 4.12601 16.7678 4.46926 17.261C4.78326 17.7122 5.18781 18.0931 5.65712 18.3793C6.17013 18.6922 6.74321 18.8291 7.42534 18.8945C8.09048 18.9583 8.91832 18.9583 9.96154 18.9583H10.0263C11.0681 18.9583 11.895 18.9583 12.5593 18.8946C13.2407 18.8293 13.8131 18.6927 14.3258 18.3804C14.7948 18.0947 15.1992 17.7145 15.5133 17.264C15.8567 16.7716 16.0283 16.2087 16.1355 15.5327C16.2401 14.8735 16.2911 14.0483 16.3554 13.0084L16.8376 5.20829H17.5C17.8452 5.20829 18.125 4.92847 18.125 4.58329C18.125 4.23812 17.8452 3.95829 17.5 3.95829H13.7714L13.3618 3.11338C13.1826 2.74382 13.0306 2.43011 12.8809 2.18069C12.722 1.91594 12.5433 1.68392 12.2918 1.4963C12.1924 1.42216 12.0871 1.35621 11.977 1.2991C11.6985 1.15458 11.4117 1.09503 11.1042 1.06752C10.8145 1.04161 10.4658 1.04162 10.0552 1.04163ZM15.5852 5.20829H13.3935C13.3847 5.20848 13.3758 5.20848 13.3669 5.20829H6.72416C6.715 5.2085 6.70582 5.2085 6.69663 5.20829H4.41389L4.87772 12.8916C4.94298 13.9725 4.98992 14.739 5.0833 15.3329C5.1751 15.9169 5.30366 16.2717 5.49526 16.547C5.71011 16.8557 5.9869 17.1163 6.30801 17.3122C6.59437 17.4868 6.95632 17.5938 7.54471 17.6502C8.14321 17.7076 8.91114 17.7083 9.99397 17.7083C11.0754 17.7083 11.8423 17.7076 12.44 17.6503C13.0277 17.594 13.3893 17.4873 13.6754 17.3129C13.9963 17.1174 14.2731 16.8573 14.488 16.5491C14.6796 16.2742 14.8085 15.9199 14.901 15.3368C14.9951 14.7437 15.043 13.9784 15.1098 12.899L15.5852 5.20829ZM12.3822 3.95829H7.68253L7.78421 3.73524C7.97304 3.32098 8.098 3.04828 8.21397 2.84502C8.32406 2.65207 8.40305 2.56445 8.47817 2.50682C8.52384 2.47178 8.57234 2.44059 8.62316 2.41356C8.70676 2.36911 8.81925 2.33358 9.04048 2.31344C9.27353 2.29222 9.5735 2.29163 10.0288 2.29163C10.4729 2.29163 10.7654 2.2922 10.9928 2.31255C11.2087 2.33185 11.319 2.36592 11.4014 2.40866C11.4514 2.43462 11.4992 2.4646 11.5444 2.4983C11.6188 2.55378 11.6976 2.63819 11.8091 2.82399C11.9267 3.01981 12.0547 3.28268 12.2485 3.68236L12.3822 3.95829Z" fill="#D02127"/>
<path d="M7.91667 14.375C7.57149 14.375 7.29167 14.0951 7.29167 13.75L7.29167 8.74996C7.29167 8.40478 7.57149 8.12496 7.91667 8.12496C8.26184 8.12496 8.54167 8.40478 8.54167 8.74996L8.54167 13.75C8.54167 14.0951 8.26184 14.375 7.91667 14.375Z" fill="#14384b"/>
<path d="M12.7083 8.74996C12.7083 8.40478 12.4285 8.12496 12.0833 8.12496C11.7382 8.12496 11.4583 8.40478 11.4583 8.74996V13.75C11.4583 14.0951 11.7382 14.375 12.0833 14.375C12.4285 14.375 12.7083 14.0951 12.7083 13.75V8.74996Z" fill="#14384b"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.0552 1.04163H10.0018C9.58075 1.04161 9.22356 1.04161 8.92715 1.06859C8.61261 1.09722 8.31962 1.15924 8.03631 1.30989C7.92449 1.36934 7.8178 1.43797 7.71732 1.51505C7.46273 1.71036 7.28477 1.95124 7.12826 2.22557C6.98076 2.48408 6.83263 2.80908 6.65799 3.19223L6.30879 3.95829H2.5C2.15482 3.95829 1.875 4.23812 1.875 4.58329C1.875 4.92847 2.15482 5.20829 2.5 5.20829H3.16161L3.63194 12.9992C3.6948 14.0406 3.74469 14.8669 3.84847 15.5271C3.95489 16.204 4.12601 16.7678 4.46926 17.261C4.78326 17.7122 5.18781 18.0931 5.65712 18.3793C6.17013 18.6922 6.74321 18.8291 7.42534 18.8945C8.09048 18.9583 8.91832 18.9583 9.96154 18.9583H10.0263C11.0681 18.9583 11.895 18.9583 12.5593 18.8946C13.2407 18.8293 13.8131 18.6927 14.3258 18.3804C14.7948 18.0947 15.1992 17.7145 15.5133 17.264C15.8567 16.7716 16.0283 16.2087 16.1355 15.5327C16.2401 14.8735 16.2911 14.0483 16.3554 13.0084L16.8376 5.20829H17.5C17.8452 5.20829 18.125 4.92847 18.125 4.58329C18.125 4.23812 17.8452 3.95829 17.5 3.95829H13.7714L13.3618 3.11338C13.1826 2.74382 13.0306 2.43011 12.8809 2.18069C12.722 1.91594 12.5433 1.68392 12.2918 1.4963C12.1924 1.42216 12.0871 1.35621 11.977 1.2991C11.6985 1.15458 11.4117 1.09503 11.1042 1.06752C10.8145 1.04161 10.4658 1.04162 10.0552 1.04163ZM15.5852 5.20829H13.3935C13.3847 5.20848 13.3758 5.20848 13.3669 5.20829H6.72416C6.715 5.2085 6.70582 5.2085 6.69663 5.20829H4.41389L4.87772 12.8916C4.94298 13.9725 4.98992 14.739 5.0833 15.3329C5.1751 15.9169 5.30366 16.2717 5.49526 16.547C5.71011 16.8557 5.9869 17.1163 6.30801 17.3122C6.59437 17.4868 6.95632 17.5938 7.54471 17.6502C8.14321 17.7076 8.91114 17.7083 9.99397 17.7083C11.0754 17.7083 11.8423 17.7076 12.44 17.6503C13.0277 17.594 13.3893 17.4873 13.6754 17.3129C13.9963 17.1174 14.2731 16.8573 14.488 16.5491C14.6796 16.2742 14.8085 15.9199 14.901 15.3368C14.9951 14.7437 15.043 13.9784 15.1098 12.899L15.5852 5.20829ZM12.3822 3.95829H7.68253L7.78421 3.73524C7.97304 3.32098 8.098 3.04828 8.21397 2.84502C8.32406 2.65207 8.40305 2.56445 8.47817 2.50682C8.52384 2.47178 8.57234 2.44059 8.62316 2.41356C8.70676 2.36911 8.81925 2.33358 9.04048 2.31344C9.27353 2.29222 9.5735 2.29163 10.0288 2.29163C10.4729 2.29163 10.7654 2.2922 10.9928 2.31255C11.2087 2.33185 11.319 2.36592 11.4014 2.40866C11.4514 2.43462 11.4992 2.4646 11.5444 2.4983C11.6188 2.55378 11.6976 2.63819 11.8091 2.82399C11.9267 3.01981 12.0547 3.28268 12.2485 3.68236L12.3822 3.95829Z" fill="#14384b"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

2
assets/images/svgs/male avatar.svg
Unescape Escape View File

@ -42,7 +42,7 @@
<g id="Group_7140" data-name="Group 7140">
<path id="Path_4438" data-name="Path 4438" d="M18.747,23.459H29.253V34.6H18.747Z" fill="#eaa678"/>
<path id="Path_4439" data-name="Path 4439" d="M24,23.46h5.253V34.6H24Z" fill="#d38c5b"/>
<path id="Path_4440" data-name="Path 4440" d="M32.43,46.477a23.683,23.683,0,0,1-3.177.946,24.178,24.178,0,0,1-10.506,0,23.683,23.683,0,0,1-3.177-.946l3.177-16.024L24,33.857l5.253-3.4Z" fill="#d02127"/>
<path id="Path_4440" data-name="Path 4440" d="M32.43,46.477a23.683,23.683,0,0,1-3.177.946,24.178,24.178,0,0,1-10.506,0,23.683,23.683,0,0,1-3.177-.946l3.177-16.024L24,33.857l5.253-3.4Z" fill="#14384b"/>
<path id="Path_4441" data-name="Path 4441" d="M32.43,46.477a23.683,23.683,0,0,1-3.177.946A24,24,0,0,1,24,48V33.857l5.253-3.4Z" fill="#aa191e"/>
<path id="Path_4442" data-name="Path 4442" d="M18.747,30.452V47.423A24,24,0,0,1,5.113,38.81V35.741A5.289,5.289,0,0,1,10.4,30.452Z" fill="#2b353e"/>
<path id="Path_4443" data-name="Path 4443" d="M42.887,35.741V38.81a24,24,0,0,1-13.634,8.613V30.452H37.6A5.289,5.289,0,0,1,42.887,35.741Z" fill="#2b353e"/>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

6
lib/config/config.dart
Unescape Escape View File

@ -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);

2
lib/config/localized_values.dart
Unescape Escape View File

@ -166,7 +166,7 @@ const Map<String, Map<String, String>> 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": "الرئيسية"},

4
lib/screens/auth/login_screen.dart
Unescape Escape View File

@ -74,12 +74,12 @@ class _LoginScreenState extends State<LoginScreen> {
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)),
),
]),
],

2
lib/screens/auth/verification_methods_screen.dart
Unescape Escape View File

@ -344,7 +344,7 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
children: <Widget>[
AppButton(
title: TranslationBase.of(context).useAnotherAccount ?? '',
color: Color(0xFFD02127),
color: Color(0xFF14384B),
//fontWeight: FontWeight.w700,
onPressed: () {
authenticationViewModel.deleteUser();

4
lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
Unescape Escape View File

@ -37,7 +37,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
: 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<DoctorReplyWidget> {
: widget.reply.infoStatus == 4
? AppGlobal.inProgressColor
: widget.reply.infoStatus == 3
? Color(0xFFD02127)
? Color(0xFF14384B)
: AppGlobal.appGreenColor,
fontWeight: FontWeight.w700,
fontFamily: 'Poppins',

34
lib/screens/home/home_screen.dart
Unescape Escape View File

@ -587,26 +587,26 @@ class _HomeScreenState extends State<HomeScreen> {
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,

8
lib/screens/live_care/end_call_screen.dart
Unescape Escape View File

@ -115,7 +115,7 @@ class _EndCallScreenState extends State<EndCallScreen> {
}
}, 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<EndCallScreen> {
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<EndCallScreen> {
},
title: TranslationBase.of(context).cancel,
fontColor: Colors.white,
color: Colors.red[600]!,
color: const Color(0xFF14384B),
),
],
),
@ -369,7 +369,7 @@ class _CheckBoxListState extends State<CheckBoxListWidget> {
widget.model!.setSelectedCheckboxValues(element, newValue!);
});
},
activeColor: Color(0xFFD02127),
activeColor: Color(0xFF14384B),
controlAffinity: ListTileControlAffinity.leading,
contentPadding: EdgeInsets.all(0),
),

2
lib/screens/live_care/panding_list.dart
Unescape Escape View File

@ -59,7 +59,7 @@ class _LiveCarePandingListState extends State<LiveCarePandingListScreen> {
? Center(
child: Text(
_liveCareProvider.errorMsg,
style: TextStyle(color: Colors.red),
style: TextStyle(color: const Color(0xFF14384B)),
),
)
: Column(

10
lib/screens/live_care/video_call.dart
Unescape Escape View File

@ -169,14 +169,14 @@ class _VideoCallPageState extends State<VideoCallPage> {
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<VideoCallPage> {
},
child: CircleAvatar(
child: Icon(Icons.close),
backgroundColor: Colors.red,
backgroundColor: const Color(0xFF14384B),
),
),
),
@ -225,7 +225,7 @@ class _VideoCallPageState extends State<VideoCallPage> {
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,

2
lib/screens/patients/profile/UCAF/ucaf_pager_screen.dart
Unescape Escape View File

@ -133,7 +133,7 @@ class _UCAFPagerScreenState extends State<UCAFPagerScreen> 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);
},

4
lib/screens/patients/profile/admission_request/admission_request_first_screen.dart
Unescape Escape View File

@ -202,7 +202,7 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestFirstScree
fontSize: SizeConfig.textMultiplier! * 2.0,
),
value: _patientPregnant,
activeColor: HexColor("#D02127"),
activeColor: HexColor("#14384b"),
onChanged: (newValue) {
setState(() {
_patientPregnant = newValue!;
@ -219,7 +219,7 @@ class _AdmissionRequestThirdScreenState extends State<AdmissionRequestFirstScree
fontSize: SizeConfig.textMultiplier! * 2.0,
),
value: _isSickLeaveRequired,
activeColor: HexColor("#D02127"),
activeColor: HexColor("#14384b"),
onChanged: (newValue) {
setState(() {
_isSickLeaveRequired = newValue!;

2
lib/screens/patients/profile/discharge_summary/discharge_summary.dart
Unescape Escape View File

@ -171,7 +171,7 @@ Widget tabWidget(Size screenSize, bool isActive, String title,
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier! * 1.5,
color: !isActive ? Colors.white : Color(0xFFD02127),
color: !isActive ? Colors.white : Color(0xFF14384B),
fontWeight: FontWeight.w700,
),
),

8
lib/screens/patients/profile/notes/note/progress_note_screen.dart
Unescape Escape View File

@ -124,7 +124,7 @@ class _ProgressNoteState extends State<ProgressNoteScreen> {
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<ProgressNoteScreen> {
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<ProgressNoteScreen> {
},
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<ProgressNoteScreen> {
child: AppText(
TranslationBase.of(context).noteConfirm,
fontWeight: FontWeight.w600,
color: Colors.red.shade700,
color: const Color(0xFF14384B),
fontSize: 16,
), //Text("Confirm", ),
onPressed: () async {

12
lib/screens/patients/profile/radiology/radiology_home_page.dart
Unescape Escape View File

@ -83,7 +83,7 @@ class _RadiologyHomePageState extends State<RadiologyHomePage> {
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<RadiologyHomePage> {
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),

4
lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart
Unescape Escape View File

@ -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

6
lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart
Unescape Escape View File

@ -66,15 +66,15 @@ class _AddAssessmentDetailsState extends State<AddAssessmentDetails> {
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,

2
lib/screens/patients/profile/soap_update/objective/add_examination_widget.dart
Unescape Escape View File

@ -219,7 +219,7 @@ class _AddExaminationWidgetState extends State<AddExaminationWidget> {
),
child: Container(
decoration: BoxDecoration(
color: status == 3 ? HexColor("#D02127") : Colors.white,
color: status == 3 ? HexColor("#14384b") : Colors.white,
shape: BoxShape.circle,
),
),

4
lib/screens/patients/profile/soap_update/shared_soap_widgets/remove_button.dart
Unescape Escape View File

@ -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,
),
],

10
lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
Unescape Escape View File

@ -243,11 +243,11 @@ class _EditDiagnosisState extends State<EditDiagnosis> {
),
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,
),
),

8
lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/favotite_diagnosis.dart
Unescape Escape View File

@ -309,10 +309,10 @@ class _FavoriteDiagnosisState extends State<FavoriteDiagnosis> {
),
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,
),
),

2
lib/screens/patients/profile/soap_update_vida_plus/objective/add_details_to_examination_vida_plus.dart
Unescape Escape View File

@ -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,
),
),

2
lib/screens/patients/profile/soap_update_vida_plus/objective/widget/examination_items.dart
Unescape Escape View File

@ -131,7 +131,7 @@ class _ExaminationItemsState extends State<ExaminationItems> {
currentIndex]
.conditionName ??
"-1")
? HexColor("#D02127")
? HexColor("#14384b")
: Colors.white,
shape: BoxShape.circle,
),

12
lib/screens/patients/profile/soap_update_vida_plus/subjective/chief_complaint/widgets/ComplaintSelection.dart
Unescape Escape View File

@ -130,11 +130,11 @@ class _ComplaintSelectionState extends State<ComplaintSelection> {
value: true,
enabled: false,
checkColor: Colors.white,
activeColor: Color(0xFFD02127),
activeColor: Color(0xFF14384B),
side: MaterialStateBorderSide.resolveWith(
(Set<MaterialState> 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<ComplaintSelection> {
horizontalTitleGap: 0,
child: CheckboxListTile(
value: true,
activeColor: Color(0xFFD02127),
activeColor: Color(0xFF14384B),
checkColor: Colors.white,
controlAffinity: ListTileControlAffinity.leading,
side: MaterialStateBorderSide.resolveWith(
(Set<MaterialState> 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<ComplaintSelection> {
ListTileTheme(
horizontalTitleGap: 0,
child: CheckboxListTile(
activeColor: Color(0xFFD02127),
activeColor: Color(0xFF14384B),
checkColor: Colors.white,
contentPadding: EdgeInsets.zero,
side: MaterialStateBorderSide.resolveWith(
(Set<MaterialState> states) {
if (states.contains(MaterialState.selected)) {
return const BorderSide(color: Color(0xFFD02127));
return const BorderSide(color: Color(0xFF14384B));
}
return const BorderSide(color: Color(0xFFE6E6E6));
},

9
lib/screens/patients/profile/soap_update_vida_plus/subjective/present_illness/update_present_illness.dart
Unescape Escape View File

@ -60,13 +60,12 @@ class UpdatePresentIllnessState extends State<UpdatePresentIllness> {
horizontalTitleGap: 0,
child: CheckboxListTile(
value: this.isPatientSelected,
activeColor: Color(0xFFD02127),
checkColor: Colors.white,
controlAffinity: ListTileControlAffinity.leading,
activeColor: Color(0xFF14384B),
side: MaterialStateBorderSide.resolveWith(
(Set<MaterialState> states) {
(Set<MaterialState> 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<UpdatePresentIllness> {
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);
},),
),

2
lib/screens/patients/profile/vital_sign/LineChartCurvedBloodPressure.dart
Unescape Escape View File

@ -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,

2
lib/screens/patients/profile/vital_sign/vital_sign_item.dart
Unescape Escape View File

@ -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,
),
],

4
lib/screens/patients/register_patient/RegisterConfirmationPatientPage.dart
Unescape Escape View File

@ -453,7 +453,7 @@ class _RegisterConfirmationPatientPageState extends State<RegisterConfirmationPa
onChanged: (value) {
setState(() {});
},
activeColor: Colors.red,
activeColor: const Color(0xFF14384B),
),
AppText(
"Married",
@ -474,7 +474,7 @@ class _RegisterConfirmationPatientPageState extends State<RegisterConfirmationPa
onChanged: (value) {
setState(() {});
},
activeColor: Colors.red,
activeColor: const Color(0xFF14384B),
),
AppText(
"Divorce",

2
lib/screens/patients/register_patient/VerifyMethodPage.dart
Unescape Escape View File

@ -375,7 +375,7 @@ class _ActivationPageState extends State<ActivationPage> {
vPadding: 12,
hPadding: 8,
borderColor: Color(0xFFB8382B),
color: HexColor("#D02127"),
color: HexColor("#14384b"),
fontColor: Colors.white,
onPressed: () async {
GifLoaderDialogUtils.showMyDialog(context);

13
lib/screens/pharmacy_intervention/widgets/PharmacyInterventionDialog.dart
Unescape Escape View File

@ -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,

2
lib/screens/prescription/add_prescription/add_drug/drug_to_drug.dart
Unescape Escape View File

@ -73,7 +73,7 @@ class _DrugToDrug extends State<DrugToDrug> {
padding: EdgeInsets.all(10),
child: AppText(
item['comment'],
color: Colors.red[900]!,
color: const Color(0xFF14384B),
));
}).toList());
}))))

2
lib/screens/prescription/new_prescriptions_page.dart
Unescape Escape View File

@ -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(),

4
lib/screens/procedures/entity_list_checkbox_search_widget.dart
Unescape Escape View File

@ -159,7 +159,7 @@ class _EntityListCheckboxSearchWidgetState extends State<EntityListCheckboxSearc
Row(
children: [
Radio(
activeColor: Color(0xFFD02127),
activeColor: Color(0xFF14384B),
value: '0',
groupValue: historyInfo.type,
onChanged: (value) {
@ -246,7 +246,7 @@ class _EntityListCheckboxSearchWidgetState extends State<EntityListCheckboxSearc
height: 20,
child: CircularProgressIndicator(
strokeWidth: 2,
valueColor: AlwaysStoppedAnimation<Color>(Color(0xFFD02127)),
valueColor: AlwaysStoppedAnimation<Color>(Color(0xFF14384B)),
),
),
)

2
lib/screens/procedures/favorite_procedure/procedure_checkout_screen.dart
Unescape Escape View File

@ -133,7 +133,7 @@ class _ProcedureCheckOutScreenState extends State<ProcedureCheckOutScreen> {
fontWeight: FontWeight.w600,
),
Radio(
activeColor: Color(0xFFD02127),
activeColor: Color(0xFF14384B),
groupValue: widget
.items![index].selectedType,
value: 1,

4
lib/screens/reschedule_leaves/add_reschedule_leave.dart
Unescape Escape View File

@ -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),

7
lib/screens/splash/splash_screen.dart
Unescape Escape View File

@ -112,8 +112,11 @@ class _SplashScreenState extends State<SplashScreen> {
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'),
),
),
);
}

2
lib/update_page.dart
Unescape Escape View File

@ -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!));

4
lib/utils/translations_delegate_base_utils.dart
Unescape Escape View File

@ -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]!;

2
lib/widgets/auth/sms-popup.dart
Unescape Escape View File

@ -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,

4
lib/widgets/dashboard/out_patient_stack.dart
Unescape Escape View File

@ -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>[Color(0x8FF5F6FA), Colors.red[100]!],
colors: <Color>[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),
),
),
),

2
lib/widgets/dialog/AskPermissionDialog.dart
Unescape Escape View File

@ -71,7 +71,7 @@ class _AskPermissionDialogState extends State<AskPermissionDialog> {
),
AppButton(
// fontColor: Theme.of(context).backgroundColor,
color: Colors.red[700]!,
color: const Color(0xFF14384B),
title: "Turn On Camera, Microphone",
onPressed: () async {
openAppSettings().then((value) {

2
lib/widgets/home/home_item.dart
Unescape Escape View File

@ -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(

8
lib/widgets/patients/patient-referral-item-widget.dart
Unescape Escape View File

@ -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,

6
lib/widgets/patients/patient_card/PatientCard.dart
Unescape Escape View File

@ -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,

2
lib/widgets/patients/patient_card/ShowTimer.dart
Unescape Escape View File

@ -26,7 +26,7 @@ class _ShowTimerState extends State<ShowTimer> {
}
return AppText(
"$displayTime",
color: Colors.red,
color: const Color(0xFF14384B),
textAlign: TextAlign.start,
fontWeight: FontWeight.bold,
fontSize: 11,

2
lib/widgets/patients/profile/app_bar/patient-profile-app-bar.dart
Unescape Escape View File

@ -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,

4
lib/widgets/patients/profile/app_bar/patient-profile-header-new-design-app-bar.dart
Unescape Escape View File

@ -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,

2
lib/widgets/shared/app_scaffold_widget.dart
Unescape Escape View File

@ -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)),
),
],
),

2
lib/widgets/shared/app_texts_widget.dart
Unescape Escape View File

@ -131,7 +131,7 @@ class _AppTextState extends State<AppText> {
},
child: Text(hidden ? "Read More" : "Read less",
style: _getFontStyle()!.copyWith(
color: HexColor('#FF0000'),
color: HexColor('#14384b'),
fontWeight: FontWeight.w800,
fontFamily: "Poppins",
)),

2
lib/widgets/shared/bottom_navigation_item.dart
Unescape Escape View File

@ -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(

2
lib/widgets/shared/buttons/app_buttons_widget.dart
Unescape Escape View File

@ -75,7 +75,7 @@ class _AppButtonState extends State<AppButton> {
? Colors.grey
: widget.color != null
? widget.color
: HexColor("#D02127"),
: HexColor("#14384b"),
splashColor: widget.color,
child: Padding(
padding: (widget.hPadding > 0 || widget.vPadding > 0)

11
lib/widgets/shared/loader/gif_loader_container.dart
Unescape Escape View File

@ -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<GifLoaderContainer> 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"),
// ),
));
}
}

2
lib/widgets/shared/master_key_checkbox_search_widget.dart
Unescape Escape View File

@ -104,7 +104,7 @@ class _MasterKeyCheckboxSearchWidgetState extends State<MasterKeyCheckboxSearchW
children: [
Checkbox(
value: widget.isServiceSelected!(historyInfo),
activeColor: Colors.red[800],
activeColor: const Color(0xFF14384B),
onChanged: (bool? newValue) {
setState(() {
if (widget.isServiceSelected!(historyInfo)) {

2
lib/widgets/shared/rounded_container_widget.dart
Unescape Escape View File

@ -29,7 +29,7 @@ class RoundedContainer extends StatefulWidget {
this.margin,
this.elevation = 1,
this.showBorder = false,
this.borderColor = Colors.red,
this.borderColor = const Color(0xFF14384B),
this.shadowWidth = 0.1,
this.shadowSpreadRadius = 10,
this.shadowDy = 5,

2
lib/widgets/shared/speech-text-popup.dart
Unescape Escape View File

@ -91,7 +91,7 @@ class _MyStatefulBuilderState extends State<MyStatefulBuilder> {
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,

4
lib/widgets/shared/text_fields/TextFields.dart
Unescape Escape View File

@ -279,11 +279,11 @@ class _TextFieldsState extends State<TextFields> {
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),

2
lib/widgets/shared/text_fields/app-textfield-custom.dart
Unescape Escape View File

@ -111,7 +111,7 @@ class _AppTextFieldCustomState extends State<AppTextFieldCustom> {
Color(0Xffffffff),
widget.validationError == null
? Color(0xFFEFEFEF)
: Colors.red.shade700,
: const Color(0xFF14384B),
)
: null,
padding:

2
lib/widgets/shared/text_fields/auto_complete_text_field.dart
Unescape Escape View File

@ -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),

4
lib/widgets/shared/text_fields/text_field_error.dart
Unescape Escape View File

@ -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,
),
),

2
lib/widgets/shared/user-guid/custom_validation_error.dart
Unescape Escape View File

@ -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,
),
),

38
pubspec.lock
Unescape Escape View File

@ -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"

Write Preview
Loading…
Cancel
Save