fix app bar

lib/pages/final_products_page.dart

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

lib/pages/parent_categorise_page.dart

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

lib/pages/pharmacies/compare.dart

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

lib/pages/pharmacies/my_reviews.dart

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

lib/pages/pharmacies/screens/product-details/shared/product_details_app_bar.dart

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

lib/pages/pharmacies/widgets/ProductOrderItem.dart

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

lib/pages/pharmacies/wishlist.dart

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

lib/pages/pharmacy/order/Order.dart

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

lib/pages/pharmacy/profile/profile.dart

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

lib/pages/sub_categories_modalsheet.dart

@@ -40,11 +40,13 @@ class _SubCategoriseModalsheetState extends State<SubCategoriseModalsheet> {
         builder: (_, model, wi) => AppScaffold(
            //   appBarTitle: titleName,
               appBarTitle: TranslationBase.of(context).categorise,
-              isBottomBar: false,
+              isBottomBar: true,
               isShowAppBar: true,
               isPharmacy: true,
               backgroundColor: Colors.white,
               isShowDecPage: false,
+              showPharmacyCart: false,
+              showHomeAppBarIcon: false,
               baseViewModel: model,
              body: Container(
              color: Colors.white,
@@ -77,7 +79,11 @@ class _SubCategoriseModalsheetState extends State<SubCategoriseModalsheet> {
                           context,
                           FadePage(
                               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,
                                 parentId: id,
                               )),

lib/pages/sub_categorise_page.dart

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