From 2f454055b90ffea1cbc5a348fcf5d56e4ca351fd Mon Sep 17 00:00:00 2001 From: Sultan Khan Date: Sun, 22 Nov 2020 12:02:36 +0300 Subject: [PATCH] login fixed --- lib/main.dart | 1 - lib/pages/landing/landing_page.dart | 9 +++----- lib/pages/login/confirm-login.dart | 21 +++++++++++++++++-- lib/pages/settings/general_setting.dart | 19 ++++++++++++----- .../authentication/auth_provider.dart | 1 + .../permission/permission_service.dart | 1 + pubspec.yaml | 1 + 7 files changed, 39 insertions(+), 14 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index e6fc0bfa..f44411a0 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -24,7 +24,6 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - final themeNotifier = Provider.of(context); return LayoutBuilder( builder: (context, constraints) { return OrientationBuilder( diff --git a/lib/pages/landing/landing_page.dart b/lib/pages/landing/landing_page.dart index 7879ab0d..346b8ae8 100644 --- a/lib/pages/landing/landing_page.dart +++ b/lib/pages/landing/landing_page.dart @@ -363,8 +363,8 @@ class _LandingPageState extends State with WidgetsBindingObserver { ), notificationCount != '' ? new Positioned( - right: 0, - top: 10, + right: projectViewModel.isArabic ? 35 : 0, + top: 5, child: new Container( padding: EdgeInsets.all(4), decoration: new BoxDecoration( @@ -379,7 +379,7 @@ class _LandingPageState extends State with WidgetsBindingObserver { notificationCount, style: new TextStyle( color: Colors.white, - fontSize: 9, + fontSize: projectViewModel.isArabic ? 8 : 9, ), textAlign: TextAlign.center, ), @@ -485,9 +485,6 @@ class _LandingPageState extends State with WidgetsBindingObserver { static Future myBackgroundMessageHandler( Map message) async { Map myMap = new Map.from(message['data']); - print(myMap); - - print("myBackgroundMessageHandler Out"); if (message.containsKey('data')) { print("myBackgroundMessageHandler Inside"); LandingPage.incomingCallData = IncomingCallData.fromJson(myMap); diff --git a/lib/pages/login/confirm-login.dart b/lib/pages/login/confirm-login.dart index 94778902..e016776e 100644 --- a/lib/pages/login/confirm-login.dart +++ b/lib/pages/login/confirm-login.dart @@ -1,5 +1,9 @@ import 'package:diplomaticquarterapp/config/shared_pref_kay.dart'; import 'package:diplomaticquarterapp/config/size_config.dart'; +import 'package:diplomaticquarterapp/core/service/AuthenticatedUserObject.dart'; +import 'package:diplomaticquarterapp/core/viewModels/appointment_rate_view_model.dart'; +import 'package:diplomaticquarterapp/core/viewModels/project_view_model.dart'; +import 'package:diplomaticquarterapp/locator.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_activation_code_response.dart'; import 'package:diplomaticquarterapp/models/Authentication/check_paitent_authentication_req.dart'; import 'package:diplomaticquarterapp/models/Authentication/select_device_imei_res.dart'; @@ -21,6 +25,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:intl/intl.dart'; import 'package:local_auth/local_auth.dart'; +import 'package:provider/provider.dart'; import 'package:smart_progress_bar/smart_progress_bar.dart'; class ConfirmLogin extends StatefulWidget { @@ -63,6 +68,13 @@ class _ConfirmLogin extends State { int fingrePrintBefore; + AuthenticatedUserObject authenticatedUserObject = + locator(); + AppointmentRateViewModel appointmentRateViewModel = + locator(); + ProjectViewModel projectViewModel; + + @override void initState() { _getAvailableBiometrics(); @@ -72,6 +84,7 @@ class _ConfirmLogin extends State { @override Widget build(BuildContext context) { + projectViewModel = Provider.of(context); return AppScaffold( appBarTitle: TranslationBase.of(context).confirm, isShowAppBar: true, @@ -447,7 +460,7 @@ class _ConfirmLogin extends State { this.deviceToken = await sharedPref.getString(PUSH_TOKEN); this.lastLogin = await sharedPref.getInt(LAST_LOGIN) != null ? await sharedPref.getInt(LAST_LOGIN) - : user.logInType; + : user.logInType !=null ? user.logInType : null; //this.cs.sharedService.getStorage(AuthenticationService.LAST_LOGIN); } @@ -501,6 +514,7 @@ class _ConfirmLogin extends State { .then((result) => { if (result is Map) { + result = CheckActivationCode.fromJson(result), if (this.registerd_data != null && this.registerd_data.isRegister == true) @@ -555,7 +569,10 @@ class _ConfirmLogin extends State { } goToHome() { - // authService.insertDeviceImei().then((value) => print(value)); + + authenticatedUserObject.isLogin = true; + appointmentRateViewModel.isLogin = true; + projectViewModel.isLogin = true; Navigator.of(context).pushNamed(HOME); } diff --git a/lib/pages/settings/general_setting.dart b/lib/pages/settings/general_setting.dart index 05e02a86..7085150a 100644 --- a/lib/pages/settings/general_setting.dart +++ b/lib/pages/settings/general_setting.dart @@ -21,11 +21,12 @@ class _GeneralSettings extends State var themeNotifier; int blindValue = 0; bool vibration =false; - bool accessibility =false; + bool accsibility =false; bool camera =false; bool location =false; var sharedPref = new AppSharedPreferences(); var permission = new PermissionService(); + var mediaQueryData; @override void initState() { getValues(); @@ -34,8 +35,8 @@ class _GeneralSettings extends State Widget build(BuildContext context) { - - themeNotifier = Provider.of(context); + mediaQueryData = MediaQuery.of(context); + themeNotifier = Provider.of(context); return Container( child: ListView(scrollDirection: Axis.vertical, children: [ Container( @@ -75,11 +76,12 @@ class _GeneralSettings extends State children: [ AppText(TranslationBase.of(context).accessibility), Switch( - value: accessibility, + value: accsibility, onChanged: (value) { setState(() { - accessibility = value; + accsibility = value; }); + //setAccisibility(value); }, activeTrackColor: Colors.lightGreenAccent, activeColor: Colors.green, @@ -300,9 +302,16 @@ class _GeneralSettings extends State permission.setVibrationPermission(value); } + setAccisibility(){ + if(!accsibility){ + + } + // permission.setVibrationPermission(value); + } getValues() async{ blindValue= permission.isThemeEnabled() == null ? 0 : permission.isThemeEnabled(); vibration = permission.isVibrationEnabled() ==null ? false : permission.isVibrationEnabled(); + accsibility =mediaQueryData.accessibleNavigation; } getTheme(value) async{ if(value ==1){ diff --git a/lib/services/authentication/auth_provider.dart b/lib/services/authentication/auth_provider.dart index 1e5e4ad2..a8517a1e 100644 --- a/lib/services/authentication/auth_provider.dart +++ b/lib/services/authentication/auth_provider.dart @@ -236,6 +236,7 @@ class AuthProvider with ChangeNotifier { neRequest.patientOutSA = neRequest.zipCode == '966' ? 0 : 1; neRequest.projectOutSA = neRequest.zipCode == '966' ? false : true; neRequest.isDentalAllowedBackend = false; + neRequest.deviceToken = null; neRequest.forRegisteration = neRequest.isRegister != null ? neRequest.isRegister : false; neRequest.isRegister = false; diff --git a/lib/services/permission/permission_service.dart b/lib/services/permission/permission_service.dart index 281ec14c..6f01f3c8 100644 --- a/lib/services/permission/permission_service.dart +++ b/lib/services/permission/permission_service.dart @@ -35,4 +35,5 @@ class PermissionService extends BaseService { isThemeEnabled() { return storage.getItem('isTheme'); } + } diff --git a/pubspec.yaml b/pubspec.yaml index 05097ec5..875fd8b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -46,6 +46,7 @@ dependencies: shared_preferences: ^0.5.8 flutter_flexible_toast: ^0.1.4 firebase_messaging: ^7.0.0 + android_intent: ^0.3.7+7 # Progress bar progress_hud_v2: ^2.0.0 percent_indicator: ^2.1.5