code improvement & translation added.

assets/langs/ar-SA.json

@@ -363,6 +363,13 @@
   "numberDays": "عدد الأيام",
   "poweredBy": "مشغل بواسطة",
   "cloudSolutions": "حلول السحابة",
+  "selectTemplate": "حدد قالب",
+  "myPostedAds": "إعلاناتي المنشورة",
+  "browseCategories": "تصفح الفئات",
+  "searchItems": "عناصر البحث",
+  "offerAndDiscounts": "العروض والخصومات",
+  "offerValid": "العرض صالح",
+  "offerExpired": "انتهى العرض",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

assets/langs/en-US.json

@@ -363,6 +363,13 @@
   "cloudSolutions": "Cloud Solutions",
   "subordinateLeave": "Subordinate Leave",
   "numberDays": "Number of days",
+  "selectTemplate": "Select Template",
+  "myPostedAds": "My posted ads",
+  "browseCategories": "Browse Categories",
+  "searchItems": "Search Items",
+  "offerAndDiscounts": "Offer & Discounts",
+  "offerValid": "Offer Valid",
+  "offerExpired": "Offer Expired",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/classes/colors.dart

@@ -18,6 +18,7 @@ class MyColors {
   static const Color grey98Color = Color(0xff989898);
   static const Color lightGreyEFColor = Color(0xffEFEFEF);
   static const Color lightGreyEDColor = Color(0xffEDEDED);
+  static const Color lightGreyE3Color = Color(0xffE3E3E3);
   static const Color lightGreyE6Color = Color(0xffE6E6E6);
   static const Color lightGreyEAColor = Color(0xffEAEAEA);
   static const Color darkWhiteColor = Color(0xffE0E0E0);

lib/extensions/int_extensions.dart

@@ -1,9 +1,13 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:mohem_flutter_app/classes/colors.dart';
 
 extension IntExtensions on int {
   Widget get height => SizedBox(height: toDouble());
 
   Widget get width => SizedBox(width: toDouble());
 
+  Widget get divider => Divider(height: toDouble(), thickness: toDouble(), color: MyColors.lightGreyEFColor);
+
   Widget get makeItSquare => SizedBox(width: toDouble(), height: toDouble());
 }

lib/extensions/string_extensions.dart

@@ -15,7 +15,7 @@ extension CapExtension on String {
 extension EmailValidator on String {
   Widget get toWidget => Text(this);
 
-  Widget toText10({Color? color, bool isBold = false, int? maxLine}) => Text(
+  Widget toText10({Color? color, bool isBold = false, int? maxlines}) => Text(
         this,
         maxLines: maxlines,
         style: TextStyle(fontSize: 10, fontWeight: isBold ? FontWeight.bold : FontWeight.w600, color: color ?? MyColors.darkTextColor, letterSpacing: -0.4),

lib/generated/codegen_loader.g.dart

@@ -379,6 +379,13 @@ class CodegenLoader extends AssetLoader{
   "numberDays": "عدد الأيام",
   "poweredBy": "مشغل بواسطة",
   "cloudSolutions": "حلول السحابة",
+  "selectTemplate": "حدد قالب",
+  "myPostedAds": "إعلاناتي المنشورة",
+  "browseCategories": "تصفح الفئات",
+  "searchItems": "عناصر البحث",
+  "offerAndDiscounts": "العروض والخصومات",
+  "offerValid": "العرض صالح",
+  "offerExpired": "انتهى العرض",
   "profile": {
     "reset_password": {
       "label": "Reset Password",
@@ -774,10 +781,17 @@ static const Map<String,dynamic> en_US = {
   "hours": "Hours",
   "approvalStatus": "Approval Status",
   "absenceStatus": "Absence Status",
-  "subordinateLeave": "Subordinate Leave",
-  "numberDays": "Number of days",
   "poweredBy": "Powered By",
   "cloudSolutions": "Cloud Solutions",
+  "subordinateLeave": "Subordinate Leave",
+  "numberDays": "Number of days",
+  "selectTemplate": "Select Template",
+  "myPostedAds": "My posted ads",
+  "browseCategories": "Browse Categories",
+  "searchItems": "Search Items",
+  "offerAndDiscounts": "Offer & Discounts",
+  "offerValid": "Offer Valid",
+  "offerExpired": "Offer Expired",
   "profile": {
     "reset_password": {
       "label": "Reset Password",

lib/generated/locale_keys.g.dart

@@ -360,10 +360,17 @@ abstract class  LocaleKeys {
   static const hours = 'hours';
   static const approvalStatus = 'approvalStatus';
   static const absenceStatus = 'absenceStatus';
-  static const poweredBy = 'poweredBy';
-  static const cloudSolutions = 'cloudSolutions';
   static const subordinateLeave = 'subordinateLeave';
   static const numberDays = 'numberDays';
+  static const poweredBy = 'poweredBy';
+  static const cloudSolutions = 'cloudSolutions';
+  static const selectTemplate = 'selectTemplate';
+  static const myPostedAds = 'myPostedAds';
+  static const browseCategories = 'browseCategories';
+  static const searchItems = 'searchItems';
+  static const offerAndDiscounts = 'offerAndDiscounts';
+  static const offerValid = 'offerValid';
+  static const offerExpired = 'offerExpired';
   static const profile_reset_password_label = 'profile.reset_password.label';
   static const profile_reset_password_username = 'profile.reset_password.username';
   static const profile_reset_password_password = 'profile.reset_password.password';

lib/provider/dashboard_provider_model.dart

@@ -159,7 +159,7 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       List<ListMenu> menuList = await DashboardApiClient().getListMenu();
       List findMyRequest = menuList.where((element) => element.menuName == "My Requests").toList();
       if (findMyRequest.isNotEmpty) {
-        drawerMenuItemList.insert(3, DrawerMenuItem("assets/images/drawer/my_requests.svg", LocaleKeys.myRequest.tr(), AppRoutes.myTeam));
+        drawerMenuItemList.insert(3, DrawerMenuItem("assets/images/drawer/my_requests.svg", LocaleKeys.myRequest.tr(), AppRoutes.myRequests));
       }
       List findMyTeam = menuList.where((element) => element.menuName == "My Team").toList();
       if (findMyTeam.isNotEmpty) {

lib/ui/landing/dashboard_screen.dart

@@ -277,11 +277,9 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                 ],
                               ),
                             ),
-                            InkWell(
+                            LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true).onPress(() {
-                                onTap: () {
                               Navigator.pushNamed(context, AppRoutes.offersAndDiscounts);
-                                },
+                            })
-                                child: LocaleKeys.viewAllOffers.tr().toText12(isUnderLine: true)),
                           ],
                         ).paddingOnly(left: 21, right: 21),
                         Consumer<DashboardProviderModel>(
@@ -312,7 +310,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
                                                       borderRadius: const BorderRadius.all(
                                                         Radius.circular(100),
                                                       ),
-                                                      border: Border.all(color: MyColors.lightGreyEDColor, width: 1),
+                                                      border: Border.all(color: MyColors.lightGreyE3Color, width: 1),
                                                     ),
                                                     child: ClipRRect(
                                                       borderRadius: const BorderRadius.all(

lib/ui/profile/profile_screen.dart

@@ -17,7 +17,6 @@ import 'package:mohem_flutter_app/models/member_information_list_model.dart';
 import 'package:mohem_flutter_app/ui/profile/widgets/profile_panel.dart';
 import 'package:mohem_flutter_app/widgets/bottom_sheet.dart';
 
-// todo '@sultan' kindly follow structure of code written. use extension methods for widgets and dont hard code strings, use localizations
 class ProfileScreen extends StatefulWidget {
   const ProfileScreen({Key? key}) : super(key: key);
 

lib/ui/screens/items_for_sale/fragments/items_for_sale.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/flutter_svg.dart';
 import 'package:mohem_flutter_app/api/items_for_sale/items_for_sale_api_client.dart';
@@ -9,9 +10,9 @@ import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
+import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/models/items_for_sale/get_items_for_sale_list.dart';
 import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart';
-import 'package:mohem_flutter_app/ui/screens/items_for_sale/items_for_sale_home.dart';
 import 'package:mohem_flutter_app/widgets/dynamic_forms/dynamic_textfield_widget.dart';
 
 class ItemsForSaleFragment extends StatefulWidget {
@@ -35,7 +36,7 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
     gridScrollController.addListener(() {
       if (gridScrollController.position.atEdge) {
         bool isTop = gridScrollController.position.pixels == 0;
-        if (!isTop) {
+        if (!isTop && getItemsForSaleList.length == currentPageNo * 10) {
           print('At the bottom');
           currentPageNo++;
           getItemsForSale(currentPageNo, currentCategoryID);
@@ -47,15 +48,12 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
 
   @override
   Widget build(BuildContext context) {
-    return SingleChildScrollView(
+    return ListView(
       controller: gridScrollController,
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        mainAxisSize: MainAxisSize.min,
       children: [
         DynamicTextFieldWidget(
-            "Search",
+          LocaleKeys.search.tr(),
-            "Search Items",
+          LocaleKeys.searchItems.tr(),
           isEnable: true,
           suffixIconData: Icons.search,
           isPopup: false,
@@ -65,11 +63,12 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
           onChange: (String value) {
             // _runFilter(value);
           },
-          ).paddingOnly(left: 21, right: 21, top: 21, bottom: 18),
+        ).paddingOnly(left: 21, right: 21, top: 21),
         Row(
           mainAxisAlignment: MainAxisAlignment.spaceBetween,
           children: [
-              "Browse Categories".toText17(),
+            LocaleKeys.browseCategories.tr().toText17(),
+            // todo @haroon define the purpose of this icon button
             IconButton(
               icon: const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0),
               onPressed: () => Navigator.pop(context),
@@ -143,7 +142,6 @@ class _ItemsForSaleFragmentState extends State<ItemsForSaleFragment> {
             : Utils.getNoDataWidget(context).paddingOnly(top: 50),
         // 32.height,
       ],
-      ),
     );
   }
 

lib/ui/screens/items_for_sale/item_for_sale_detail.dart

@@ -1,10 +1,12 @@
 import 'dart:convert';
 
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/date_uitl.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
+import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/models/items_for_sale/get_items_for_sale_list.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
 import 'package:mohem_flutter_app/widgets/button/default_button.dart';
@@ -26,10 +28,7 @@ class _ItemForSaleDetailPageState extends State<ItemForSaleDetailPage> {
     getItemsForSaleList = ModalRoute.of(context)?.settings.arguments as GetItemsForSaleList;
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar: AppBarWidget(context,
+      appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
-          // title: LocaleKeys.mowadhafhiRequest.tr(),
-          title: "Items for sale",
-          showHomeButton: true,),
       body: SingleChildScrollView(
         child: Column(
           children: [

lib/ui/screens/items_for_sale/items_for_sale_home.dart

@@ -1,10 +1,11 @@
+import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
-import 'package:mohem_flutter_app/models/items_for_sale/get_sale_categories_list.dart';
+import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/items_for_sale.dart';
 import 'package:mohem_flutter_app/ui/screens/items_for_sale/fragments/my_posted_ads_fragment.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@@ -24,10 +25,7 @@ class _ItemsForSaleState extends State<ItemsForSale> {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar: AppBarWidget(context,
+      appBar: AppBarWidget(context, title: LocaleKeys.itemsForSale.tr(), showHomeButton: true),
-          // title: LocaleKeys.mowadhafhiRequest.tr(),
-          title: "Items for sale",
-          showHomeButton: true),
       body: Column(
         children: [
           Container(
@@ -48,7 +46,7 @@ class _ItemsForSaleState extends State<ItemsForSale> {
               ),
             ),
             child: Row(
-              children: [myTab("Items for sale", 0), myTab("My posted ads", 1)],
+              children: [myTab(LocaleKeys.itemsForSale.tr(), 0), myTab("My posted ads", 1)],
             ),
           ),
           PageView(
@@ -59,10 +57,7 @@ class _ItemsForSaleState extends State<ItemsForSale> {
                 tabIndex = pageIndex;
               });
             },
-            children: [
+            children: [ItemsForSaleFragment(), MyPostedAdsFragment()],
-              ItemsForSaleFragment(),
-              MyPostedAdsFragment()
-            ],
           ).expanded,
         ],
       ),
@@ -77,9 +72,11 @@ class _ItemsForSaleState extends State<ItemsForSale> {
           ]),
         ),
         child: const Icon(Icons.add, color: Colors.white, size: 30),
-      ).onPress(() {
+      ).onPress(
+        () {
           Navigator.pushNamed(context, AppRoutes.addNewItemForSale);
-      })
+        },
+      ),
     );
   }
 

lib/ui/screens/my_requests/my_requests.dart

@@ -49,29 +49,18 @@ class _MyRequestsState extends State<MyRequests> {
         context,
         title: "Concurrent Reports",
       ),
-      body: Container(
+      body: Column(
-        width: double.infinity,
+        children: [
-        decoration: BoxDecoration(
+          ListView(
-          color: Colors.white,
+            physics: const BouncingScrollPhysics(),
-          borderRadius: BorderRadius.circular(10),
-          boxShadow: [
-            BoxShadow(
-              color: const Color(0xff000000).withOpacity(.05),
-              blurRadius: 26,
-              offset: const Offset(0, -3),
-            ),
-          ],
-        ),
-        child: Column(
             children: [
-            12.height,
               Container(
                 padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 0),
                 margin: const EdgeInsets.only(left: 12, right: 12, top: 0, bottom: 0),
                 child: PopupMenuButton(
                     child: DynamicTextFieldWidget(
-                    "Template Name",
+                      LocaleKeys.templateName.tr(),
-                    selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? "",
+                      selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? LocaleKeys.selectTemplate.tr(),
                       isEnable: false,
                       isPopup: true,
                       isInputTypeNum: true,
@@ -88,6 +77,8 @@ class _MyRequestsState extends State<MyRequests> {
               ),
               12.height,
               Expanded(
+                // todo list don't have data, need to confirm later , because have issues, need fixes
+
                 child: ListView.separated(
                     physics: const BouncingScrollPhysics(),
                     shrinkWrap: true,
@@ -149,22 +140,16 @@ class _MyRequestsState extends State<MyRequests> {
                       );
                     },
                     separatorBuilder: (BuildContext context, int index) => 12.height,
-                    itemCount: getCCPTransactionsList.length ?? 0)),
+                    itemCount: getCCPTransactionsList.length),
-            80.height,
-            Container(
-              decoration: const BoxDecoration(
-                color: MyColors.white,
-                boxShadow: [
-                  BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 3),
-                ],
               ),
-              child: DefaultButton(LocaleKeys.createRequest.tr(), () async {
+            ],
+          ).expanded,
+          1.divider,
+          DefaultButton(LocaleKeys.createRequest.tr(), () async {
             openNewRequest();
           }).insideContainer,
-            )
         ],
       ),
-      ),
     );
   }
 

lib/ui/screens/my_requests/new_request.dart

@@ -4,7 +4,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:mohem_flutter_app/api/my_requests_api_client.dart';
-import 'package:mohem_flutter_app/classes/colors.dart';
 import 'package:mohem_flutter_app/classes/utils.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
@@ -27,7 +26,7 @@ class _NewRequestState extends State<NewRequest> {
   List<GetConcurrentProgramsModel> getConcurrentProgramsList = [];
   GetConcurrentProgramsModel? selectedConcurrentProgramList;
 
-  List<GetEITDFFStructureList> getCCPDFFStructureModelList = [];
+  List<GetEITDFFStructureList>? getCCPDFFStructureModelList;
 
   DateTime selectedDate = DateTime.now();
 
@@ -45,17 +44,16 @@ class _NewRequestState extends State<NewRequest> {
         context,
         title: "Concurrent Reports",
       ),
-      body: Container(
+      body: Column(
-        child: Column(
         children: [
-            12.height,
+          ListView(
-            Container(
+            padding: const EdgeInsets.all(21),
-              padding: const EdgeInsets.only(left: 12, right: 12, top: 10, bottom: 0),
+            physics: const BouncingScrollPhysics(),
-              margin: const EdgeInsets.only(left: 12, right: 12, top: 0, bottom: 0),
+            children: [
-              child: PopupMenuButton(
+              PopupMenuButton(
                   child: DynamicTextFieldWidget(
-                    "Template Name",
+                    LocaleKeys.templateName.tr(),
-                    selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? "",
+                    selectedConcurrentProgramList?.uSERCONCURRENTPROGRAMNAME ?? LocaleKeys.selectTemplate.tr(),
                     isEnable: false,
                     isPopup: true,
                     isInputTypeNum: true,
@@ -69,32 +67,28 @@ class _NewRequestState extends State<NewRequest> {
                     getCCPDFFStructure(selectedConcurrentProgramList?.cONCURRENTPROGRAMNAME);
                     setState(() {});
                   }),
-            ),
+              getCCPDFFStructureModelList == null
-            (getCCPDFFStructureModelList.isEmpty
+                  ? const SizedBox()
+                  : (getCCPDFFStructureModelList!.isEmpty
                       ? LocaleKeys.noDataAvailable.tr().toText16().center
                       : ListView.separated(
-                        physics: const BouncingScrollPhysics(),
+                          physics: const NeverScrollableScrollPhysics(),
-                        padding: const EdgeInsets.all(21),
+                          shrinkWrap: true,
-                        itemBuilder: (cxt, int parentIndex) => parseDynamicFormatType(getCCPDFFStructureModelList[parentIndex], parentIndex),
+                          padding: const EdgeInsets.all(0),
+                          itemBuilder: (cxt, int parentIndex) => parseDynamicFormatType(getCCPDFFStructureModelList![parentIndex], parentIndex),
                           separatorBuilder: (cxt, index) => 0.height,
-                        itemCount: getCCPDFFStructureModelList.length))
+                          itemCount: getCCPDFFStructureModelList!.length,
-                .expanded,
+                        )),
-            Container(
-              decoration: const BoxDecoration(
-                color: MyColors.white,
-                boxShadow: [
-                  BoxShadow(color: MyColors.lightGreyEFColor, spreadRadius: 3),
             ],
-              ),
+          ).expanded,
-              child: DefaultButton(LocaleKeys.submit.tr(), () async {
+          1.divider,
+          DefaultButton(LocaleKeys.submit.tr(), () {
+            // todo need to add submit method
             // openNewRequest();
           })
               .insideContainer,
-            )
         ],
       ),
-      ),
-      // bottomSheet:
     );
   }
 
@@ -132,9 +126,7 @@ class _NewRequestState extends State<NewRequest> {
             isReadOnly: model.rEADONLY == "Y",
             onChange: (text) {
               model.fieldAnswer = text;
-              if (model.eSERVICESDV == null) {
+              model.eSERVICESDV ??= ESERVICESDV();
-                model.eSERVICESDV = ESERVICESDV();
-              }
               model.eSERVICESDV!.pIDCOLUMNNAME = text;
             },
           ).paddingOnly(bottom: 12);
@@ -146,9 +138,7 @@ class _NewRequestState extends State<NewRequest> {
             isInputTypeNum: true,
             onChange: (text) {
               model.fieldAnswer = text;
-              if (model.eSERVICESDV == null) {
+              model.eSERVICESDV ??= ESERVICESDV();
-                model.eSERVICESDV = ESERVICESDV();
-              }
               model.eSERVICESDV!.pIDCOLUMNNAME = text;
             },
           ).paddingOnly(bottom: 12);
@@ -164,7 +154,7 @@ class _NewRequestState extends State<NewRequest> {
           }
           return DynamicTextFieldWidget(
             (model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""),
-            displayText,
+            displayText.isEmpty ? LocaleKeys.pleaseSelectDate.tr() : displayText,
             suffixIconData: Icons.calendar_today,
             isEnable: false,
             onTap: () async {
@@ -331,7 +321,7 @@ class _NewRequestState extends State<NewRequest> {
       }
       return DynamicTextFieldWidget(
         (model.sEGMENTPROMPT ?? "") + (model.rEQUIREDFLAG == "Y" ? "*" : ""),
-        displayText,
+        displayText.isEmpty ? LocaleKeys.pleaseSelectDate.tr() : displayText,
         suffixIconData: Icons.calendar_today,
         isEnable: false,
         onTap: () async {

lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart

@@ -50,24 +50,10 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
         title: "Offers & Discounts",
         showHomeButton: true,
       ),
-      body: SingleChildScrollView(
+      body: ListView(
         controller: _scrollController,
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-            Container(
+          Column(
-              decoration: BoxDecoration(
-                color: Colors.white,
-                borderRadius: BorderRadius.circular(10),
-                boxShadow: [
-                  BoxShadow(
-                    color: const Color(0xff000000).withOpacity(.05),
-                    blurRadius: 26,
-                    offset: const Offset(0, -3),
-                  ),
-                ],
-              ),
-              child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Hero(
@@ -116,21 +102,18 @@ class _OffersAndDiscountsDetailsState extends State<OffersAndDiscountsDetails> {
                     )
                   : 12.height,
             ],
-              ),
+          ).objectContainerView().paddingOnly(left: 21, right: 21, top: 21),
-            ).paddingOnly(left: 21, right: 21, top: 21),
+          "Related Offers".toText22(isBold: true, color: const Color(0xff2B353E)).paddingOnly(left: 21, right: 21, top: 21),
-            "Related Offers".toText22(isBold: true, color: const Color(0xff2B353E)).paddingAll(21.0),
           GridView(
             gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 2, childAspectRatio: 162 / 266, crossAxisSpacing: 12, mainAxisSpacing: 12),
-              padding: const EdgeInsets.only(left: 21, right: 21, bottom: 21, top: 21),
+            padding: const EdgeInsets.all(21),
             shrinkWrap: true,
             primary: false,
             physics: const ScrollPhysics(),
             children: getItemsForSaleWidgets(),
           ),
-            50.height,
         ],
       ),
-      ),
     );
   }
 

lib/ui/screens/offers_and_discounts/offers_and_discounts_home.dart

@@ -9,6 +9,7 @@ import 'package:mohem_flutter_app/config/routes.dart';
 import 'package:mohem_flutter_app/extensions/int_extensions.dart';
 import 'package:mohem_flutter_app/extensions/string_extensions.dart';
 import 'package:mohem_flutter_app/extensions/widget_extensions.dart';
+import 'package:mohem_flutter_app/generated/locale_keys.g.dart';
 import 'package:mohem_flutter_app/models/offers_and_discounts/get_categories_list.dart';
 import 'package:mohem_flutter_app/models/offers_and_discounts/get_offers_list.dart';
 import 'package:mohem_flutter_app/widgets/app_bar_widget.dart';
@@ -37,20 +38,15 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar: AppBarWidget(
+      appBar: AppBarWidget(context, title: LocaleKeys.offerAndDiscounts.tr(), showHomeButton: true),
-        context,
-        // title: LocaleKeys.mowadhafhiRequest.tr(),
-        title: "Offers & Discounts",
-        showHomeButton: true,
-      ),
       body: SingleChildScrollView(
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           mainAxisSize: MainAxisSize.min,
           children: [
             DynamicTextFieldWidget(
-              "Search",
+              LocaleKeys.search.tr(),
-              "Search Items",
+              LocaleKeys.searchItems.tr(),
               isEnable: true,
               suffixIconData: Icons.search,
               isPopup: false,
@@ -60,17 +56,16 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
               onChange: (String value) {
                 // _runFilter(value);
               },
-            ).paddingOnly(left: 21, right: 21, top: 21, bottom: 18),
+            ).paddingOnly(left: 21, right: 21, top: 21),
             Row(
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
-                "Browse Categories".toText17(),
+                LocaleKeys.browseCategories.tr().toText17(),
-                IconButton(
+                const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0).onPress(() {
-                  icon: const Icon(Icons.filter_alt_sharp, color: MyColors.darkIconColor, size: 28.0),
+                  Navigator.pop(context);
-                  onPressed: () => Navigator.pop(context),
+                }),
-                ),
               ],
-            ).paddingOnly(left: 21, right: 21),
+            ).paddingOnly(left: 21, right: 21, top: 21),
             SizedBox(
               height: 110.0,
               child: getCategoriesList.isNotEmpty
@@ -120,7 +115,7 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
                                       currentCategoryID == getCategoriesList[index].id ? const Icon(Icons.check_circle_rounded, color: MyColors.greenColor, size: 16.0) : Container(),
                                     ],
                                   ).expanded,
-                                  AppState().isArabic(context) ? getCategoriesList[index].categoryNameAr!.toText10(maxLine: 1) : getCategoriesList[index].categoryNameEn!.toText10(maxLine: 1)
+                                  AppState().isArabic(context) ? getCategoriesList[index].categoryNameAr!.toText10(maxlines: 1) : getCategoriesList[index].categoryNameEn!.toText10(maxlines: 1)
                                 ],
                               ).paddingOnly(left: 10, right: 10, bottom: 10, top: 12),
                             ),
@@ -195,7 +190,9 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
               ),
             ),
             10.height,
-            AppState().isArabic(context) ? getOffersList.titleAR!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1) : getOffersList.title!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1),
+            AppState().isArabic(context)
+                ? getOffersList.titleAR!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1)
+                : getOffersList.title!.toText16(isBold: true, color: const Color(0xff2B353E), maxlines: 1),
             // Html(
             //     data: AppState().isArabic(context) ? getOffersList.descriptionAR! : getOffersList.description ?? "",
             //     // onLinkTap: (String? url, RenderContext context, Map<String, String> attributes, _) {
@@ -224,8 +221,8 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
     getOffersDetailList.add(offersListModelObj);
 
     getOffersList.forEach((element) {
-      if(counter <= 4) {
+      if (counter <= 4) {
-      if(element.rowID != offersListModelObj.rowID) {
+        if (element.rowID != offersListModelObj.rowID) {
           getOffersDetailList.add(element);
           counter++;
         }
@@ -238,9 +235,9 @@ class _OffersAndDiscountsHomeState extends State<OffersAndDiscountsHome> {
   Widget checkDate(String endDate) {
     DateTime endDateObj = DateFormat("yyyy-MM-dd").parse(endDate);
     if (endDateObj.isAfter(DateTime.now())) {
-      return "Offer Valid".toText14(isBold: true, color: MyColors.greenColor);
+      return LocaleKeys.offerValid.tr().toText14(isBold: true, color: MyColors.greenColor);
     } else {
-      return "Offer Expired".toText14(isBold: true, color: MyColors.redColor);
+      return LocaleKeys.offerExpired.tr().toText14(isBold: true, color: MyColors.redColor);
     }
   }