Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new

lib/pages/pharmacies/screens/product-details/footor/footer-widget.dart

@@ -185,7 +185,7 @@ class _FooterWidgetState extends State<FooterWidget> {
                 width: MediaQuery.of(context).size.width * 0.45,
                 child: SecondaryButton(
                   label: TranslationBase.of(context).addToCart.toUpperCase(),
-                  disabled: !widget.isAvailable && widget.quantity > 0 ||
+                  disabled: !widget.isAvailable && widget.quantity == 0 ||
                       widget.quantity > widget.quantityLimit ||
                       widget.item.rxMessage != null,
                   disableColor: Color(0xFF4CAF50),
@@ -196,9 +196,9 @@ class _FooterWidgetState extends State<FooterWidget> {
                       );
                     } else
                       await widget.addToCartFunction(
-                    quantity: widget.quantity,
+                          quantity: widget.quantity,
-                    itemID: widget.item.id,
+                          itemID: widget.item.id,
-                    model: widget.model);
+                          model: widget.model);
                   },
                   fontWeight: FontWeight.w600,
                   borderColor: Color(0xFF4CAF50),

lib/widgets/pharmacy/bottom_nav_pharmacy_item.dart

@@ -50,7 +50,7 @@ class BottomNavPharmacyItem extends StatelessWidget {
                 splashColor: Colors.transparent,
                 onTap: () {
                   if (!Provider.of<ProjectViewModel>(context, listen: false)
-                      .isLogin &&
+                          .isLogin &&
                       (currentIndex == 2 || currentIndex == 3))
                     Navigator.push(
                       context,
@@ -68,19 +68,19 @@ class BottomNavPharmacyItem extends StatelessWidget {
                     ),
                     currentIndex == index
                         ? Divider(
-                      color: Color(0xff5AB145),
+                            color: Color(0xff5AB145),
-                      thickness: 3.5,
+                            thickness: 3.5,
-                    )
+                          )
                         : Divider(
-                      thickness: 0,
+                            thickness: 0,
-                    ),
+                          ),
                     Container(
                       child: Icon(currentIndex == index ? activeIcon : icon,
                           color: isHome
                               ? Color(0xff5AB145)
                               : currentIndex == index
-                              ? Colors.grey
+                                  ? Colors.grey
-                              : Colors.grey,
+                                  : Colors.grey,
                           size: 22.0),
                     ),
                     SizedBox(
@@ -92,26 +92,37 @@ class BottomNavPharmacyItem extends StatelessWidget {
                       title,
                       textAlign: TextAlign.center,
                       color: currentIndex == index ? Colors.grey : Colors.grey,
-                      fontWeight:
+                      fontWeight: currentIndex == index
-                      currentIndex == index ? FontWeight.bold : FontWeight.w400,
+                          ? FontWeight.bold
+                          : FontWeight.w400,
                       fontSize: currentIndex == index ? 13 : 11,
                     ),
                   ],
                 ),
               ),
             ),
-            if(projectViewModel.isLogin && currentIndex == 3 && orderPreviewViewModel.cartResponse.quantityCount !=0)
+            if (currentIndex == 3 &&
+                Provider.of<OrderPreviewViewModel>(context, listen: false)
+                        .cartResponse
+                        .quantityCount !=
+                    0)
               Positioned(
-                top: 5, right: -3.5,
+                top: 11.5,
+                right: -4.5,
                 child: Container(
                   decoration: BoxDecoration(
-                      color: Colors.red,
+                    color: Colors.red,
-                      borderRadius: BorderRadius.circular(15),
+                    borderRadius: BorderRadius.circular(15),
-
                   ),
-                  padding: EdgeInsets.only(left: 5, right: 4.5),
+                  padding: EdgeInsets.only(left: 7, right: 6.5),
                   height: 18,
-                  child: Center(child: Texts(orderPreviewViewModel.cartResponse.quantityCount.toString(), style: "caption", medium: true, color: Colors.white,)),
+                  child: Center(
+                      child: Texts(
+                    orderPreviewViewModel.cartResponse.quantityCount.toString(),
+                    style: "caption",
+                    medium: true,
+                    color: Colors.white,
+                  )),
                 ),
               )
           ],