Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal

* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  added shimmer

# Conflicts:
#	lib/generated/locale_keys.g.dart

lib/generated/codegen_loader.g.dart

@@ -837,7 +837,9 @@ class CodegenLoader extends AssetLoader{
   "reset": "إعادة تعيين",
   "applyFilters": "تطبيق الفلاتر",
   "distanceKm": "{} كم",
-  "discountPercentPlus": "{}%+"
+  "discountPercentPlus": "{}%+",
+  "visitMerchantWebsite": "زيارة موقع التاجر",
+  "merchantWebsiteNotAvailable": "موقع التاجر غير متوفر"
 };
 static const Map<String,dynamic> _en_US = {
   "mohemm": "Mohemm",
@@ -1662,7 +1664,9 @@ static const Map<String,dynamic> _en_US = {
   "reset": "Reset",
   "applyFilters": "Apply filters",
   "distanceKm": "{} km",
-  "discountPercentPlus": "{}%+"
+  "discountPercentPlus": "{}%+",
+  "visitMerchantWebsite": "Visit Merchant Website",
+  "merchantWebsiteNotAvailable": "Merchant website not available"
 };
 static const Map<String, Map<String,dynamic>> mapLocales = {"ar_SA": _ar_SA, "en_US": _en_US};
 }

lib/generated/locale_keys.g.dart

@@ -2,7 +2,7 @@
 
 // ignore_for_file: constant_identifier_names
 
-abstract class LocaleKeys {
+abstract class  LocaleKeys {
   static const mohemm = 'mohemm';
   static const english = 'english';
   static const arabic = 'arabic';
@@ -258,7 +258,7 @@ abstract class LocaleKeys {
   static const Payroll = 'Payroll';
   static const civilIdentityNumber = 'civilIdentityNumber';
   static const dateOfBirth = 'dateOfBirth';
-  static const maritalStatus = 'maritalStatus ';
+  static const maritalStatus  = 'maritalStatus ';
   static const fullName = 'fullName';
   static const remove = 'remove';
   static const submit = 'submit';
@@ -289,7 +289,7 @@ abstract class LocaleKeys {
   static const enterNewInfo = 'enterNewInfo';
   static const endDate = 'endDate';
   static const removeThisMember = 'removeThisMember';
-  static const wantUpdateThisMember = 'wantUpdateThisMember ';
+  static const wantUpdateThisMember  = 'wantUpdateThisMember ';
   static const addNewFamilyMember = 'addNewFamilyMember';
   static const addRow = 'addRow';
   static const pleaseSelect = 'pleaseSelect';

lib/ui/landing/dashboard_screen_for_dependet.dart

@@ -812,7 +812,18 @@ class _DashboardScreenForDependetState extends State<DashboardScreenForDependet>
               Expanded(
                 child:
                     isSubcategoriesLoading
-                      ? const Center(child: SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2, color: Color(0xFF94A3B8))))
+                      ? Shimmer.fromColors(
+                        baseColor: const Color(0xFFE2E8F0),
+                        highlightColor: const Color(0xFFF8FAFC),
+                        child: ListView.separated(
+                          scrollDirection: Axis.horizontal,
+                          physics: const NeverScrollableScrollPhysics(),
+                          itemCount: 4,
+                          separatorBuilder: (BuildContext _, int __) => const SizedBox(width: 8),
+                          itemBuilder:
+                              (BuildContext _, int __) => Container(width: 70, height: 32, decoration: BoxDecoration(color: Colors.white, borderRadius: BorderRadius.circular(6))),
+                        ),
+                      )
                       : ListView.separated(
                         scrollDirection: Axis.horizontal,
                         physics: const BouncingScrollPhysics(),