From 7fcf49df5c38b688ebdc62b595886b5a46b8a472 Mon Sep 17 00:00:00 2001 From: zaid_daoud Date: Thu, 9 Nov 2023 09:32:44 +0300 Subject: [PATCH] Improvements --- lib/extensions/widget_extensions.dart | 4 ++-- lib/new_views/pages/land_page/calendar_page.dart | 2 +- .../land_page/calender_fragments/monthly_fragment.dart | 2 +- .../land_page/calender_fragments/weekly_fragment.dart | 2 +- .../pages/land_page/contact_us_bottom_sheet.dart | 9 ++++----- .../land_page/dashboard_fragments/progress_fragment.dart | 2 +- .../land_page/dashboard_fragments/requests_fragment.dart | 2 +- lib/views/widgets/gas_refill/gas_refill_item.dart | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/extensions/widget_extensions.dart b/lib/extensions/widget_extensions.dart index 444e7029..941640d8 100644 --- a/lib/extensions/widget_extensions.dart +++ b/lib/extensions/widget_extensions.dart @@ -35,10 +35,10 @@ extension WidgetExtensions on Widget { ) : this; - Widget get toShadowContainer => Container( + Widget toShadowContainer(BuildContext context) => Container( padding: const EdgeInsets.all(16), decoration: ShapeDecoration( - color: Colors.white, + color: Theme.of(context).cardColor, shape: RoundedRectangleBorder( borderRadius: BorderRadius.circular(20), ), diff --git a/lib/new_views/pages/land_page/calendar_page.dart b/lib/new_views/pages/land_page/calendar_page.dart index 677815b9..c067b5de 100644 --- a/lib/new_views/pages/land_page/calendar_page.dart +++ b/lib/new_views/pages/land_page/calendar_page.dart @@ -43,7 +43,7 @@ class _CalendarPageState extends State with SingleTickerProviderSt "Sunday to Thursday".bodyText(context), "09:00 to 18:00".bodyText(context).custom(color: AppColor.neutral50), ], - ).toShadowContainer, + ).toShadowContainer(context), ).paddingOnly(start: 16, end: 16), 16.height, Container( diff --git a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart index 3928e598..64323c4d 100644 --- a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart @@ -82,7 +82,7 @@ class _MonthlyFragmentState extends State { ], ), ], - ).toShadowContainer, + ).toShadowContainer(context), ); } } diff --git a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart index 12d55447..cceb4358 100644 --- a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart @@ -94,7 +94,7 @@ class _WeeklyFragmentState extends State { // availableGestures: AvailableGestures.none, // ), ], - ).toShadowContainer, + ).toShadowContainer(context), ); } diff --git a/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart b/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart index 1bb9ce2b..72b1d6a9 100644 --- a/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart +++ b/lib/new_views/pages/land_page/contact_us_bottom_sheet.dart @@ -4,7 +4,6 @@ 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/extensions/widget_extensions.dart'; -import 'package:test_sa/models/enums/translation_keys.dart'; import '../../app_style/app_color.dart'; @@ -42,9 +41,9 @@ class ContactUsBottomSheet extends StatelessWidget { 16.height, Row( children: [ - contactItem(context.isDark, "phone", context.translation.callUs, "+966 546345567").onPress(() { }).expanded, + contactItem(context, context.isDark, "phone", context.translation.callUs, "+966 546345567").onPress(() {}).expanded, 16.width, - contactItem(context.isDark, "whatsapp", context.translation.liveChat, context.translation.openWhatsapp).onPress(() {}).expanded, + contactItem(context, context.isDark, "whatsapp", context.translation.liveChat, context.translation.openWhatsapp).onPress(() {}).expanded, ], ), 32.height, @@ -53,7 +52,7 @@ class ContactUsBottomSheet extends StatelessWidget { ); } - Widget contactItem(bool isDark, String iconName, String title, String subtitle) { + Widget contactItem(BuildContext context, bool isDark, String iconName, String title, String subtitle) { return Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -72,6 +71,6 @@ class ContactUsBottomSheet extends StatelessWidget { style: AppTextStyles.bodyText.copyWith(color: isDark ? AppColor.neutral10 : AppColor.neutral20), ), ], - ).toShadowContainer; + ).toShadowContainer(context); } } diff --git a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart index 3414bb46..d4f70e9e 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart @@ -35,7 +35,7 @@ class ProgressFragment extends StatelessWidget { chartValueStyle: AppTextStyles.heading6.copyWith(color: AppColor.neutral20), showChartValuesOutside: false, ), - ).paddingAll(8).toShadowContainer, + ).paddingAll(8).toShadowContainer(context), ], ).paddingOnly(start: 16, end: 16); } diff --git a/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart index d886fb8b..aea31335 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/requests_fragment.dart @@ -68,6 +68,6 @@ class RequestsFragment extends StatelessWidget { ], ).toShimmer(isShow: isLoading), ], - ).toShadowContainer; + ).toShadowContainer(context); } } diff --git a/lib/views/widgets/gas_refill/gas_refill_item.dart b/lib/views/widgets/gas_refill/gas_refill_item.dart index 126b7e44..5ab6501e 100644 --- a/lib/views/widgets/gas_refill/gas_refill_item.dart +++ b/lib/views/widgets/gas_refill/gas_refill_item.dart @@ -133,6 +133,6 @@ class GasRefillItem extends StatelessWidget { // ], // ), ], - ).toShadowContainer.paddingOnly(bottom: 8); + ).toShadowContainer(context).paddingOnly(bottom: 8); } }