diff --git a/assets/images/svgs/profile_screen/diagnosis.svg b/assets/images/svgs/profile_screen/diagnosis.svg
new file mode 100644
index 00000000..b0c9b83c
--- /dev/null
+++ b/assets/images/svgs/profile_screen/diagnosis.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/svgs/profile_screen/operating report.svg b/assets/images/svgs/profile_screen/operating report.svg
new file mode 100644
index 00000000..8d9766be
--- /dev/null
+++ b/assets/images/svgs/profile_screen/operating report.svg
@@ -0,0 +1,6 @@
+
diff --git a/assets/images/svgs/profile_screen/order sheets.svg b/assets/images/svgs/profile_screen/order sheets.svg
new file mode 100644
index 00000000..c9e61e92
--- /dev/null
+++ b/assets/images/svgs/profile_screen/order sheets.svg
@@ -0,0 +1,3 @@
+
diff --git a/assets/images/svgs/profile_screen/pending orders.svg b/assets/images/svgs/profile_screen/pending orders.svg
new file mode 100644
index 00000000..ffe95e3b
--- /dev/null
+++ b/assets/images/svgs/profile_screen/pending orders.svg
@@ -0,0 +1,7 @@
+
diff --git a/assets/images/svgs/profile_screen/sick leave.svg b/assets/images/svgs/profile_screen/sick leave.svg
new file mode 100644
index 00000000..0774eb79
--- /dev/null
+++ b/assets/images/svgs/profile_screen/sick leave.svg
@@ -0,0 +1,5 @@
+
diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
index c417860a..6dc954c3 100644
--- a/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
+++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_InPatient.dart
@@ -76,7 +76,7 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).order,
TranslationBase.of(context).sheet,
ORDER_NOTE,
- 'assets/images/svgs/profile_screen/Progress notes.svg',
+ 'assets/images/svgs/profile_screen/order sheets.svg',
isInPatient: isInpatient,
isDischargedPatient: isDischargedPatient),
PatientProfileCardModel(
@@ -130,14 +130,14 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).operation,
TranslationBase.of(context).report,
GET_OPERATION_REPORT,
- 'assets/images/svgs/profile_screen/patient sick leave.svg',
+ 'assets/images/svgs/profile_screen/operating report.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
TranslationBase.of(context).pending,
TranslationBase.of(context).orders,
PENDING_ORDERS,
- 'assets/images/svgs/profile_screen/patient sick leave.svg',
+ 'assets/images/svgs/profile_screen/pending orders.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
@@ -158,7 +158,7 @@ class ProfileGridForInPatient extends StatelessWidget {
TranslationBase.of(context).diagnosis,
"",
DIAGNOSIS_FOR_IN_PATIENT,
- 'assets/images/svgs/profile_screen/patient sick leave.svg',
+ 'assets/images/svgs/profile_screen/diagnosis.svg',
isInPatient: isInpatient,
),
PatientProfileCardModel(
@@ -179,7 +179,7 @@ class ProfileGridForInPatient extends StatelessWidget {
// if you want IOS bouncing effect, otherwise remove this line
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisSpacing: 10,
- mainAxisSpacing: 10,
+ mainAxisSpacing: 8,
crossAxisCount: 3,
),
//change the number as you want
diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
index 2254f964..dbdaf4a8 100644
--- a/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
+++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_other.dart
@@ -74,7 +74,7 @@ class ProfileGridForOther extends StatelessWidget {
TranslationBase.of(context).referral,
TranslationBase.of(context).patient,
REFER_PATIENT_TO_DOCTOR,
- 'patient/refer_patient.png',
+ 'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient,
isDisable: isFromLiveCare
? patient.appointmentNo == null
@@ -82,7 +82,7 @@ class ProfileGridForOther extends StatelessWidget {
),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request,
- PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png',
+ PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient,
isDisable: isFromLiveCare
? patient.appointmentNo == null
@@ -96,8 +96,8 @@ class ProfileGridForOther extends StatelessWidget {
child: StaggeredGridView.countBuilder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
- crossAxisSpacing: 10,
- mainAxisSpacing: 10,
+ crossAxisSpacing: 8,
+ mainAxisSpacing: 8,
crossAxisCount: 3,
itemCount: cardsList.length,
staggeredTileBuilder: (int index) => StaggeredTile.fit(1),
diff --git a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
index f628811d..b1438e70 100644
--- a/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
+++ b/lib/screens/patients/profile/profile_screen/profile_gird_for_search.dart
@@ -54,15 +54,15 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient),
if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf,
- PATIENT_UCAF_REQUEST, 'patient/ucaf.png',
+ PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient,
- REFER_PATIENT_TO_DOCTOR, 'patient/refer_patient.png',
+ REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
if (patient.appointmentNo != null && patient.appointmentNo != 0)
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request,
- PATIENT_ADMISSION_REQUEST, 'patient/admission_req.png',
+ PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient, isDisable: patient.patientStatusType != 43 ? true : false),
];
@@ -73,8 +73,8 @@ class ProfileGridForSearch extends StatelessWidget {
child: StaggeredGridView.countBuilder(
shrinkWrap: true,
physics: NeverScrollableScrollPhysics(),
- crossAxisSpacing: 10,
- mainAxisSpacing: 10,
+ crossAxisSpacing: 8,
+ mainAxisSpacing: 8,
crossAxisCount: 3,
itemCount: cardsList.length,
staggeredTileBuilder: (int index) => StaggeredTile.fit(1),
diff --git a/lib/widgets/patients/profile/PatientProfileButton.dart b/lib/widgets/patients/profile/PatientProfileButton.dart
index e62c061d..31c4c903 100644
--- a/lib/widgets/patients/profile/PatientProfileButton.dart
+++ b/lib/widgets/patients/profile/PatientProfileButton.dart
@@ -1,3 +1,4 @@
+import 'package:doctor_app_flutter/config/config.dart';
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart';
import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
@@ -60,7 +61,7 @@ class PatientProfileButton extends StatelessWidget {
return Container(
margin: EdgeInsets.symmetric(horizontal: 0.0),
- padding: EdgeInsets.symmetric(horizontal: 8, vertical: 16),
+ padding: EdgeInsets.symmetric(horizontal: 8, vertical: 0),
child: InkWell(
onTap: isDisable
? null
@@ -69,7 +70,9 @@ class PatientProfileButton extends StatelessWidget {
: () {
navigator(context, this.route);
},
- child: Column(children: [
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
Container(
padding: EdgeInsets.fromLTRB(8, 0, 8, 8),
child: Row(
@@ -98,17 +101,19 @@ class PatientProfileButton extends StatelessWidget {
children: [
AppText(
!projectsProvider.isArabic ? this.nameLine1 : nameLine2,
- color: color ?? Color(0xFF2B353E),
+ color: color ?? AppGlobal.appTextColor,
+ letterSpacing: -0.33,
fontWeight: FontWeight.w600,
+
textAlign: TextAlign.left,
- fontSize: SizeConfig.textMultiplier * 1.35,
+ fontSize: SizeConfig.textMultiplier * 1.30,
),
AppText(
!projectsProvider.isArabic ? this.nameLine2 : nameLine1,
color: color ?? Color(0xFF2B353E),
fontWeight: FontWeight.w600,
textAlign: TextAlign.left,
- fontSize: SizeConfig.textMultiplier * 1.35,
+ fontSize: SizeConfig.textMultiplier * 1.30,
),
if (isLoading) DrAppCircularProgressIndeicator()
],
@@ -119,9 +124,9 @@ class PatientProfileButton extends StatelessWidget {
decoration: BoxDecoration(
// border: Border.all(),
color: isDisable ? Colors.grey.withOpacity(0.4) : Colors.white,
- borderRadius: BorderRadius.all(Radius.circular(10)),
+ borderRadius: BorderRadius.all(Radius.circular(15)),
border: Border.fromBorderSide(BorderSide(
- color: color ?? Color(0xffBBBBBB),
+ color: color ?? Color(0xFFEFEFEF),
width: 1,
)),
),
diff --git a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart
index 386581bf..a45f7cdc 100644
--- a/lib/widgets/patients/profile/profile_medical_info_widget_search.dart
+++ b/lib/widgets/patients/profile/profile_medical_info_widget_search.dart
@@ -157,7 +157,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).patient,
nameLine2: TranslationBase.of(context).ucaf,
- icon: 'patient/ucaf.png'),
+ icon: 'assets/images/svgs/profile_screen/UCAF.svg'),
if (patient.appointmentNo != null &&
patient.appointmentNo != 0)
PatientProfileButton(
@@ -170,7 +170,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).referral,
nameLine2: TranslationBase.of(context).patient,
- icon: 'patient/refer_patient.png'),
+ icon: 'assets/images/svgs/profile_screen/refer patient.svg'),
if (patient.appointmentNo != null &&
patient.appointmentNo != 0)
PatientProfileButton(
@@ -183,7 +183,7 @@ class ProfileMedicalInfoWidgetSearch extends StatelessWidget {
patient.patientStatusType != 43 ? true : false,
nameLine1: TranslationBase.of(context).admission,
nameLine2: TranslationBase.of(context).request,
- icon: 'patient/admission_req.png'),
+ icon: 'assets/images/svgs/profile_screen/admission req.svg'),
if (isInpatient)
PatientProfileButton(
key: key,