diff --git a/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart b/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart index 52c7cfa2..f60d5332 100644 --- a/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart +++ b/lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart @@ -303,7 +303,7 @@ class _AssetInventoryFormViewState extends State { attachment: attachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), ), 12.height, AppTextFormField( diff --git a/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart b/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart index fe8760eb..d31dbf94 100644 --- a/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart +++ b/lib/modules/cm_module/views/forms/asset_retired/asset_retired.dart @@ -107,7 +107,7 @@ class _AssetRetiredState extends State with TickerProviderStateMix label: context.translation.attachFiles, attachment: _attachments, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), buttonColor: AppColor.black10, ), ], diff --git a/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart b/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart index 1821a20b..de312a41 100644 --- a/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart +++ b/lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart @@ -296,7 +296,7 @@ class _SparePartRequestState extends State with TickerProvider AttachmentPicker( label: context.translation.attachQuotation, attachment: attachments, - buttonIcon: 'quotation_icon'.toSvgAsset(), + buttonIcon: 'quotation_icon'.toSvgAsset(color: AppColor.primary10), buttonColor: AppColor.primary10, ), ], diff --git a/lib/modules/cx_module/chat/helper/chat_file_picker.dart b/lib/modules/cx_module/chat/helper/chat_file_picker.dart index f080cd20..514e4a7c 100644 --- a/lib/modules/cx_module/chat/helper/chat_file_picker.dart +++ b/lib/modules/cx_module/chat/helper/chat_file_picker.dart @@ -27,13 +27,13 @@ class ChatFilePicker extends StatelessWidget { physics: const NeverScrollableScrollPhysics(), gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(crossAxisCount: 3, childAspectRatio: 1, crossAxisSpacing: 12, mainAxisSpacing: 12), children: [ - gridItem(Icons.camera_enhance_rounded, context.translation.pickFromCamera).onPress(() async { + gridItem(context, Icons.camera_enhance_rounded, context.translation.pickFromCamera).onPress(() async { await fromMediaPicker(context, ImageSource.camera); }), - gridItem(Icons.image_rounded, context.translation.pickFromGallery).onPress(() async { + gridItem(context, Icons.image_rounded, context.translation.pickFromGallery).onPress(() async { await fromMediaPicker(context, ImageSource.gallery); }), - gridItem(Icons.file_present_rounded, context.translation.pickFromFiles).onPress(() async { + gridItem(context, Icons.file_present_rounded, context.translation.pickFromFiles).onPress(() async { await fromFilePicker(context); }), ], @@ -81,23 +81,20 @@ class ChatFilePicker extends StatelessWidget { } } - Widget gridItem(IconData iconData, String title) { + Widget gridItem(BuildContext context, IconData iconData, String title) { return Container( padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(12), - border: Border.all(color: const Color(0xffF1F1F1), width: 1), + color: AppColor.background(context), + borderRadius: BorderRadius.circular(16), + border: Border.all(color: AppColor.borderColor(context), width: 2), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Icon(iconData, color: const Color(0xff7D859A), size: 36), - Text( - title, - style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500), - ), + Icon(iconData, color: AppColor.icon2Color(context), size: 36), + title.bodyText2(context).custom(color: AppColor.labelTextStyleColor(context), fontSize: context.isTablet() ? 10.toScreenWidth : null), ], ), ); diff --git a/lib/modules/demo_module/create_demo_request_page.dart b/lib/modules/demo_module/create_demo_request_page.dart index b8cce18d..a921ed91 100644 --- a/lib/modules/demo_module/create_demo_request_page.dart +++ b/lib/modules/demo_module/create_demo_request_page.dart @@ -148,7 +148,7 @@ class _CreateDemoRequestPageState extends State with Tick enabled: demoDocumentLookup != null, documentType: demoDocumentLookup, showAsListView: true, - buttonIcon: 'image-plus'.toSvgAsset(color: (context.isDark ? AppColor.primary10 : AppColor.neutral120).withOpacity(demoDocumentLookup != null ? 1 : .4)), + buttonIcon: 'image-plus'.toSvgAsset(color: (AppColor.primary10).withOpacity(demoDocumentLookup != null ? 1 : .4)), onChange: (attachments) { _attachments = attachments; setState(() {}); diff --git a/lib/modules/demo_module/update_demo-request_view.dart b/lib/modules/demo_module/update_demo-request_view.dart index d7b1ffe9..02dae2d2 100644 --- a/lib/modules/demo_module/update_demo-request_view.dart +++ b/lib/modules/demo_module/update_demo-request_view.dart @@ -227,7 +227,7 @@ class _UpdateDemoRequestViewState extends State with Tick documentType: demoDocumentLookup, enabled: demoDocumentLookup != null, showAsListView: true, - buttonIcon: 'image-plus'.toSvgAsset(color: (context.isDark ? AppColor.primary10 : AppColor.neutral120).withOpacity(demoDocumentLookup != null ? 1 : .4)), + buttonIcon: 'image-plus'.toSvgAsset(color: (AppColor.primary10).withOpacity(demoDocumentLookup != null ? 1 : .4)), ), ], ).toShadowContainer(context, borderRadius: 20), diff --git a/lib/modules/incident_module/create_incident_request_page.dart b/lib/modules/incident_module/create_incident_request_page.dart index dc33c3e2..3085dc26 100644 --- a/lib/modules/incident_module/create_incident_request_page.dart +++ b/lib/modules/incident_module/create_incident_request_page.dart @@ -156,7 +156,7 @@ class _CreateIncidentRequestPageState extends State { buttonColor: AppColor.black10, onlyImages: false, showAsListView: true, - buttonIcon: 'image-plus'.toSvgAsset(color: context.isDark ? AppColor.primary10 : AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), onChange: (_attachments) { attachments = _attachments; setState(() {}); diff --git a/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart b/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart index fb317f1e..9c5be1d2 100644 --- a/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart +++ b/lib/modules/internal_audit_module/pages/equipment_internal_audit/update_equipment_internal_audit_page.dart @@ -223,9 +223,7 @@ class _UpdateEquipmentInternalAuditPageState extends State(context, listen: false); - if ( formModel.startTime == null) { + if (formModel.startTime == null) { Fluttertoast.showToast(msg: "Working Hours Required"); return; } @@ -162,9 +162,7 @@ class _UpdateSystemInternalAuditPageState extends State with Tick attachment: attachments, onlyImages: false, showAsListView: true, - buttonIcon: 'image-plus'.toSvgAsset(color: context.isDark ? AppColor.primary10 : AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), onChange: (attachments) { attachments = attachments; setState(() {}); diff --git a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart index 86cebf54..1a0dfae5 100644 --- a/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart +++ b/lib/modules/medical_gas_inspection/update_delivery_notes_page.dart @@ -206,9 +206,7 @@ class _UpdateDeliveryNotesState extends State { buttonColor: AppColor.primary10, // showAsListView: true, onlyImages: false, - buttonIcon: 'attachment_icon'.toSvgAsset( - color: AppColor.primary10, - ), + buttonIcon: 'attachment_icon'.toSvgAsset(color: AppColor.primary10), ), 16.height, //should create a reusable widget. diff --git a/lib/modules/medical_gas_inspection/update_medical_gas_inspection_page.dart b/lib/modules/medical_gas_inspection/update_medical_gas_inspection_page.dart index 7175b7e1..b11a0a92 100644 --- a/lib/modules/medical_gas_inspection/update_medical_gas_inspection_page.dart +++ b/lib/modules/medical_gas_inspection/update_medical_gas_inspection_page.dart @@ -203,9 +203,7 @@ class _UpdateMedicalGasInspectionPageState extends State { attachment: ppmProvider.ppmPlanAttachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), ), ], ).toShadowContainer(context), diff --git a/lib/modules/tm_module/device_transfer/create_device_transfer_request.dart b/lib/modules/tm_module/device_transfer/create_device_transfer_request.dart index 6b9ed8aa..3383d57a 100644 --- a/lib/modules/tm_module/device_transfer/create_device_transfer_request.dart +++ b/lib/modules/tm_module/device_transfer/create_device_transfer_request.dart @@ -247,7 +247,7 @@ class _CreateDeviceTransferRequestState extends State { attachment: attachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), ), 8.height, ], diff --git a/lib/modules/tm_module/gas_refill/gas_refill_request_form.dart b/lib/modules/tm_module/gas_refill/gas_refill_request_form.dart index 8b6814c8..6e6e46d3 100644 --- a/lib/modules/tm_module/gas_refill/gas_refill_request_form.dart +++ b/lib/modules/tm_module/gas_refill/gas_refill_request_form.dart @@ -219,7 +219,7 @@ class _GasRefillRequestFormState extends State { attachment: attachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), ), ], ).toShadowContainer(context, padding: 10).paddingOnly(start: 16, end: 16, top: 16), diff --git a/lib/modules/tm_module/gas_refill/update_gas_refill_request.dart b/lib/modules/tm_module/gas_refill/update_gas_refill_request.dart index 643766ec..b254dd79 100644 --- a/lib/modules/tm_module/gas_refill/update_gas_refill_request.dart +++ b/lib/modules/tm_module/gas_refill/update_gas_refill_request.dart @@ -294,7 +294,7 @@ class _UpdateGasRefillRequestState extends State { attachment: _attachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), ), 8.height, ], diff --git a/lib/modules/tm_module/tasks/create_task_view.dart b/lib/modules/tm_module/tasks/create_task_view.dart index ef88a1af..fe088868 100644 --- a/lib/modules/tm_module/tasks/create_task_view.dart +++ b/lib/modules/tm_module/tasks/create_task_view.dart @@ -111,13 +111,13 @@ class _CreateTaskViewState extends State with TickerProviderStat _addTaskModel?.callComment = value; }, ), - 23.height, + 24.height, AttachmentPicker( label: context.translation.attachImage, attachment: attachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: context.isDark ? AppColor.primary10 : AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), //verify this if not required delete this .. onChange: (attachments) { attachments = attachments; diff --git a/lib/modules/tm_module/tasks/update_task_request_view.dart b/lib/modules/tm_module/tasks/update_task_request_view.dart index 141ac7c0..f7c94d60 100644 --- a/lib/modules/tm_module/tasks/update_task_request_view.dart +++ b/lib/modules/tm_module/tasks/update_task_request_view.dart @@ -193,7 +193,7 @@ class _UpdateTaskRequestState extends State { attachment: attachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), ), ], ).toShadowContainer(context), diff --git a/lib/modules/traf_module/update_traf_request_page.dart b/lib/modules/traf_module/update_traf_request_page.dart index 5567dd31..21297656 100644 --- a/lib/modules/traf_module/update_traf_request_page.dart +++ b/lib/modules/traf_module/update_traf_request_page.dart @@ -213,7 +213,7 @@ class _UpdateTrafRequestPageState extends State { attachment: attachments, buttonColor: AppColor.black10, onlyImages: false, - buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.neutral120), + buttonIcon: 'image-plus'.toSvgAsset(color: AppColor.primary10), onChange: (attachment) { attachments = attachment; }, diff --git a/lib/views/widgets/images/multi_image_picker.dart b/lib/views/widgets/images/multi_image_picker.dart index aa9ecd79..582bc6ea 100644 --- a/lib/views/widgets/images/multi_image_picker.dart +++ b/lib/views/widgets/images/multi_image_picker.dart @@ -482,19 +482,20 @@ class _AttachmentPickerState extends State { return Container( padding: const EdgeInsets.all(12), decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(12), - border: Border.all(color: const Color(0xffF1F1F1), width: 1), + color: AppColor.background(context), + borderRadius: BorderRadius.circular(16), + border: Border.all(color: AppColor.borderColor(context), width: 2), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Icon(iconData, color: const Color(0xff7D859A), size: 36), - Text( - title, - style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500), - ), + Icon(iconData, color: AppColor.icon2Color(context), size: 24), + title.bodyText2(context).custom(color: AppColor.labelTextStyleColor(context), fontSize: context.isTablet() ? 10.toScreenWidth : null), + // Text( + // title, + // style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500), + // ), ], ), ); @@ -509,20 +510,15 @@ class _AttachmentPickerState extends State { padding: const EdgeInsets.all(12), decoration: BoxDecoration( color: AppColor.background(context), - // color: Colors.white, - borderRadius: BorderRadius.circular(12), - border: Border.all(color: const Color(0xffF1F1F1), width: 1), + borderRadius: BorderRadius.circular(16), + border: Border.all(color: AppColor.borderColor(context), width: 2), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - icon.toSvgAsset(color: AppColor.iconColor(context), width: 36, height: 36), - // Icon(iconData, color: const Color(0xff7D859A), size: 36), - Text( - label, - style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w500), - ), + icon.toSvgAsset(color: AppColor.icon2Color(context), width: 36, height: 36), + label.bodyText2(context).custom(color: AppColor.labelTextStyleColor(context), fontSize: context.isTablet() ? 10.toScreenWidth : null), ], ), ).onPress(onTap); diff --git a/lib/views/widgets/images/multi_image_picker_item.dart b/lib/views/widgets/images/multi_image_picker_item.dart index b889b547..acd8a992 100644 --- a/lib/views/widgets/images/multi_image_picker_item.dart +++ b/lib/views/widgets/images/multi_image_picker_item.dart @@ -64,14 +64,14 @@ class MultiFilesPickerItem extends StatelessWidget { Flexible( child: EllipsizedText( file.path.split("/").last, - style: AppTextStyles.bodyText.copyWith(color: AppColor.black10), + style: AppTextStyles.bodyText.copyWith(color: AppColor.labelTextStyleColor(context)), type: EllipsisType.start, // or EllipsisType.middle ), ), 8.width, if (enabled) InkWell( - child: "remove".toSvgAsset(width: 16), + child: "remove".toSvgAsset(width: 16,color: AppColor.red30), onTap: () { onRemoveTap(file); if (onRemove != null) { @@ -85,7 +85,7 @@ class MultiFilesPickerItem extends StatelessWidget { RichText( text: TextSpan( text: documentType == null ? 'Asset Guide | ' : '$documentType | ', - style: AppTextStyles.bodyText.copyWith(color: AppColor.neutral120), + style: AppTextStyles.bodyText.copyWith(color: AppColor.lightTextColor(context)), children: [ TextSpan( text: 'View', diff --git a/lib/views/widgets/images/new_multi_image_picker.dart b/lib/views/widgets/images/new_multi_image_picker.dart index 040af263..60a4fdce 100644 --- a/lib/views/widgets/images/new_multi_image_picker.dart +++ b/lib/views/widgets/images/new_multi_image_picker.dart @@ -174,19 +174,20 @@ class _MultiFilesPickerState extends State { return Container( padding: EdgeInsets.all(12), decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(12), - border: Border.all(color: Color(0xffF1F1F1), width: 1), + color: AppColor.background(context), + borderRadius: BorderRadius.circular(16), + border: Border.all(color: AppColor.borderColor(context), width: 2), ), child: Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Icon(iconData, color: Color(0xff7D859A), size: 36), - Text( - title, - style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500), - ), + Icon(iconData, color: AppColor.icon2Color(context), size: 36), + title.bodyText2(context).custom(color: AppColor.labelTextStyleColor(context), fontSize: context.isTablet() ? 10.toScreenWidth : null), + // Text( + // title, + // style: TextStyle(fontSize: 12, fontWeight: FontWeight.w500), + // ), ], ), );