fix issues

merge-requests/474/head
Elham Rababh 5 years ago
parent 5a389de93f
commit db96749849

@ -26,8 +26,10 @@ import 'package:diplomaticquarterapp/uitl/gif_loader_dialog_utils.dart';
import 'package:diplomaticquarterapp/uitl/navigation_service.dart'; import 'package:diplomaticquarterapp/uitl/navigation_service.dart';
import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart'; import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
import 'package:diplomaticquarterapp/uitl/utils_new.dart'; import 'package:diplomaticquarterapp/uitl/utils_new.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/pharmacy/bottom_nav_pharmacy_bar.dart'; import 'package:diplomaticquarterapp/widgets/pharmacy/bottom_nav_pharmacy_bar.dart';
import 'package:diplomaticquarterapp/widgets/progress_indicator/app_loader_widget.dart'; import 'package:diplomaticquarterapp/widgets/progress_indicator/app_loader_widget.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
@ -83,7 +85,6 @@ class AppScaffold extends StatefulWidget {
AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>(); AuthenticatedUserObject authenticatedUserObject = locator<AuthenticatedUserObject>();
AppBarWidget appBar;
final ValueChanged<int> changeCurrentTab; final ValueChanged<int> changeCurrentTab;
final Widget customAppBar; final Widget customAppBar;
final int currentTab; final int currentTab;
@ -128,7 +129,7 @@ class AppScaffold extends StatefulWidget {
this.dropdownIndexValue, this.dropdownIndexValue,
this.dropDownIndexChange, this.dropDownIndexChange,
this.onTap, this.onTap,
appBar, this.appBar,
this.customAppBar, this.customAppBar,
this.isLocalLoader = false, this.isLocalLoader = false,
this.backButtonTab, this.backButtonTab,
@ -220,39 +221,39 @@ class _AppScaffoldState extends State<AppScaffold> {
PharmacyPagesViewModel pagesViewModel = Provider.of(context); PharmacyPagesViewModel pagesViewModel = Provider.of(context);
AppGlobal.context = context; AppGlobal.context = context;
bool isUserNotLogin = (!Provider.of<ProjectViewModel>(context, listen: false).isLogin && isShowDecPage); bool isUserNotLogin = (!Provider.of<ProjectViewModel>(context, listen: false).isLogin && widget.isShowDecPage);
return Scaffold( return Scaffold(
backgroundColor: backgroundColor ?? CustomColors.appBackgroudGrey2Color, backgroundColor: widget.backgroundColor ?? CustomColors.appBackgroudGrey2Color,
extendBody: widget.extendBody, extendBody: widget.extendBody,
appBar: isUserNotLogin appBar: isUserNotLogin
? null ? null
: (showNewAppBar : (widget.showNewAppBar
? NewAppBarWidget( ? NewAppBarWidget(
title: appBarTitle, title: widget.appBarTitle,
showTitle: showNewAppBarTitle, showTitle: widget.showNewAppBarTitle,
showDropDown: showDropDown, showDropDown: widget.showDropDown,
dropdownIndexValue: dropdownIndexValue, dropdownIndexValue: widget.dropdownIndexValue,
dropDownList: dropDownList ?? [], dropDownList: widget.dropDownList ?? [],
dropDownIndexChange: dropDownIndexChange, dropDownIndexChange: widget.dropDownIndexChange,
appBarIcons: appBarIcons, appBarIcons: widget.appBarIcons,
onTap: onTap, onTap: widget.onTap,
) )
: widget.isShowPharmacyAppbar : widget.isShowPharmacyAppbar
? pharmacyAppbar() ? pharmacyAppbar()
:(isShowAppBar :(widget.isShowAppBar
? customAppBar != null ? widget.customAppBar != null
? customAppBar ? widget.customAppBar
: appBar = AppBarWidget( : widget.appBar = AppBarWidget(
appBarTitle: appBarTitle, appBarTitle: widget.appBarTitle,
appBarIcons: appBarIcons, appBarIcons: widget.appBarIcons,
showHomeAppBarIcon: showHomeAppBarIcon, showHomeAppBarIcon: widget.showHomeAppBarIcon,
isPharmacy: isPharmacy, isPharmacy:widget.isPharmacy,
showPharmacyCart: showPharmacyCart, showPharmacyCart: widget.showPharmacyCart,
isOfferPackages: isOfferPackages, isOfferPackages:widget.isOfferPackages,
showOfferPackagesCart: showOfferPackagesCart, showOfferPackagesCart: widget.showOfferPackagesCart,
isShowDecPage: isShowDecPage, isShowDecPage: widget.isShowDecPage,
backButtonTab: backButtonTab, backButtonTab: widget.backButtonTab,
) )
: null)), : null)),
bottomSheet: widget.bottomSheet, bottomSheet: widget.bottomSheet,
@ -273,7 +274,7 @@ class _AppScaffoldState extends State<AppScaffold> {
floatingActionButton: widget.floatingActionButton, floatingActionButton: widget.floatingActionButton,
bottomNavigationBar: widget.isBottomBar bottomNavigationBar: widget.isBottomBar
? BottomNavPharmacyBar( ? BottomNavPharmacyBar(
changeIndex: changeCurrentTab, changeIndex: widget.changeCurrentTab,
index: widget.currentTab, index: widget.currentTab,
) )
: null, : null,
@ -309,7 +310,7 @@ class _AppScaffoldState extends State<AppScaffold> {
} }
buildBodyWidget(context) { buildBodyWidget(context) {
return Stack(children: <Widget>[body, isHelp == true ? RobotIcon() : Container()]); return Stack(children: <Widget>[widget.body, widget.isHelp == true ? RobotIcon() : Container()]);
} }
} }

Loading…
Cancel
Save