Merge issue fixed

lib/classes/utils.dart

@@ -7,7 +7,7 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:fluttertoast/fluttertoast.dart';
-import 'package:hmg_nurses/app_state/app_state.dart';
+import 'package:hmg_nurses/config/app_state.dart';
 import 'package:hmg_nurses/classes/colors.dart';
 import 'package:hmg_nurses/config/routes.dart';
 import 'package:hmg_nurses/exceptions/api_exception.dart';

lib/config/dependencies.dart

@@ -1,8 +1,9 @@
 // import 'package:firebase_crashlytics/firebase_crashlytics.dart';
 // import 'package:flutter/material.dart';
-import 'package:hmg_nurses/app_state/app_state.dart';
+import 'package:hmg_nurses/config/app_state.dart';
 import 'package:hmg_nurses/services/api_client.dart';
-import 'package:hmg_nurses/api_repo/login_api_repo.dart';
+import 'package:hmg_nurses/services/api_repo/login_api_repo.dart';
+
 import 'package:hmg_nurses/services/firebase_service.dart';
 import 'package:injector/injector.dart';
 

lib/config/routes.dart

@@ -4,6 +4,9 @@ import 'package:hmg_nurses/ui/login/login_page.dart';
 import 'package:hmg_nurses/ui/login/splash_page.dart';
 
 class AppRoutes {
+
+  static const String initialPage =login;
+
   //Login
   static const String splash = "/splash";
   static const String registerSelection = "/registerSelection";

lib/dependency_injection.dart

@@ -1,18 +0,0 @@
-import 'package:get_it/get_it.dart';
-import 'package:hmg_nurses/ui/login/login_vm.dart';
-
-GetIt getIt = GetIt.instance;
-
-
-void initDependencies () {
-  // TODO; WE WILL REGISTER ALL THE SERVICES HERE AS LAZY SINGLETON
-
-
-
-  //TODO: WE WILL REGISTER ALL THE VIEW MODELS AS FACTORY HERE
-
-  /// View Model
-  getIt.registerFactory(() => LoginViewModel());
-
-
-}

lib/main.dart

@@ -3,7 +3,7 @@ import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
-import 'package:hmg_nurses/app_state/app_state.dart';
+import 'package:hmg_nurses/config/app_state.dart';
 import 'package:hmg_nurses/config/dependencies.dart';
 import 'package:hmg_nurses/config/routes.dart';
 import 'package:hmg_nurses/provider/dashboard_provider_model.dart';
@@ -92,7 +92,7 @@ class MyApp extends StatelessWidget {
           localizationsDelegates: delegates,
           supportedLocales: context.supportedLocales,
           locale: context.locale,
-          initialRoute: AppRoutes.splash,
+          initialRoute: AppRoutes.initialPage,
           routes: AppRoutes.routes,
         );
       },

lib/services/api_client.dart

@@ -5,7 +5,7 @@ import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
-import 'package:hmg_nurses/app_state/app_state.dart';
+import 'package:hmg_nurses/config/app_state.dart';
 import 'package:hmg_nurses/exceptions/api_exception.dart';
 import 'package:hmg_nurses/main.dart';
 // ignore_for_file: avoid_annotating_with_dynamic

lib/services/api_repo/login_api_client.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:hmg_nurses/services/api_client.dart';
-import 'package:hmg_nurses/app_state/app_state.dart';
+import 'package:hmg_nurses/config/app_state.dart';
 import 'package:hmg_nurses/classes/consts.dart';
 
 

lib/services/api_repo/login_api_repo.dart

@@ -5,9 +5,10 @@ import 'package:hmg_nurses/services/api_client.dart';
 import 'package:hmg_nurses/classes/consts.dart';
 import 'package:hmg_nurses/model/base/generic_response_model.dart';
 import 'package:hmg_nurses/model/login/imei_details_model.dart';
+import 'package:hmg_nurses/services/firebase_service.dart';
 import 'package:injector/injector.dart';
 
-import '../services/firebase_service.dart';
+
 
 abstract class ILoginApiRepo {
   Future<List<GetIMEIDetailsModel>> getDeviceInfoByIMEI();

lib/ui/login/login_page.dart

@@ -58,7 +58,11 @@ class _LoginPageState extends State<LoginPage> {
                 padding: EdgeInsets.symmetric(horizontal: 8.w),
                 child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
                   buildSpacer20h(),
-                  CustomTextField(LocaleKeys.userID.tr(), userIdController, isEnableBorder: true, ),
+                  CustomTextField(
+                    LocaleKeys.userID.tr(),
+                    userIdController,
+                    isEnableBorder: true,
+                  ),
                   buildSpacer20h(),
                   CustomTextField(LocaleKeys.password.tr(), passwordController, isTextIsPassword: true),
                   buildSpacer20h(),

lib/ui/login/login_vm.dart

@@ -3,11 +3,12 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:hmg_nurses/base/base_vm.dart';
+import 'package:hmg_nurses/provider/base_vm.dart';
 import 'package:hmg_nurses/classes/enums.dart';
 import 'package:hmg_nurses/classes/utils.dart';
-import 'package:hmg_nurses/dialogs/otp_dialog.dart';
+
 import 'package:hmg_nurses/generated/locale_keys.g.dart';
+import 'package:hmg_nurses/widgets/dialogs/otp_dialog.dart';
 import 'package:local_auth/local_auth.dart';
 
 class LoginViewModel extends BaseViewModel {

lib/ui/login/splash_page.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:hmg_nurses/api_repo/login_api_repo.dart';
+import 'package:hmg_nurses/services/api_repo/login_api_repo.dart';
 import 'package:hmg_nurses/services/firebase_service.dart';
 import 'package:injector/injector.dart';
 

pubspec.lock

@@ -210,13 +210,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "8.1.1"
-  get_it:
-    dependency: "direct main"
-    description:
-      name: get_it
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "7.2.0"
   hexcolor:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -50,7 +50,7 @@ dependencies:
   shimmer: ^2.0.0
   sizer: ^2.0.15
   local_auth: ^2.1.2
-  get_it: ^7.2.0
+#  get_it: ^7.2.0
   hexcolor: ^2.0.4