fix app bar

merge-requests/543/head
Fatimah Alshammari 4 years ago
parent 2992ca4f70
commit 12b20831df

@ -93,6 +93,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
isShowAppBar: true, isShowAppBar: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model, baseViewModel: model,
body: Container( body: Container(
height: MediaQuery.of(context).size.height * 5.87, height: MediaQuery.of(context).size.height * 5.87,

@ -93,6 +93,8 @@ class _ParentCategorisePageState extends State<ParentCategorisePage> {
isShowAppBar: true, isShowAppBar: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model, baseViewModel: model,
body: SmartRefresher( body: SmartRefresher(
enablePullDown: false, enablePullDown: false,

@ -33,6 +33,9 @@ class _ComparePageState extends State<ComparePage> {
appBarTitle: TranslationBase.of(context).compare, appBarTitle: TranslationBase.of(context).compare,
isShowAppBar: true, isShowAppBar: true,
isPharmacy: true, isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
body: SingleChildScrollView( body: SingleChildScrollView(
child: Container( child: Container(
child: compareList(), child: compareList(),

@ -26,6 +26,9 @@ class _MyReviewsPageState extends State<MyReviewsPage> {
appBarTitle: TranslationBase.of(context).reviews, appBarTitle: TranslationBase.of(context).reviews,
isShowAppBar: true, isShowAppBar: true,
isPharmacy: true, isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
baseViewModel: model, baseViewModel: model,
body: model.reviewListList.length == 0 body: model.reviewListList.length == 0
? Container( ? Container(

@ -157,7 +157,7 @@ class ProductAppBar extends StatelessWidget with PreferredSizeWidget {
quantity: quantity, quantity: quantity,
itemID: itemID, itemID: itemID,
model: model, model: model,
context: context); );
Navigator.of(context).pop(); Navigator.of(context).pop();
} }

@ -248,7 +248,9 @@ class _ProductOrderItemState extends State<ProductOrderItem> {
} else { } else {
newValue = widget.item.quantity - 1; newValue = widget.item.quantity - 1;
} }
} else { widget.item.quantity = newValue;
} else
{
_quantityController.text = "${widget.item.quantity}"; _quantityController.text = "${widget.item.quantity}";
_totalPrice = _totalPrice =
"${(widget.item.product.price * widget.item.quantity).toStringAsFixed(2)}"; "${(widget.item.product.price * widget.item.quantity).toStringAsFixed(2)}";

@ -17,6 +17,9 @@ class WishlistPage extends StatelessWidget {
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: false, isShowDecPage: false,
isPharmacy: true, isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
baseViewModel: model, baseViewModel: model,
body: model.wishListList.length == 0 body: model.wishListList.length == 0
? Container( ? Container(

@ -66,6 +66,9 @@ class _OrderPageState extends State<OrderPage> with SingleTickerProviderStateMix
baseViewModel: model, baseViewModel: model,
isShowAppBar: true, isShowAppBar: true,
isPharmacy: true, isPharmacy: true,
showPharmacyCart: false,
showHomeAppBarIcon: false,
isBottomBar: true,
body: Container( body: Container(
child: Column( child: Column(
children: [ children: [

@ -108,10 +108,10 @@ class _ProfilePageState extends State<PharmacyProfilePage> {
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(
appBarTitle: TranslationBase.of(context).myAccount, appBarTitle: TranslationBase.of(context).myAccount,
isShowAppBar: true, isShowAppBar: true,
isShowDecPage: true, isShowDecPage: false,
isPharmacy: true, isPharmacy: true,
showPharmacyCart: false,
//isBottomBar: true, showHomeAppBarIcon: false,
isMainPharmacyPages: true, isMainPharmacyPages: true,
body: user != null body: user != null
? Container( ? Container(

@ -40,11 +40,13 @@ class _SubCategoriseModalsheetState extends State<SubCategoriseModalsheet> {
builder: (_, model, wi) => AppScaffold( builder: (_, model, wi) => AppScaffold(
// appBarTitle: titleName, // appBarTitle: titleName,
appBarTitle: TranslationBase.of(context).categorise, appBarTitle: TranslationBase.of(context).categorise,
isBottomBar: false, isBottomBar: true,
isShowAppBar: true, isShowAppBar: true,
isPharmacy: true, isPharmacy: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model, baseViewModel: model,
body: Container( body: Container(
color: Colors.white, color: Colors.white,
@ -77,7 +79,11 @@ class _SubCategoriseModalsheetState extends State<SubCategoriseModalsheet> {
context, context,
FadePage( FadePage(
page: SubCategorisePage( page: SubCategorisePage(
title: model.categoriseParent[index].name, title: projectViewModel
.isArabic
? model.categoriseParent[index].namen
: model.categoriseParent[index].name,
// title: model.categoriseParent[index].name,
id: model.categoriseParent[index].id, id: model.categoriseParent[index].id,
parentId: id, parentId: id,
)), )),

@ -14,6 +14,7 @@ import 'package:diplomaticquarterapp/uitl/utils.dart';
import 'package:diplomaticquarterapp/widgets/buttons/button.dart'; import 'package:diplomaticquarterapp/widgets/buttons/button.dart';
import 'package:diplomaticquarterapp/widgets/data_display/text.dart'; import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart'; import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/app_scaffold_widget.dart';
import 'package:diplomaticquarterapp/widgets/others/entity_checkbox_list.dart'; import 'package:diplomaticquarterapp/widgets/others/entity_checkbox_list.dart';
import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart'; import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart'; import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
@ -76,12 +77,15 @@ class _SubCategorisePageState extends State<SubCategorisePage> {
allowAny: true, allowAny: true,
builder: (BuildContext context, PharmacyCategoriseViewModel model, builder: (BuildContext context, PharmacyCategoriseViewModel model,
Widget child) => Widget child) =>
PharmacyAppScaffold( AppScaffold(
isPharmacy: true,
appBarTitle: title, appBarTitle: title,
isBottomBar: false, isBottomBar: true,
isShowAppBar: true, isShowAppBar: true,
backgroundColor: Colors.white, backgroundColor: Colors.white,
isShowDecPage: false, isShowDecPage: false,
showPharmacyCart: false,
showHomeAppBarIcon: false,
baseViewModel: model, baseViewModel: model,
body: SmartRefresher( body: SmartRefresher(
controller: controller, controller: controller,

Loading…
Cancel
Save