From 396967f851811099407fdf1b5f8a2283578519fc Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Mon, 18 May 2026 10:51:38 +0300 Subject: [PATCH] improvements. --- lib/dashboard_latest/dashboard_view.dart | 13 ++++++++----- .../components/service_request_detail_view.dart | 2 +- .../export_module/pages/export_form_view.dart | 2 +- lib/new_views/common_widgets/custom_badge.dart | 6 +++--- .../land_page/contact_us_bottom_sheet.dart | 17 +++++++++-------- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/lib/dashboard_latest/dashboard_view.dart b/lib/dashboard_latest/dashboard_view.dart index f527ac06..f5f0abfe 100644 --- a/lib/dashboard_latest/dashboard_view.dart +++ b/lib/dashboard_latest/dashboard_view.dart @@ -57,7 +57,7 @@ class _DashboardViewState extends State { _dashBoardProvider.setTabs(userType: userProvider.user!.type!, context: context); _dashBoardProvider.getDashBoardCount(usersType: userProvider.user!.type!); _dashBoardProvider.resetRequestDataList(); - _dashBoardProvider.currentListIndex=0; + _dashBoardProvider.currentListIndex = 0; _dashBoardProvider.getRequestDetail( usersType: userProvider.user!.type!, status: _dashBoardProvider.tabs[_dashBoardProvider.currentListIndex].tag, @@ -131,9 +131,11 @@ class _DashboardViewState extends State { child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, - children: [16.height, ProgressFragment(), 16.height, + children: [ + 16.height, ProgressFragment(), 16.height, // const RequestsFragment(), - const RequestCategoryFragment()], + const RequestCategoryFragment() + ], ), ), ), @@ -167,11 +169,12 @@ class _DashboardViewState extends State { mainAxisAlignment: MainAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center, children: [ - 'swipe'.toSvgAsset(width: 32, height: 32), + 'swipe'.toSvgAsset(width: 24, height: 24), 8.height, Text( ("${context.translation.checkIn}\n${userProvider.swipeTransactionModel.swipeTime != null ? SwipeGeneralUtils.instance.formatTimeOnly(userProvider.swipeTransactionModel.swipeTime!) : '--:--'}"), - style: AppTextStyles.bodyText2.copyWith(color: AppColor.textColor(context), fontWeight: FontWeight.w500, fontFamily: "Poppins"), + textAlign: TextAlign.center, + style: AppTextStyles.tinyFont2.copyWith(color: AppColor.textColor(context), fontWeight: FontWeight.w500, fontFamily: "Poppins"), ), ], ); diff --git a/lib/modules/cm_module/views/components/service_request_detail_view.dart b/lib/modules/cm_module/views/components/service_request_detail_view.dart index 14af307c..fee7bb28 100644 --- a/lib/modules/cm_module/views/components/service_request_detail_view.dart +++ b/lib/modules/cm_module/views/components/service_request_detail_view.dart @@ -238,7 +238,7 @@ class _ServiceRequestDetailViewState extends State { 8.height, Text( workOrder.comments!, - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.labelTextStyleColor(context)), ), ], if (userProvider.user?.type == UsersTypes.engineer) ...[ diff --git a/lib/modules/export_module/pages/export_form_view.dart b/lib/modules/export_module/pages/export_form_view.dart index 8bb6d933..6075772b 100644 --- a/lib/modules/export_module/pages/export_form_view.dart +++ b/lib/modules/export_module/pages/export_form_view.dart @@ -72,7 +72,7 @@ class _ExportFormViewState extends State> { Expanded( child: SingleChildScrollView( child: Column( - spacing: 16, + spacing: 12, children: [ MultipleItemDropDownMenu( context: context, diff --git a/lib/new_views/common_widgets/custom_badge.dart b/lib/new_views/common_widgets/custom_badge.dart index 20f14dd3..5fc4fd10 100644 --- a/lib/new_views/common_widgets/custom_badge.dart +++ b/lib/new_views/common_widgets/custom_badge.dart @@ -37,9 +37,9 @@ class CustomBadge extends StatelessWidget { child: Opacity( opacity: value > 0 ? 1 : 0, child: Container( - height: height ?? 23, - constraints: BoxConstraints(minWidth: width ?? 23), - padding: const EdgeInsets.all(3), + height: height ?? 24, + constraints: BoxConstraints(minWidth: width ?? 24), + padding: const EdgeInsets.only(top: 0,bottom: 0,left: 4,right: 4), alignment: Alignment.center, decoration: BoxDecoration(color: color, borderRadius: BorderRadius.circular(30)), child: CounterAnimatedText( 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 539ad240..8640d202 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 @@ -5,9 +5,12 @@ import 'package:provider/provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/int_extensions.dart'; +import 'package:test_sa/extensions/string_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/site_contact_info_model.dart'; +import 'package:test_sa/views/widgets/item_views/info_header_widget.dart'; +import 'package:test_sa/views/widgets/item_views/info_text_widget.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher_string.dart'; @@ -60,21 +63,18 @@ class ContactUsBottomSheet extends StatelessWidget { 8.width, Column( crossAxisAlignment: CrossAxisAlignment.start, + spacing: 4, children: [ - Text( + InfoHeaderWidget( sites[index].siteName ?? "", - style: AppTextStyles.heading6.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), - ), - 4.height, - Text( - sites[index].phoneNumber ?? "", - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), ), + InfoTextWidget(label: sites[index].phoneNumber ?? "", isMsg: true, showEmptyValue: true), ], ).expanded, IconButton( icon: const Icon(Icons.copy_rounded), padding: EdgeInsets.zero, + color: AppColor.icon2Color(context), iconSize: 20, onPressed: () { Clipboard.setData(ClipboardData(text: sites[index].phoneNumber!)); @@ -83,6 +83,7 @@ class ContactUsBottomSheet extends StatelessWidget { IconButton( icon: const Icon(Icons.call), padding: EdgeInsets.zero, + color: AppColor.icon2Color(context), iconSize: 20, onPressed: () async { final Uri launchUri = Uri(scheme: 'tel', path: sites[index].phoneNumber!); @@ -90,7 +91,7 @@ class ContactUsBottomSheet extends StatelessWidget { if (await canLaunchUrl(launchUri)) { await launchUrl(launchUri); } else { - // Handle error, e.g., show a snackbar + "You don't have any calling supported application, Please install.".showToast; throw 'Could not launch $launchUri'; } },