fixes

assets/langs/ar-SA.json

@@ -720,7 +720,7 @@
   "ownerInformation": "معلومات المالك",
   "acceptedRequests": "الطلبات المقبولة",
   "specialRequestChat": "دردشة الطلب الخاص",
-  "companyName": "اسم الشركة *",
+  "companyName": "اسم الشركة",
   "noAvailableItems": "لا توجد عناصر متاحة.",
   "serviceDeliveryType": "نوع تقديم الخدمة",
   "noImagesToShow": "لا توجد صور للعرض",

assets/langs/en-US.json

@@ -714,7 +714,7 @@
   "noItemsToShow": "There are no Items no show.",
   "acceptedRequests": "Accepted Requests",
   "specialRequestChat": "Special Request Chat",
-  "companyName": "Company Name *",
+  "companyName": "Company Name",
   "noAvailableItems": "There are no available items.",
   "serviceDeliveryType": "Service Delivery Type",
   "noImagesToShow": "No Images to Show",

lib/classes/consts.dart

@@ -261,6 +261,8 @@ class GlobalConsts {
 
   static int maxFileCount = 7;
   static int maxFileSizeInBytes = 2 * 1024 * 1024;
+  static String allowedFileExtensions = "jpg,png - 2MB";
+  static String allowedFileExtensionsPDF = "PDF 2MB";
 
   static int providerDealerRoleTypeId = 6;
   static int providerIndividualRoleTypeId = 5;

lib/view_models/chat_view_model.dart

@@ -388,7 +388,7 @@ class ChatVM extends BaseVM {
           "ServiceItem": serviceItemName,
           "ReqOfferImages": offerImages,
           "OfferedItemCreatedByName": manufacturedByName,
-          // "OfferedItemCreatedOn": manufacturedOn, // TODO: This should be in String on Server, Right now it is in DateTime
+          "OfferedItemCreatedOn": manufacturedOn, // TODO: This should be in String on Server, Right now it is in DateTime
           "ServiceProviderID": providerId,
           "OfferStatus": RequestOfferStatusEnum.offer.getIdFromRequestOfferStatusEnum(),
           "Comment": message,

lib/views/advertisement/ad_creation_steps/ad_creation_steps_containers.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
+import 'package:mc_common_app/extensions/int_extensions.dart';
 import 'package:mc_common_app/extensions/string_extensions.dart';
 import 'package:mc_common_app/theme/colors.dart';
 import 'package:mc_common_app/widgets/common_widgets/dotted_rect.dart';
+import 'package:mc_common_app/widgets/extensions/extensions_widget.dart';
 
 class DottedRoundedCard extends StatelessWidget {
   final Function() onTap;
@@ -26,7 +28,7 @@ class DottedRoundedCard extends StatelessWidget {
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
               icon,
-              SizedBox(width: 8),
+              const SizedBox(width: 8),
               text.toText(
                 fontSize: 15,
                 isBold: true,
@@ -44,34 +46,46 @@ class DottedRectContainer extends StatelessWidget {
   final Function() onTap;
   final String text;
   final Widget icon;
+  final String extensions;
 
-  const DottedRectContainer({Key? key, required this.onTap, required this.text, required this.icon}) : super(key: key);
+  const DottedRectContainer({Key? key, required this.onTap, required this.text, required this.icon, required this.extensions}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return InkWell(
       onTap: onTap,
-      child: Container(
+      child: Column(
-        height: 46,
+        children: [
-        width: double.infinity,
+          DashedRect(
-        color: MyColors.white,
+            color: MyColors.lightIconColor,
-        child: DashedRect(
+            strokeWidth: 2.0,
-          color: MyColors.lightIconColor,
+            gap: 4.0,
-          strokeWidth: 2.0,
+            child: Row(
-          gap: 4.0,
+              mainAxisAlignment: MainAxisAlignment.center,
-          child: Row(
+              children: [
-            mainAxisAlignment: MainAxisAlignment.center,
+                icon,
+                const SizedBox(width: 8),
+                text
+                    .toText(
+                      fontSize: 15,
+                      isBold: true,
+                      color: MyColors.darkPrimaryColor,
+                    )
+                    .paddingAll(6),
+              ],
+            ),
+          ),
+          8.height,
+          Row(
+            mainAxisAlignment: MainAxisAlignment.end,
             children: [
-              icon,
+              "( $extensions )".toText(
-              SizedBox(width: 8),
+                fontSize: 8,
-              text.toText(
+                color: MyColors.lightTextColor,
-                fontSize: 15,
-                isBold: true,
-                color: MyColors.darkPrimaryColor,
               ),
             ],
-          ),
+          )
-        ),
+        ],
       ),
     );
   }

lib/views/advertisement/ad_creation_steps/vehicle_details_container.dart

@@ -300,6 +300,7 @@ class VehicleDetails extends StatelessWidget {
                   onTap: () => context.read<AdVM>().pickMultipleImages(),
                   text: LocaleKeys.attachImage.tr(),
                   icon: MyAssets.attachmentIcon.buildSvg(),
+                  extensions: GlobalConsts.allowedFileExtensions,
                 ),
               ],
               if (adVM.vehicleImageError != "") ...[

lib/views/requests/create_request_page.dart

@@ -239,6 +239,7 @@ class CreateRequestPage extends StatelessWidget {
                                   onTap: () => context.read<RequestsVM>().pickMultipleImages(),
                                   text: LocaleKeys.attachImage.tr(),
                                   icon: MyAssets.attachmentIcon.buildSvg(),
+                                  extensions: GlobalConsts.allowedFileExtensions,
                                 ),
                               ],
                               if (requestsVM.vehicleImageError != "") ...[

lib/views/requests/request_bottomsheets.dart

@@ -135,6 +135,7 @@ Future buildSendOfferBottomSheet({
                           onTap: () => context.read<RequestsVM>().pickMultipleImages(),
                           text: LocaleKeys.attachImage.tr(),
                           icon: MyAssets.attachmentIcon.buildSvg(),
+                          extensions: GlobalConsts.allowedFileExtensions,
                         ),
                       ],
                       if (requestsVM.pickedVehicleImages.isNotEmpty) ...[

lib/views/setting_options/provider_license_page.dart

@@ -235,6 +235,7 @@ class _ProviderLicensePageState extends State<ProviderLicensePage> {
                   onTap: () => serviceVM.pickPdfReceiptFile(context, document.documentId!, index) ?? "",
                   text: LocaleKeys.attachPDF.tr(),
                   icon: MyAssets.attachmentIcon.buildSvg(),
+                  extensions: GlobalConsts.allowedFileExtensionsPDF,
                 ),
               ]
           ],

lib/widgets/common_widgets/branch_details_card.dart

@@ -68,10 +68,11 @@ class BranchDetailCard extends StatelessWidget {
                             ],
                             if (providerName != null)
                               Row(
+                                crossAxisAlignment: CrossAxisAlignment.start,
                                 children: [
                                   ("${LocaleKeys.provider.tr()}:").toText(color: MyColors.lightTextColor, fontSize: 12),
                                   4.width,
-                                  providerName!.toText(fontSize: 12, isBold: true),
+                                  Flexible(child: providerName!.toText(fontSize: 12, isBold: true),)
                                 ],
                               ),
                           ],