Merge branch 'qassim-MOH-demo-' of http://34.17.182.140/Haroon6138/doctor_app_flutter into qassim-MOH-demo-

main^2
Sultan Khan 2 months ago
commit 4d91c67579

@ -45,7 +45,7 @@
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
tools:replace="android:name" tools:replace="android:name"
android:label="HMG Doctor"> android:label="Qasim hospital cluster">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/> <background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon> </adaptive-icon>

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/> <background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/> <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon> </adaptive-icon>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 67 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 266 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 KiB

After

Width:  |  Height:  |  Size: 311 KiB

@ -1,128 +1,122 @@
{ {
"images":[ "images" : [
{ {
"idiom":"iphone", "filename" : "Icon-40.png",
"size":"20x20", "idiom" : "iphone",
"scale":"2x", "scale" : "2x",
"filename":"Icon-App-20x20@2x.png" "size" : "20x20"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-60.png",
"size":"20x20", "idiom" : "iphone",
"scale":"3x", "scale" : "3x",
"filename":"Icon-App-20x20@3x.png" "size" : "20x20"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-29 1.png",
"size":"29x29", "idiom" : "iphone",
"scale":"1x", "scale" : "1x",
"filename":"Icon-App-29x29@1x.png" "size" : "29x29"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-58.png",
"size":"29x29", "idiom" : "iphone",
"scale":"2x", "scale" : "2x",
"filename":"Icon-App-29x29@2x.png" "size" : "29x29"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-87.png",
"size":"29x29", "idiom" : "iphone",
"scale":"3x", "scale" : "3x",
"filename":"Icon-App-29x29@3x.png" "size" : "29x29"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-80.png",
"size":"40x40", "idiom" : "iphone",
"scale":"2x", "scale" : "2x",
"filename":"Icon-App-40x40@2x.png" "size" : "40x40"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-120.png",
"size":"40x40", "idiom" : "iphone",
"scale":"3x", "scale" : "3x",
"filename":"Icon-App-40x40@3x.png" "size" : "40x40"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-120 1.png",
"size":"60x60", "idiom" : "iphone",
"scale":"2x", "scale" : "2x",
"filename":"Icon-App-60x60@2x.png" "size" : "60x60"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-180.png",
"size":"60x60", "idiom" : "iphone",
"scale":"3x", "scale" : "3x",
"filename":"Icon-App-60x60@3x.png" "size" : "60x60"
}, },
{ {
"idiom":"iphone", "filename" : "Icon-20.png",
"size":"76x76", "idiom" : "ipad",
"scale":"2x", "scale" : "1x",
"filename":"Icon-App-76x76@2x.png" "size" : "20x20"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-40 1.png",
"size":"20x20", "idiom" : "ipad",
"scale":"1x", "scale" : "2x",
"filename":"Icon-App-20x20@1x.png" "size" : "20x20"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-29.png",
"size":"20x20", "idiom" : "ipad",
"scale":"2x", "scale" : "1x",
"filename":"Icon-App-20x20@2x.png" "size" : "29x29"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-58 1.png",
"size":"29x29", "idiom" : "ipad",
"scale":"1x", "scale" : "2x",
"filename":"Icon-App-29x29@1x.png" "size" : "29x29"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-40 2.png",
"size":"29x29", "idiom" : "ipad",
"scale":"2x", "scale" : "1x",
"filename":"Icon-App-29x29@2x.png" "size" : "40x40"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-80 1.png",
"size":"40x40", "idiom" : "ipad",
"scale":"1x", "scale" : "2x",
"filename":"Icon-App-40x40@1x.png" "size" : "40x40"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-76.png",
"size":"40x40", "idiom" : "ipad",
"scale":"2x", "scale" : "1x",
"filename":"Icon-App-40x40@2x.png" "size" : "76x76"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-152.png",
"size":"76x76", "idiom" : "ipad",
"scale":"1x", "scale" : "2x",
"filename":"Icon-App-76x76@1x.png" "size" : "76x76"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-167.png",
"size":"76x76", "idiom" : "ipad",
"scale":"2x", "scale" : "2x",
"filename":"Icon-App-76x76@2x.png" "size" : "83.5x83.5"
}, },
{ {
"idiom":"ipad", "filename" : "Icon-1024.png",
"size":"83.5x83.5", "idiom" : "ios-marketing",
"scale":"2x", "scale" : "1x",
"filename":"Icon-App-83.5x83.5@2x.png" "size" : "1024x1024"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"scale" : "1x",
"filename" : "ItunesArtwork@2x.png"
}
],
"info":{
"version":1,
"author":"easyappicon"
} }
],
"info" : {
"author" : "xcode",
"version" : 1
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 504 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 998 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB

@ -11,9 +11,9 @@ const DOCTOR_ROTATION = 'https://doctorrota.hmg.com/';
// const BASE_URL = 'https://hmgwebservices.com/'; // const BASE_URL = 'https://hmgwebservices.com/';
// const BASE_URL = 'http://10.20.200.111:1010/'; // 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/'; // const BASE_URL = 'https://webservices.hmg.com/';
// //
@ -430,8 +430,8 @@ const TIMER_MIN = 10;
class AppGlobal { class AppGlobal {
static var CONTEX; static var CONTEX;
static Color appRedColor = Color(0xFFD02127); static Color appRedColor = Color(0xFF1E8CC8);
static Color appGreenColor = Color(0xFF359846); static Color appGreenColor = Color(0xFF1E8CC8);
static Color appTextColor = Color(0xFF2B353E); static Color appTextColor = Color(0xFF2B353E);
static Color scheduleTextColor = Color(0xFF2E303A); static Color scheduleTextColor = Color(0xFF2E303A);
static Color inProgressColor = Color(0xFFCC9B14); static Color inProgressColor = Color(0xFFCC9B14);

@ -166,7 +166,7 @@ const Map<String, Map<String, String>> localizedValues = {
"ar": "الرجاء ادخال مستشفى" "ar": "الرجاء ادخال مستشفى"
}, },
"login": {"en": "Login", "ar": "تسجيل دخول"}, "login": {"en": "Login", "ar": "تسجيل دخول"},
"drSulaimanAlHabib": {"en": "Dr Sulaiman Al Habib", "ar": "د.سليمان الحبيب"}, "ministryOfHealth": {"en": "Ministry of Health", "ar": "وزارة الصحة"},
"welcomeTo": {"en": "Welcome to", "ar": "مرحبا بك"}, "welcomeTo": {"en": "Welcome to", "ar": "مرحبا بك"},
"welcomeBackTo": {"en": "Welcome Back to", "ar": "مرحبًا بعودتك الى "}, "welcomeBackTo": {"en": "Welcome Back to", "ar": "مرحبًا بعودتك الى "},
"home": {"en": "Home", "ar": "الرئيسية"}, "home": {"en": "Home", "ar": "الرئيسية"},

@ -81,11 +81,11 @@ class _LandingPageState extends State<LandingPage> {
HomeScreen(), HomeScreen(),
MyScheduleScreen(), MyScheduleScreen(),
QrReaderScreen(), QrReaderScreen(),
DoctorReplyScreen( // DoctorReplyScreen(
changeCurrentTab: () { // changeCurrentTab: () {
_changeCurrentTab(0); // _changeCurrentTab(0);
}, // },
), // ),
], ],
), ),
bottomNavigationBar: BottomNavBar( bottomNavigationBar: BottomNavBar(

@ -74,12 +74,12 @@ class _LoginScreenState extends State<LoginScreen> {
style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, fontFamily: 'Poppins'), style: TextStyle(fontSize: 16, fontWeight: FontWeight.w600, fontFamily: 'Poppins'),
), ),
Text( Text(
TranslationBase.of(context).drSulaimanAlHabib, TranslationBase.of(context).ministryOfHealth,
style: TextStyle(color: Color(0xFF2B353E), fontWeight: FontWeight.bold, fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth! * 0.029, fontFamily: 'Poppins'), style: TextStyle(color: Color(0xFF2B353E), fontWeight: FontWeight.bold, fontSize: SizeConfig.isMobile ? 24 : SizeConfig.realScreenWidth! * 0.029, fontFamily: 'Poppins'),
), ),
Text( Text(
"Doctor App", "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(0xFF1E8CC8)),
), ),
]), ]),
], ],

@ -302,20 +302,19 @@ class _VerificationMethodsScreenState extends State<VerificationMethodsScreen> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[ children: <Widget>[
Expanded( VerificationMethodsList(
child: VerificationMethodsList(
authenticationViewModel: authenticationViewModel, authenticationViewModel: authenticationViewModel,
authMethodType: AuthMethodTypes.SMS, authMethodType: AuthMethodTypes.SMS,
authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive), authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive),
onShowMore: () {}, onShowMore: () {},
)), ),
Expanded( // Expanded(
child: VerificationMethodsList( // child: VerificationMethodsList(
authenticationViewModel: authenticationViewModel, // authenticationViewModel: authenticationViewModel,
authMethodType: AuthMethodTypes.WhatsApp, // authMethodType: AuthMethodTypes.WhatsApp,
authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive), // authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive),
onShowMore: () {}, // onShowMore: () {},
)) // ))
], ],
), ),
]), ]),

@ -368,59 +368,59 @@ class _HomeScreenState extends State<HomeScreen> {
List<HomePatientCard> patientCards = []; List<HomePatientCard> patientCards = [];
if (model.hasVirtualClinic) { // if (model.hasVirtualClinic) {
patientCards.add(HomePatientCard( // patientCards.add(HomePatientCard(
gradient: backgroundColors[colorIndex], // gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex], // backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.livecare, // cardIcon: DoctorApp.livecare,
textColor: textColors[colorIndex], // textColor: textColors[colorIndex],
iconSize: 21, // iconSize: 21,
text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}", // text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}",
onTap: () { // onTap: () {
// TODO MOSA TEST // // TODO MOSA TEST
// PatiantInformtion patient = PatiantInformtion( // // PatiantInformtion patient = PatiantInformtion(
// patientStatusType: 43, // // patientStatusType: 43,
// episodeNo: 0, // // episodeNo: 0,
// vcId: 42342, // // vcId: 42342,
// fullName: "mosa test", // // fullName: "mosa test",
// dateofBirth: "2000-05-01 10:42:35.790004" // // dateofBirth: "2000-05-01 10:42:35.790004"
// ); // // );
// Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: { // // Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: {
// "patient": patient, // // "patient": patient,
// "patientType": "0", // // "patientType": "0",
// "isSearch": false, // // "isSearch": false,
// "isInpatient": false, // // "isInpatient": false,
// "arrivalType": "0", // // "arrivalType": "0",
// "isSearchAndOut": false, // // "isSearchAndOut": false,
// "isFromLiveCare": true, // // "isFromLiveCare": true,
// }); // // });
Navigator.push( // Navigator.push(
context, // context,
FadePage( // FadePage(
page: LiveCarePatientScreen(), // page: LiveCarePatientScreen(),
), // ),
); // );
}, // },
)); // ));
changeColorIndex(); // changeColorIndex();
} // }
patientCards.add(HomePatientCard( // patientCards.add(HomePatientCard(
gradient: backgroundColors[colorIndex], // gradient: backgroundColors[colorIndex],
backgroundIconColor: backgroundIconColors[colorIndex], // backgroundIconColor: backgroundIconColors[colorIndex],
cardIcon: DoctorApp.qr_reader, // cardIcon: DoctorApp.qr_reader,
textColor: textColors[colorIndex], // textColor: textColors[colorIndex],
text: "ER sign In", // text: "ER sign In",
onTap: () { // onTap: () {
Navigator.push( // Navigator.push(
context, // context,
FadePage( // FadePage(
page: ErSignInScreen(), // page: ErSignInScreen(),
), // ),
); // );
}, // },
)); // ));
changeColorIndex(); // changeColorIndex();
if (model.doctorProfile != null) { if (model.doctorProfile != null) {
patientCards.add( patientCards.add(

@ -72,7 +72,7 @@ class _InPatientListPageState extends State<InPatientListPage> {
widget.patientSearchViewModel!.resetFilters(); widget.patientSearchViewModel!.resetFilters();
}); });
}, },
activeColor: Colors.red, activeColor: Color(0xFF1E8CC8),
), ),
AppText( AppText(
"${TranslationBase.of(context).allClinic}", "${TranslationBase.of(context).allClinic}",
@ -103,7 +103,7 @@ class _InPatientListPageState extends State<InPatientListPage> {
widget.onChangeValue!(isAllClinic: false, showBottomSheet: true, selectedClinicName: widget.selectedClinicName); widget.onChangeValue!(isAllClinic: false, showBottomSheet: true, selectedClinicName: widget.selectedClinicName);
} }
}, },
activeColor: Colors.red, activeColor: Color(0xFF1E8CC8),
), ),
AppText( AppText(
widget.selectedClinicName ?? TranslationBase.of(context).clinicSelect, widget.selectedClinicName ?? TranslationBase.of(context).clinicSelect,
@ -247,7 +247,7 @@ class _InPatientListPageState extends State<InPatientListPage> {
widget.patientSearchViewModel!.filterByClinic(clinicName: value!); widget.patientSearchViewModel!.filterByClinic(clinicName: value!);
}); });
}, },
activeColor: Colors.red, activeColor: Color(0xFF1E8CC8),
), ),
AppText( AppText(
widget.patientSearchViewModel!.InpatientClinicList[index], widget.patientSearchViewModel!.InpatientClinicList[index],

@ -43,14 +43,14 @@ class ProfileGridForInPatient extends StatelessWidget {
isVidaPlusProject: isVidaPlusProject isVidaPlusProject: isVidaPlusProject
), ),
PatientProfileCardModel( // PatientProfileCardModel(
TranslationBase.of(context).lab, // TranslationBase.of(context).lab,
TranslationBase.of(context).special, // TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT, // ALL_SPECIAL_LAB_RESULT,
'assets/images/svgs/profile_screen/lab results.svg', // 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject // isVidaPlusProject: isVidaPlusProject
), // ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).radiology, TranslationBase.of(context).radiology,
TranslationBase.of(context).result, TranslationBase.of(context).result,
@ -59,14 +59,14 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject isVidaPlusProject: isVidaPlusProject
), ),
PatientProfileCardModel( // PatientProfileCardModel(
TranslationBase.of(context).patient, // TranslationBase.of(context).patient,
TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', // TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})',
ORDER_PRESCRIPTION_OLD, // ORDER_PRESCRIPTION_OLD,
'assets/images/svgs/profile_screen/order prescription.svg', // 'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject // isVidaPlusProject: isVidaPlusProject
), // ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).patient, TranslationBase.of(context).patient,
TranslationBase.of(context).prescription, TranslationBase.of(context).prescription,
@ -145,15 +145,15 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject isVidaPlusProject: isVidaPlusProject
), ),
PatientProfileCardModel( // PatientProfileCardModel(
TranslationBase.of(context).patientSick, // TranslationBase.of(context).patientSick,
TranslationBase.of(context).leave, // TranslationBase.of(context).leave,
ADD_SICKLEAVE, // ADD_SICKLEAVE,
'assets/images/svgs/profile_screen/patient sick leave.svg', // 'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
//onTap: () {}, // //onTap: () {},
isVidaPlusProject: isVidaPlusProject // isVidaPlusProject: isVidaPlusProject
), // ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).operation, TranslationBase.of(context).operation,
TranslationBase.of(context).report, TranslationBase.of(context).report,
@ -194,22 +194,22 @@ class ProfileGridForInPatient extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject isVidaPlusProject: isVidaPlusProject
), ),
PatientProfileCardModel( // PatientProfileCardModel(
TranslationBase.of(context).diabetic, // TranslationBase.of(context).diabetic,
TranslationBase.of(context).chart, // TranslationBase.of(context).chart,
DIABETIC_CHART_VALUES, // DIABETIC_CHART_VALUES,
'assets/images/svgs/profile_screen/diabetic chart.svg', // 'assets/images/svgs/profile_screen/diabetic chart.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject // isVidaPlusProject: isVidaPlusProject
), // ),
PatientProfileCardModel( // PatientProfileCardModel(
"VTE", // "VTE",
"Assessment", // "Assessment",
VTE_ASSESSMENT, // VTE_ASSESSMENT,
'assets/images/svgs/profile_screen/diabetic chart.svg', // 'assets/images/svgs/profile_screen/diabetic chart.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
isVidaPlusProject: isVidaPlusProject // isVidaPlusProject: isVidaPlusProject
), // ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).pharmacy, TranslationBase.of(context).pharmacy,
TranslationBase.of(context).intervention, TranslationBase.of(context).intervention,

@ -27,50 +27,60 @@ class ProfileGridForOther extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final List<PatientProfileCardModel> cardsList = [ final List<PatientProfileCardModel> cardsList = [
PatientProfileCardModel(TranslationBase.of(context).vital, TranslationBase.of(context).signs, VITAL_SIGN_DETAILS, 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient), .of(context)
.vital, TranslationBase
.of(context)
.signs, VITAL_SIGN_DETAILS, 'assets/images/svgs/profile_screen/vital signs.svg', isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase
.of(context)
.lab, TranslationBase
.of(context)
.result, LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special, ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg', PatientProfileCardModel(TranslationBase.of(context).lab, TranslationBase.of(context).special, ALL_SPECIAL_LAB_RESULT, 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg', PatientProfileCardModel(TranslationBase.of(context).radiology, TranslationBase.of(context).service, RADIOLOGY_PATIENT, 'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', ORDER_PRESCRIPTION_OLD, PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', ORDER_PRESCRIPTION_OLD,
'assets/images/svgs/profile_screen/order prescription.svg', 'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).prescription, ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg', PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).prescription, ORDER_PRESCRIPTION_NEW, 'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, 'assets/images/svgs/profile_screen/health summary.svg', PatientProfileCardModel(TranslationBase.of(context).health, TranslationBase.of(context).summary, HEALTH_SUMMARY, 'assets/images/svgs/profile_screen/health summary.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient), PatientProfileCardModel(TranslationBase
.of(context)
.patient, "ECG", PATIENT_ECG, 'assets/images/svgs/profile_screen/ECG.svg', isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures, ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg', PatientProfileCardModel(TranslationBase.of(context).orders, TranslationBase.of(context).procedures, ORDER_PROCEDURE, 'assets/images/svgs/profile_screen/Order Procedures.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service, PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/insurance approval.svg', PatientProfileCardModel(TranslationBase.of(context).insurance, TranslationBase.of(context).service, PATIENT_INSURANCE_APPROVALS_NEW, 'assets/images/svgs/profile_screen/insurance approval.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE, 'assets/images/svgs/profile_screen/patient sick leave.svg', PatientProfileCardModel(TranslationBase.of(context).patientSick, TranslationBase.of(context).leave, ADD_SICKLEAVE, 'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient), isInPatient: isInpatient,),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) if ( (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf, PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg', PatientProfileCardModel(TranslationBase.of(context).patient, TranslationBase.of(context).ucaf, PATIENT_UCAF_REQUEST, 'assets/images/svgs/profile_screen/UCAF.svg',
isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null), isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null,),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) if ( (patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient, REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg', PatientProfileCardModel(TranslationBase.of(context).referral, TranslationBase.of(context).patient, REFER_PATIENT_TO_DOCTOR, 'assets/images/svgs/profile_screen/refer patient.svg',
isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null), isInPatient: isInpatient, isDisable: isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43 || patient.appointmentNo == null,),
if (isFromLiveCare || (patient.appointmentNo != null && patient.appointmentNo != 0)) if ((patient.appointmentNo != null && patient.appointmentNo != 0))
PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg', PatientProfileCardModel(TranslationBase.of(context).admission, TranslationBase.of(context).request, PATIENT_ADMISSION_REQUEST, 'assets/images/svgs/profile_screen/admission req.svg',
isInPatient: isInpatient, isInPatient: isInpatient,
isDisable: isDisable:
Utils.isVidaPlusProject(projectViewModel, patient.projectId!) || (isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43) || patient.appointmentNo == null), Utils.isVidaPlusProject(projectViewModel, patient.projectId!) || (isFromLiveCare ? patient.appointmentNo == null : patient.patientStatusType != 43) || patient.appointmentNo == null,),
]; ];
return Padding( return Padding(
padding: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 15), padding: const EdgeInsets.symmetric(vertical: 15.0, horizontal: 15,),
child: GridView( child: GridView(
shrinkWrap: true, shrinkWrap: true,
physics: BouncingScrollPhysics(), physics: BouncingScrollPhysics(),
// if you want IOS bouncing effect, otherwise remove this line // if you want IOS bouncing effect, otherwise remove this line
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount( gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
crossAxisSpacing: 10, crossAxisSpacing: 10,
mainAxisSpacing: 8, mainAxisSpacing: 8,
crossAxisCount: 3, crossAxisCount: 3,
), ),
//change the number as you want //change the number as you want
children: cardsList.map((item) { children: cardsList.map((item) {
return PatientProfileButton( return PatientProfileButton(
@ -90,7 +100,7 @@ class ProfileGridForOther extends StatelessWidget {
isLoading: item.isLoading, isLoading: item.isLoading,
); );
}).toList(), }).toList(),
), ),
); );
} }
} }

@ -36,14 +36,14 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
//onTap: () {}, //onTap: () {},
), ),
PatientProfileCardModel( // PatientProfileCardModel(
TranslationBase.of(context).lab, // TranslationBase.of(context).lab,
TranslationBase.of(context).special, // TranslationBase.of(context).special,
ALL_SPECIAL_LAB_RESULT, // ALL_SPECIAL_LAB_RESULT,
'assets/images/svgs/profile_screen/lab results.svg', // 'assets/images/svgs/profile_screen/lab results.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
//onTap: () {}, // //onTap: () {},
), // ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).radiology, TranslationBase.of(context).radiology,
TranslationBase.of(context).service, TranslationBase.of(context).service,
@ -52,14 +52,14 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
//onTap: () {}, //onTap: () {},
), ),
PatientProfileCardModel( // PatientProfileCardModel(
TranslationBase.of(context).orders, // TranslationBase.of(context).orders,
TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})', // TranslationBase.of(context).prescription + ' (${TranslationBase.of(context).old})',
ORDER_PRESCRIPTION_OLD, // ORDER_PRESCRIPTION_OLD,
'assets/images/svgs/profile_screen/order prescription.svg', // 'assets/images/svgs/profile_screen/order prescription.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
//onTap: () {}, // //onTap: () {},
), // ),
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).patient, TranslationBase.of(context).patient,
TranslationBase.of(context).prescription, TranslationBase.of(context).prescription,
@ -100,14 +100,14 @@ class ProfileGridForSearch extends StatelessWidget {
isInPatient: isInpatient, isInPatient: isInpatient,
//onTap: () {}, //onTap: () {},
), ),
PatientProfileCardModel( // PatientProfileCardModel(
TranslationBase.of(context).patientSick, // TranslationBase.of(context).patientSick,
TranslationBase.of(context).leave, // TranslationBase.of(context).leave,
ADD_SICKLEAVE, // ADD_SICKLEAVE,
'assets/images/svgs/profile_screen/patient sick leave.svg', // 'assets/images/svgs/profile_screen/patient sick leave.svg',
isInPatient: isInpatient, // isInPatient: isInpatient,
//onTap: () {}, // //onTap: () {},
), // ),
if (patient!.appointmentNo != null && patient!.appointmentNo != 0) if (patient!.appointmentNo != null && patient!.appointmentNo != 0)
PatientProfileCardModel( PatientProfileCardModel(
TranslationBase.of(context).patient, TranslationBase.of(context).patient,

@ -415,7 +415,7 @@ class _EditDiagnosisState extends State<EditDiagnosis> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context).save, title: TranslationBase.of(context).save,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xFF359846), color: Color(0xFF1E8CC8),
onPressed: () async { onPressed: () async {
selectedDiagnosisItem ??= selectedDiagnosisItem ??=
model.diagnosisTypeList.keys.first; model.diagnosisTypeList.keys.first;

@ -381,7 +381,7 @@ class _EnterDiagnosisState extends State<EnterDiagnosis> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context).save, title: TranslationBase.of(context).save,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xFF359846), color: Color(0xFF1E8CC8),
onPressed: () async { onPressed: () async {
selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first;
selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem]; selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem];

@ -451,7 +451,7 @@ class _FavoriteDiagnosisState extends State<FavoriteDiagnosis> {
child: AppButton( child: AppButton(
title: TranslationBase.of(context).save, title: TranslationBase.of(context).save,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
color: Color(0xFF359846), color: Color(0xFF1E8CC8),
onPressed: () async { onPressed: () async {
selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first; selectedDiagnosisItem ??= model.diagnosisTypeList.keys.first;
selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem]; selectedDiagnosisItemValue = model.diagnosisTypeList[selectedDiagnosisItem];

@ -112,7 +112,7 @@ class _AddDetailsToExaminationVidaPlusState
Expanded( Expanded(
child: AppButton( child: AppButton(
title: TranslationBase.of(context).saveSmall, title: TranslationBase.of(context).saveSmall,
color: Color(0xff359846), color: Color(0xFF1E8CC8),
fontColor: Colors.white, fontColor: Colors.white,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
onPressed: () async { onPressed: () async {

@ -325,7 +325,7 @@ class _AddProgressNoteState extends State<AddProgressNote> {
Expanded( Expanded(
child: AppButton( child: AppButton(
title: TranslationBase.of(context).save, title: TranslationBase.of(context).save,
color: Color(0xff359846), color: Color(0xFF1E8CC8),
fontColor: Colors.white, fontColor: Colors.white,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
onPressed: () async { onPressed: () async {

@ -470,7 +470,7 @@ class _ReactionsSelectionAllergiesWidgetState
)) ))
// CustomBottomSheetContainer( // CustomBottomSheetContainer(
// buttonColor: Color(0xff359846), // buttonColor: Color(0xFF1E8CC8),
// fontColor: Colors.white, // fontColor: Colors.white,
// label: TranslationBase.of(context).next, // label: TranslationBase.of(context).next,
// onTap: () { // onTap: () {

@ -201,7 +201,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidgetVidaPlus> {
label: AppText( label: AppText(
TranslationBase.of(context).resolve, TranslationBase.of(context).resolve,
fontSize: 12, fontSize: 12,
color: Color(0xff359846))) color: Color(0xFF1E8CC8)))
], ],
) )
: selectedAllergy.allergyID! != 0 : selectedAllergy.allergyID! != 0
@ -253,7 +253,7 @@ class _UpdateAllergiesWidgetState extends State<UpdateAllergiesWidgetVidaPlus> {
Color getColor(int severity) { Color getColor(int severity) {
Map<int, dynamic> color = { Map<int, dynamic> color = {
1: Color(0xff359846), 1: Color(0xFF1E8CC8),
2: Color(0xFFCC9B14), 2: Color(0xFFCC9B14),
3: Color(0xffD02127) 3: Color(0xffD02127)
}; };

@ -78,7 +78,7 @@ class SoapDetailItem extends StatelessWidget {
), ),
AppText( AppText(
type ?? '', type ?? '',
color: Color(0xff359846), color: Color(0xFF1E8CC8),
fontSize: 10, fontSize: 10,
fontWeight: FontWeight.w500, fontWeight: FontWeight.w500,
), ),
@ -131,7 +131,7 @@ class SoapDetailItem extends StatelessWidget {
onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE), onSoapDetailActionClicked(SoapDetailItemActions.RESOLVE),
child: SoapDetailItemActionsView( child: SoapDetailItemActionsView(
icon: 'assets/images/svgs/resolve.svg', icon: 'assets/images/svgs/resolve.svg',
fontColor: Color(0XFF359846), fontColor: Color(0xFF1E8CC8),
text: TranslationBase.of(context).resolve, text: TranslationBase.of(context).resolve,
), ),
), ),
@ -203,7 +203,7 @@ class Status extends StatelessWidget {
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(3), borderRadius: BorderRadius.circular(3),
), ),
// color: Color(0xFF359846), // color: Color(0xFF1E8CC8),
color: (status.toLowerCase() == color: (status.toLowerCase() ==
TranslationBase.of(context).active.toLowerCase() || TranslationBase.of(context).active.toLowerCase() ||
status.toLowerCase() == status.toLowerCase() ==
@ -221,7 +221,7 @@ class Status extends StatelessWidget {
TranslationBase.of(context).active.toLowerCase() || TranslationBase.of(context).active.toLowerCase() ||
status.toLowerCase() == status.toLowerCase() ==
TranslationBase.of(context).stable.toLowerCase()) TranslationBase.of(context).stable.toLowerCase())
? Color(0xFF359846) ? Color(0xFF1E8CC8)
: Colors.white, : Colors.white,
fontSize: 8, fontSize: 8,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,

@ -562,7 +562,7 @@ getIcdCodeData() async{
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
children: <Widget>[ children: <Widget>[
AppButton( AppButton(
color: Color(0xff359846), color: Color(0xFF1E8CC8),
title: TranslationBase.of(context).addMedication, title: TranslationBase.of(context).addMedication,
fontWeight: FontWeight.w600, fontWeight: FontWeight.w600,
onPressed: () async { onPressed: () async {

@ -335,8 +335,8 @@ class TranslationBase {
String get login => localizedValues['login']![locale.languageCode]!; String get login => localizedValues['login']![locale.languageCode]!;
String get drSulaimanAlHabib => String get ministryOfHealth =>
localizedValues['drSulaimanAlHabib']![locale.languageCode]!; localizedValues['ministryOfHealth']![locale.languageCode]!;
String get welcomeTo => localizedValues['welcomeTo']![locale.languageCode]!; String get welcomeTo => localizedValues['welcomeTo']![locale.languageCode]!;

@ -13,7 +13,7 @@ class CustomBottomSheetContainer extends StatelessWidget {
final double? widthFactor; final double? widthFactor;
double headerHeight = SizeConfig.heightMultiplier! * 12; double headerHeight = SizeConfig.heightMultiplier! * 12;
CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF359846) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key); CustomBottomSheetContainer({Key? key, required this.onTap, required this.label, this.buttonColor = const Color(0xFF1E8CC8) , this.fontColor = Colors.white, this.widthFactor = .80 }) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {

@ -127,22 +127,22 @@ class _AppDrawerState extends State<AppDrawer> {
}, },
), ),
SizedBox(height: 15), SizedBox(height: 15),
InkWell( // InkWell(
child: DrawerItem( // child: DrawerItem(
TranslationBase.of(context).doctorRota, // TranslationBase.of(context).doctorRota,
icon: Icons.punch_clock, // icon: Icons.punch_clock,
//
// subTitle: , // // subTitle: ,
), // ),
onTap: () { // onTap: () {
Navigator.pop(context); // Navigator.pop(context);
Navigator.push( // Navigator.push(
context, // context,
MaterialPageRoute(builder: (context) => DoctorSchedulePage(), settings: RouteSettings(name: 'doctorSchedule') // MaterialPageRoute(builder: (context) => DoctorSchedulePage(), settings: RouteSettings(name: 'doctorSchedule')
// MyReferredPatient(), // // MyReferredPatient(),
)); // ));
}, // },
), // ),
SizedBox(height: 15), SizedBox(height: 15),
InkWell( InkWell(
child: DrawerItem( child: DrawerItem(

@ -80,16 +80,16 @@ class _BottomNavBarState extends State<BottomNavBar> {
name: TranslationBase.of(context).qr, name: TranslationBase.of(context).qr,
dashboardViewModel: widget.dashboardViewModel, dashboardViewModel: widget.dashboardViewModel,
), ),
BottomNavigationItem( // BottomNavigationItem(
icon: DoctorApp.dr_reply_1, // icon: DoctorApp.dr_reply_1,
activeIcon: DoctorApp.dr_reply_active_1, // activeIcon: DoctorApp.dr_reply_active_1,
svgPath: "assets/images/svgs/bottom_nav/reply-active.svg", // svgPath: "assets/images/svgs/bottom_nav/reply-active.svg",
changeIndex: _changeIndex, // changeIndex: _changeIndex,
index: widget.index, // index: widget.index,
currentIndex: 3, // currentIndex: 3,
name: TranslationBase.of(context).replay2, // name: TranslationBase.of(context).replay2,
dashboardViewModel: widget.dashboardViewModel, // dashboardViewModel: widget.dashboardViewModel,
), // ),
], ],
), ),
), ),

@ -75,7 +75,7 @@ class _AppButtonState extends State<AppButton> {
? Colors.grey ? Colors.grey
: widget.color != null : widget.color != null
? widget.color ? widget.color
: HexColor("#D02127"), : Color(0xFF1E8CC8),
splashColor: widget.color, splashColor: widget.color,
child: Padding( child: Padding(
padding: (widget.hPadding > 0 || widget.vPadding > 0) padding: (widget.hPadding > 0 || widget.vPadding > 0)
@ -133,7 +133,7 @@ class _AppButtonState extends State<AppButton> {
? widget.borderColor ? widget.borderColor
: widget.disabled : widget.disabled
? Colors.grey ? Colors.grey
: widget.color ?? Color(0xFFB8382C), : widget.color ?? Color(0xFF1E8CC8),
width: 0.8, width: 0.8,
), ),
borderRadius: BorderRadius.all(Radius.circular(widget.radius))), borderRadius: BorderRadius.all(Radius.circular(widget.radius))),

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

@ -1073,10 +1073,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394" sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.17.0" version: "1.16.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
@ -1598,10 +1598,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "0.7.7" version: "0.7.6"
timezone: timezone:
dependency: "direct main" dependency: "direct main"
description: description:

Loading…
Cancel
Save