diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a7a5340b..db0fe5f0 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -42,7 +42,7 @@ android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" - android:exported="true" + android:windowSoftInputMode="adjustResize"> diff --git a/android/build.gradle b/android/build.gradle index dc4d22a0..5254f6aa 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,5 +1,5 @@ buildscript { - ext.kotlin_version = '1.7.20' + ext.kotlin_version = '1.8.20' repositories { google() jcenter() @@ -31,6 +31,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 8ba9b615..bb5920c1 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -497,7 +497,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -636,7 +636,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -670,7 +670,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 51a10e79..069d11ca 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -37,12 +37,12 @@ class BaseAppClient { bool callLog = true; try { Map? profile = await sharedPref.getObj(DOCTOR_PROFILE); - String token = await sharedPref.getString(TOKEN); + String? token = await sharedPref.getString(TOKEN); if (profile != null) { DoctorProfileModel doctorProfile = DoctorProfileModel.fromJson(profile); - if (body!['DoctorID'] == null) { - body['DoctorID'] = doctorProfile.doctorID; + if (body == null || body['DoctorID'] == null) { + body!['DoctorID'] = doctorProfile.doctorID; } if (body['DoctorID'] == "") body['DoctorID'] = null; if (body['EditedBy'] == null) body['EditedBy'] = doctorProfile.doctorID; @@ -96,7 +96,7 @@ class BaseAppClient { body['VidaRefreshTokenID'] = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID); } - int projectID = await sharedPref.getInt(PROJECT_ID); + int? projectID = await sharedPref.getInt(PROJECT_ID); if (projectID == 2 || projectID == 3) body['PatientOutSA'] = true; else if ((body.containsKey('facilityId') && body['facilityId'] == 2 || body['facilityId'] == 3) || body['ProjectID'] == 2 || body['ProjectID'] == 3) diff --git a/lib/core/model/hospitals/get_hospitals_request_model.dart b/lib/core/model/hospitals/get_hospitals_request_model.dart index fb78cb51..3fc2b3e5 100644 --- a/lib/core/model/hospitals/get_hospitals_request_model.dart +++ b/lib/core/model/hospitals/get_hospitals_request_model.dart @@ -1,9 +1,9 @@ class GetHospitalsRequestModel { - int? languageID; + dynamic? languageID; String? stamp; String? iPAdress; double? versionID; - int? channel; + dynamic? channel; String? tokenID; String? sessionID; bool? isLoginForDoctorApp; diff --git a/lib/core/service/patient/patientInPatientService.dart b/lib/core/service/patient/patientInPatientService.dart index 52883551..b51fab3d 100644 --- a/lib/core/service/patient/patientInPatientService.dart +++ b/lib/core/service/patient/patientInPatientService.dart @@ -1,14 +1,13 @@ import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/core/model/patient_muse/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/service/base/base_service.dart'; -import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart'; class PatientInPatientService extends BaseService { List inPatientList = []; List myInPatientList = []; - Future getInPatientList( - PatientSearchRequestModel requestModel, bool isMyInpatient) async { + Future getInPatientList(PatientSearchRequestModel requestModel, bool isMyInpatient) async { hasError = false; await getDoctorProfile(isGetProfile: true); requestModel.loginDoctorID = doctorProfile!.doctorID; @@ -23,7 +22,6 @@ class PatientInPatientService extends BaseService { onSuccess: (dynamic response, int statusCode) { inPatientList.clear(); myInPatientList.clear(); - response['List_MyInPatient'].forEach((v) { PatiantInformtion patient = PatiantInformtion.fromJson(v); inPatientList.add(patient); diff --git a/lib/core/viewModel/authentication_view_model.dart b/lib/core/viewModel/authentication_view_model.dart index a0674f0f..9111c416 100644 --- a/lib/core/viewModel/authentication_view_model.dart +++ b/lib/core/viewModel/authentication_view_model.dart @@ -55,7 +55,7 @@ class AuthenticationViewModel extends BaseViewModel { List get vidaPlusProjectList => _hospitalsService.vidaPlusProjectListModel; NewLoginInformationModel loggedUser = NewLoginInformationModel(); - GetIMEIDetailsModel user = GetIMEIDetailsModel(); + GetIMEIDetailsModel? user; UserModel userInfo = UserModel(); final LocalAuthentication auth = LocalAuthentication(); @@ -100,7 +100,7 @@ class AuthenticationViewModel extends BaseViewModel { insertIMEIDetailsModel.vidaAuthTokenID = await sharedPref.getString(VIDA_AUTH_TOKEN_ID); insertIMEIDetailsModel.vidaRefreshTokenID = await sharedPref.getString(VIDA_REFRESH_TOKEN_ID); insertIMEIDetailsModel.password = userInfo.password; - insertIMEIDetailsModel.loginDoctorID = loggedUser != null ? loggedUser!.listMemberInformation![0].employeeID : int.parse(user!.editedBy.toString()); + insertIMEIDetailsModel.loginDoctorID = loggedUser != null ? loggedIn["List_MemberInformation"][0]["employeeID"] : int.parse(user!.editedBy.toString()); await _authService.insertDeviceImei(insertIMEIDetailsModel); if (_authService.hasError) { @@ -177,17 +177,17 @@ class AuthenticationViewModel extends BaseViewModel { setState(ViewState.BusyLocal); CheckActivationCodeRequestModel checkActivationCodeForDoctorApp = new CheckActivationCodeRequestModel( - zipCode: loggedUser != null ? loggedUser.zipCode : user.zipCode, - mobileNumber: loggedUser != null ? loggedUser.mobileNumber : user.mobile, - projectID: await sharedPref.getInt(PROJECT_ID) != null ? await sharedPref.getInt(PROJECT_ID) : user.projectID, + zipCode: loggedUser != null ? loggedUser.zipCode : user!.zipCode, + mobileNumber: loggedUser != null ? loggedUser.mobileNumber : user!.mobile, + projectID: await sharedPref.getInt(PROJECT_ID) != null ? await sharedPref.getInt(PROJECT_ID) : user!.projectID, logInTokenID: await sharedPref.getString(TOKEN), activationCode: activationCode ?? '0000', - memberID: userInfo.userID != null ? int.parse(userInfo.userID!) : user.doctorID, + memberID: userInfo.userID != null ? int.parse(userInfo.userID!) : user!.doctorID, password: userInfo.password, - facilityId: userInfo.projectID != null ? userInfo.projectID.toString() : user.projectID.toString(), + facilityId: userInfo.projectID != null ? userInfo.projectID.toString() : user!.projectID.toString(), oTPSendType: await sharedPref.getInt(OTP_TYPE), iMEI: localToken, - loginDoctorID: loggedUser != null ? loggedUser.listMemberInformation![0].employeeID : int.parse(user.editedBy.toString()), + loginDoctorID: loggedUser != null ? loggedUser.listMemberInformation![0].employeeID : int.parse(user!.editedBy.toString()), ///loggedUser.listMemberInformation[0].employeeID, // loggedUser.listMemberInformation[0].employeeID, @@ -355,8 +355,8 @@ class AuthenticationViewModel extends BaseViewModel { if (_authService.dashboardItemsList.length > 0) { user = _authService.dashboardItemsList[0]; sharedPref.setObj(LAST_LOGIN_USER, _authService.dashboardItemsList[0]); - await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user.vidaRefreshTokenID!); - await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user.vidaAuthTokenID!); + await sharedPref.setString(VIDA_REFRESH_TOKEN_ID, user!.vidaRefreshTokenID!); + await sharedPref.setString(VIDA_AUTH_TOKEN_ID, user!.vidaAuthTokenID!); this.unverified = true; } setState(ViewState.Idle); diff --git a/lib/icons_app/doctor_app_icons.dart b/lib/icons_app/doctor_app_icons.dart index 113fcbae..1c7676b1 100644 --- a/lib/icons_app/doctor_app_icons.dart +++ b/lib/icons_app/doctor_app_icons.dart @@ -23,385 +23,197 @@ class DoctorApp { DoctorApp._(); static const _kFontFam = 'DoctorApp'; - static const String _kFontPkg = ""; + static const String? _kFontPkg = null; - static const IconData female_icon = - IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData male = - IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData reject_icon = - IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon_active = - IconData(0xe803, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon = - IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon_active = - IconData(0xe805, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon = - IconData(0xe806, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon_active = - IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData scdedule_icon_active = - IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData schedule_icon = - IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData discharge_patient = - IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData approved_icon = - IconData(0xe80b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData pending_icon = - IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData in_patient_white = - IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData lab_results = - IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon = - IconData(0xe80f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData referral_1 = - IconData(0xe810, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData progress_notes = - IconData(0xe811, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon_1 = - IconData(0xe812, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData operations = - IconData(0xe813, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData out_patient = - IconData(0xe814, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData patient = - IconData(0xe815, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_code = - IconData(0xe816, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData radiology = - IconData(0xe817, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData referral = - IconData(0xe818, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData male_2 = - IconData(0xe819, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_patient = - IconData(0xe81a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData female_1 = - IconData(0xe81b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon_active_1 = - IconData(0xe81c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon_1 = - IconData(0xe81d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData mail = - IconData(0xe81e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData medicine_search = - IconData(0xe81f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_code_1 = - IconData(0xe820, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_1 = - IconData(0xe821, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData referred = - IconData(0xe822, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData send = - IconData(0xe823, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData sync_icon = - IconData(0xe824, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData drawer_icon = - IconData(0xe825, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData view = - IconData(0xe826, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData warning = - IconData(0xe827, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData add = - IconData(0xe828, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData close = - IconData(0xe829, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData back = - IconData(0xe82a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData health_summary = - IconData(0xe82b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData powered_by_cs = - IconData(0xe82c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_code_2 = - IconData(0xe82d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ecg = - IconData(0xe82e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData create_episode = - IconData(0xe82f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData booked = - IconData(0xe830, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData admission_req = - IconData(0xe831, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData walkin = - IconData(0xe832, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData reschedule_ = - IconData(0xe833, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData edit = - IconData(0xe834, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData leaves = - IconData(0xe836, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData logout = - IconData(0xe837, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData obese_bmi = - IconData(0xe838, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData livecare = - IconData(0xe839, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData health_bmi = - IconData(0xe83a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData health_bmi_r = - IconData(0xe83b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData modify_episode = - IconData(0xe83c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData height = - IconData(0xe83d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData obese_bmi_r = - IconData(0xe83e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ovrweight_bmi = - IconData(0xe83f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData order_prescription = - IconData(0xe840, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData order_procedures = - IconData(0xe841, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ovrweight_bmi_r = - IconData(0xe842, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData respiration_rate = - IconData(0xe843, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData patient_sick_leave = - IconData(0xe844, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData progress_notes_1 = - IconData(0xe845, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData temperature = - IconData(0xe846, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData underweight_bmi = - IconData(0xe847, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData radiology_1 = - IconData(0xe848, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_patient_1 = - IconData(0xe849, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData referral_bg = - IconData(0xe84a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search = - IconData(0xe84b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_bg = - IconData(0xe84c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData arrival_patients = - IconData(0xe84d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData arrival_patients_bg = - IconData(0xe84e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData refer_patient = - IconData(0xe84f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData underweight_bmi_r = - IconData(0xe850, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData weight = - IconData(0xe851, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData blood_pressure = - IconData(0xe852, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData vital_signs = - IconData(0xe853, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ucaf = - IconData(0xe854, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData filter = - IconData(0xe855, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData male_1 = - IconData(0xe856, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData female = - IconData(0xe857, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData external_link = - IconData(0xe858, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_face_2 = - IconData(0xe859, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_sms_2 = - IconData(0xe85a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home = - IconData(0xe85b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_finger_2 = - IconData(0xe85c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData dr_reply_active = - IconData(0xe85d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData dr_reply = - IconData(0xe85e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData schedule_active = - IconData(0xe85f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData schedule = - IconData(0xe860, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_reader_active = - IconData(0xe861, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_reader = - IconData(0xe862, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_active = - IconData(0xe863, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData arrow_forward = - IconData(0xe864, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData heart_rate = - IconData(0xe865, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon_active_1 = - IconData(0xe866, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon_1 = - IconData(0xe867, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon_active_1 = - IconData(0xe868, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData scdedule_icon_active_1 = - IconData(0xe869, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ovrweight_bmi_r_1 = - IconData(0xe86a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData underweight_bmi_1 = - IconData(0xe86b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData temperature_1 = - IconData(0xe86c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData underweight_bmi_r_1 = - IconData(0xe86d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData weight_1 = - IconData(0xe86e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData blood_pressure_1 = - IconData(0xe86f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData health_bmi_r_1 = - IconData(0xe870, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData health_bmi_1 = - IconData(0xe871, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData heart_rate_1 = - IconData(0xe872, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData height_1 = - IconData(0xe873, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData obese_bmi_1 = - IconData(0xe874, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ovrweight_bmi_1 = - IconData(0xe875, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData respiration_rate_1 = - IconData(0xe876, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_code_3 = - IconData(0xe877, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData reschedule__1 = - IconData(0xe878, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData logout_1 = - IconData(0xe879, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData livecare_1 = - IconData(0xe87a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData modify_episode_1 = - IconData(0xe87b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData order_prescription_1 = - IconData(0xe87c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData order_procedures_1 = - IconData(0xe87d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData patient_sick_leave_1 = - IconData(0xe87e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData progress_notes_2 = - IconData(0xe87f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData radiology_2 = - IconData(0xe880, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData refer_patient_1 = - IconData(0xe881, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ucaf_1 = - IconData(0xe882, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData vital_signs_1 = - IconData(0xe883, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData walkin_1 = - IconData(0xe884, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData admission_req_1 = - IconData(0xe885, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData booked_1 = - IconData(0xe886, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData create_episode_1 = - IconData(0xe887, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData ecg_1 = - IconData(0xe888, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData health_summary_1 = - IconData(0xe889, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData lab_results_1 = - IconData(0xe88a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData female_2 = - IconData(0xe88b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData filter_1 = - IconData(0xe88c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData male_3 = - IconData(0xe88d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_2 = - IconData(0xe88e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData send_1 = - IconData(0xe88f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData view_1 = - IconData(0xe890, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData warning_1 = - IconData(0xe891, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData add_1 = - IconData(0xe892, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData arrow_forward_1 = - IconData(0xe893, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData back_1 = - IconData(0xe894, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData close_1 = - IconData(0xe895, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData edit_1 = - IconData(0xe896, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData external_link_1 = - IconData(0xe897, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_finger_1 = - IconData(0xe898, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_sms_1 = - IconData(0xe899, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_face_1 = - IconData(0xe89a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_reader_1 = - IconData(0xe89b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_reader_active_1 = - IconData(0xe89c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData schedule_1 = - IconData(0xe89d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData schedule_active_1 = - IconData(0xe89e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData dr_reply_1 = - IconData(0xe89f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData dr_reply_active_1 = - IconData(0xe8a0, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_1 = - IconData(0xe8a1, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_active_1 = - IconData(0xe8a2, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_face = - IconData(0xe8a3, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_finger = - IconData(0xe8a4, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_whtsapp = - IconData(0xe8a5, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData verify_sms = - IconData(0xe8a6, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData female_icon = IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData male = IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData reject_icon = IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon_active = IconData(0xe803, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon = IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon_active = IconData(0xe805, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon = IconData(0xe806, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon_active = IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData scdedule_icon_active = IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData schedule_icon = IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData discharge_patient = IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData approved_icon = IconData(0xe80b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData pending_icon = IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData in_patient_white = IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData lab_results = IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon = IconData(0xe80f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referral_1 = IconData(0xe810, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData progress_notes = IconData(0xe811, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon_1 = IconData(0xe812, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData operations = IconData(0xe813, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData out_patient = IconData(0xe814, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData patient = IconData(0xe815, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_code = IconData(0xe816, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData radiology = IconData(0xe817, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referral = IconData(0xe818, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData male_2 = IconData(0xe819, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_patient = IconData(0xe81a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData female_1 = IconData(0xe81b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon_active_1 = IconData(0xe81c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon_1 = IconData(0xe81d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData mail = IconData(0xe81e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData medicine_search = IconData(0xe81f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_code_1 = IconData(0xe820, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_1 = IconData(0xe821, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referred = IconData(0xe822, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData send = IconData(0xe823, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData sync_icon = IconData(0xe824, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData drawer_icon = IconData(0xe825, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData view = IconData(0xe826, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData warning = IconData(0xe827, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData add = IconData(0xe828, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData close = IconData(0xe829, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData back = IconData(0xe82a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData health_summary = IconData(0xe82b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData powered_by_cs = IconData(0xe82c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_code_2 = IconData(0xe82d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ecg = IconData(0xe82e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData create_episode = IconData(0xe82f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData booked = IconData(0xe830, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData admission_req = IconData(0xe831, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData walkin = IconData(0xe832, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData reschedule_ = IconData(0xe833, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData edit = IconData(0xe834, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData leaves = IconData(0xe836, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData logout = IconData(0xe837, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData obese_bmi = IconData(0xe838, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData livecare = IconData(0xe839, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData health_bmi = IconData(0xe83a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData health_bmi_r = IconData(0xe83b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData modify_episode = IconData(0xe83c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData height = IconData(0xe83d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData obese_bmi_r = IconData(0xe83e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ovrweight_bmi = IconData(0xe83f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData order_prescription = IconData(0xe840, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData order_procedures = IconData(0xe841, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ovrweight_bmi_r = IconData(0xe842, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData respiration_rate = IconData(0xe843, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData patient_sick_leave = IconData(0xe844, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData progress_notes_1 = IconData(0xe845, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData temperature = IconData(0xe846, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData underweight_bmi = IconData(0xe847, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData radiology_1 = IconData(0xe848, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_patient_1 = IconData(0xe849, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referral_bg = IconData(0xe84a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search = IconData(0xe84b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_bg = IconData(0xe84c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData arrival_patients = IconData(0xe84d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData arrival_patients_bg = IconData(0xe84e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData refer_patient = IconData(0xe84f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData underweight_bmi_r = IconData(0xe850, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData weight = IconData(0xe851, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData blood_pressure = IconData(0xe852, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData vital_signs = IconData(0xe853, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ucaf = IconData(0xe854, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData filter = IconData(0xe855, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData male_1 = IconData(0xe856, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData female = IconData(0xe857, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData external_link = IconData(0xe858, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_face_2 = IconData(0xe859, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_sms_2 = IconData(0xe85a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home = IconData(0xe85b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_finger_2 = IconData(0xe85c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData dr_reply_active = IconData(0xe85d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData dr_reply = IconData(0xe85e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData schedule_active = IconData(0xe85f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData schedule = IconData(0xe860, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_reader_active = IconData(0xe861, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_reader = IconData(0xe862, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_active = IconData(0xe863, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData arrow_forward = IconData(0xe864, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData heart_rate = IconData(0xe865, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon_active_1 = IconData(0xe866, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon_1 = IconData(0xe867, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon_active_1 = IconData(0xe868, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData scdedule_icon_active_1 = IconData(0xe869, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ovrweight_bmi_r_1 = IconData(0xe86a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData underweight_bmi_1 = IconData(0xe86b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData temperature_1 = IconData(0xe86c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData underweight_bmi_r_1 = IconData(0xe86d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData weight_1 = IconData(0xe86e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData blood_pressure_1 = IconData(0xe86f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData health_bmi_r_1 = IconData(0xe870, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData health_bmi_1 = IconData(0xe871, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData heart_rate_1 = IconData(0xe872, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData height_1 = IconData(0xe873, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData obese_bmi_1 = IconData(0xe874, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ovrweight_bmi_1 = IconData(0xe875, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData respiration_rate_1 = IconData(0xe876, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_code_3 = IconData(0xe877, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData reschedule__1 = IconData(0xe878, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData logout_1 = IconData(0xe879, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData livecare_1 = IconData(0xe87a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData modify_episode_1 = IconData(0xe87b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData order_prescription_1 = IconData(0xe87c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData order_procedures_1 = IconData(0xe87d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData patient_sick_leave_1 = IconData(0xe87e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData progress_notes_2 = IconData(0xe87f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData radiology_2 = IconData(0xe880, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData refer_patient_1 = IconData(0xe881, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ucaf_1 = IconData(0xe882, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData vital_signs_1 = IconData(0xe883, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData walkin_1 = IconData(0xe884, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData admission_req_1 = IconData(0xe885, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData booked_1 = IconData(0xe886, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData create_episode_1 = IconData(0xe887, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData ecg_1 = IconData(0xe888, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData health_summary_1 = IconData(0xe889, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData lab_results_1 = IconData(0xe88a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData female_2 = IconData(0xe88b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData filter_1 = IconData(0xe88c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData male_3 = IconData(0xe88d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_2 = IconData(0xe88e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData send_1 = IconData(0xe88f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData view_1 = IconData(0xe890, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData warning_1 = IconData(0xe891, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData add_1 = IconData(0xe892, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData arrow_forward_1 = IconData(0xe893, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData back_1 = IconData(0xe894, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData close_1 = IconData(0xe895, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData edit_1 = IconData(0xe896, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData external_link_1 = IconData(0xe897, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_finger_1 = IconData(0xe898, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_sms_1 = IconData(0xe899, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_face_1 = IconData(0xe89a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_reader_1 = IconData(0xe89b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_reader_active_1 = IconData(0xe89c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData schedule_1 = IconData(0xe89d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData schedule_active_1 = IconData(0xe89e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData dr_reply_1 = IconData(0xe89f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData dr_reply_active_1 = IconData(0xe8a0, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_1 = IconData(0xe8a1, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_active_1 = IconData(0xe8a2, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_face = IconData(0xe8a3, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_finger = IconData(0xe8a4, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_whtsapp = IconData(0xe8a5, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData verify_sms = IconData(0xe8a6, fontFamily: _kFontFam, fontPackage: _kFontPkg); /// static const IconData 124 = IconData(0xe8a7, fontFamily: _kFontFam, fontPackage: _kFontPkg); ///static const IconData 123 = IconData(0xe8a8, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData obese_bmi_r_1 = - IconData(0xe8a9, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData end_call = - IconData(0xe8d4, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData end_consultaion = - IconData(0xe8d5, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData folder_open = - IconData(0xe8d6, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData folder = - IconData(0xe8d7, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData link_in = - IconData(0xe8d8, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData link_out = - IconData(0xe8d9, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData mute_microphone = - IconData(0xe8da, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData no_video = - IconData(0xe8db, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData send_instruction = - IconData(0xe8dc, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData transfer_to_admin = - IconData(0xe8dd, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData inpatient = - IconData(0xe959, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData discharge = - IconData(0xe95a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData order_sheets = - IconData(0xe95b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData call = - IconData(0xe95c, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData medical_report = - IconData(0xe95d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData painscale = - IconData(0xe95e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData oxygenation = - IconData(0xe95f, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData speechtotext = - IconData(0xe960, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_medicines = - IconData(0xe964, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData discharge_patients = - IconData(0xe965, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData referral_discharge = - IconData(0xe966, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData obese_bmi_r_1 = IconData(0xe8a9, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData end_call = IconData(0xe8d4, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData end_consultaion = IconData(0xe8d5, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData folder_open = IconData(0xe8d6, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData folder = IconData(0xe8d7, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData link_in = IconData(0xe8d8, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData link_out = IconData(0xe8d9, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData mute_microphone = IconData(0xe8da, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData no_video = IconData(0xe8db, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData send_instruction = IconData(0xe8dc, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData transfer_to_admin = IconData(0xe8dd, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData inpatient = IconData(0xe959, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData discharge = IconData(0xe95a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData order_sheets = IconData(0xe95b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData call = IconData(0xe95c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData medical_report = IconData(0xe95d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData painscale = IconData(0xe95e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData oxygenation = IconData(0xe95f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData speechtotext = IconData(0xe960, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_medicines = IconData(0xe964, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData discharge_patients = IconData(0xe965, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referral_discharge = IconData(0xe966, fontFamily: _kFontFam, fontPackage: _kFontPkg); } diff --git a/lib/landing_page.dart b/lib/landing_page.dart index 67fc723b..9317e4e0 100644 --- a/lib/landing_page.dart +++ b/lib/landing_page.dart @@ -60,11 +60,12 @@ class _LandingPageState extends State { width: 40, margin: EdgeInsets.only(left: projectViewModel.isArabic ? 0 : 20, right: projectViewModel.isArabic ? 20 : 0), child: IconButton( - icon: SvgPicture.asset('assets/images/svgs/menu.svg', height: 25, width: 10), - iconSize: 15, - color: Color(0xff2B353E), - onPressed: () => Scaffold.of(context).openDrawer(), - ), + icon: SvgPicture.asset('assets/images/svgs/menu.svg', height: 25, width: 10), + iconSize: 15, + color: Color(0xff2B353E), + onPressed: () { + Scaffold.of(context).openDrawer(); + }), ); }, ), diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index cb613263..42628f04 100644 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -115,16 +115,17 @@ class _LoginScreenState extends State { isSecure: true, controller: passwordController, onChanged: (value) { - if (value != null) + if (value != null) { setState(() { authenticationViewModel.userInfo.password = value.trim(); }); - // if(allowCallApi) { - this.getProjects(authenticationViewModel.userInfo.userID); - // setState(() { - // allowCallApi = false; - // }); - // } + // if(allowCallApi) { + this.getProjects(authenticationViewModel.userInfo.userID); + // setState(() { + // allowCallApi = false; + // }); + // } + } }, onClick: () {}, onFieldSubmitted: () {}, @@ -139,7 +140,7 @@ class _LoginScreenState extends State { onClick: () { Utils.showCupertinoPicker(context, projectsList, 'facilityName', onSelectProject, authenticationViewModel); }, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), buildSizedBox() diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index b305b48e..b7dc8134 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -93,7 +93,7 @@ class _VerificationMethodsScreenState extends State { letterSpacing: -0.72, ), AppText( - Utils.convertToTitleCase(authenticationViewModel.user.doctorName!), + Utils.convertToTitleCase(authenticationViewModel.user!.doctorName!), fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 6, color: AppGlobal.appTextColor, fontWeight: FontWeight.bold, @@ -152,7 +152,7 @@ class _VerificationMethodsScreenState extends State { letterSpacing: -0.4), children: [ TextSpan( - text: authenticationViewModel.getType(authenticationViewModel.user.logInTypeID, context), + text: authenticationViewModel.getType(authenticationViewModel.user!.logInTypeID, context), style: TextStyle( color: AppGlobal.appTextColor, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, @@ -171,10 +171,10 @@ class _VerificationMethodsScreenState extends State { mainAxisAlignment: MainAxisAlignment.start, children: [ AppText( - authenticationViewModel.user.editedOn != null - ? AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.convertStringToDate(authenticationViewModel.user.editedOn!), isMonthShort: true) - : authenticationViewModel.user.createdOn != null - ? AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.convertStringToDate(authenticationViewModel.user.createdOn!), isMonthShort: true) + authenticationViewModel.user!.editedOn != null + ? AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.convertStringToDate(authenticationViewModel.user!.editedOn!), isMonthShort: true) + : authenticationViewModel.user!.createdOn != null + ? AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.convertStringToDate(authenticationViewModel.user!.createdOn!), isMonthShort: true) : '--', textAlign: TextAlign.right, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 4.5, @@ -183,10 +183,10 @@ class _VerificationMethodsScreenState extends State { letterSpacing: -0.48, ), AppText( - authenticationViewModel.user.editedOn != null - ? AppDateUtils.getHour(AppDateUtils.convertStringToDate(authenticationViewModel.user.editedOn!)) - : authenticationViewModel.user.createdOn != null - ? AppDateUtils.getHour(AppDateUtils.convertStringToDate(authenticationViewModel.user.createdOn!)) + authenticationViewModel.user!.editedOn != null + ? AppDateUtils.getHour(AppDateUtils.convertStringToDate(authenticationViewModel.user!.editedOn!)) + : authenticationViewModel.user!.createdOn != null + ? AppDateUtils.getHour(AppDateUtils.convertStringToDate(authenticationViewModel.user!.createdOn!)) : '--', textAlign: TextAlign.right, fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3.5, @@ -250,7 +250,7 @@ class _VerificationMethodsScreenState extends State { }, child: VerificationMethodsList( authenticationViewModel: authenticationViewModel, - authMethodType: SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user.logInTypeID!), + authMethodType: SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user!.logInTypeID!), authenticateUser: (AuthMethodTypes authMethodType, isActive) => authenticateUser(authMethodType, isActive), )), ), @@ -422,7 +422,7 @@ class _VerificationMethodsScreenState extends State { new SMSOTP( context, type, - authenticationViewModel.loggedUser != null ? authenticationViewModel.loggedUser.mobileNumber : authenticationViewModel.user.mobile, + authenticationViewModel.loggedUser != null ? authenticationViewModel.loggedUser.mobileNumber : authenticationViewModel.user!.mobile, (value) { showDialog( context: context, @@ -443,8 +443,8 @@ class _VerificationMethodsScreenState extends State { await authenticationViewModel.showIOSAuthMessages(); if (!mounted) return; if (authenticationViewModel.user != null && - (SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user.logInTypeID!) == AuthMethodTypes.Fingerprint || - SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user.logInTypeID!) == AuthMethodTypes.FaceID)) { + (SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user!.logInTypeID!) == AuthMethodTypes.Fingerprint || + SelectedAuthMethodTypesService.getMethodsTypeService(authenticationViewModel.user!.logInTypeID!) == AuthMethodTypes.FaceID)) { this.sendActivationCode(authMethodTypes); } else { setState(() { diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 98a87752..0f6e381c 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -313,39 +313,41 @@ class _HomeScreenState extends State { List patientCards = []; if (model.hasVirtualClinic) { - patientCards.add(HomePatientCard( - gradient: backgroundColors[colorIndex], - backgroundIconColor: backgroundIconColors[colorIndex], - cardIcon: DoctorApp.livecare, - textColor: textColors[colorIndex], - iconSize: 21, - text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}", - onTap: () { - // TODO MOSA TEST - // PatiantInformtion patient = PatiantInformtion( - // patientStatusType: 43, - // episodeNo: 0, - // vcId: 42342, - // fullName: "mosa test", - // dateofBirth: "2000-05-01 10:42:35.790004" - // ); - // Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: { - // "patient": patient, - // "patientType": "0", - // "isSearch": false, - // "isInpatient": false, - // "arrivalType": "0", - // "isSearchAndOut": false, - // "isFromLiveCare": true, - // }); - Navigator.push( - context, - FadePage( - page: LiveCarePatientScreen(), - ), - ); - }, - )); + patientCards.add( + HomePatientCard( + gradient: backgroundColors[colorIndex], + backgroundIconColor: backgroundIconColors[colorIndex], + cardIcon: DoctorApp.livecare, + textColor: textColors[colorIndex], + iconSize: 21, + text: "${TranslationBase.of(context).liveCare}\n${TranslationBase.of(context).patients}", + onTap: () { + // TODO MOSA TEST + // PatiantInformtion patient = PatiantInformtion( + // patientStatusType: 43, + // episodeNo: 0, + // vcId: 42342, + // fullName: "mosa test", + // dateofBirth: "2000-05-01 10:42:35.790004" + // ); + // Navigator.of(context).pushNamed(PATIENTS_PROFILE, arguments: { + // "patient": patient, + // "patientType": "0", + // "isSearch": false, + // "isInpatient": false, + // "arrivalType": "0", + // "isSearchAndOut": false, + // "isFromLiveCare": true, + // }); + Navigator.push( + context, + FadePage( + page: LiveCarePatientScreen(), + ), + ); + }, + ), + ); changeColorIndex(); } diff --git a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart index 91b027c9..9efe8e75 100644 --- a/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart +++ b/lib/screens/patients/profile/admission_request/admission_request_first_screen.dart @@ -140,7 +140,7 @@ class _AdmissionRequestThirdScreenState extends State { ? null : selectValue['Description'], enabled: false, - isTextFieldHasSuffix: true, onChanged: (String value) {}, onFieldSubmitted: () {}, + isTextFieldHasSuffix: true, onChanged: (value) {}, onFieldSubmitted: () {}, ), ), ), @@ -171,7 +171,7 @@ class _UpdateNoteOrderState extends State { hasBorder: true, // isTextFieldHasSuffix: true, - validationError: progressNoteController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (String value) {}, + validationError: progressNoteController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (value) {}, onFieldSubmitted: () {}, ), Positioned( diff --git a/lib/screens/patients/profile/operation_report/update_operation_report.dart b/lib/screens/patients/profile/operation_report/update_operation_report.dart index 39198c50..db48a4c2 100644 --- a/lib/screens/patients/profile/operation_report/update_operation_report.dart +++ b/lib/screens/patients/profile/operation_report/update_operation_report.dart @@ -147,7 +147,7 @@ class _UpdateOperationReportState extends State { minLines: 1, enabled: false, hasBorder: true, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -161,7 +161,7 @@ class _UpdateOperationReportState extends State { hasBorder: true, // isTextFieldHasSuffix: true, - validationError: preOpDiagmosisController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (String value) {}, + validationError: preOpDiagmosisController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -174,7 +174,7 @@ class _UpdateOperationReportState extends State { minLines: 8, hasBorder: true, // isTextFieldHasSuffix: true, - validationError: postOpDiagmosisNoteController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (String value) {}, + validationError: postOpDiagmosisNoteController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -187,7 +187,7 @@ class _UpdateOperationReportState extends State { minLines: 1, hasBorder: true, // isTextFieldHasSuffix: true, - validationError: surgeonController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (String value) {}, + validationError: surgeonController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -201,7 +201,7 @@ class _UpdateOperationReportState extends State { hasBorder: true, // isTextFieldHasSuffix: true, - validationError: assistantNoteController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (String value) {}, + validationError: assistantNoteController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -216,7 +216,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: operationController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -231,7 +231,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: inasionController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -245,7 +245,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: findingController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -259,7 +259,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: surgeryProcedureController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -273,7 +273,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: postOpInstructionController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -286,7 +286,7 @@ class _UpdateOperationReportState extends State { hasBorder: true, // isTextFieldHasSuffix: true, validationError: complicationDetailsController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -300,7 +300,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: bloodLossDetailController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -314,7 +314,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: histopathSpecimenController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -328,7 +328,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: microbiologySpecimenController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -342,7 +342,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: otherSpecimenController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -356,7 +356,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: scrubNurseController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -370,7 +370,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: circulatingNurseController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -384,7 +384,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: BloodTransfusedDetailController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 4, @@ -398,7 +398,7 @@ class _UpdateOperationReportState extends State { // isTextFieldHasSuffix: true, validationError: anasthetistController.text.isEmpty && isSubmitted ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, onFieldSubmitted: () {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( height: 250, diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index cf1178df..1cbe3430 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -89,7 +89,7 @@ class _PatientProfileScreenState extends State with Single arrivalType = routeArgs['arrivalType']; from = routeArgs['from']; to = routeArgs['to']; - isSigned = routeArgs['isSigned']; + isSigned = routeArgs['isSigned'] ?? false; if (routeArgs.containsKey("isSearch")) { isFromSearch = routeArgs['isSearch']; } diff --git a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart index 266cfc87..127f3d80 100644 --- a/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart +++ b/lib/screens/patients/profile/soap_update/assessment/add_assessment_details.dart @@ -117,7 +117,7 @@ class _AddAssessmentDetailsState extends State { isTextFieldHasSuffix: false, enabled: false, controller: appointmentIdController, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), @@ -292,7 +292,7 @@ class _AddAssessmentDetailsState extends State { enabled: false, hasBorder: true, validationError: isFormSubmitted && widget.mySelectedAssessment.selectedDiagnosisCondition == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -330,7 +330,7 @@ class _AddAssessmentDetailsState extends State { controller: typeController, hasBorder: true, validationError: isFormSubmitted && widget.mySelectedAssessment.selectedDiagnosisType == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( diff --git a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart index 297131cb..203b7b98 100644 --- a/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart +++ b/lib/screens/patients/profile/soap_update/plan/update_plan_page.dart @@ -172,7 +172,7 @@ class _UpdatePlanPageState extends State implements PlanCallBack onChanged: (value) { setState(() { patientProgressNote.planNote = value; - model.progressNoteText = value; + model.progressNoteText = value!; widget.changeStateFun(); }); }, diff --git a/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart b/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart index 00bfbca0..2f272a96 100644 --- a/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart +++ b/lib/screens/patients/profile/soap_update/shared_soap_widgets/expandable_SOAP_widget.dart @@ -9,11 +9,11 @@ import 'package:hexcolor/hexcolor.dart'; class ExpandableSOAPWidget extends StatelessWidget { final bool isExpanded; final Widget? child; - final Function? onTap; + final Function() onTap; final headerTitle; final bool isRequired; - const ExpandableSOAPWidget({Key? key, this.isExpanded = false, this.child, this.onTap, this.headerTitle, this.isRequired = true}) : super(key: key); + const ExpandableSOAPWidget({Key? key, this.isExpanded = false, this.child, required this.onTap, this.headerTitle, this.isRequired = true}) : super(key: key); @override Widget build(BuildContext context) { @@ -28,12 +28,12 @@ class ExpandableSOAPWidget extends StatelessWidget { ), child: HeaderBodyExpandableNotifier( headerWidget: InkWell( - onTap: onTap!(), + onTap: onTap, child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ InkWell( - onTap: onTap!(), + onTap: onTap, child: Row( children: [ AppText( diff --git a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart index 7f9e25a3..fd0991b0 100644 --- a/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart +++ b/lib/screens/patients/profile/soap_update/subjective/medication/add_medication.dart @@ -123,7 +123,7 @@ class _AddMedicationState extends State { onPressed: () {}, ), enabled: false, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), @@ -181,7 +181,7 @@ class _AddMedicationState extends State { isTextFieldHasSuffix: true, controller: doseController, validationError: isFormSubmitted && _selectedMedicationDose == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -219,7 +219,7 @@ class _AddMedicationState extends State { minLines: 1, controller: strengthController, validationError: isFormSubmitted && _selectedMedicationStrength == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -260,7 +260,7 @@ class _AddMedicationState extends State { minLines: 1, controller: routeController, validationError: isFormSubmitted && _selectedMedicationRoute == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( @@ -301,7 +301,7 @@ class _AddMedicationState extends State { isTextFieldHasSuffix: true, controller: frequencyController, validationError: isFormSubmitted && _selectedMedicationFrequency == null ? TranslationBase.of(context).emptyMessage : null, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), SizedBox( diff --git a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart index 68fbd6b1..fb2a18ee 100644 --- a/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart +++ b/lib/screens/patients/profile/soap_update/subjective/update_subjective_page.dart @@ -160,9 +160,11 @@ class _UpdateSubjectivePageState extends State implements ExpandableSOAPWidget( headerTitle: TranslationBase.of(context).chiefComplaints, onTap: () { - setState(() { - isChiefExpand = !isChiefExpand; - }); + if (mounted) { + setState(() { + isChiefExpand = !isChiefExpand; + }); + } }, child: UpdateChiefComplaints( formKey: formKey, diff --git a/lib/screens/prescription/add_prescription/prescription_form_widget.dart b/lib/screens/prescription/add_prescription/prescription_form_widget.dart index 12df2377..e0a20b7f 100644 --- a/lib/screens/prescription/add_prescription/prescription_form_widget.dart +++ b/lib/screens/prescription/add_prescription/prescription_form_widget.dart @@ -183,9 +183,9 @@ class _PrescriptionFormWidgetState extends State { isTextFieldHasSuffix: false, enabled: true, controller: strengthController, - onChanged: (String value) { + onChanged: (value) { setState(() { - strengthChar = value.length; + strengthChar = value!.length; }); if (strengthChar! >= 5) { DrAppToastMsg.showErrorToast( @@ -281,7 +281,7 @@ class _PrescriptionFormWidgetState extends State { child: AppTextFieldCustom( hintText: widget.medicineViewModel.patientAssessmentList[0].icdCode10ID.toString(), enabled: true, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), @@ -292,7 +292,7 @@ class _PrescriptionFormWidgetState extends State { maxLines: 5, hintText: widget.medicineViewModel.patientAssessmentList[0].asciiDesc.toString(), enabled: true, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), @@ -317,7 +317,7 @@ class _PrescriptionFormWidgetState extends State { ), dropDownText: selectedDate != null ? "${AppDateUtils.convertStringToDateFormat(selectedDate.toString(), "yyyy-MM-dd")}" : null, enabled: false, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), @@ -348,7 +348,7 @@ class _PrescriptionFormWidgetState extends State { isTextFieldHasSuffix: false, dropDownText: uom != null ? uom : null, enabled: false, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), @@ -360,7 +360,7 @@ class _PrescriptionFormWidgetState extends State { isTextFieldHasSuffix: false, dropDownText: box != null ? widget.medicineViewModel.boxQuintity.toString() : null, enabled: false, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), diff --git a/lib/screens/prescription/prescription_checkout_screen.dart b/lib/screens/prescription/prescription_checkout_screen.dart index 35043771..5f492074 100644 --- a/lib/screens/prescription/prescription_checkout_screen.dart +++ b/lib/screens/prescription/prescription_checkout_screen.dart @@ -341,9 +341,9 @@ class _PrescriptionCheckOutScreenState extends State isTextFieldHasSuffix: false, enabled: true, controller: strengthController, - onChanged: (String value) { + onChanged: (value) { setState(() { - strengthChar = value.length; + strengthChar = value!.length; }); if (strengthChar >= 5) { DrAppToastMsg.showErrorToast( diff --git a/lib/screens/procedures/add_procedure_page.dart b/lib/screens/procedures/add_procedure_page.dart index c9863b57..5cdea7c7 100644 --- a/lib/screens/procedures/add_procedure_page.dart +++ b/lib/screens/procedures/add_procedure_page.dart @@ -102,7 +102,7 @@ class _AddProcedurePageState extends State { minLines: 1, hasBorder: true, controller: procedureName, - onChanged: (String value) {}, + onChanged: (value) {}, onFieldSubmitted: () {}, ), ), diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index ccc6bb48..a1598897 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -3,20 +3,16 @@ import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/screens/doctor_schedule/doctor_schedule.dart'; import 'package:doctor_app_flutter/screens/reschedule_leaves/add_reschedule_leave.dart'; -import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:doctor_app_flutter/utils/translations_delegate_base_utils.dart'; -import 'package:doctor_app_flutter/widgets/shared/loader/gif_loader_dialog_utils.dart'; +import 'package:doctor_app_flutter/utils/utils.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/widgets.dart'; import 'package:provider/provider.dart'; -import '../../config/size_config.dart'; import '../../utils/dr_app_shared_pref.dart'; import '../../widgets/shared/drawer_item_widget.dart'; -import '../../widgets/shared/rounded_container_widget.dart'; import 'app_texts_widget.dart'; -DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); +DrAppSharedPreferances sharedPref = DrAppSharedPreferances(); class AppDrawer extends StatefulWidget { @override @@ -24,215 +20,193 @@ class AppDrawer extends StatefulWidget { } class _AppDrawerState extends State { - Utils helpers = new Utils(); + Utils helpers = Utils(); late ProjectViewModel projectsProvider; @override Widget build(BuildContext context) { AuthenticationViewModel authenticationViewModel = Provider.of(context); projectsProvider = Provider.of(context); - return RoundedContainer( - child: Container( - color: Colors.white, - child: Drawer( - child: Column(children: [ - Expanded( - flex: 7, - child: ListView(padding: EdgeInsets.zero, children: [ - Container( - margin: EdgeInsets.symmetric(horizontal: 15), - // height: SizeConfig.heightMultiplier! * 50, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Container( - child: Image.asset( - 'assets/images/dr_app_logo.png', - width: MediaQuery.of(context).size.width * 0.16, - height: MediaQuery.of(context).size.height * 0.16, - ), - margin: EdgeInsets.only(top: 10, bottom: 10), - ), - Container( - child: InkWell( - onTap: () { - Navigator.pop(context); - }, - child: Icon( - DoctorApp.close_1, - size: 20, - color: Color(0xff2B353E), + return Container( + color: Colors.white, + child: Drawer( + child: Column( + children: [ + Expanded( + flex: 7, + child: ListView(padding: EdgeInsets.zero, children: [ + Container( + margin: EdgeInsets.symmetric(horizontal: 15), + // height: SizeConfig.heightMultiplier! * 50, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Container( + child: Image.asset( + 'assets/images/dr_app_logo.png', + width: MediaQuery.of(context).size.width * 0.16, + height: MediaQuery.of(context).size.height * 0.16, ), + margin: EdgeInsets.only(top: 10, bottom: 10), ), - margin: EdgeInsets.only(top: 20, bottom: 10), - ) - ], - crossAxisAlignment: CrossAxisAlignment.start, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - ), - SizedBox(height: 5), - if (authenticationViewModel.doctorProfile != null) - InkWell( - onTap: () { - // TODO: return it back when its needed - // Navigator.of(context).pushNamed(PROFILE, arguments: { - // 'title': authProvider.doctorProfile.doctorName, - // "doctorProfileall": authProvider.doctorProfile - // }); - }, - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: EdgeInsets.only(top: 8.0), - child: AppText( - TranslationBase.of(context).dr + - capitalizeOnlyFirstLater( - authenticationViewModel - .doctorProfile!.doctorName! - .replaceAll("DR.", "") - .toLowerCase()), - fontWeight: FontWeight.w700, - color: Color(0xFF2E303A), - fontFamily: 'Poppins', - fontSize: 25.0, - letterSpacing: -1.5, + Container( + child: InkWell( + onTap: () { + Navigator.pop(context); + }, + child: Icon( + DoctorApp.close_1, + size: 20, + color: Color(0xff2B353E), ), ), - Padding( - padding: EdgeInsets.only(top: 0), + margin: EdgeInsets.only(top: 20, bottom: 10), + ) + ], + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + ), + SizedBox(height: 5), + if (authenticationViewModel.doctorProfile != null) + InkWell( + onTap: () { + // TODO: return it back when its needed + // Navigator.of(context).pushNamed(PROFILE, arguments: { + // 'title': authProvider.doctorProfile.doctorName, + // "doctorProfileall": authProvider.doctorProfile + // }); + }, + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: EdgeInsets.only(top: 8.0), child: AppText( - authenticationViewModel - .doctorProfile!.clinicDescription!, - fontWeight: FontWeight.w500, + TranslationBase.of(context).dr + capitalizeOnlyFirstLater(authenticationViewModel.doctorProfile!.doctorName!.replaceAll("DR.", "").toLowerCase()), + fontWeight: FontWeight.w700, color: Color(0xFF2E303A), - fontSize: 16, fontFamily: 'Poppins', - letterSpacing: -0.96, - //textAlign: TextAlign.left, - )) - ], + fontSize: 25.0, + letterSpacing: -1.5, + ), + ), + Padding( + padding: EdgeInsets.only(top: 0), + child: AppText( + authenticationViewModel.doctorProfile!.clinicDescription!, + fontWeight: FontWeight.w500, + color: Color(0xFF2E303A), + fontSize: 16, + fontFamily: 'Poppins', + letterSpacing: -0.96, + //textAlign: TextAlign.left, + )) + ], + ), ), - ), - SizedBox(height: 40), - InkWell( - child: DrawerItem( - TranslationBase.of(context).applyOrRescheduleLeave, - icon: DoctorApp.reschedule__1, + SizedBox(height: 40), + InkWell( + child: DrawerItem( + TranslationBase.of(context).applyOrRescheduleLeave, + icon: DoctorApp.reschedule__1, - // subTitle: , + // subTitle: , + ), + onTap: () { + Navigator.pop(context); + Navigator.push( + context, + MaterialPageRoute(builder: (context) => AddRescheduleLeaveScreen(), settings: RouteSettings(name: 'AddRescheduleLeaveScreen') + // MyReferredPatient(), + )); + }, ), - onTap: () { - Navigator.pop(context); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => - AddRescheduleLeaveScreen(), - settings: RouteSettings( - name: 'AddRescheduleLeaveScreen') - // MyReferredPatient(), - )); - }, - ), - SizedBox(height: 15), - - InkWell( - child: DrawerItem( - TranslationBase.of(context).doctorRota, - icon: Icons.punch_clock, + SizedBox(height: 15), + InkWell( + child: DrawerItem( + TranslationBase.of(context).doctorRota, + icon: Icons.punch_clock, - // subTitle: , + // subTitle: , + ), + onTap: () { + Navigator.pop(context); + Navigator.push( + context, + MaterialPageRoute(builder: (context) => DoctorSchedulePage(), settings: RouteSettings(name: 'doctorSchedule') + // MyReferredPatient(), + )); + }, ), - onTap: () { - Navigator.pop(context); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => DoctorSchedulePage(), - settings: RouteSettings( - name: 'doctorSchedule') - // MyReferredPatient(), - )); - }, - ), - SizedBox(height: 15), - - InkWell( - child: DrawerItem( - TranslationBase.of(context).myQRCode, - icon: DoctorApp.qr_code_3, - // subTitle: , + SizedBox(height: 15), + InkWell( + child: DrawerItem( + TranslationBase.of(context).myQRCode, + icon: DoctorApp.qr_code_3, + // subTitle: , + ), ), - ), - - SizedBox(height: MediaQuery.of(context).size.height * 0.02), - InkWell( - child: Container( - height: MediaQuery.of(context).size.height * 0.16, - width: MediaQuery.of(context).size.width * 0.16, - child: Image.asset('assets/images/qr_code.png'), + SizedBox(height: MediaQuery.of(context).size.height * 0.02), + InkWell( + child: Container( + height: MediaQuery.of(context).size.height * 0.16, + width: MediaQuery.of(context).size.width * 0.16, + child: Image.asset('assets/images/qr_code.png'), + ), + onTap: () {}, ), - onTap: () {}, - ), - ], + ], + ), ), - ), - SizedBox( - height: MediaQuery.of(context).size.height * 0.02, - ), - Container( - margin: EdgeInsets.symmetric(horizontal: 20), - child: Column( - children: [ - InkWell( - child: DrawerItem( - projectsProvider.isArabic - ? TranslationBase.of(context).lanEnglish - : TranslationBase.of(context).lanArabic, - // icon: DoctorApp.qr_code, - assetLink: projectsProvider.isArabic - ? 'assets/images/usa-flag.png' - : 'assets/images/saudi-arabia-flag.png', + SizedBox( + height: MediaQuery.of(context).size.height * 0.02, + ), + Container( + margin: EdgeInsets.symmetric(horizontal: 20), + child: Column( + children: [ + InkWell( + child: DrawerItem( + projectsProvider.isArabic ? TranslationBase.of(context).lanEnglish : TranslationBase.of(context).lanArabic, + // icon: DoctorApp.qr_code, + assetLink: projectsProvider.isArabic ? 'assets/images/usa-flag.png' : 'assets/images/saudi-arabia-flag.png', + ), + onTap: () { + if (projectsProvider.isArabic) + projectsProvider.changeLanguage('en'); + else + projectsProvider.changeLanguage('ar'); + }, ), - onTap: () { - if (projectsProvider.isArabic) - projectsProvider.changeLanguage('en'); - else - projectsProvider.changeLanguage('ar'); - }, - ), - SizedBox(height: 10), - InkWell( - child: DrawerItem( - TranslationBase.of(context).logout, - icon: DoctorApp.logout_1, + SizedBox(height: 10), + InkWell( + child: DrawerItem( + TranslationBase.of(context).logout, + icon: DoctorApp.logout_1, + ), + onTap: () async { + Navigator.pop(context); + await authenticationViewModel.logout(isFromLogin: false); + }, ), - onTap: () async { - Navigator.pop(context); - await authenticationViewModel.logout( - isFromLogin: false); - }, - ), - ], + ], + ), ), - ), - ]), - ), - Expanded( + ]), + ), + Expanded( flex: 1, - child: Column(children: [ - Container( + child: Column( + children: [ + Container( // This align moves the children to the bottom child: Align( - alignment: FractionalOffset.bottomCenter, - child: Container( - child: Padding( - padding: EdgeInsets.only( - left: projectsProvider.isArabic ? 0 : 15.0, - right: projectsProvider.isArabic ? 15.0 : 0), + alignment: FractionalOffset.bottomCenter, + child: Container( + child: Padding( + padding: EdgeInsets.only(left: projectsProvider.isArabic ? 0 : 15.0, right: projectsProvider.isArabic ? 15.0 : 0), child: Row( mainAxisAlignment: MainAxisAlignment.start, children: [ @@ -240,44 +214,37 @@ class _AppDrawerState extends State { width: MediaQuery.of(context).size.width * 0.5, child: RichText( text: TextSpan( - text: 'Powered by', - style: TextStyle( - color: Color(0xFF989898), - fontWeight: FontWeight.w600, - fontSize: 14, - fontFamily: 'Poppins', - letterSpacing: -0.56, - ), - children: [ - TextSpan( - text: ' Cloud Solutions', - style: TextStyle( - color: Color(0xFF2E303A), - fontSize: 14, - fontFamily: 'Poppins', - letterSpacing: -0.56, - fontWeight: FontWeight.w700), - ) - ]), + text: 'Powered by', + style: TextStyle( + color: Color(0xFF989898), + fontWeight: FontWeight.w600, + fontSize: 14, + fontFamily: 'Poppins', + letterSpacing: -0.56, + ), + children: [ + TextSpan( + text: ' Cloud Solutions', + style: TextStyle(color: Color(0xFF2E303A), fontSize: 14, fontFamily: 'Poppins', letterSpacing: -0.56, fontWeight: FontWeight.w700), + ) + ], + ), ), ), // Text("Powered by"), - Image.asset('assets/images/cs_logo_container.png', - width: - MediaQuery.of(context).size.width * 0.13) + Image.asset('assets/images/cs_logo_container.png', width: MediaQuery.of(context).size.width * 0.13) ], ), - )))) - ])) - ])), + ), + ), + ), + ) + ], + ), + ) + ], + ), ), - width: SizeConfig.realScreenWidth! * 0.80, - margin: EdgeInsets.all(0), - - customCornerRaduis: false, - // topRight: 30, - // bottomRight: 30, - backgroundColor: Colors.white, ); } diff --git a/lib/widgets/shared/app_texts_widget.dart b/lib/widgets/shared/app_texts_widget.dart index 509e516c..958852ec 100644 --- a/lib/widgets/shared/app_texts_widget.dart +++ b/lib/widgets/shared/app_texts_widget.dart @@ -5,11 +5,11 @@ import 'package:hexcolor/hexcolor.dart'; class AppText extends StatefulWidget { final String text; final String? variant; - final Color color; + final Color? color; final FontWeight? fontWeight; final double? fontSize; final double? fontHeight; - final String fontFamily; + final String? fontFamily; final int maxLength; final bool italic; final double? margin; @@ -112,8 +112,8 @@ class _AppTextState extends State { child: Container( decoration: BoxDecoration( gradient: LinearGradient(colors: [ - Theme.of(context).backgroundColor, - Theme.of(context).backgroundColor.withOpacity(0), + Theme.of(context).colorScheme.background, + Theme.of(context).colorScheme.background.withOpacity(0), ], begin: Alignment.bottomCenter, end: Alignment.topCenter)), height: 30, ), @@ -159,14 +159,14 @@ class _AppTextState extends State { child: SelectableText( !hidden ? text : (text.substring(0, text.length > widget.maxLength ? widget.maxLength : text.length)), textAlign: widget.textAlign, - // overflow: widget.maxLines != null - // ? ((widget.maxLines > 1) - // ? TextOverflow.fade - // : TextOverflow.ellipsis) - // : null, maxLines: widget.maxLines ?? null, style: widget.style != null - ? _getFontStyle()!.copyWith(fontStyle: widget.italic ? FontStyle.italic : null, color: widget.color, fontWeight: widget.fontWeight ?? _getFontWeight(), height: widget.fontHeight) + ? _getFontStyle()!.copyWith( + fontStyle: widget.italic ? FontStyle.italic : FontStyle.normal, + fontSize: widget.fontSize ?? _getFontSize(), + color: widget.color, + fontWeight: widget.fontWeight ?? _getFontWeight(), + height: widget.fontHeight) : TextStyle( fontStyle: widget.italic ? FontStyle.italic : null, color: widget.color != null ? widget.color : Color(0xff2E303A), @@ -186,9 +186,15 @@ class _AppTextState extends State { overflow: widget.maxLines != null ? ((widget.maxLines! > 1) ? TextOverflow.fade : TextOverflow.ellipsis) : null, maxLines: widget.maxLines ?? null, style: widget.style != null - ? _getFontStyle()!.copyWith(fontStyle: widget.italic ? FontStyle.italic : null, color: widget.color, fontWeight: widget.fontWeight ?? _getFontWeight(), height: widget.fontHeight) + ? _getFontStyle()!.copyWith( + fontStyle: widget.italic ? FontStyle.italic : FontStyle.normal, + color: widget.color, + fontSize: widget.fontSize ?? _getFontSize(), + fontWeight: widget.fontWeight ?? _getFontWeight(), + height: widget.fontHeight, + ) : TextStyle( - fontStyle: widget.italic ? FontStyle.italic : null, + fontStyle: widget.italic ? FontStyle.italic : FontStyle.normal, color: widget.color != null ? widget.color : Colors.black, fontSize: widget.fontSize ?? _getFontSize(), letterSpacing: widget.letterSpacing ?? (widget.variant == "overline" ? 1.5 : null), diff --git a/lib/widgets/shared/text_fields/app-textfield-custom.dart b/lib/widgets/shared/text_fields/app-textfield-custom.dart index 3061ac4f..d2a7c0de 100644 --- a/lib/widgets/shared/text_fields/app-textfield-custom.dart +++ b/lib/widgets/shared/text_fields/app-textfield-custom.dart @@ -24,7 +24,7 @@ class AppTextFieldCustom extends StatefulWidget { final int minLines; final int maxLines; final List? inputFormatters; - final Function(String value) onChanged; + final Function(String? value) onChanged; final Function() onFieldSubmitted; final String? validationError; diff --git a/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart b/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart index e73d020f..2995ddd8 100644 --- a/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart +++ b/lib/widgets/shared/text_fields/app_text_field_custom_serach.dart @@ -60,7 +60,7 @@ class AppTextFieldCustomSearch extends StatelessWidget { ), controller: searchController, onChanged: (val) { - onChangeFun(val); + onChangeFun(val!); }, onFieldSubmitted: () { onFieldSubmitted(); diff --git a/pubspec.yaml b/pubspec.yaml index 27a0cbdf..e3e4e844 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -65,6 +65,7 @@ dependencies: cupertino_icons: ^1.0.6 # SVG #flutter_svg: ^1.0.0 + flutter_svg: ^2.0.9 percent_indicator: ^4.2.3 #Dependency Injection