From ff900e1756eba2a96456829315b10cdf0ef6ceb0 Mon Sep 17 00:00:00 2001 From: WaseemAbbasi22 <50428976+WaseemAbbasi22@users.noreply.github.com> Date: Sun, 17 May 2026 12:12:55 +0300 Subject: [PATCH] Ui fixes for darkmode --- .../pages/create_loan_request_page.dart | 59 +++++++++++-------- .../components/room_inspection_card.dart | 3 +- .../common_widgets/app_lazy_loading.dart | 2 +- 3 files changed, 37 insertions(+), 27 deletions(-) diff --git a/lib/modules/loan_module/pages/create_loan_request_page.dart b/lib/modules/loan_module/pages/create_loan_request_page.dart index e1312904..5ac46720 100644 --- a/lib/modules/loan_module/pages/create_loan_request_page.dart +++ b/lib/modules/loan_module/pages/create_loan_request_page.dart @@ -32,6 +32,8 @@ import 'package:test_sa/providers/loading_list_notifier.dart'; import 'package:test_sa/providers/lookups/department_lookup_provider.dart'; import 'package:test_sa/providers/work_order/vendor_provider.dart'; import 'package:test_sa/views/widgets/images/multi_image_picker.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 '../../../../../../new_views/common_widgets/default_app_bar.dart'; class CreateLoanRequestPage extends StatefulWidget { @@ -106,34 +108,40 @@ class _CreateLoanRequestPageState extends State with Tick staticData: loanTypes, initialValue: isBackUpRequest ? loanTypes[1] : loanTypes[0], showShadow: false, - backgroundColor: AppColor.fieldBgColor(context), + // backgroundColor: AppColor.fieldBgColor(context), showAsBottomSheet: true, onSelect: (value) {}, ), 16.height, if (isBackUpRequest) ...[ - 'Asset Information'.addTranslation.bodyText(context).custom(color: AppColor.black10), + InfoHeaderWidget('Asset Information'.addTranslation), 8.height, - Text( - '${context.translation.assetName}: ${widget.workOrder!.assetNdModel!.name?.cleanupWhitespace.capitalizeFirstOfEach}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), - Text( - '${context.translation.assetNumber}: ${widget.workOrder!.asset!.assetNumber}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), - Text( - '${context.translation.serialNo}: ${widget.workOrder!.asset!.assetSerialNo}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), - Text( - '${context.translation.model}: ${widget.workOrder!.model?.name!.cleanupWhitespace.capitalizeFirstOfEach}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), - Text( - '${context.translation.manufacture}: ${widget.workOrder!.manufacturer?.name?.cleanupWhitespace.capitalizeFirstOfEach}', - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), - ), + InfoTextWidget(label: context.translation.assetName, value: widget.workOrder!.assetNdModel!.name?.cleanupWhitespace.capitalizeFirstOfEach ?? '-'), + // Text( + // '${context.translation.assetName}: ${widget.workOrder!.assetNdModel!.name?.cleanupWhitespace.capitalizeFirstOfEach}', + // style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + // ), + InfoTextWidget(label: context.translation.assetNumber,value:widget.workOrder!.asset!.assetNumber ,), + // Text( + // '${context.translation.assetNumber}: ${widget.workOrder!.asset!.assetNumber}', + // style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + // ), + InfoTextWidget(label: context.translation.serialNo,value:widget.workOrder!.asset!.assetSerialNo ,), + InfoTextWidget(label: context.translation.model,value:widget.workOrder!.model?.name!.cleanupWhitespace.capitalizeFirstOfEach,), + InfoTextWidget(label: context.translation.manufacture,value:widget.workOrder!.manufacturer?.name?.cleanupWhitespace.capitalizeFirstOfEach), + + // Text( + // '${context.translation.serialNo}: ${widget.workOrder!.asset!.assetSerialNo}', + // style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + // ), + // Text( + // '${context.translation.model}: ${widget.workOrder!.model?.name!.cleanupWhitespace.capitalizeFirstOfEach}', + // style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + // ), + // Text( + // '${context.translation.manufacture}: ${widget.workOrder!.manufacturer?.name?.cleanupWhitespace.capitalizeFirstOfEach}', + // style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral120), + // ), 16.height, ], ...doctorInfoSection(), @@ -228,7 +236,8 @@ class _CreateLoanRequestPageState extends State with Tick List doctorInfoSection() { return [ - context.translation.contactInfo.bodyText(context).custom(color: AppColor.black10), + InfoHeaderWidget(context.translation.contactInfo), + // context.translation.contactInfo.bodyText(context).custom(color: AppColor.black10), 8.height, AppTextFormField( initialValue: "", @@ -288,7 +297,7 @@ class _CreateLoanRequestPageState extends State with Tick List itemDetailsSection() { return [ - 'Item Details'.addTranslation.bodyText(context).custom(color: AppColor.black10), + InfoHeaderWidget('Item Details'.addTranslation), 8.height, SingleItemDropDownMenu( context: context, @@ -442,7 +451,7 @@ class _CreateLoanRequestPageState extends State with Tick Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - 'Vendor Details'.addTranslation.bodyText(context).custom(color: AppColor.black10), + InfoHeaderWidget('Vendor Details'.addTranslation), Row( children: [ Container( diff --git a/lib/modules/pm_module/recurrent_wo/components/room_inspection_card.dart b/lib/modules/pm_module/recurrent_wo/components/room_inspection_card.dart index 4f508332..8a02aefa 100644 --- a/lib/modules/pm_module/recurrent_wo/components/room_inspection_card.dart +++ b/lib/modules/pm_module/recurrent_wo/components/room_inspection_card.dart @@ -206,7 +206,8 @@ class _RoomInspectionCardState extends State { decoration: InputDecoration( contentPadding: EdgeInsets.symmetric(horizontal: 5.toScreenWidth), filled: true, - fillColor: AppColor.fieldBgColor(context), + // fillColor: AppColor.fieldBgColor(context), + fillColor: AppColor.dropDownBackground(context), constraints: BoxConstraints( maxWidth: 99.toScreenWidth, maxHeight: 30.toScreenHeight, diff --git a/lib/new_views/common_widgets/app_lazy_loading.dart b/lib/new_views/common_widgets/app_lazy_loading.dart index d4f82cfb..fd9a95e3 100644 --- a/lib/new_views/common_widgets/app_lazy_loading.dart +++ b/lib/new_views/common_widgets/app_lazy_loading.dart @@ -13,7 +13,7 @@ class AppLazyLoading extends StatelessWidget { height: 36.toScreenWidth, width: 36.toScreenWidth, padding: const EdgeInsets.all(8), - decoration: const BoxDecoration(color: AppColor.neutral10, shape: BoxShape.circle, boxShadow: [AppStyle.boxShadow]), + decoration: BoxDecoration(color: AppColor.background(context), shape: BoxShape.circle, boxShadow: [AppStyle.boxShadow]), child: const Center(child: CircularProgressIndicator(strokeWidth: 3)), ), );