Merge branch 'refs/heads/master' into master-Api2.0

# Conflicts:
#	lib/classes/consts.dart

lib/provider/dashboard_provider_model.dart

@@ -253,8 +253,10 @@ class DashboardProviderModel with ChangeNotifier, DiagnosticableTreeMixin {
       notifyListeners();
     } catch (ex) {
       // Utils.hideLoading(context);
+      getOffersList=[];
+      isOffersLoading = false;
       notifyListeners();
-      Utils.handleException(ex, context, null);
+     // Utils.handleException(ex, context, null);
     }
   }
 

lib/ui/landing/dashboard_screen.dart

@@ -3,7 +3,6 @@ import 'dart:io';
 import 'dart:ui' as ui;
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_countdown_timer/flutter_countdown_timer.dart';
 import 'package:flutter_svg/flutter_svg.dart';
@@ -421,7 +420,11 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                         ),
                       ],
                     ).paddingOnly(left: 21, right: 21, top: 7, bottom: 21),
-                    Column(
+                    Consumer<DashboardProviderModel>(builder: (BuildContext context, DashboardProviderModel model, Widget? child) {
+                      if (!model.isOffersLoading && model.getOffersList.isEmpty) {
+                        return const SizedBox();
+                      }
+                      return Column(
                         mainAxisSize: MainAxisSize.min,
                         crossAxisAlignment: CrossAxisAlignment.start,
                         children: [
@@ -517,7 +520,8 @@ class _DashboardScreenState extends State<DashboardScreen> with WidgetsBindingOb
                             },
                           ),
                         ],
-                    ),
+                      );
+                    }),
                     Container(
                       width: double.infinity,
                       padding: const EdgeInsets.only(top: 31),

lib/ui/work_list/itg_fragments/request_detail_fragment.dart

@@ -69,13 +69,34 @@ class RequestDetailFragment extends StatelessWidget {
     );
   }
 
-  Widget detailView(List<Fields> fields) {
+  Widget detailView(List<Fields> fieldsF) {
+    List<Fields> fields = List.from(fieldsF);
+
     bool isOdd = false;
     if (fields.length % 2 != 0) {
       isOdd = true;
       fields.add(new Fields());
     }
-    return GridView.builder(
+
+    int descriptionFormatIndex = fields.indexWhere((element) => element.title == "Description Format" || element.title == "Description Format"); // todo add arabic in future
+    Widget? descriptionFormatView;
+    if (descriptionFormatIndex >= 0) {
+      Fields descriptionFormat = fields[descriptionFormatIndex];
+      fields.removeAt(descriptionFormatIndex);
+
+      descriptionFormatView = ItemDetailViewGridItem(
+        2,
+        descriptionFormat.title,
+        descriptionFormat.value == null ? (descriptionFormat.multipleValue?.join(", ") ?? "") : descriptionFormat.value ?? "",
+        type: descriptionFormat.type,
+        maxLine: 0,
+      );
+    }
+
+    return Column(
+      mainAxisSize: MainAxisSize.min,
+      children: [
+        GridView.builder(
           itemCount: fields.length,
           shrinkWrap: true,
           physics: const NeverScrollableScrollPhysics(),
@@ -109,6 +130,9 @@ class RequestDetailFragment extends StatelessWidget {
             crossAxisCount: 2,
             childAspectRatio: (itemWidth / itemHeight),
           ),
+        ),
+        if (descriptionFormatView != null) descriptionFormatView,
+      ],
     ).objectContainerView();
     return ListView.separated(
             shrinkWrap: true,

lib/widgets/item_detail_view_widget.dart

@@ -52,8 +52,9 @@ class ItemDetailViewGridItem extends StatelessWidget {
   final String? value;
   final String? type;
   final bool isNeedToShowEmptyDivider;
+  final int maxLine;
 
-  ItemDetailViewGridItem(this.index, this.title, this.value, {Key? key, this.isNeedToShowEmptyDivider = false, this.type = ""}) : super(key: key);
+  ItemDetailViewGridItem(this.index, this.title, this.value, {Key? key, this.isNeedToShowEmptyDivider = false, this.type = "", this.maxLine = 6}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -76,10 +77,11 @@ class ItemDetailViewGridItem extends StatelessWidget {
         ),
       ),
       child: isNeedToShowEmptyDivider
-          ? Container()
+          ? SizedBox()
           : Column(
               crossAxisAlignment: CrossAxisAlignment.start,
               mainAxisAlignment: MainAxisAlignment.center,
+              mainAxisSize: MainAxisSize.min,
               children: [
                 title != null ? Flexible(child: "$title:".toText12Auto(isBold: true, color: const Color(0xff2BB8A6))) : Container(),
                 4.width,
@@ -87,7 +89,7 @@ class ItemDetailViewGridItem extends StatelessWidget {
                     ? type!.toLowerCase() == "table"
                         ? getStringFromJSON(value!)
                         // : Flexible(child: (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: 5))
-                        : (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: 6)
+                        : (value!.isEmpty ? "--" : value).toString().toText12Auto(color: MyColors.normalTextColor, maxLine: maxLine)
                     : Container(),
               ],
             ),