Merge branch 'pharmacy-Fatima' into 'development'

Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!309

lib/config/localized_values.dart

@@ -777,6 +777,7 @@ const Map localizedValues = {
   "orderDate": {"en": "Date", "ar": "التاريخ:"},
   "itemsNo": {"en": "items(s)", "ar": "عناصر"},
   "noOrder": {"en": "You Don't have any orders.", "ar": "ليس لديك طلبات"},
+  "noResult": {"en": "No Result.", "ar": "لايوجد نتئج"},
 
   "TermsService": {"en": "Terms of Service", "ar": "شروط الخدمه"},
   "Beforeusing": {
@@ -871,6 +872,7 @@ const Map localizedValues = {
   "wishList": {"en": "WishList", "ar": "الرغبات"},
   "myAccount": {"en": "My Account", "ar": "حسابي"},
   "cart": {"en": "Cart", "ar": "التسوق"},
+  "Alhabibapp": {"en": "Al habib app", "ar": "تطبيق الحبيب"},
   "searchProductHere": {
     "en": "Search Product here",
     "ar": "ابحث في الطلب الخاص بك"

lib/pages/final_products_page.dart

@@ -1,4 +1,5 @@
 import 'package:diplomaticquarterapp/core/viewModels/pharmacy_categorise_view_model.dart';
+import 'package:diplomaticquarterapp/pages/pharmacies/screens/pharmacy_module_page.dart';
 import 'package:diplomaticquarterapp/uitl/translations_delegate_base.dart';
 import 'package:diplomaticquarterapp/pages/pharmacies/product_detail.dart';
 import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
@@ -7,7 +8,8 @@ import 'package:diplomaticquarterapp/widgets/others/app_scaffold_pharmacy_widget
 import 'package:diplomaticquarterapp/widgets/others/network_base_view.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/material.dart';
-
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:flutter/src/widgets/image.dart' as flutterImage;
 import 'base/base_view.dart';
 
 class FinalProductsPage extends StatefulWidget {
@@ -124,7 +126,8 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
                     ),
                     styleOne == true
                         ? Expanded(
-                            child: Container(
+                            child:model.finalProducts.length > 0
+                           ? Container(
                               height: MediaQuery.of(context).size.height * 3.90,
                               child: GridView.builder(
                                 gridDelegate:
@@ -355,10 +358,33 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
                                       ));
                                 },
                               ),
-                            ),
-                          )
+                            )
+                                : Container(
+                              child: Column(
+                                mainAxisAlignment: MainAxisAlignment.center,
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                children: [
+                                  Align(
+                                    alignment: Alignment.center,
+                                    child: Image.asset(
+                                      'assets/images/pharmacy/empty_box.png',
+                                      width: 100,
+                                      height: 100,
+                                    ),
+                                  ),
+                                  Text(
+                                    TranslationBase.of(context).noResult,
+                                    style: TextStyle(
+                                      fontSize: 20.0,
+//                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                ],
+                              ),
+                          ),)
                         : Expanded(
-                            child: Container(
+                            child: model.finalProducts.length > 0
+                           ? Container(
                               height: MediaQuery.of(context).size.height * 5.0,
                               child: ListView.builder(
                                   itemCount: model.finalProducts.length,
@@ -546,6 +572,29 @@ class _FinalProductsPageState extends State<FinalProductsPage> {
                                       },
                                     );
                                   }),
+                            )
+                            : Container(
+                              child:  Column(
+                               mainAxisAlignment: MainAxisAlignment.center,
+                                crossAxisAlignment: CrossAxisAlignment.center,
+                                children: [
+                                  Align(
+                                    alignment: Alignment.center,
+                                    child: Image.asset(
+                                      'assets/images/pharmacy/empty_box.png',
+                                      width: 100,
+                                      height: 100,
+                                    ),
+                                  ),
+                                  Text(
+                                    TranslationBase.of(context).noResult,
+                                    style: TextStyle(
+                                      fontSize: 20.0,
+//                                      fontWeight: FontWeight.bold,
+                                    ),
+                                  ),
+                                ],
+                              ),
                             ),
                           )
                   ],

lib/pages/pharmacy/order/OrderDetails.dart

@@ -616,7 +616,29 @@ class _OrderDetailsPageState extends State<OrderDetailsPage> {
                   ),
                 ),
               )
-            : Container(),
+            : Container(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            crossAxisAlignment: CrossAxisAlignment.center,
+            children: [
+              Align(
+                alignment: Alignment.center,
+                child: Image.asset(
+                  'assets/images/pharmacy/empty_box.png',
+                  width: 80,
+                  height: 80,
+                ),
+              ),
+              Text(
+                TranslationBase.of(context).noResult,
+                style: TextStyle(
+                  fontSize: 20.0,
+//                                      fontWeight: FontWeight.bold,
+                ),
+              ),
+            ],
+          ),
+        ),
       ),
     );
   }

lib/uitl/translations_delegate_base.dart

@@ -799,6 +799,7 @@ class TranslationBase {
   String get orderDate => localizedValues['orderDate'][locale.languageCode];
   String get itemsNo => localizedValues['itemsNo'][locale.languageCode];
   String get noOrder => localizedValues['noOrder'][locale.languageCode];
+  String get noResult => localizedValues['noResult'][locale.languageCode];
 
   String get offersAndPromotions =>
       localizedValues['offersAndPromotions'][locale.languageCode];
@@ -890,6 +891,7 @@ class TranslationBase {
   String get categorise => localizedValues['categorise'][locale.languageCode];
   String get cart => localizedValues['cart'][locale.languageCode];
   String get wishList => localizedValues['wishList'][locale.languageCode];
+  String get Alhabibapp => localizedValues['Alhabibapp'][locale.languageCode];
   String get searchProductHere =>
       localizedValues['searchProductHere'][locale.languageCode];
   String get email => localizedValues['email'][locale.languageCode];

lib/widgets/pharmacy/bottom_nav_pharmacy_bar.dart

@@ -41,6 +41,7 @@ class _BottomNavPharmacyBarState extends State<BottomNavPharmacyBar> {
               changeIndex: _changeIndex,
               index: widget.index,
               currentIndex: 0,
+              title: TranslationBase.of(context).Alhabibapp,
             ),
 
             Container(

lib/widgets/pharmacy/bottom_nav_pharmacy_home_item.dart

@@ -1,10 +1,13 @@
 import 'package:diplomaticquarterapp/pages/landing/landing_page.dart';
 import 'package:diplomaticquarterapp/widgets/transitions/fade_page.dart';
 import 'package:flutter/material.dart';
+import 'package:diplomaticquarterapp/widgets/data_display/text.dart';
+import 'package:diplomaticquarterapp/Constants.dart';
 
 class BottomNavHomeItem extends StatelessWidget {
   final IconData icon;
   final Image image;
+  final String title;
 
   final ValueChanged<int> changeIndex;
   final int index;
@@ -19,7 +22,8 @@ class BottomNavHomeItem extends StatelessWidget {
       this.currentIndex,
       this.activeIcon,
       this.onTap,
-      this.image});
+      this.image,
+      this.title});
 
   @override
   Widget build(BuildContext context) {
@@ -61,7 +65,12 @@ class BottomNavHomeItem extends StatelessWidget {
                 SizedBox(
                   height: 11,
                 ),
-
+                Texts(
+                  title,
+                  textAlign: TextAlign.center,
+                  color: currentIndex == index ? secondaryColor : Colors.grey,
+                  fontSize: 11,
+                ),
                 // Added TextAlign Property
               ],
             ),