diff --git a/lib/extensions/widget_extensions.dart b/lib/extensions/widget_extensions.dart index 86e5f975..ce120527 100644 --- a/lib/extensions/widget_extensions.dart +++ b/lib/extensions/widget_extensions.dart @@ -4,7 +4,6 @@ import 'package:shimmer/shimmer.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; -import 'package:test_sa/views/app_style/sizing.dart'; import '../new_views/app_style/app_color.dart'; @@ -32,7 +31,10 @@ extension WidgetExtensions on Widget { flushbarPosition: FlushbarPosition.TOP, backgroundColor: backgroundColor ?? AppColor.green70, title: title, - messageText: Text(message,style: AppTextStyles.heading6.copyWith(color: AppColor.white10),), + messageText: Text( + message, + style: AppTextStyles.heading6.copyWith(color: AppColor.white10), + ), duration: Duration(seconds: duration ?? 3), flushbarStyle: FlushbarStyle.GROUNDED, reverseAnimationCurve: Curves.easeInOut, @@ -79,14 +81,14 @@ extension WidgetExtensions on Widget { ).toShadowContainer(context) : this; - Widget toShadowContainer(BuildContext context, {bool showShadow = true,Color? backgroundColor, double padding = 16}) => showShadow + Widget toShadowContainer(BuildContext context, {bool withoutShadow = true, bool showShadow = true, Color? backgroundColor, double padding = 16}) => withoutShadow ? Container( padding: EdgeInsets.all(padding), width: double.infinity, decoration: ShapeDecoration( - color: backgroundColor?? AppColor.background(context), + color: backgroundColor ?? AppColor.background(context), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(14)), - shadows: [boxShadowR14], + shadows: showShadow ? [boxShadowR14] : null, ), child: this, ) diff --git a/lib/new_views/pages/land_page/requests/asset_item_view.dart b/lib/new_views/pages/land_page/requests/asset_item_view.dart index 28d227a0..b0f532dd 100644 --- a/lib/new_views/pages/land_page/requests/asset_item_view.dart +++ b/lib/new_views/pages/land_page/requests/asset_item_view.dart @@ -76,7 +76,7 @@ class AssetItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(id: requestData!.id!)))); }); } @@ -134,7 +134,7 @@ class AssetItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { Navigator.of(context).push(MaterialPageRoute(builder: (_) => DeviceTransferDetails(model: AssetTransfer(id: requestDetails!.id!)))); }); } diff --git a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart index ee7f077c..7fe21068 100644 --- a/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart +++ b/lib/new_views/pages/land_page/requests/gas_refill_item_view.dart @@ -68,7 +68,7 @@ class GasRefillItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { Navigator.of(context).push( MaterialPageRoute( builder: (_) => GasRefillDetailsPage( @@ -127,7 +127,7 @@ class GasRefillItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { Navigator.of(context).push( MaterialPageRoute( builder: (_) => GasRefillDetailsPage( diff --git a/lib/new_views/pages/land_page/requests/ppm_item_view.dart b/lib/new_views/pages/land_page/requests/ppm_item_view.dart index 4a5d0388..9f2a9c6b 100644 --- a/lib/new_views/pages/land_page/requests/ppm_item_view.dart +++ b/lib/new_views/pages/land_page/requests/ppm_item_view.dart @@ -67,7 +67,7 @@ class PpmItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { // Navigator.of(context).push(MaterialPageRoute(builder: (_) => PpmDetailsPage(request: request))); }); } @@ -117,7 +117,7 @@ class PpmItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { Navigator.of(context).push(MaterialPageRoute(builder: (_) => PpmDetailsPage(request: requestDetails!))); }); } diff --git a/lib/new_views/pages/land_page/requests/service_request_item_view.dart b/lib/new_views/pages/land_page/requests/service_request_item_view.dart index 359bd6a8..4b71c92d 100644 --- a/lib/new_views/pages/land_page/requests/service_request_item_view.dart +++ b/lib/new_views/pages/land_page/requests/service_request_item_view.dart @@ -69,7 +69,7 @@ class ServiceRequestItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { Navigator.of(context).push(MaterialPageRoute(builder: (_) => RequestDetailMain(requestId: requestData!.id!))); }); } @@ -120,7 +120,7 @@ class ServiceRequestItemView extends StatelessWidget { ], ), ], - ).toShadowContainer(context, showShadow: showShadow).onPress(() { + ).toShadowContainer(context, withoutShadow: showShadow).onPress(() { Navigator.of(context).push(MaterialPageRoute(builder: (_) => RequestDetailMain(requestId: requestDetails!.id!))); }); } diff --git a/lib/service_request_latest/views/components/activities_list_view.dart b/lib/service_request_latest/views/components/activities_list_view.dart index 449c0b2e..d2ce87f6 100644 --- a/lib/service_request_latest/views/components/activities_list_view.dart +++ b/lib/service_request_latest/views/components/activities_list_view.dart @@ -44,7 +44,7 @@ class ActivitiesListView extends StatelessWidget { : ListView.separated( padding: const EdgeInsets.all(16), itemCount: activities.length, - separatorBuilder: (czt, index) => 8.height, + separatorBuilder: (czt, index) => 16.height, itemBuilder: (context, index) { return Column( mainAxisSize: MainAxisSize.min, @@ -140,7 +140,7 @@ class ActivitiesListView extends StatelessWidget { FilesList(images: activities[index].activitySparePart!.acitiySparePartAttachments!.map((toElement) => URLs.getFileUrl(toElement.name!)!).toList()), ], ], - ).toShadowContainer(context, padding: 12).onPress(() { + ).toShadowContainer(context, padding: 12, showShadow: false).onPress(() { //TODO write onview detail method.. // Navigator.push( // context,