login_design_fixes
Elham Rababah 5 years ago
parent 70020f35c9
commit 8d2252ecdf

@ -415,16 +415,27 @@ class AuthenticationViewModel extends BaseViewModel {
/// logout function
logout({bool isFromLogin = false}) async {
DEVICE_TOKEN = "";
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);
try {
DEVICE_TOKEN = "";
String lang = await sharedPref.getString(APP_Language);
String errr = await sharedPref.getString("LogOut Error");
await Helpers.clearSharedPref();
doctorProfile = null;
sharedPref.setString(APP_Language, lang);
sharedPref.setString("LogOut Error", errr);
deleteUser();
await getDeviceInfoFromFirebase();
this.isFromLogin = isFromLogin;
app_status = APP_STATUS.UNAUTHENTICATED;
setState(ViewState.Idle);
}
catch (e) {
sharedPref.setString("LogOut Error", e);
}
Navigator.pushAndRemoveUntil(
AppGlobal.CONTEX,
FadePage(

@ -13,8 +13,13 @@ import 'landing_page.dart';
class RootPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
AuthenticationViewModel authenticationViewModel = Provider.of(context);
Widget buildRoot() {
sharedPref.getString("LogOut Error").then((error){
});
switch (authenticationViewModel.status) {
case APP_STATUS.LOADING:
return Scaffold(

@ -1,6 +1,6 @@
import 'package:doctor_app_flutter/config/size_config.dart';
import 'package:doctor_app_flutter/models/dashboard/dashboard_model.dart';
import 'package:doctor_app_flutter/widgets/dashboard/activity_button.dart';
import 'package:doctor_app_flutter/widgets/dashboard/activity_card.dart';
import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
import 'package:flutter/material.dart';
@ -24,7 +24,7 @@ class DashboardSliderItemWidget extends StatelessWidget {
],
),
new Container(
height: SizeConfig.heightMultiplier* (SizeConfig.isHeightShort?18:12),
height: SizeConfig.heightMultiplier* (SizeConfig.isHeightShort?15:12),
child: ListView(
scrollDirection: Axis.horizontal,
children:

@ -28,9 +28,10 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
@override
Widget build(BuildContext context) {
double height = SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 40 : 30);
return Container(
height: SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 40 : 30),
height: height,
// height: 230,
child: Swiper(
onIndexChanged: (index) {
@ -42,7 +43,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
}
},
itemBuilder: (BuildContext context, int index) {
return getSwipeWidget(widget.dashboardItemList, index);
return getSwipeWidget(widget.dashboardItemList, index, height);
},
itemCount: 3,
// itemHeight: 300,
@ -85,7 +86,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
);
}
Widget getSwipeWidget(List<DashboardModel> dashboardItemList, int index) {
Widget getSwipeWidget(List<DashboardModel> dashboardItemList, int index, double height) {
if (index == 1)
return RoundedContainer(
raduis: 16,
@ -124,10 +125,16 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
shadowDy: 1,
margin: EdgeInsets.only(top: 15, bottom: 15, left: 10, right: 10),
child:
Column(crossAxisAlignment: CrossAxisAlignment.start, children: [
Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.start,
children: [
Expanded(
flex: 1,
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
flex: 4,
@ -158,44 +165,41 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 5,
fontWeight: FontWeight.bold,
),
SizedBox(
height: SizeConfig.getHeightMultiplier(height: height) * (SizeConfig.isHeightShort?0: 7)
)
],
)),
),),
Expanded(
flex: 1,
child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Expanded(
child: RowCounts(
dashboardItemList[2]
.summaryoptions[0]
.kPIParameter,
dashboardItemList[2]
.summaryoptions[0]
.value,
Colors.black),
),
Expanded(
child: RowCounts(
dashboardItemList[2]
.summaryoptions[1]
.kPIParameter,
dashboardItemList[2]
.summaryoptions[1]
.value,
Colors.grey),
),
Expanded(
child: RowCounts(
dashboardItemList[2]
.summaryoptions[2]
.kPIParameter,
dashboardItemList[2]
.summaryoptions[2]
.value,
Colors.red),
),
RowCounts(
dashboardItemList[2]
.summaryoptions[0]
.kPIParameter,
dashboardItemList[2]
.summaryoptions[0]
.value,
Colors.black),
RowCounts(
dashboardItemList[2]
.summaryoptions[1]
.kPIParameter,
dashboardItemList[2]
.summaryoptions[1]
.value,
Colors.grey),
RowCounts(
dashboardItemList[2]
.summaryoptions[2]
.kPIParameter,
dashboardItemList[2]
.summaryoptions[2]
.value,
Colors.red),
],
),
)
@ -206,6 +210,8 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
flex: 3,
child: Stack(children: [
Container(
padding:EdgeInsets.all(0),
child: GaugeChart(
_createReferralData(widget.dashboardItemList))),
Positioned(
@ -221,7 +227,7 @@ class _DashboardSwipeWidgetState extends State<DashboardSwipeWidget> {
)
],
),
top: MediaQuery.of(context).size.height * 0.13,
top: height * .35,
left: 0,
right: 0)
]),

@ -25,14 +25,14 @@ class GetActivityCard extends StatelessWidget {
children: [
AppText(
value.value.toString(),
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.height * 0.125)* 12,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.height * 0.125)* 25,
fontWeight: FontWeight.bold,
color: Color(0xFF2B353E),
),
AppText(
value.kPIParameter,
textOverflow: TextOverflow.clip,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.height * 0.125)* 12,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth(width: MediaQuery.of(context).size.height * 0.125)* 09,
color: Color(0xFF2B353E),
textAlign: TextAlign.start,
fontWeight: FontWeight.w700,

@ -33,7 +33,7 @@ class RowCounts extends StatelessWidget {
' (' + count.toString() + ')',
color: Colors.black,
textAlign: TextAlign.center,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 2,
fontSize: SizeConfig.getTextMultiplierBasedOnWidth() * 3,
fontWeight: FontWeight.bold,
)
],

@ -203,10 +203,31 @@ class _AppDrawerState extends State<AppDrawer> {
),
onTap: () async {
Navigator.pop(context);
GifLoaderDialogUtils.showMyDialog(context);
await authenticationViewModel.logout(isFromLogin: false);
// GifLoaderDialogUtils.showMyDialog(context);
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
}
},
),
],

@ -35,7 +35,7 @@ class BottomNavigationItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: <Widget>[
SizedBox(height: SizeConfig.getHeightMultiplier(height:SizeConfig.heightMultiplier *
(SizeConfig.isHeightShort ? 10 : 8) ) * 10,),
(SizeConfig.isHeightShort ? 12 : 9) ) * 10,),
Container(
child: Icon(currentIndex == index ? activeIcon : icon,
color: currentIndex == index

Loading…
Cancel
Save