diff --git a/lib/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart b/lib/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart index 4dcbd64b..04fdd0ce 100644 --- a/lib/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart +++ b/lib/modules/cm_module/views/components/bottom_sheets/service_request_bottomsheet.dart @@ -790,8 +790,8 @@ class ServiceRequestBottomSheet { label: context.translation.no, loading: false, showBorder: true, - buttonColor: context.isDark ? AppColor.neutral70 : AppColor.white60, - textColor: context.isDark ? AppColor.white10 : AppColor.black10, + buttonColor: AppColor.noButtonColor(context), + textColor: AppColor.labelTextStyleColor(context), // buttonColor: AppColor.white60, // textColor: AppColor.black10, onPressed: () async { diff --git a/lib/modules/tm_module/tasks/task_request_detail_view.dart b/lib/modules/tm_module/tasks/task_request_detail_view.dart index 43568769..ca6f02e8 100644 --- a/lib/modules/tm_module/tasks/task_request_detail_view.dart +++ b/lib/modules/tm_module/tasks/task_request_detail_view.dart @@ -128,10 +128,7 @@ class _TaskRequestDetailsViewState extends State { if (taskProvider.taskRequestModel?.taskType?.relatedTo?.value == 1) ...[ assetDetails(taskModel: taskProvider.taskRequestModel!), ], - if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[ - const Divider().defaultStyle(context), - installationWidget(taskModel: taskProvider.taskRequestModel!) - ], + if (taskProvider.taskRequestModel?.taskType?.isInstallation == true) ...[const Divider().defaultStyle(context), installationWidget(taskModel: taskProvider.taskRequestModel!)], if (taskProvider.taskRequestModel?.taskType?.relatedTo?.value == 2) ...[ const Divider().defaultStyle(context), linkWithLocationWidget(taskModel: taskProvider.taskRequestModel!), @@ -184,9 +181,7 @@ class _TaskRequestDetailsViewState extends State { ) else if (userProvider!.user!.type == UsersTypes.engineer && taskModel?.taskJobStatus?.value == 5) ...[] - else if (userProvider!.user!.type == UsersTypes.engineer && (taskModel?.taskJobStatus?.value != 4 && taskModel?.taskJobStatus?.value != 3 - && taskModel?.taskJobStatus?.value != 1 - )) + else if (userProvider!.user!.type == UsersTypes.engineer && (taskModel?.taskJobStatus?.value != 4 && taskModel?.taskJobStatus?.value != 3 && taskModel?.taskJobStatus?.value != 1)) FooterActionButton.footerContainer( context: context, child: Row( @@ -259,20 +254,20 @@ class _TaskRequestDetailsViewState extends State { ), ).onPress(() => showModalBottomSheet( context: context, + useSafeArea: true, + isScrollControlled: true, isDismissible: true, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(20)), - ), - clipBehavior: Clip.antiAliasWithSaveLayer, + backgroundColor: AppColor.bottomSheetColor(context), builder: (BuildContext context) => TotalWorkingTimeDetailBottomSheet( - timerList: timer.map((e) { + timerList: timer.map((e) { return TimerHistoryModel( id: e.id, startTime: e.startDate, endTime: e.endDate, workingHours: e.totalWorkingHour, ); - }).toList()), + }).toList()) + .bottomSheetContainer(context), )); } diff --git a/lib/new_views/app_style/app_color.dart b/lib/new_views/app_style/app_color.dart index 8ada48d1..f6ed7e3d 100644 --- a/lib/new_views/app_style/app_color.dart +++ b/lib/new_views/app_style/app_color.dart @@ -171,6 +171,7 @@ class AppColor { static Color selectedButtonColor(BuildContext context) => context.isDark ? neutral60 : neutral30; static Color unSelectedButtonColor(BuildContext context) => context.isDark ? neutral60 : Colors.white; + static Color noButtonColor(BuildContext context) => context.isDark ?AppColor.neutral70 : AppColor.white60; static Color filterButtonTextColor(BuildContext context) => context.isDark ? neutral30 : neutral50; diff --git a/lib/new_views/common_widgets/working_time_tile.dart b/lib/new_views/common_widgets/working_time_tile.dart index a2fe3660..846a8336 100644 --- a/lib/new_views/common_widgets/working_time_tile.dart +++ b/lib/new_views/common_widgets/working_time_tile.dart @@ -27,7 +27,7 @@ class WorkingTimeTile extends StatelessWidget { padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), alignment: Alignment.centerLeft, decoration: BoxDecoration( - color: AppColor.fieldBgColor(context), + color: AppColor.disableFieldBackground(context), borderRadius: BorderRadius.circular(10), // boxShadow: [ // BoxShadow( @@ -43,6 +43,7 @@ class WorkingTimeTile extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, children: [ + Text( title, style: Theme.of(context).textTheme.bodySmall?.copyWith( @@ -63,12 +64,11 @@ class WorkingTimeTile extends StatelessWidget { ).onPress(() async { await showModalBottomSheet( context: context, + useSafeArea: true, + isScrollControlled: true, isDismissible: true, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.vertical(top: Radius.circular(20)), - ), - clipBehavior: Clip.antiAliasWithSaveLayer, - builder: (BuildContext context) => TotalWorkingTimeDetailBottomSheet(timerList: timerList), + backgroundColor: AppColor.bottomSheetColor(context), + builder: (BuildContext context) => TotalWorkingTimeDetailBottomSheet(timerList: timerList).bottomSheetContainer(context), ); }); } diff --git a/lib/views/widgets/total_working_time_detail_bottomsheet.dart b/lib/views/widgets/total_working_time_detail_bottomsheet.dart index 90d990f8..fddf50b3 100644 --- a/lib/views/widgets/total_working_time_detail_bottomsheet.dart +++ b/lib/views/widgets/total_working_time_detail_bottomsheet.dart @@ -7,6 +7,8 @@ import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/new_models/work_order_detail_model.dart'; import 'package:test_sa/modules/cm_module/cm_request_utils.dart'; import 'package:test_sa/new_views/app_style/app_color.dart'; +import 'package:test_sa/views/widgets/item_views/info_header_widget.dart'; +import 'package:test_sa/models/size_config.dart'; class TotalWorkingTimeDetailBottomSheet extends StatelessWidget { final List timerList; @@ -15,57 +17,58 @@ class TotalWorkingTimeDetailBottomSheet extends StatelessWidget { @override Widget build(BuildContext context) { - return SafeArea( - child: Container( - height: MediaQuery.of(context).size.height * 0.5, - padding: const EdgeInsets.all(16), - child: Column( - children: [ - Container( - width: 40.toScreenWidth, - height: 5.toScreenHeight, - decoration: BoxDecoration(color: AppColor.neutral40, borderRadius: BorderRadius.circular(30)), - ), - 8.height, - Align( - alignment: AlignmentDirectional.centerStart, - child: Text( - "Total Working Time", - style: AppTextStyles.heading3.copyWith(fontWeight: FontWeight.w600, color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), - ), - ), - ListView.separated( - itemCount: timerList.length, - separatorBuilder: (cxt, index) => const Divider().defaultStyle(context), - padding: const EdgeInsets.only(top: 16, bottom: 16), - itemBuilder: (cxt, index) { - int totalWorkingHours = DateTime.parse(timerList[index].endTime!).difference(DateTime.parse(timerList[index].startTime!)).inSeconds; - return Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - RichText( - text: TextSpan( - text: "From: ", - style: Theme.of(context).textTheme.bodySmall?.copyWith(color: context.isDark ? null : AppColor.neutral20, fontWeight: FontWeight.w500), - children: [TextSpan(text: timerList[index].startTime!.toServiceRequestDetailsFormatWithSS, style: Theme.of(context).textTheme.bodySmall)])), - 4.height, - RichText( - text: TextSpan( - text: "To: ", - style: Theme.of(context).textTheme.bodySmall?.copyWith(color: context.isDark ? null : AppColor.neutral20, fontWeight: FontWeight.w500), - children: [TextSpan(text: timerList[index].endTime!.toServiceRequestDetailsFormatWithSS, style: Theme.of(context).textTheme.bodySmall)])), - 4.height, - RichText( - text: TextSpan( - text: "Duration: ", - style: Theme.of(context).textTheme.bodySmall?.copyWith(color: context.isDark ? null : AppColor.neutral20, fontWeight: FontWeight.w500), - children: [TextSpan(text: " ${CMRequestUtils.formatTimerDuration(totalWorkingHours.round())}", style: Theme.of(context).textTheme.bodySmall)])), - ], - ); - }).expanded, - ], - ), + return SizedBox( + height: SizeConfig.screenHeight! / 2.2, + width: SizeConfig.screenWidth, + child: Column( + mainAxisSize: MainAxisSize.min, + // crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: 40.toScreenWidth, + height: 5.toScreenHeight, + decoration: BoxDecoration(color: AppColor.neutral40, borderRadius: BorderRadius.circular(30)), + ), + 16.height, + Align( + alignment: AlignmentDirectional.centerStart, + child: InfoHeader16Widget("Total Working Time".addTranslation), + ), + 8.height, + ListView.separated( + itemCount: timerList.length, + separatorBuilder: (cxt, index) => const Divider().defaultStyle(context), + padding: const EdgeInsets.only(bottom: 16), + itemBuilder: (cxt, index) { + int totalWorkingHours = DateTime.parse(timerList[index].endTime!).difference(DateTime.parse(timerList[index].startTime!)).inSeconds; + return Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + RichText( + text: TextSpan(text: "From: ", style: AppTextStyles.bodyText.copyWith(color: AppColor.lightTextColor(context)), children: [ + TextSpan( + text: timerList[index].startTime!.toServiceRequestDetailsFormatWithSS, + style: AppTextStyles.bodyText.copyWith(fontWeight: FontWeight.normal, color: AppColor.lightTextColor(context))) + ])), + 4.height, + RichText( + text: TextSpan(text: "To: ", style: AppTextStyles.bodyText.copyWith(color: AppColor.lightTextColor(context)), children: [ + TextSpan( + text: timerList[index].endTime!.toServiceRequestDetailsFormatWithSS, + style: AppTextStyles.bodyText.copyWith(fontWeight: FontWeight.normal, color: AppColor.lightTextColor(context))) + ])), + 4.height, + RichText( + text: TextSpan(text: "Duration: ", style: AppTextStyles.bodyText.copyWith(color: AppColor.lightTextColor(context)), children: [ + TextSpan( + text: " ${CMRequestUtils.formatTimerDuration(totalWorkingHours.round())}", + style: AppTextStyles.bodyText.copyWith(fontWeight: FontWeight.normal, color: AppColor.lightTextColor(context))) + ])), + ], + ); + }).expanded, + ], ), ); }