diff --git a/lib/extensions/widget_extensions.dart b/lib/extensions/widget_extensions.dart index 63c90ebb..bc5f3c8a 100644 --- a/lib/extensions/widget_extensions.dart +++ b/lib/extensions/widget_extensions.dart @@ -116,7 +116,7 @@ extension WidgetExtensions on Widget { double borderRadius = 14, bool withShadow = true, Color? backgroundColor, - Color borderColor = Colors.transparent, + Color? borderColor, double padding = 12, EdgeInsets? paddingObject, EdgeInsets? margin, @@ -128,7 +128,7 @@ extension WidgetExtensions on Widget { width: double.infinity, decoration: ShapeDecoration( color: backgroundColor ?? AppColor.background(context), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(borderRadius), side: BorderSide(color: AppColor.borderColor(context))), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(borderRadius), side: BorderSide(color: borderColor ?? AppColor.borderColor(context))), shadows: showShadow ? [boxShadowR14] : null, ), child: this, diff --git a/lib/main.dart b/lib/main.dart index c240cefa..c10bc2c1 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -114,7 +114,7 @@ import 'package:test_sa/views/pages/user/profile_page.dart'; import 'package:test_sa/views/update_available_screen.dart'; import 'package:test_sa/views/widgets/departments/single_department_picker.dart'; import 'package:test_sa/views/widgets/equipment/asset_detail_page.dart'; -import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; +import 'package:test_sa/views/widgets/equipment/my_assets_page.dart'; import 'package:timezone/data/latest_all.dart' as tz; import 'package:timezone/timezone.dart' as tz; diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart index a495d8c1..a52085a0 100644 --- a/lib/new_views/pages/land_page/land_page.dart +++ b/lib/new_views/pages/land_page/land_page.dart @@ -22,7 +22,7 @@ import 'package:test_sa/new_views/pages/land_page/my_request/my_requests_page.da import 'package:test_sa/new_views/pages/login_page.dart'; import 'package:test_sa/new_views/pages/settings_page.dart'; import 'package:test_sa/providers/work_order/vendor_provider.dart'; -import 'package:test_sa/views/widgets/equipment/single_device_picker.dart'; +import 'package:test_sa/views/widgets/equipment/my_assets_page.dart'; import '../../../controllers/providers/settings/setting_provider.dart'; import '../../../views/widgets/dialogs/dialog.dart'; diff --git a/lib/views/widgets/equipment/asset_item_gridview.dart b/lib/views/widgets/equipment/asset_item_gridview.dart index cc463097..4947d46d 100644 --- a/lib/views/widgets/equipment/asset_item_gridview.dart +++ b/lib/views/widgets/equipment/asset_item_gridview.dart @@ -5,6 +5,7 @@ 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/device/asset.dart'; +import 'package:test_sa/views/widgets/item_views/info_text_widget.dart'; import '../../../new_views/app_style/app_color.dart'; @@ -41,20 +42,23 @@ class AssetItemGridView extends StatelessWidget { device.modelDefinition!.assetName!.cleanupWhitespace.capitalizeFirstOfEach, maxLines: 2, overflow: TextOverflow.ellipsis, - style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), + style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)), ), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - "${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context), - "${context.translation.modelName} : ${device.modelDefinition!.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText2(context), - Text( - "${context.translation.serialNo} : ${device.assetSerialNo}", - maxLines: 2, - overflow: TextOverflow.ellipsis, - style: AppTextStyles.bodyText2.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), - ).expanded, + // "${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context), + // "${context.translation.modelName} : ${device.modelDefinition!.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText2(context), + // Text( + // "${context.translation.serialNo} : ${device.assetSerialNo}", + // maxLines: 2, + // overflow: TextOverflow.ellipsis, + // style: AppTextStyles.bodyText2.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), + // ).expanded, + InfoTextWidget(label: context.translation.assetNumber, value: device.assetNumber), + InfoTextWidget(label: context.translation.modelName, value: device.modelDefinition!.modelName), + InfoTextWidget(label: context.translation.serialNo, value: device.assetSerialNo), ], ).expanded, Row( @@ -62,15 +66,15 @@ class AssetItemGridView extends StatelessWidget { children: [ Text( 'View Details', - style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10), ), 4.width, - Icon(Icons.arrow_forward, color: AppColor.blueStatus(context), size: 14) + const Icon(Icons.arrow_forward, color: AppColor.primary10, size: 14) ], ), ], ).expanded ], - ).onPress(() => onPressed(device)).toShadowContainer(context,padding: 12); + ).onPress(() => onPressed(device)).toShadowContainer(context); } } diff --git a/lib/views/widgets/equipment/asset_item_listview.dart b/lib/views/widgets/equipment/asset_item_listview.dart index f2aab423..e5fe91e9 100644 --- a/lib/views/widgets/equipment/asset_item_listview.dart +++ b/lib/views/widgets/equipment/asset_item_listview.dart @@ -6,6 +6,8 @@ import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/models/device/asset.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/views/widgets/item_views/info_text_widget.dart'; class AssetItemListView extends StatelessWidget { final Asset device; @@ -24,14 +26,14 @@ class AssetItemListView extends StatelessWidget { width: 95, height: 95, decoration: ShapeDecoration( - color: context.isDark ? AppColor.neutral50 : AppColor.neutral30, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), + color: AppColor.dropDownBackground(context), + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10), side: BorderSide(color: AppColor.border2Color(context))), image: DecorationImage( fit: BoxFit.cover, image: NetworkImage(device.assetPhoto != null ? URLs.getFileUrl(device.assetPhoto!)! : "https://www.lasteelcraft.com/images/no-image-available.png"), )), ), - 15.width, + 12.width, Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.start, @@ -40,38 +42,33 @@ class AssetItemListView extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - device.modelDefinition!.assetName!.cleanupWhitespace.capitalizeFirstOfEach.heading6(context), - 8.height, - "${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context), - "${context.translation.modelName} : ${device.modelDefinition!.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText(context), + InfoHeaderWidget(device.modelDefinition!.assetName!.cleanupWhitespace), + // device.modelDefinition!.assetName!.cleanupWhitespace.capitalizeFirstOfEach.heading6(context), + 4.height, + InfoTextWidget(label: context.translation.assetNumber, value: device.assetNumber), + InfoTextWidget(label: context.translation.modelName, value: device.modelDefinition!.modelName), + InfoTextWidget(label: context.translation.serialNo, value: device.assetSerialNo), + // "${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context), + // "${context.translation.modelName} : ${device.modelDefinition!.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText(context), ], ), - Row( - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - "${context.translation.serialNo} : ${device.assetSerialNo}".bodyText(context).expanded, - 4.width, - selectButton ?? + Align( + alignment: Alignment.bottomRight, + child: selectButton ?? Row( mainAxisSize: MainAxisSize.min, children: [ Text( context.translation.viewDetails, - style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context)), + style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)), ), 4.width, - Icon( - Icons.arrow_forward, - color: AppColor.blueStatus(context), - size: 14, - ) + const Icon(Icons.arrow_forward, color: AppColor.primary10, size: 14) ], - ), - ], - ) + )) ], ).expanded ], - ).toShadowContainer(context, padding: 12, borderColor: isSelected ? AppColor.blueStatus(context) : Colors.transparent).onPress(() => onPressed(device)); + ).toShadowContainer(context, borderColor: isSelected ? AppColor.primary10 : Colors.transparent).onPress(() => onPressed(device)); } } diff --git a/lib/views/widgets/equipment/single_device_picker.dart b/lib/views/widgets/equipment/my_assets_page.dart similarity index 99% rename from lib/views/widgets/equipment/single_device_picker.dart rename to lib/views/widgets/equipment/my_assets_page.dart index 62aca8c9..ff85da41 100644 --- a/lib/views/widgets/equipment/single_device_picker.dart +++ b/lib/views/widgets/equipment/my_assets_page.dart @@ -192,7 +192,7 @@ class _MyAssetsPageState extends State { ? ListView.separated( padding: const EdgeInsets.all(16), itemCount: _searchableList.length, - separatorBuilder: (listContext, itemIndex) => 8.height, + separatorBuilder: (listContext, itemIndex) => 12.height, itemBuilder: (listContext, itemIndex) { return AssetItemListView( device: _searchableList[itemIndex], diff --git a/lib/views/widgets/equipment/pick_asset.dart b/lib/views/widgets/equipment/pick_asset.dart index f5d0f4ff..4d9c08d6 100644 --- a/lib/views/widgets/equipment/pick_asset.dart +++ b/lib/views/widgets/equipment/pick_asset.dart @@ -3,7 +3,7 @@ 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/views/widgets/equipment/single_device_picker.dart'; +import 'package:test_sa/views/widgets/equipment/my_assets_page.dart'; import '../../../models/device/asset.dart'; import '../../../new_views/app_style/app_color.dart'; diff --git a/lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart b/lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart index 2ae7ea48..47cfa0f9 100644 --- a/lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart +++ b/lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart @@ -149,7 +149,7 @@ class _SelectionBottomSheetState extends State