Merge issue fixed

development_mirza
mirza.shafique 3 years ago
parent a0a162df4c
commit 5b155690b1

@ -7,7 +7,7 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:fluttertoast/fluttertoast.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/classes/colors.dart';
import 'package:hmg_nurses/config/routes.dart'; import 'package:hmg_nurses/config/routes.dart';
import 'package:hmg_nurses/exceptions/api_exception.dart'; import 'package:hmg_nurses/exceptions/api_exception.dart';

@ -1,8 +1,9 @@
// import 'package:firebase_crashlytics/firebase_crashlytics.dart'; // import 'package:firebase_crashlytics/firebase_crashlytics.dart';
// import 'package:flutter/material.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/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:hmg_nurses/services/firebase_service.dart';
import 'package:injector/injector.dart'; import 'package:injector/injector.dart';

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

@ -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());
}

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

@ -5,7 +5,7 @@ import 'dart:io';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:http/http.dart'; import 'package:http/http.dart';
import 'package:http/io_client.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/exceptions/api_exception.dart';
import 'package:hmg_nurses/main.dart'; import 'package:hmg_nurses/main.dart';
// ignore_for_file: avoid_annotating_with_dynamic // ignore_for_file: avoid_annotating_with_dynamic

@ -1,7 +1,7 @@
import 'dart:async'; import 'dart:async';
import 'package:hmg_nurses/services/api_client.dart'; 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'; import 'package:hmg_nurses/classes/consts.dart';

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

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

@ -3,11 +3,12 @@ import 'package:flutter/cupertino.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.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/enums.dart';
import 'package:hmg_nurses/classes/utils.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/generated/locale_keys.g.dart';
import 'package:hmg_nurses/widgets/dialogs/otp_dialog.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
class LoginViewModel extends BaseViewModel { class LoginViewModel extends BaseViewModel {

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; 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:hmg_nurses/services/firebase_service.dart';
import 'package:injector/injector.dart'; import 'package:injector/injector.dart';

@ -210,13 +210,6 @@ packages:
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "8.1.1" 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: hexcolor:
dependency: "direct main" dependency: "direct main"
description: description:

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

Loading…
Cancel
Save