fix homepage screen

login_design_fixes
Elham Rababah 5 years ago
parent 19bac417c4
commit 00aa2c3752

@ -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/doctor_profile_model.dart';
import 'package:doctor_app_flutter/models/doctor/profile_req_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/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/dr_app_toast_msg.dart';
import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/helpers.dart';
import 'package:doctor_app_flutter/util/translations_delegate_base.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:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:local_auth/auth_strings.dart'; import 'package:local_auth/auth_strings.dart';
import 'package:local_auth/local_auth.dart'; import 'package:local_auth/local_auth.dart';
@ -299,8 +296,7 @@ class AuthenticationViewModel extends BaseViewModel {
clinicID: clinicInfo.clinicID, clinicID: clinicInfo.clinicID,
license: true, license: true,
projectID: clinicInfo.projectID, projectID: clinicInfo.projectID,
tokenID: '', tokenID: '',);
languageID: 2);//TODO change the lan
await _authService.getDoctorProfileBasedOnClinic(docInfo); await _authService.getDoctorProfileBasedOnClinic(docInfo);
if (_authService.hasError) { if (_authService.hasError) {
error = _authService.error; error = _authService.error;
@ -419,18 +415,16 @@ class AuthenticationViewModel extends BaseViewModel {
logout({bool isFromLogin = false}) async { logout({bool isFromLogin = false}) async {
DEVICE_TOKEN = ""; DEVICE_TOKEN = "";
String lang = await sharedPref.getString(APP_Language); String lang = await sharedPref.getString(APP_Language);
await Helpers.clearSharedPref(); await Helpers.clearSharedPref();
doctorProfile = null; doctorProfile = null;
sharedPref.setString(APP_Language, lang); sharedPref.setString(APP_Language, lang);
deleteUser(); deleteUser();
await getDeviceInfoFromFirebase(); await getDeviceInfoFromFirebase();
this.isFromLogin = isFromLogin;
app_status = APP_STATUS.UNAUTHENTICATED;
this.isFromLogin = isFromLogin; setState(ViewState.Idle);
app_status = APP_STATUS.UNAUTHENTICATED;
setState(ViewState.Idle);
} }
deleteUser(){ deleteUser(){

@ -35,19 +35,13 @@ class MethodTypeCard extends StatelessWidget {
child: Center( child: Center(
child: Column( child: Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Row( Image.asset(
mainAxisAlignment: MainAxisAlignment.center, assetPath,
crossAxisAlignment: CrossAxisAlignment.center, width: SizeConfig.widthMultiplier* 12,
children: [ height: cardHeight * 0.35,
Image.asset( // height: ,
assetPath,
width: SizeConfig.widthMultiplier* 12,
height: cardHeight * 0.35,
// height: ,
),
],
), ),
SizedBox( SizedBox(
height:height , height:height ,

@ -10,9 +10,10 @@ class GetActivityCard extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Container(
//TODO change it to make it depend on width
width: MediaQuery.of(context).size.height * 0.125, width: MediaQuery.of(context).size.height * 0.125,
padding: EdgeInsets.all(5), padding: EdgeInsets.all(SizeConfig.heightMultiplier * .3),
margin: EdgeInsets.all(5), margin: EdgeInsets.all(SizeConfig.heightMultiplier * .5),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Colors.white, color: Colors.white,
borderRadius: BorderRadius.circular(15), borderRadius: BorderRadius.circular(15),

@ -51,7 +51,7 @@ class _AppDrawerState extends State<AppDrawer> {
child: Image.asset( child: Image.asset(
'assets/images/dr_app_logo.png', 'assets/images/dr_app_logo.png',
width: SizeConfig.getWidthMultiplier( 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), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?1:2), bottom: SizeConfig.heightMultiplier * 0.5),
@ -63,7 +63,7 @@ class _AppDrawerState extends State<AppDrawer> {
}, },
child: Icon( child: Icon(
DoctorApp.close_1, 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), margin: EdgeInsets.only(top: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?2:3), bottom: SizeConfig.heightMultiplier * 0.5),
@ -163,7 +163,7 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
), ),
SizedBox( SizedBox(
height: SizeConfig.heightMultiplier * (SizeConfig.isHeightShort?5:9), height: SizeConfig.heightMultiplier *(SizeConfig.isHeightShort?10:16),
), ),
Container( Container(
margin: EdgeInsets.symmetric(horizontal: 20), margin: EdgeInsets.symmetric(horizontal: 20),
@ -203,31 +203,8 @@ class _AppDrawerState extends State<AppDrawer> {
), ),
onTap: () async { onTap: () async {
try {
Navigator.pop(context); Navigator.pop(context);
//GifLoaderDialogUtils.showMyDialog(context);
await authenticationViewModel.logout(isFromLogin: false); 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
}
}, },
), ),
], ],

Loading…
Cancel
Save