From 00aa2c3752065d71fcb6892d34cab9a9d80aaffa Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Tue, 1 Jun 2021 14:34:10 +0300 Subject: [PATCH] fix homepage screen --- .../viewModel/authentication_view_model.dart | 26 +++++++---------- lib/widgets/auth/method_type_card.dart | 18 ++++-------- lib/widgets/dashboard/activity_card.dart | 5 ++-- lib/widgets/shared/app_drawer_widget.dart | 29 ++----------------- 4 files changed, 22 insertions(+), 56 deletions(-) diff --git a/lib/core/viewModel/authentication_view_model.dart b/lib/core/viewModel/authentication_view_model.dart index 4a6d105c..87ba86f5 100644 --- a/lib/core/viewModel/authentication_view_model.dart +++ b/lib/core/viewModel/authentication_view_model.dart @@ -22,13 +22,10 @@ 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/models/doctor/user_model.dart'; -import 'package:doctor_app_flutter/root_page.dart'; import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; -import 'package:doctor_app_flutter/widgets/transitions/fade_page.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:local_auth/auth_strings.dart'; import 'package:local_auth/local_auth.dart'; @@ -299,8 +296,7 @@ class AuthenticationViewModel extends BaseViewModel { clinicID: clinicInfo.clinicID, license: true, projectID: clinicInfo.projectID, - tokenID: '', - languageID: 2);//TODO change the lan + tokenID: '',); await _authService.getDoctorProfileBasedOnClinic(docInfo); if (_authService.hasError) { error = _authService.error; @@ -419,18 +415,16 @@ class AuthenticationViewModel extends BaseViewModel { logout({bool isFromLogin = false}) async { DEVICE_TOKEN = ""; - String lang = await sharedPref.getString(APP_Language); + String lang = await sharedPref.getString(APP_Language); - await Helpers.clearSharedPref(); - doctorProfile = null; - sharedPref.setString(APP_Language, lang); - deleteUser(); - await getDeviceInfoFromFirebase(); - - - this.isFromLogin = isFromLogin; - app_status = APP_STATUS.UNAUTHENTICATED; - setState(ViewState.Idle); + await Helpers.clearSharedPref(); + doctorProfile = null; + sharedPref.setString(APP_Language, lang); + deleteUser(); + await getDeviceInfoFromFirebase(); + this.isFromLogin = isFromLogin; + app_status = APP_STATUS.UNAUTHENTICATED; + setState(ViewState.Idle); } deleteUser(){ diff --git a/lib/widgets/auth/method_type_card.dart b/lib/widgets/auth/method_type_card.dart index d7c9a2e0..d02d8dc7 100644 --- a/lib/widgets/auth/method_type_card.dart +++ b/lib/widgets/auth/method_type_card.dart @@ -35,19 +35,13 @@ class MethodTypeCard extends StatelessWidget { child: Center( child: Column( mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Image.asset( - assetPath, - width: SizeConfig.widthMultiplier* 12, - height: cardHeight * 0.35, - // height: , - ), - ], + Image.asset( + assetPath, + width: SizeConfig.widthMultiplier* 12, + height: cardHeight * 0.35, + // height: , ), SizedBox( height:height , diff --git a/lib/widgets/dashboard/activity_card.dart b/lib/widgets/dashboard/activity_card.dart index 5181de42..e3c1fe8f 100644 --- a/lib/widgets/dashboard/activity_card.dart +++ b/lib/widgets/dashboard/activity_card.dart @@ -10,9 +10,10 @@ class GetActivityCard extends StatelessWidget { @override Widget build(BuildContext context) { return Container( + //TODO change it to make it depend on width width: MediaQuery.of(context).size.height * 0.125, - padding: EdgeInsets.all(5), - margin: EdgeInsets.all(5), + padding: EdgeInsets.all(SizeConfig.heightMultiplier * .3), + margin: EdgeInsets.all(SizeConfig.heightMultiplier * .5), decoration: BoxDecoration( color: Colors.white, borderRadius: BorderRadius.circular(15), diff --git a/lib/widgets/shared/app_drawer_widget.dart b/lib/widgets/shared/app_drawer_widget.dart index 4bc783ac..3145da2d 100644 --- a/lib/widgets/shared/app_drawer_widget.dart +++ b/lib/widgets/shared/app_drawer_widget.dart @@ -51,7 +51,7 @@ class _AppDrawerState extends State { child: Image.asset( 'assets/images/dr_app_logo.png', width: SizeConfig.getWidthMultiplier( - width: drawerWidth) * (SizeConfig.isHeightShort? 30: 35), + width: drawerWidth) * (SizeConfig.isHeightShort? 30: 32), ), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?1:2), bottom: SizeConfig.heightMultiplier * 0.5), @@ -63,7 +63,7 @@ class _AppDrawerState extends State { }, child: Icon( DoctorApp.close_1, - size: SizeConfig.heightMultiplier * 3, + size: SizeConfig.heightMultiplier * 2, ), ), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?2:3), bottom: SizeConfig.heightMultiplier * 0.5), @@ -163,7 +163,7 @@ class _AppDrawerState extends State { ), ), SizedBox( - height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?5:9), + height: SizeConfig.heightMultiplier *(SizeConfig.isHeightShort?10:16), ), Container( margin: EdgeInsets.symmetric(horizontal: 20), @@ -203,31 +203,8 @@ class _AppDrawerState extends State { ), onTap: () async { - try { - Navigator.pop(context); - //GifLoaderDialogUtils.showMyDialog(context); await authenticationViewModel.logout(isFromLogin: false); - // GifLoaderDialogUtils.hideDialog(context); - - - } - - catch (err) { - - // show the dialog - showDialog( - context: context, - builder: (BuildContext context) { - return AlertDialog( - content: Text(err.toString()), - ); - }, - ); - - // code for handling exception - } - }, ), ],