diff --git a/lib/client/base_app_client.dart b/lib/client/base_app_client.dart index 2521cf07..454f4d04 100644 --- a/lib/client/base_app_client.dart +++ b/lib/client/base_app_client.dart @@ -3,7 +3,7 @@ import 'dart:convert'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:http/http.dart' as http; diff --git a/lib/core/service/hospital/hospitals_service.dart b/lib/core/service/hospital/hospitals_service.dart deleted file mode 100644 index 1fb24c6b..00000000 --- a/lib/core/service/hospital/hospitals_service.dart +++ /dev/null @@ -1,23 +0,0 @@ -import 'package:doctor_app_flutter/config/config.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/base/base_service.dart'; - -///This service just an example -class HospitalService extends BaseService { - List _hospitals = List(); - - List get hospitals => _hospitals; - - Future getHospitals() async { - await baseAppClient.post(GET_PROJECTS, - onSuccess: (dynamic response, int statusCode) { - _hospitals.clear(); - response['ListProject'].forEach((hospital) { - _hospitals.add(HospitalsModel.fromJson(hospital)); - }); - }, onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, body: Map()); - } -} diff --git a/lib/providers/auth_provider.dart b/lib/core/viewModel/auth_view_model.dart similarity index 97% rename from lib/providers/auth_provider.dart rename to lib/core/viewModel/auth_view_model.dart index eaca545d..9b656d31 100644 --- a/lib/providers/auth_provider.dart +++ b/lib/core/viewModel/auth_view_model.dart @@ -5,12 +5,12 @@ import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:flutter/cupertino.dart'; import 'package:doctor_app_flutter/config/config.dart'; -import '../models/doctor/user_model.dart'; +import '../../models/doctor/user_model.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); enum APP_STATUS { LOADING, UNAUTHENTICATED, AUTHENTICATED } -class AuthProvider with ChangeNotifier { +class AuthViewModel with ChangeNotifier { List doctorsClinicList = []; String selectedClinicName; bool isLogin = false; @@ -23,7 +23,7 @@ class AuthProvider with ChangeNotifier { } - AuthProvider() { + AuthViewModel() { getUserAuthentication(); } diff --git a/lib/core/viewModel/doctor_replay_view_model.dart b/lib/core/viewModel/doctor_replay_view_model.dart index ac212578..29d3b125 100644 --- a/lib/core/viewModel/doctor_replay_view_model.dart +++ b/lib/core/viewModel/doctor_replay_view_model.dart @@ -1,7 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/hospital_view_model.dart b/lib/core/viewModel/hospital_view_model.dart index cac49dac..56f03686 100644 --- a/lib/core/viewModel/hospital_view_model.dart +++ b/lib/core/viewModel/hospital_view_model.dart @@ -1,23 +1,31 @@ -import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; +import 'package:doctor_app_flutter/client/base_app_client.dart'; +import 'package:doctor_app_flutter/config/config.dart'; +import 'package:flutter/cupertino.dart'; -import '../../locator.dart'; -import 'base_view_model.dart'; +// TODO change it when change login +class HospitalViewModel with ChangeNotifier { + BaseAppClient baseAppClient = BaseAppClient(); -///This View Model just an example -class HospitalViewModel extends BaseViewModel { - HospitalService _hospitalService = locator(); + Future getProjectsList() async { + const url = GET_PROJECTS; + // TODO create model or remove it if no info need + var info = { + "LanguageID": 1, + "stamp": "2020-02-26T13:51:44.111Z", + "IPAdress": "11.11.11.11", + "VersionID": 1.2, + "Channel": 9, + "TokenID": "", + "SessionID": "i1UJwCTSqt", + "IsLoginForDoctorApp": true + }; + dynamic localRes; - List get hospitals => _hospitalService.hospitals; - - Future getHospitals() async { - setState(ViewState.Busy); - await _hospitalService.getHospitals(); - if (_hospitalService.hasError) { - error = _hospitalService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); + await baseAppClient.post(url, onSuccess: (response, statusCode) async { + localRes = response; + }, onFailure: (String error, int statusCode) { + throw error; + }, body: info); + return Future.value(localRes); } } diff --git a/lib/providers/livecare_provider.dart b/lib/core/viewModel/livecare_view_model.dart similarity index 97% rename from lib/providers/livecare_provider.dart rename to lib/core/viewModel/livecare_view_model.dart index 7af6585f..f6ef42e7 100644 --- a/lib/providers/livecare_provider.dart +++ b/lib/core/viewModel/livecare_view_model.dart @@ -1,7 +1,7 @@ -import 'dart:convert'; import 'package:doctor_app_flutter/client/base_app_client.dart'; import 'package:doctor_app_flutter/config/config.dart'; +import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/models/livecare/end_call_req.dart'; import 'package:doctor_app_flutter/models/livecare/get_panding_req_list.dart'; import 'package:doctor_app_flutter/models/livecare/get_pending_res_list.dart'; @@ -9,11 +9,10 @@ import 'package:doctor_app_flutter/models/livecare/start_call_req.dart'; import 'package:doctor_app_flutter/models/livecare/start_call_res.dart'; import 'package:doctor_app_flutter/models/livecare/transfer_to_admin.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; -import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; -import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; -class LiveCareProvider with ChangeNotifier { +//TODO: change it when Live care return back. +class LiveCareViewModel with ChangeNotifier { DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); List liveCarePendingList = []; diff --git a/lib/core/viewModel/medicine_view_model.dart b/lib/core/viewModel/medicine_view_model.dart index 72f4d0ab..a86f6dfb 100644 --- a/lib/core/viewModel/medicine_view_model.dart +++ b/lib/core/viewModel/medicine_view_model.dart @@ -1,11 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/core/service/medicine_service.dart'; -import 'package:doctor_app_flutter/core/service/schedule_service.dart'; -import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; import 'base_view_model.dart'; diff --git a/lib/providers/project_provider.dart b/lib/core/viewModel/project_view_model.dart similarity index 96% rename from lib/providers/project_provider.dart rename to lib/core/viewModel/project_view_model.dart index db912c3c..a12846c7 100644 --- a/lib/providers/project_provider.dart +++ b/lib/core/viewModel/project_view_model.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/cupertino.dart'; @@ -121,7 +121,7 @@ class ProjectProvider with ChangeNotifier { tokenID: '', languageID: 2); - Provider.of(AppGlobal.CONTEX, listen: false) + Provider.of(AppGlobal.CONTEX, listen: false) .getDocProfiles(docInfo.toJson()) .then((res) async { sharedPref.setObj(DOCTOR_PROFILE, res['DoctorProfileList'][0]); diff --git a/lib/core/viewModel/referral_view_model.dart b/lib/core/viewModel/referral_view_model.dart index 54c3fd8a..2e99cc3a 100644 --- a/lib/core/viewModel/referral_view_model.dart +++ b/lib/core/viewModel/referral_view_model.dart @@ -1,11 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/core/service/referral_patient_service.dart'; -import 'package:doctor_app_flutter/core/service/schedule_service.dart'; -import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/referred_view_model.dart b/lib/core/viewModel/referred_view_model.dart index b12241e3..b5e3ecdc 100644 --- a/lib/core/viewModel/referred_view_model.dart +++ b/lib/core/viewModel/referred_view_model.dart @@ -1,13 +1,5 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; -import 'package:doctor_app_flutter/core/service/referral_patient_service.dart'; import 'package:doctor_app_flutter/core/service/referred_patient_service.dart'; -import 'package:doctor_app_flutter/core/service/schedule_service.dart'; -import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; -import 'package:doctor_app_flutter/models/patient/my_referral/my_referral_patient_model.dart'; import 'package:doctor_app_flutter/models/patient/my_referral/my_referred_patient_model.dart'; import '../../locator.dart'; diff --git a/lib/core/viewModel/schedule_view_model.dart b/lib/core/viewModel/schedule_view_model.dart index cfaa1be4..8aebc4cb 100644 --- a/lib/core/viewModel/schedule_view_model.dart +++ b/lib/core/viewModel/schedule_view_model.dart @@ -1,10 +1,6 @@ import 'package:doctor_app_flutter/core/enum/viewstate.dart'; -import 'package:doctor_app_flutter/core/model/hospitals_model.dart'; -import 'package:doctor_app_flutter/core/service/doctor_reply_service.dart'; -import 'package:doctor_app_flutter/core/service/hospital/hospitals_service.dart'; import 'package:doctor_app_flutter/core/service/schedule_service.dart'; import 'package:doctor_app_flutter/models/doctor/list_doctor_working_hours_table_model.dart'; -import 'package:doctor_app_flutter/models/doctor/list_gt_my_patients_question_model.dart'; import '../../locator.dart'; import 'base_view_model.dart'; diff --git a/lib/locator.dart b/lib/locator.dart index d4695f84..550b4666 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -3,13 +3,11 @@ import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:get_it/get_it.dart'; import 'core/service/doctor_reply_service.dart'; -import 'core/service/hospital/hospitals_service.dart'; import 'core/service/medicine_service.dart'; import 'core/service/referral_patient_service.dart'; import 'core/service/referred_patient_service.dart'; import 'core/service/schedule_service.dart'; import 'core/viewModel/doctor_replay_view_model.dart'; -import 'core/viewModel/hospital_view_model.dart'; import 'core/viewModel/medicine_view_model.dart'; import 'core/viewModel/referral_view_model.dart'; import 'core/viewModel/referred_view_model.dart'; @@ -20,7 +18,6 @@ GetIt locator = GetIt.instance; ///di void setupLocator() { /// Services - locator.registerLazySingleton(() => HospitalService()); locator.registerLazySingleton(() => DoctorReplyService()); locator.registerLazySingleton(() => ScheduleService()); locator.registerLazySingleton(() => ReferralPatientService()); @@ -29,7 +26,6 @@ void setupLocator() { locator.registerLazySingleton(() => PatientService()); /// View Model - locator.registerFactory(() => HospitalViewModel()); locator.registerFactory(() => DoctorReplayViewModel()); locator.registerFactory(() => ScheduleViewModel()); locator.registerFactory(() => ReferralPatientViewModel()); diff --git a/lib/main.dart b/lib/main.dart index 4a431d64..06d0ecfa 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,5 @@ -import 'package:doctor_app_flutter/providers/livecare_provider.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; @@ -7,8 +7,8 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import './config/size_config.dart'; -import './providers/auth_provider.dart'; -import './providers/hospital_provider.dart'; +import 'core/viewModel/auth_view_model.dart'; +import 'core/viewModel/hospital_view_model.dart'; import './routes.dart'; import 'config/config.dart'; import 'locator.dart'; @@ -29,15 +29,15 @@ class MyApp extends StatelessWidget { SizeConfig().init(constraints, orientation); return MultiProvider( providers: [ - ChangeNotifierProvider( - create: (context) => AuthProvider()), - ChangeNotifierProvider( - create: (context) => HospitalProvider()), + ChangeNotifierProvider( + create: (context) => AuthViewModel()), + ChangeNotifierProvider( + create: (context) => HospitalViewModel()), ChangeNotifierProvider( create: (context) => ProjectProvider(), ), - ChangeNotifierProvider( - create: (context) => LiveCareProvider(), + ChangeNotifierProvider( + create: (context) => LiveCareViewModel(), ), ], child: Consumer( diff --git a/lib/providers/hospital_provider.dart b/lib/providers/hospital_provider.dart deleted file mode 100644 index 3b1c7d03..00000000 --- a/lib/providers/hospital_provider.dart +++ /dev/null @@ -1,29 +0,0 @@ -import 'package:doctor_app_flutter/client/base_app_client.dart'; -import 'package:doctor_app_flutter/config/config.dart'; -import 'package:flutter/cupertino.dart'; - -class HospitalProvider with ChangeNotifier { - BaseAppClient baseAppClient = BaseAppClient(); - - Future getProjectsList() async { - const url = GET_PROJECTS; - var info = { - "LanguageID": 1, - "stamp": "2020-02-26T13:51:44.111Z", - "IPAdress": "11.11.11.11", - "VersionID": 1.2, - "Channel": 9, - "TokenID": "", - "SessionID": "i1UJwCTSqt", - "IsLoginForDoctorApp": true - }; - dynamic localRes; - - await baseAppClient.post(url, onSuccess: (response, statusCode) async { - localRes = response; - }, onFailure: (String error, int statusCode) { - throw error; - }, body: info); - return Future.value(localRes); - } -} diff --git a/lib/root_page.dart b/lib/root_page.dart index e361e42c..fe35a246 100644 --- a/lib/root_page.dart +++ b/lib/root_page.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/screens/auth/login_screen.dart'; import 'package:doctor_app_flutter/widgets/shared/dr_app_circular_progress_Indeicator.dart'; import 'package:flutter/cupertino.dart'; @@ -11,7 +11,7 @@ import 'landing_page.dart'; class RootPage extends StatelessWidget { @override Widget build(BuildContext context) { - AuthProvider authProvider = Provider.of(context); + AuthViewModel authProvider = Provider.of(context); Widget buildRoot() { switch (authProvider.stutas) { case APP_STATUS.LOADING: diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 33e39e9c..80697352 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -4,9 +4,9 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; -import 'package:doctor_app_flutter/providers/hospital_provider.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; @@ -38,8 +38,8 @@ class DashboardScreen extends StatefulWidget { } class _DashboardScreenState extends State { - HospitalProvider hospitalProvider; - AuthProvider authProvider; + HospitalViewModel hospitalProvider; + AuthViewModel authProvider; bool isLoading = false; ProjectProvider projectsProvider; var _isInit = true; diff --git a/lib/screens/live_care/panding_list.dart b/lib/screens/live_care/panding_list.dart index a59d7f05..251f9594 100644 --- a/lib/screens/live_care/panding_list.dart +++ b/lib/screens/live_care/panding_list.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/providers/livecare_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; import 'package:doctor_app_flutter/screens/live_care/video_call.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; @@ -33,12 +33,12 @@ class _LiveCarePandingListState extends State { List _data = []; Helpers helpers = new Helpers(); bool _isInit = true; - LiveCareProvider _liveCareProvider; + LiveCareViewModel _liveCareProvider; @override void didChangeDependencies() { super.didChangeDependencies(); if (_isInit) { - _liveCareProvider = Provider.of(context); + _liveCareProvider = Provider.of(context); pendingList(); } _isInit = false; diff --git a/lib/screens/live_care/video_call.dart b/lib/screens/live_care/video_call.dart index c4c59af1..f6d011a7 100644 --- a/lib/screens/live_care/video_call.dart +++ b/lib/screens/live_care/video_call.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:doctor_app_flutter/models/livecare/get_pending_res_list.dart'; import 'package:doctor_app_flutter/models/livecare/session_status_model.dart'; import 'package:doctor_app_flutter/models/livecare/start_call_res.dart'; -import 'package:doctor_app_flutter/providers/livecare_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/livecare_view_model.dart'; import 'package:doctor_app_flutter/screens/live_care/panding_list.dart'; import 'package:doctor_app_flutter/util/VideoChannel.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; @@ -30,7 +30,7 @@ class _VideoCallPageState extends State { Timer _timmerInstance; int _start = 0; String _timmer = ''; - LiveCareProvider _liveCareProvider; + LiveCareViewModel _liveCareProvider; bool _isInit = true; var _tokenData; bool isTransfer = false; @@ -43,7 +43,7 @@ class _VideoCallPageState extends State { void didChangeDependencies() { super.didChangeDependencies(); if (_isInit) { - _liveCareProvider = Provider.of(context); + _liveCareProvider = Provider.of(context); startCall(false); } _isInit = false; diff --git a/lib/screens/medicine/pharmacies_list_screen.dart b/lib/screens/medicine/pharmacies_list_screen.dart index d55916b2..6057bf23 100644 --- a/lib/screens/medicine/pharmacies_list_screen.dart +++ b/lib/screens/medicine/pharmacies_list_screen.dart @@ -3,7 +3,7 @@ import 'dart:typed_data'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/viewModel/medicine_view_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; diff --git a/lib/screens/patients/patient_search_screen.dart b/lib/screens/patients/patient_search_screen.dart index 44420140..204d2336 100644 --- a/lib/screens/patients/patient_search_screen.dart +++ b/lib/screens/patients/patient_search_screen.dart @@ -1,7 +1,7 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 8f092701..4ca3e587 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -13,7 +13,7 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart'; import 'package:doctor_app_flutter/models/patient/patient_model.dart'; import 'package:doctor_app_flutter/models/patient/topten_users_res_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; diff --git a/lib/screens/settings/settings_screen.dart b/lib/screens/settings/settings_screen.dart index 631d639e..79cd827e 100644 --- a/lib/screens/settings/settings_screen.dart +++ b/lib/screens/settings/settings_screen.dart @@ -1,5 +1,5 @@ -import 'package:doctor_app_flutter/providers/project_provider.dart'; -import 'package:doctor_app_flutter/providers/hospital_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/hospital_view_model.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart'; diff --git a/lib/widgets/auth/known_user_login.dart b/lib/widgets/auth/known_user_login.dart index a3330285..4df37d66 100644 --- a/lib/widgets/auth/known_user_login.dart +++ b/lib/widgets/auth/known_user_login.dart @@ -8,7 +8,7 @@ import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; import '../../config/size_config.dart'; -import '../../providers/auth_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_toast_msg.dart'; @@ -69,7 +69,7 @@ class _KnownUserLoginState extends State { @override Widget build(BuildContext context) { - AuthProvider authProv = Provider.of(context); + AuthViewModel authProv = Provider.of(context); var imeiModel = {'IMEI': _platformImei}; _loginTypeFuture = authProv.selectDeviceImei(imeiModel); return FutureBuilder( diff --git a/lib/widgets/auth/login_form.dart b/lib/widgets/auth/login_form.dart index dbdb853d..8cf5f3d4 100644 --- a/lib/widgets/auth/login_form.dart +++ b/lib/widgets/auth/login_form.dart @@ -10,8 +10,8 @@ import 'package:provider/provider.dart'; import '../../config/shared_pref_kay.dart'; import '../../config/size_config.dart'; import '../../models/doctor/user_model.dart'; -import '../../providers/auth_provider.dart'; -import '../../providers/hospital_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; +import '../../core/viewModel/hospital_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_toast_msg.dart'; @@ -51,7 +51,7 @@ class _LoginFormState extends State { channel: 9, sessionID: "i1UJwCTSqt"); - AuthProvider authProv; + AuthViewModel authProv; @override void initState() { super.initState(); @@ -61,7 +61,7 @@ class _LoginFormState extends State { @override void didChangeDependencies() { super.didChangeDependencies(); - authProv = Provider.of(context); + authProv = Provider.of(context); if (_isInit) { if (projectsList.length == 0) { @@ -222,7 +222,7 @@ class _LoginFormState extends State { ); } - login(context, AuthProvider authProv, Function changeLoadingStata) { + login(context, AuthViewModel authProv, Function changeLoadingStata) { FocusScopeNode currentFocus = FocusScope.of(context); // if (!currentFocus.hasPrimaryFocus) { @@ -258,7 +258,7 @@ class _LoginFormState extends State { } } - insertDeviceImei(preRes, AuthProvider authProv) { + insertDeviceImei(preRes, AuthViewModel authProv) { if (_platformImei != 'Unknown') { var imeiInfo = { "IMEI": _platformImei, @@ -323,7 +323,7 @@ class _LoginFormState extends State { } getProjectsList() { - HospitalProvider projectsProv = Provider.of(context); + HospitalViewModel projectsProv = Provider.of(context); projectsProv.getProjectsList().then((res) { if (res['MessageStatus'] == 1) { setState(() { diff --git a/lib/widgets/auth/show_timer_text.dart b/lib/widgets/auth/show_timer_text.dart index 73590e1e..fd09ec25 100644 --- a/lib/widgets/auth/show_timer_text.dart +++ b/lib/widgets/auth/show_timer_text.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:flutter/material.dart'; @@ -24,7 +24,7 @@ class _ShowTimerTextState extends State { int sec = 59; Timer _timer; - AuthProvider authProv; + AuthViewModel authProv; resendCode() { min = TIMER_MIN - 1; @@ -64,7 +64,7 @@ class _ShowTimerTextState extends State { @override Widget build(BuildContext context) { - authProv = Provider.of(context); + authProv = Provider.of(context); return Center( child: Row( mainAxisAlignment: MainAxisAlignment.center, diff --git a/lib/widgets/auth/verfiy_account.dart b/lib/widgets/auth/verfiy_account.dart index b4b5e31b..43e9e988 100644 --- a/lib/widgets/auth/verfiy_account.dart +++ b/lib/widgets/auth/verfiy_account.dart @@ -10,7 +10,7 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import '../../config/size_config.dart'; -import '../../providers/auth_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/dr_app_toast_msg.dart'; @@ -40,7 +40,7 @@ class _VerifyAccountState extends State { }; Future _loggedUserFuture; var _loggedUser; - AuthProvider authProv; + AuthViewModel authProv; bool _isInit = true; var model; TextEditingController digit1 = TextEditingController(text: ""); @@ -64,7 +64,7 @@ class _VerifyAccountState extends State { void didChangeDependencies() { super.didChangeDependencies(); if (_isInit) { - authProv = Provider.of(context); + authProv = Provider.of(context); final routeArgs = ModalRoute.of(context).settings.arguments as Map; model = routeArgs['model']; } @@ -73,7 +73,7 @@ class _VerifyAccountState extends State { @override Widget build(BuildContext context) { - authProv = Provider.of(context); + authProv = Provider.of(context); final focusD1 = FocusNode(); final focusD2 = FocusNode(); final focusD3 = FocusNode(); @@ -335,7 +335,7 @@ class _VerifyAccountState extends State { *@return: *@desc: verify Account func call sendActivationCodeByOtpNotificationType service */ - verifyAccount(AuthProvider authProv, Function changeLoadingStata) async { + verifyAccount(AuthViewModel authProv, Function changeLoadingStata) async { if (verifyAccountForm.currentState.validate()) { changeLoadingStata(true); diff --git a/lib/widgets/auth/verification_methods.dart b/lib/widgets/auth/verification_methods.dart index 22fc5779..2102a125 100644 --- a/lib/widgets/auth/verification_methods.dart +++ b/lib/widgets/auth/verification_methods.dart @@ -6,7 +6,7 @@ import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart'; import '../../config/size_config.dart'; -import '../../providers/auth_provider.dart'; +import '../../core/viewModel/auth_view_model.dart'; import '../../routes.dart'; import '../../util/dr_app_shared_pref.dart'; import '../../util/helpers.dart'; @@ -57,7 +57,7 @@ class _VerificationMethodsState extends State { @override Widget build(BuildContext context) { - AuthProvider authProv = Provider.of(context); + AuthViewModel authProv = Provider.of(context); return FutureBuilder( future: Future.wait([_loggedUserFuture]), builder: (BuildContext context, AsyncSnapshot snapshot) { @@ -145,7 +145,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: buildSMSMethod Methods widget */ - Center buildSMSMethod(BuildContext context, AuthProvider authProv) { + Center buildSMSMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_sms_icon.png', @@ -161,7 +161,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: build WhatsApp Methods widget */ - Center buildWhatsAppMethod(BuildContext context, AuthProvider authProv) { + Center buildWhatsAppMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_whatsapp_icon.png', @@ -177,7 +177,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: build FaceID Methods widget */ - Center buildFaceIDMethod(BuildContext context, AuthProvider authProv) { + Center buildFaceIDMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_faceid_icon.png', @@ -193,7 +193,7 @@ class _VerificationMethodsState extends State { *@return: Center widget *@desc: build Fingerprint Methods widget */ - Center buildFingerprintMethod(BuildContext context, AuthProvider authProv) { + Center buildFingerprintMethod(BuildContext context, AuthViewModel authProv) { return buildVerificationMethod( context, 'assets/images/verification_fingerprint_icon.png', @@ -262,7 +262,7 @@ class _VerificationMethodsState extends State { *@return: *@desc: send Activation Code By Otp Notification Type */ - sendActivationCodeByOtpNotificationType(oTPSendType, AuthProvider authProv) { + sendActivationCodeByOtpNotificationType(oTPSendType, AuthViewModel authProv) { // TODO : build enum for verfication method if (oTPSendType == 1 || oTPSendType == 2) { widget.changeLoadingStata(true); diff --git a/lib/widgets/dashboard/dashboard_item_texts_widget.dart b/lib/widgets/dashboard/dashboard_item_texts_widget.dart index cd52e064..c3e4986d 100644 --- a/lib/widgets/dashboard/dashboard_item_texts_widget.dart +++ b/lib/widgets/dashboard/dashboard_item_texts_widget.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:provider/provider.dart'; import '../shared/rounded_container_widget.dart'; diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index e899d6e8..4ff72904 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; -import 'package:doctor_app_flutter/providers/auth_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/auth_view_model.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:flutter/material.dart'; @@ -40,7 +40,7 @@ class _AppDrawerState extends State { @override Widget build(BuildContext context) { - AuthProvider authProvider = Provider.of(context); + AuthViewModel authProvider = Provider.of(context); return RoundedContainer( child: Container( color: Colors.white, diff --git a/lib/widgets/shared/app_scaffold_widget.dart b/lib/widgets/shared/app_scaffold_widget.dart index 290d18cd..eb61ce30 100644 --- a/lib/widgets/shared/app_scaffold_widget.dart +++ b/lib/widgets/shared/app_scaffold_widget.dart @@ -1,6 +1,6 @@ import 'package:doctor_app_flutter/config/config.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/routes.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/widgets/shared/card_with_bgNew_widget.dart b/lib/widgets/shared/card_with_bgNew_widget.dart index 3c4f3fa4..628a1eb4 100644 --- a/lib/widgets/shared/card_with_bgNew_widget.dart +++ b/lib/widgets/shared/card_with_bgNew_widget.dart @@ -1,5 +1,5 @@ import 'package:doctor_app_flutter/config/size_config.dart'; -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/widgets/shared/rounded_container_widget.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; diff --git a/lib/widgets/shared/card_with_bg_widget.dart b/lib/widgets/shared/card_with_bg_widget.dart index a6bbec60..e3110cde 100644 --- a/lib/widgets/shared/card_with_bg_widget.dart +++ b/lib/widgets/shared/card_with_bg_widget.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/providers/project_provider.dart'; +import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:flutter/material.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:provider/provider.dart';