improvements.

main_production_RSG
Sikander Saleem 2 months ago
parent 59ad837864
commit f356d5efcd

@ -116,7 +116,7 @@ extension WidgetExtensions on Widget {
double borderRadius = 14, double borderRadius = 14,
bool withShadow = true, bool withShadow = true,
Color? backgroundColor, Color? backgroundColor,
Color borderColor = Colors.transparent, Color? borderColor,
double padding = 12, double padding = 12,
EdgeInsets? paddingObject, EdgeInsets? paddingObject,
EdgeInsets? margin, EdgeInsets? margin,
@ -128,7 +128,7 @@ extension WidgetExtensions on Widget {
width: double.infinity, width: double.infinity,
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: backgroundColor ?? AppColor.background(context), 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, shadows: showShadow ? [boxShadowR14] : null,
), ),
child: this, child: this,

@ -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/update_available_screen.dart';
import 'package:test_sa/views/widgets/departments/single_department_picker.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/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/data/latest_all.dart' as tz;
import 'package:timezone/timezone.dart' as tz; import 'package:timezone/timezone.dart' as tz;

@ -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/login_page.dart';
import 'package:test_sa/new_views/pages/settings_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/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 '../../../controllers/providers/settings/setting_provider.dart';
import '../../../views/widgets/dialogs/dialog.dart'; import '../../../views/widgets/dialogs/dialog.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/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/device/asset.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'; import '../../../new_views/app_style/app_color.dart';
@ -41,20 +42,23 @@ class AssetItemGridView extends StatelessWidget {
device.modelDefinition!.assetName!.cleanupWhitespace.capitalizeFirstOfEach, device.modelDefinition!.assetName!.cleanupWhitespace.capitalizeFirstOfEach,
maxLines: 2, maxLines: 2,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), style: AppTextStyles.bodyText.copyWith(color: AppColor.textStyleColor(context)),
), ),
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
"${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context), // "${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context),
"${context.translation.modelName} : ${device.modelDefinition!.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText2(context), // "${context.translation.modelName} : ${device.modelDefinition!.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText2(context),
Text( // Text(
"${context.translation.serialNo} : ${device.assetSerialNo}", // "${context.translation.serialNo} : ${device.assetSerialNo}",
maxLines: 2, // maxLines: 2,
overflow: TextOverflow.ellipsis, // overflow: TextOverflow.ellipsis,
style: AppTextStyles.bodyText2.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20), // style: AppTextStyles.bodyText2.copyWith(color: context.isDark ? AppColor.neutral10 : AppColor.neutral20),
).expanded, // ).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, ).expanded,
Row( Row(
@ -62,15 +66,15 @@ class AssetItemGridView extends StatelessWidget {
children: [ children: [
Text( Text(
'View Details', 'View Details',
style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)), style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10),
), ),
4.width, 4.width,
Icon(Icons.arrow_forward, color: AppColor.blueStatus(context), size: 14) const Icon(Icons.arrow_forward, color: AppColor.primary10, size: 14)
], ],
), ),
], ],
).expanded ).expanded
], ],
).onPress(() => onPressed(device)).toShadowContainer(context,padding: 12); ).onPress(() => onPressed(device)).toShadowContainer(context);
} }
} }

@ -6,6 +6,8 @@ import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_extensions.dart'; import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/device/asset.dart'; import 'package:test_sa/models/device/asset.dart';
import 'package:test_sa/new_views/app_style/app_color.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 { class AssetItemListView extends StatelessWidget {
final Asset device; final Asset device;
@ -24,14 +26,14 @@ class AssetItemListView extends StatelessWidget {
width: 95, width: 95,
height: 95, height: 95,
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: context.isDark ? AppColor.neutral50 : AppColor.neutral30, color: AppColor.dropDownBackground(context),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)), shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10), side: BorderSide(color: AppColor.border2Color(context))),
image: DecorationImage( image: DecorationImage(
fit: BoxFit.cover, fit: BoxFit.cover,
image: NetworkImage(device.assetPhoto != null ? URLs.getFileUrl(device.assetPhoto!)! : "https://www.lasteelcraft.com/images/no-image-available.png"), image: NetworkImage(device.assetPhoto != null ? URLs.getFileUrl(device.assetPhoto!)! : "https://www.lasteelcraft.com/images/no-image-available.png"),
)), )),
), ),
15.width, 12.width,
Column( Column(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@ -40,38 +42,33 @@ class AssetItemListView extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
device.modelDefinition!.assetName!.cleanupWhitespace.capitalizeFirstOfEach.heading6(context), InfoHeaderWidget(device.modelDefinition!.assetName!.cleanupWhitespace),
8.height, // device.modelDefinition!.assetName!.cleanupWhitespace.capitalizeFirstOfEach.heading6(context),
"${context.translation.assetNumber} : ${device.assetNumber}".bodyText(context), 4.height,
"${context.translation.modelName} : ${device.modelDefinition!.modelName}".cleanupWhitespace.capitalizeFirstOfEach.bodyText(context), 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( Align(
crossAxisAlignment: CrossAxisAlignment.end, alignment: Alignment.bottomRight,
children: [ child: selectButton ??
"${context.translation.serialNo} : ${device.assetSerialNo}".bodyText(context).expanded,
4.width,
selectButton ??
Row( Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
Text( Text(
context.translation.viewDetails, context.translation.viewDetails,
style: AppTextStyles.bodyText.copyWith(color: AppColor.blueStatus(context)), style: AppTextStyles.bodyText2.copyWith(color: AppColor.blueStatus(context)),
), ),
4.width, 4.width,
Icon( const Icon(Icons.arrow_forward, color: AppColor.primary10, size: 14)
Icons.arrow_forward,
color: AppColor.blueStatus(context),
size: 14,
)
],
),
], ],
) ))
], ],
).expanded ).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));
} }
} }

@ -192,7 +192,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
? ListView.separated( ? ListView.separated(
padding: const EdgeInsets.all(16), padding: const EdgeInsets.all(16),
itemCount: _searchableList.length, itemCount: _searchableList.length,
separatorBuilder: (listContext, itemIndex) => 8.height, separatorBuilder: (listContext, itemIndex) => 12.height,
itemBuilder: (listContext, itemIndex) { itemBuilder: (listContext, itemIndex) {
return AssetItemListView( return AssetItemListView(
device: _searchableList[itemIndex], device: _searchableList[itemIndex],

@ -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/int_extensions.dart';
import 'package:test_sa/extensions/text_extensions.dart'; import 'package:test_sa/extensions/text_extensions.dart';
import 'package:test_sa/extensions/widget_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 '../../../models/device/asset.dart';
import '../../../new_views/app_style/app_color.dart'; import '../../../new_views/app_style/app_color.dart';

Loading…
Cancel
Save