From 53791f1028fb43dd179ce80f39620c6998feb62a Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Wed, 5 May 2021 12:48:36 +0300 Subject: [PATCH] change imei to authentication --- ...auth_service.dart => authentication_service.dart} | 2 +- ...iew_model.dart => authentication_view_model.dart} | 6 +++--- lib/locator.dart | 8 ++++---- lib/screens/auth/login_screen.dart | 12 ++++++------ lib/screens/auth/verification_methods_screen.dart | 4 ++-- lib/screens/home/home_screen.dart | 4 ++-- lib/widgets/auth/verification_methods.dart | 4 ++-- 7 files changed, 20 insertions(+), 20 deletions(-) rename lib/core/service/{auth_service.dart => authentication_service.dart} (99%) rename lib/core/viewModel/{imei_view_model.dart => authentication_view_model.dart} (96%) diff --git a/lib/core/service/auth_service.dart b/lib/core/service/authentication_service.dart similarity index 99% rename from lib/core/service/auth_service.dart rename to lib/core/service/authentication_service.dart index ec7c2615..59d8e34a 100644 --- a/lib/core/service/auth_service.dart +++ b/lib/core/service/authentication_service.dart @@ -10,7 +10,7 @@ import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart'; import 'package:provider/provider.dart'; -class AuthService extends BaseService { +class AuthenticationService extends BaseService { List _imeiDetails = []; List get dashboardItemsList => _imeiDetails; //TODO Change this to models diff --git a/lib/core/viewModel/imei_view_model.dart b/lib/core/viewModel/authentication_view_model.dart similarity index 96% rename from lib/core/viewModel/imei_view_model.dart rename to lib/core/viewModel/authentication_view_model.dart index 90fb3578..54a06c04 100644 --- a/lib/core/viewModel/imei_view_model.dart +++ b/lib/core/viewModel/authentication_view_model.dart @@ -5,7 +5,7 @@ import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_request_mo import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart'; import 'package:doctor_app_flutter/core/model/imei_details.dart'; import 'package:doctor_app_flutter/core/model/insert_imei_model.dart'; -import 'package:doctor_app_flutter/core/service/auth_service.dart'; +import 'package:doctor_app_flutter/core/service/authentication_service.dart'; import 'package:doctor_app_flutter/core/service/hospitals/hospitals_service.dart'; import 'package:doctor_app_flutter/core/viewModel/base_view_model.dart'; import 'package:doctor_app_flutter/locator.dart'; @@ -14,8 +14,8 @@ import 'package:doctor_app_flutter/models/auth/activation_code_for_verification_ import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart'; -class IMEIViewModel extends BaseViewModel { - AuthService _authService = locator(); +class AuthenticationViewModel extends BaseViewModel { + AuthenticationService _authService = locator(); HospitalsService _hospitalsService = locator(); List get imeiDetails => _authService.dashboardItemsList; diff --git a/lib/locator.dart b/lib/locator.dart index d0d76ea3..3032c49d 100644 --- a/lib/locator.dart +++ b/lib/locator.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/core/service/auth_service.dart'; +import 'package:doctor_app_flutter/core/service/authentication_service.dart'; import 'package:doctor_app_flutter/core/service/dasboard_service.dart'; import 'package:doctor_app_flutter/core/service/medical_file_service.dart'; import 'package:doctor_app_flutter/core/service/patient_service.dart'; @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/service/procedure_service.dart'; import 'package:doctor_app_flutter/core/service/sickleave_service.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/hospitals_view_model.dart'; -import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/medical_file_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/patient_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/prescription_view_model.dart'; @@ -75,7 +75,7 @@ void setupLocator() { locator.registerLazySingleton(() => MedicalFileService()); locator.registerLazySingleton(() => AdmissionRequestService()); locator.registerLazySingleton(() => UcafService()); - locator.registerLazySingleton(() => AuthService()); + locator.registerLazySingleton(() => AuthenticationService()); locator.registerLazySingleton(() => PatientMuseService()); locator.registerLazySingleton(() => LabsService()); locator.registerLazySingleton(() => InsuranceCardService()); @@ -90,7 +90,7 @@ void setupLocator() { /// View Model locator.registerFactory(() => DoctorReplayViewModel()); - locator.registerFactory(() => IMEIViewModel()); + locator.registerFactory(() => AuthenticationViewModel()); locator.registerFactory(() => ScheduleViewModel()); locator.registerFactory(() => ReferralPatientViewModel()); locator.registerFactory(() => ReferredPatientViewModel()); diff --git a/lib/screens/auth/login_screen.dart b/lib/screens/auth/login_screen.dart index 5e069a2a..707e178c 100644 --- a/lib/screens/auth/login_screen.dart +++ b/lib/screens/auth/login_screen.dart @@ -6,8 +6,8 @@ import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/hospitals/get_hospitals_response_model.dart'; -import 'package:doctor_app_flutter/core/service/auth_service.dart'; -import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; +import 'package:doctor_app_flutter/core/service/authentication_service.dart'; +import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/doctor/user_model.dart'; import 'package:doctor_app_flutter/screens/auth/verification_methods_screen.dart'; @@ -42,7 +42,7 @@ class _LoginsreenState extends State { final FirebaseMessaging _firebaseMessaging = FirebaseMessaging(); bool _isLoading = true; ProjectViewModel projectViewModel; - AuthService authService = AuthService(); + AuthenticationService authService = AuthenticationService(); //TODO change AppTextFormField to AppTextFormFieldCustom final loginFormKey = GlobalKey(); @@ -99,7 +99,7 @@ class _LoginsreenState extends State { projectViewModel = Provider.of(context); - return BaseView( + return BaseView( onModelReady: (model) => {}, builder: (_, model, w) => AppScaffold( @@ -452,7 +452,7 @@ class _LoginsreenState extends State { } login(context, - IMEIViewModel model,) async { + AuthenticationViewModel model,) async { if (loginFormKey.currentState.validate()) { loginFormKey.currentState.save(); GifLoaderDialogUtils.showMyDialog(context); @@ -499,7 +499,7 @@ class _LoginsreenState extends State { primaryFocus.unfocus(); } - getProjects(memberID, IMEIViewModel model)async { + getProjects(memberID, AuthenticationViewModel model)async { if (memberID != null && memberID != '') { if (projectsList.length == 0) { await model.getHospitalsList(memberID); diff --git a/lib/screens/auth/verification_methods_screen.dart b/lib/screens/auth/verification_methods_screen.dart index a83db25c..3d44d726 100644 --- a/lib/screens/auth/verification_methods_screen.dart +++ b/lib/screens/auth/verification_methods_screen.dart @@ -1,4 +1,4 @@ -import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/screens/base/base_view.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; import 'package:flutter/material.dart'; @@ -27,7 +27,7 @@ class _VerificationMethodsScreenState extends State { @override Widget build(BuildContext context) { - return BaseView( + return BaseView( onModelReady: (model) async {}, builder: (_, model, w) => AppScaffold( isLoading: _isLoading, diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index b3f79761..dad2460d 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -7,7 +7,7 @@ import 'package:doctor_app_flutter/core/model/PatientSearchRequestModel.dart'; import 'package:doctor_app_flutter/core/viewModel/doctor_profile_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/dashboard_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/hospitals_view_model.dart'; -import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; 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/models/dashboard/dashboard_model.dart'; @@ -75,7 +75,7 @@ class _HomeScreenState extends State { var clinicId; var _patientSearchFormValues; - IMEIViewModel _IMEIViewModel = locator(); + AuthenticationViewModel _IMEIViewModel = locator(); void didChangeDependencies() async { diff --git a/lib/widgets/auth/verification_methods.dart b/lib/widgets/auth/verification_methods.dart index 67252c6b..7e268b06 100644 --- a/lib/widgets/auth/verification_methods.dart +++ b/lib/widgets/auth/verification_methods.dart @@ -3,7 +3,7 @@ import 'dart:io' show Platform; import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/core/enum/viewstate.dart'; import 'package:doctor_app_flutter/core/model/imei_details.dart'; -import 'package:doctor_app_flutter/core/viewModel/imei_view_model.dart'; +import 'package:doctor_app_flutter/core/viewModel/authentication_view_model.dart'; import 'package:doctor_app_flutter/core/viewModel/project_view_model.dart'; import 'package:doctor_app_flutter/models/auth/activation_Code_req_model.dart'; import 'package:doctor_app_flutter/models/auth/check_activation_code_request_model.dart'; @@ -42,7 +42,7 @@ class VerificationMethods extends StatefulWidget { final password; final Function changeLoadingState; - final IMEIViewModel model; + final AuthenticationViewModel model; @override _VerificationMethodsState createState() => _VerificationMethodsState();