From 4757c7373764c82b568d329dc779c4ae22ae93c7 Mon Sep 17 00:00:00 2001 From: nextwo <1234> Date: Sun, 12 Nov 2023 14:33:28 +0300 Subject: [PATCH] dark / ligth dark --- lib/extensions/widget_extensions.dart | 2 +- lib/l10n/app_ar.arb | 15 +- lib/l10n/app_en.arb | 13 +- .../pages/land_page/calendar_page.dart | 10 +- .../calender_fragments/daily_fragment.dart | 3 +- .../calender_fragments/monthly_fragment.dart | 6 +- .../calender_fragments/weekly_fragment.dart | 4 +- .../progress_fragment.dart | 8 +- .../device_transfer_details.dart | 113 +++++------ .../update_device_transfer.dart | 37 +--- lib/views/pages/user/land_page.dart | 14 +- .../widgets/equipment/asset_detail_page.dart | 179 ++++++++---------- .../equipment/asset_item_gridview.dart | 15 +- 13 files changed, 197 insertions(+), 222 deletions(-) diff --git a/lib/extensions/widget_extensions.dart b/lib/extensions/widget_extensions.dart index cc74b21b..79aadcf7 100644 --- a/lib/extensions/widget_extensions.dart +++ b/lib/extensions/widget_extensions.dart @@ -68,5 +68,5 @@ extension WidgetExtensions on Widget { } extension DividerExtension on Divider { - Divider defaultStyle(BuildContext context) => Divider(thickness: 1, color: context.isDark ? AppColor.neutral50 : AppColor.neutral30); + Divider defaultStyle(BuildContext context) => Divider(thickness: 1, color: context.isDark ? AppColor.neutral20 : AppColor.neutral30); } diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index f015996a..f4f5c82e 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -307,7 +307,7 @@ "updateWorkOrder" : "تعديل طلب العمل", "createPreventiveMaintenanceRequest" : "إنشاء طلب صيانة وقائية", "createNewRequest" : "إنشاء طلب جديد", - "calendar" : "التقويم", + "calender" : "التقويم", "helpCenter" : "مركز المساعدة", "rateUs": "قيمنا", "settings" : " الاعدادات", @@ -350,7 +350,16 @@ "item" : "عنصر", "serialNo" : "رقم التسلسلي", "measuredValue": "القيمة المقاسه", - "sureExit" : " هل انت متاكد من الخروج؟" - + "sureExit" : " هل انت متاكد من الخروج؟", + "daily" : "يومي", + "weekly" : "اسبوعي", + "monthly" : "شهري", + "myShift" : "ورديتي", + "myTeamRequest" : "طلب فريقي", + "sunToThurs": "الاحد الى الخميس", + "requestGasRefill" : "طلب اعادة تعبئة غاز", + "trackGasRefill" : "تتبع طلبات اعادة تعبئة غاز", + "trackAssetTransfer" : "تتبع نقل اجهزة", + "total" : "مجموع" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index b4047448..28a7e7d6 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -349,7 +349,18 @@ "addItem" : "Add Item", "item" : "Item", "measuredValue": "Measured Value", - "sureExit" : "Are you sure ypu want to Exit? " + "sureExit" : "Are you sure ypu want to Exit? ", + "daily" : "Daily", + "weekly" : "Weekly", + "monthly" : "Monthly", + "myShift" : "My Shift", + "myTeamRequest" : "My Team Request", + "sunToThurs": "Sunday to Thursday", + "requestGasRefill" : "Request Gas Refill", + "trackGasRefill" : "Track Gas Refill", + "trackAssetTransfer" : "Track Asset Transfer", + "total" : "Total" + } \ No newline at end of file diff --git a/lib/new_views/pages/land_page/calendar_page.dart b/lib/new_views/pages/land_page/calendar_page.dart index 3625864a..e5f72479 100644 --- a/lib/new_views/pages/land_page/calendar_page.dart +++ b/lib/new_views/pages/land_page/calendar_page.dart @@ -39,9 +39,9 @@ class _CalendarPageState extends State with SingleTickerProviderSt child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ - "My Shift".heading5(context), + context.translation.myShift.heading5(context), 8.height, - "Sunday to Thursday".bodyText(context), + context.translation.sunToThurs.bodyText(context), "09:00 to 18:00".bodyText(context).custom(color: context.isDark? AppColor.neutral10: AppColor.neutral50), ], ).toShadowContainer(context), @@ -61,9 +61,9 @@ class _CalendarPageState extends State with SingleTickerProviderSt setState(() {}); }, tabs: [ - Tab(text: "Monthly", height: 57.toScreenHeight), - Tab(text: "Weekly", height: 57.toScreenHeight), - Tab(text: "Daily", height: 57.toScreenHeight), + Tab(text: context.translation.monthly, height: 57.toScreenHeight), + Tab(text: context.translation.weekly, height: 57.toScreenHeight), + Tab(text: context.translation.daily, height: 57.toScreenHeight), ], ), ), diff --git a/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart index c0182e20..93eb4640 100644 --- a/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/daily_fragment.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:test_sa/extensions/context_extension.dart'; import 'package:test_sa/extensions/text_extensions.dart'; class DailyFragment extends StatefulWidget { @@ -27,7 +28,7 @@ class _DailyFragmentState extends State { Widget build(BuildContext context) { return SingleChildScrollView( child: Column( - children: ["Daily".heading5(context)], + children: [context.translation.daily.heading5(context)], ), ); } diff --git a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart index 2c44a724..4f65751c 100644 --- a/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/monthly_fragment.dart @@ -39,9 +39,9 @@ class _MonthlyFragmentState extends State { _controller = controller; }, calendarBuilders: CalendarBuilders( - headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy"), dateTime: dateTime), + headerTitleBuilder: (context, dateTime) => CalendarHeader(dateFormat: DateFormat("MMMM, yyyy", context.isAr?"ar":"en"), dateTime: dateTime), dowBuilder: (context, dateTime) { - final day = DateFormat("EE").format(dateTime).toUpperCase(); + final day = DateFormat("EE",context.isAr?"ar":"en").format(dateTime).toUpperCase(); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10:AppColor.neutral50)); }, defaultBuilder: (context, dateTime, _) { @@ -78,7 +78,7 @@ class _MonthlyFragmentState extends State { children: [ const CircleAvatar(backgroundColor: AppColor.green50, radius: 8), 8.width, - "My Team Requests".heading6(context), + context.translation.myTeamRequest.heading6(context), ], ), ], diff --git a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart index f6ffa364..2b66d473 100644 --- a/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart +++ b/lib/new_views/pages/land_page/calender_fragments/weekly_fragment.dart @@ -51,13 +51,13 @@ class _WeeklyFragmentState extends State { headerTitleBuilder: (context, dateTime) => Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - DateFormat("EEEE, d MMMM, yyyy").format(dateTime).heading5(context), + DateFormat("EEEE, d MMMM, yyyy", context.isAr?"ar":"en").format(dateTime).heading5(context), 8.height, const Divider().defaultStyle(context), ], ), dowBuilder: (context, dateTime) { - final day = DateFormat("EE").format(dateTime).toUpperCase(); + final day = DateFormat("EE", context.isAr?"ar":"en").format(dateTime).toUpperCase(); return Align(alignment: Alignment.center, child: day.bodyText(context).custom(color: context.isDark? AppColor.neutral10:AppColor.neutral50)); }, defaultBuilder: (context, dateTime, _) { diff --git a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart index f24ebffa..d22987ba 100644 --- a/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart +++ b/lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart @@ -38,7 +38,7 @@ class ProgressFragment extends StatelessWidget { initialAngleInDegree: 270, chartType: ChartType.ring, ringStrokeWidth: 40.toScreenWidth, - centerText: "Total\n20", + centerText: "${context.translation.total}\n20", centerTextStyle: AppTextStyles.heading5.copyWith(color: context.isDark ? AppColor.neutral30 : AppColor.neutral50), legendOptions: const LegendOptions(showLegends: false), chartValuesOptions: ChartValuesOptions( @@ -68,9 +68,9 @@ class ProgressFragment extends StatelessWidget { // setState(() {}); }, tabs: [ - Tab(text: "Open", height: 57.toScreenHeight), - Tab(text: "In Progress", height: 57.toScreenHeight), - Tab(text: "Completed", height: 57.toScreenHeight), + Tab(text: context.translation.open, height: 57.toScreenHeight), + Tab(text: context.translation.inProgress, height: 57.toScreenHeight), + Tab(text: context.translation.completed, height: 57.toScreenHeight), ], ), ), diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index b965dc60..73c2be5a 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -75,7 +75,7 @@ class _DeviceTransferDetailsState extends State { Column( crossAxisAlignment: CrossAxisAlignment.stretch, children: [ - Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), + context.translation.transferDetails.heading5(context), 8.height, Column( crossAxisAlignment: CrossAxisAlignment.start, @@ -109,7 +109,7 @@ class _DeviceTransferDetailsState extends State { // ), 1.width, Text(widget.model.createdOn != null ? widget.model.createdOn.toServiceRequestCardFormat : "", - textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color: const Color(0xFF3B3D4A))), + textAlign: TextAlign.end, style: AppTextStyles.tinyFont.copyWith(color:context.isDark? AppColor.neutral10: Color(0xFF3B3D4A))), ], ), ], @@ -163,72 +163,63 @@ class _DeviceTransferDetailsState extends State { } _buildDetailsCard(Widget widget) { - return widget.paddingOnly(top: 14, start: 14, end: 14); + return widget.toShadowContainer(context).paddingOnly(top: 14, start: 14, end: 14); } _buildTextWidget(String text) { - return Text( - text, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ); + return text.bodyText(context); } _buildCard({@required String site, @required String unit, @required String comment, @required bool isSender, StatusLabel statusLabel}) { - return Container( - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(AppStyle.getBorderRadius(context)), - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - statusLabel ?? Container(), - 8.height, - Text(isSender ? context.translation.senderDetails : context.translation.receiverDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), - ], - ), - if ((_userProvider.user?.type == UsersTypes.engineer) && (isSender ? _model.senderMachineStatusName != "Closed" : _model.receiverMachineStatusName != "Closed")) - CircleAvatar( - radius: 25, - backgroundColor: AppColor.neutral30, - child: CircleAvatar( - radius: 24, - backgroundColor: Colors.white, - child: Padding( - padding: const EdgeInsets.only(left: 3.0), - child: SvgPicture.asset('assets/images/update.svg'), - ), + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + statusLabel ?? Container(), + 8.height, + isSender ? context.translation.senderDetails.heading5(context) : context.translation.receiverDetails.heading5(context), + ], + ), + if ((_userProvider.user?.type == UsersTypes.engineer) && (isSender ? _model.senderMachineStatusName != "Closed" : _model.receiverMachineStatusName != "Closed")) + CircleAvatar( + radius: 25, + backgroundColor: AppColor.neutral30, + child: CircleAvatar( + radius: 24, + backgroundColor: Colors.white, + child: Padding( + padding: const EdgeInsets.only(left: 3.0), + child: SvgPicture.asset('assets/images/update.svg'), ), - ).onPress(isSender - ? () { - Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender))); - } - : () { - Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender))); - }), - ], - ), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - _buildTextWidget('${context.translation.site} : $site'), - _buildTextWidget('${context.translation.unite} : $unit'), - 8.height, - const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), - 8.height, - _buildTextWidget(comment), - ], - ), - 8.height, - ], - ).paddingAll(14), - ).paddingOnly(top: 14, start: 14, end: 14); + ), + ).onPress(isSender + ? () { + Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender))); + } + : () { + Navigator.of(context).push(MaterialPageRoute(builder: (_) => UpdateDeviceTransfer(model: _model, isSender: isSender))); + }), + ], + ), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildTextWidget('${context.translation.site} : $site'), + _buildTextWidget('${context.translation.unite} : $unit'), + 8.height, + const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), + 8.height, + _buildTextWidget(comment), + ], + ), + 8.height, + ], + ).toShadowContainer(context).paddingOnly(top: 14, start: 14, end: 14); } int getIdstatus(String status) { diff --git a/lib/views/pages/device_transfer/update_device_transfer.dart b/lib/views/pages/device_transfer/update_device_transfer.dart index 146b2b1a..bf01a34a 100644 --- a/lib/views/pages/device_transfer/update_device_transfer.dart +++ b/lib/views/pages/device_transfer/update_device_transfer.dart @@ -206,32 +206,15 @@ class _UpdateDeviceTransferState extends State { } _buildCard() { - return Container( - width: MediaQuery.of(context).size.width, - decoration: ShapeDecoration( - color: Colors.white, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(15), - ), - shadows: const [BoxShadow(color: Color(0x07000000), blurRadius: 14, offset: Offset(0, 0), spreadRadius: 0)], - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(context.translation.transferDetails, style: AppTextStyles.heading5.copyWith(color: const Color(0xFF3B3D4A))), - 8.height, - Text( - '${context.translation.assetName}: ${_formModel.assetName}', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - - ///TBD - Text( - '${context.translation.requesterName}: ', - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - ], - ).paddingAll(16), - ); + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + context.translation.transferDetails.heading5(context), + 8.height, + '${context.translation.assetName}: ${_formModel.assetName}'.bodyText(context), + ///TBDZ + '${context.translation.requesterName}: '.bodyText(context), + ], + ).toShadowContainer(context); } } diff --git a/lib/views/pages/user/land_page.dart b/lib/views/pages/user/land_page.dart index 39deede8..4185df62 100644 --- a/lib/views/pages/user/land_page.dart +++ b/lib/views/pages/user/land_page.dart @@ -151,7 +151,7 @@ class _LandPageState extends State { if (_userProvider.user != null && _userProvider.user.type == UsersTypes.normal_user) LandPageItem( // text: _subtitle.newServiceRequest, - text: "New Service Request", + text: context.translation.newServiceRequest, icon: FontAwesomeIcons.screwdriverWrench, onPressed: () { Navigator.of(context).pushNamed(CreateServiceRequestPage.id); @@ -159,7 +159,7 @@ class _LandPageState extends State { ), LandPageItem( // text: _subtitle.trackServiceRequest, - text: "Track Service Request", + text: context.translation.trackServiceRequest, icon: FontAwesomeIcons.listCheck, onPressed: () { Navigator.of(context).pushNamed(ServiceRequestsPage.id); @@ -168,7 +168,7 @@ class _LandPageState extends State { //if (_userProvider.user.type == UsersTypes.engineer) LandPageItem( // text: _subtitle.preventiveMaintenance, - text: "Preventive Maintenance", + text: context.translation.preventiveMaintenance, icon: FontAwesomeIcons.personWalking, onPressed: () { Navigator.of(context).pushNamed(RegularVisitsPage.id); @@ -184,7 +184,7 @@ class _LandPageState extends State { // ), if (_userProvider?.user != null && _userProvider?.user?.type != UsersTypes.engineer) LandPageItem( - text: "Request Gas Refill", + text: context.translation.requestGasRefill, icon: FontAwesomeIcons.truckFast, onPressed: () { // Navigator.of(context).pushNamed(RequestGasRefill.id); @@ -192,21 +192,21 @@ class _LandPageState extends State { }, ), LandPageItem( - text: "Track Gas Refill", + text: context.translation.trackGasRefill, icon: Icons.content_paste_search, onPressed: () { Navigator.of(context).pushNamed(TrackGasRefillPage.id); }, ), LandPageItem( - text: "Transfer Asset", + text: context.translation.deviceTransfer, icon: FontAwesomeIcons.rightLeft, onPressed: () { Navigator.of(context).pushNamed(RequestDeviceTransfer.id); }, ), LandPageItem( - text: "Track Asset Transfer", + text: context.translation.trackAssetTransfer, icon: FontAwesomeIcons.peopleCarryBox, onPressed: () { Navigator.of(context).pushNamed(TrackDeviceTransferPage.id); diff --git a/lib/views/widgets/equipment/asset_detail_page.dart b/lib/views/widgets/equipment/asset_detail_page.dart index 77c7a43d..e1219f1c 100644 --- a/lib/views/widgets/equipment/asset_detail_page.dart +++ b/lib/views/widgets/equipment/asset_detail_page.dart @@ -13,6 +13,8 @@ import 'package:test_sa/views/widgets/loaders/failed_loading.dart'; import 'package:test_sa/views/widgets/loaders/lazy_loading.dart'; import 'package:test_sa/views/widgets/loaders/loading_manager.dart'; +import '../../../new_views/app_style/app_color.dart'; + class AssetDetailPage extends StatefulWidget { static const String id = "/asset-details"; @@ -62,111 +64,94 @@ class _AssetDetailPageState extends State { if (snapshot.hasData) { return SingleChildScrollView( padding: const EdgeInsets.all(16), - child: Container( - padding: const EdgeInsets.all(16), - decoration: ShapeDecoration( - color: Colors.white, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(20), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + AspectRatio( + aspectRatio: 159 / 94, + child: Container( + width: 95, + height: 95, + decoration: ShapeDecoration( + color: const Color(0xFFEAF1F4), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(10), + ), + image: DecorationImage( + fit: BoxFit.cover, + image: NetworkImage( + _assetProvider.assetById?.assetPhoto != null ? URLs.getFileUrl(_assetProvider.assetById.assetPhoto) : "https://www.lasteelcraft.com/images/no-image-available.png"), + )), + ), ), - shadows: const [BoxShadow(color: Color(0x07000000), blurRadius: 14, offset: Offset(0, 0), spreadRadius: 0)], - ), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - AspectRatio( - aspectRatio: 159 / 94, - child: Container( - width: 95, - height: 95, - decoration: ShapeDecoration( - color: const Color(0xFFEAF1F4), - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(10), - ), - image: DecorationImage( - fit: BoxFit.cover, - image: NetworkImage( - _assetProvider.assetById?.assetPhoto != null ? URLs.getFileUrl(_assetProvider.assetById.assetPhoto) : "https://www.lasteelcraft.com/images/no-image-available.png"), - )), + 6.height, + Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + _assetProvider.assetById?.modelDefinition?.assetName ?? "-".heading5(context), ), - ), - 6.height, - Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - _assetProvider.assetById?.modelDefinition?.assetName ?? "-", - style: AppTextStyles.heading5.copyWith(color: Color(0xFF3B3D4A)), - ), - 8.height, - Text( - "${context.translation.assetNumber}: ${_assetProvider.assetById.multiAssets.first.assetNumber}", - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - "${context.translation.model}: ${_assetProvider.assetById.modelDefinition.modelDefCode}", - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - "${context.translation.serialNo}: ${_assetProvider.assetById.multiAssets.first.assetSerialNo}", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - "MD: ${_assetProvider.assetById.department.departmentName ?? "-"}", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - "Supplier: ${_assetProvider.assetById.supplier?.suppliername ?? "-"}", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - "Manufacturer: ${_assetProvider.assetById.modelDefinition.manufacturerName}", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - "Location: ${_assetProvider.assetById.site.custName}", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), + 8.height, + "${context.translation.assetNumber}: ${_assetProvider.assetById.multiAssets.first.assetNumber}".bodyText(context), + "${context.translation.model}: ${_assetProvider.assetById.modelDefinition.modelDefCode}".bodyText(context), + Text( + "${context.translation.serialNo}: ${_assetProvider.assetById.multiAssets.first.assetSerialNo}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10:Color(0xFF757575)), + ), + Text( + "MD: ${_assetProvider.assetById.department.departmentName ?? "-"}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + ), + Text( + "Supplier: ${_assetProvider.assetById.supplier?.suppliername ?? "-"}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + ), + Text( + "Manufacturer: ${_assetProvider.assetById.modelDefinition.manufacturerName}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + ), + Text( + "Location: ${_assetProvider.assetById.site.custName}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + ), + 8.height, + const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), + 8.height, + Text( + "Installation Date: ${_assetProvider.assetById.installationDate ?? "-"}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + ), + Text( + "Next PM Date: ${_assetProvider.assetById.installationDate ?? "-"}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + ), + Text( + "Last PM Date: ${_assetProvider.assetById.installationDate ?? "-"}", + maxLines: 2, + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), + ), + if ((_assetProvider.assetById.modelDefinition.assetDescription ?? "").isNotEmpty) ...[ 8.height, const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), 8.height, Text( - "Installation Date: ${_assetProvider.assetById.installationDate ?? "-"}", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - Text( - "Next PM Date: ${_assetProvider.assetById.installationDate ?? "-"}", + _assetProvider.assetById.modelDefinition.assetDescription ?? "-", maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral10: Color(0xFF757575)), ), - Text( - "Last PM Date: ${_assetProvider.assetById.installationDate ?? "-"}", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - if ((_assetProvider.assetById.modelDefinition.assetDescription ?? "").isNotEmpty) ...[ - 8.height, - const Divider(color: Color(0xFFEAF1F4), height: 1, thickness: 1), - 8.height, - Text( - _assetProvider.assetById.modelDefinition.assetDescription ?? "-", - maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF757575)), - ), - ] - ], - ) - ], - ), - ), + ] + ], + ) + ], + ).toShadowContainer(context), ); } return Center(child: ALoading()); diff --git a/lib/views/widgets/equipment/asset_item_gridview.dart b/lib/views/widgets/equipment/asset_item_gridview.dart index b4b5510e..ee3cca65 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/new_views/app_style/app_color.dart'; class AssetItemGridView extends StatelessWidget { final Asset device; @@ -40,26 +41,20 @@ class AssetItemGridView extends StatelessWidget { Text( device.modelDefinition.assetName, maxLines: 2, - style: AppTextStyles.bodyText.copyWith(color: Color(0xFF3B3D4A)), + style: AppTextStyles.bodyText.copyWith(color: context.isDark? AppColor.neutral30: Color(0xFF3B3D4A)), ), Column( crossAxisAlignment: CrossAxisAlignment.start, mainAxisSize: MainAxisSize.min, children: [ - Text( - "${context.translation.assetNumber} : ${device.assetNumber}", - style: AppTextStyles.bodyText2.copyWith(color: Color(0xFF757575)), - ), - Text( - "${context.translation.model} : ${device.modelDefinition.modelDefCode}", - style: AppTextStyles.bodyText2.copyWith(color: Color(0xFF757575)), - ), + "${context.translation.assetNumber} : ${device.assetNumber}".bodyText2(context), + "${context.translation.model} : ${device.modelDefinition.modelDefCode}".bodyText2(context), Text( "${context.translation.serialNo} : ${device.assetSerialNo}", maxLines: 2, overflow: TextOverflow.fade, style: AppTextStyles.bodyText2.copyWith( - color: Color(0xFF757575), + color: context.isDark? AppColor.neutral10: Color(0xFF757575), ), ), ],