Haroon6138
/
cloudsolutions-atoms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 21 Wiki Activity

improvements

Browse Source
main_production_RSG
Sikander Saleem 2 months ago
parent c12a0ce88d
commit 5a61d52455
28 changed files with 179 additions and 182 deletions
Show Stats Download Patch File Download Diff File

2
lib/modules/asset_inventory_module/pages/asset_inventory_form_view.dart
Unescape Escape View File

@ -92,7 +92,7 @@ class _AssetInventoryFormViewState extends State<AssetInventoryFormView> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
'Not Registered'.addTranslation.heading5(context), 'Not Registered'.addTranslation.heading5(context).custom(color: AppColor.textStyleColor(context)),
AdvancedSwitch( AdvancedSwitch(
controller: registeredController, controller: registeredController,
activeColor: AppColor.green50.withOpacity(0.5), activeColor: AppColor.green50.withOpacity(0.5),

2
lib/modules/cleaner_module/pages/cleaner_request_item_view.dart
Unescape Escape View File

@ -23,7 +23,7 @@ class CleanerRequestItemView extends StatelessWidget {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
if (result.taskNo != null && result.taskNo!.isNotEmpty) result.taskNo!.heading5(context), if (result.taskNo != null && result.taskNo!.isNotEmpty) result.taskNo!.heading5(context).custom(color: AppColor.textStyleColor(context)),
if (result.createdDate != null) if (result.createdDate != null)
Text( Text(
result.createdDate!.split('T').first, result.createdDate!.split('T').first,

2
lib/modules/cm_module/views/forms/spare_part/spare_part_request.dart
Unescape Escape View File

@ -137,7 +137,7 @@ class _SparePartRequestState extends State<SparePartRequest> with TickerProvider
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
context.translation.sparePartDetails.heading5(context), context.translation.sparePartDetails.heading5(context).custom(color: AppColor.textStyleColor(context)),
// 12.height, // 12.height,
// SingleItemDropDownMenu<Lookup, ActivityStatusProvider>( // SingleItemDropDownMenu<Lookup, ActivityStatusProvider>(
// context: context, // context: context,

2
lib/modules/pm_module/ppm_wo/ppm_details_page.dart
Unescape Escape View File

@ -90,7 +90,7 @@ class _PpmDetailsPageState extends State<PpmDetailsPage> {
], ],
), ),
8.height, 8.height,
planPreventiveVisit.assetName!.cleanupWhitespace.capitalizeFirstOfEach.heading5(context), planPreventiveVisit.assetName!.cleanupWhitespace.capitalizeFirstOfEach.heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
'${context.translation.assetNumber}: ${planPreventiveVisit.asset!.assetNumber}'.bodyText(context), '${context.translation.assetNumber}: ${planPreventiveVisit.asset!.assetNumber}'.bodyText(context),
'${context.translation.assetSN}: ${planPreventiveVisit.asset!.assetSerialNo}'.bodyText(context), '${context.translation.assetSN}: ${planPreventiveVisit.asset!.assetSerialNo}'.bodyText(context),

2
lib/modules/pm_module/ppm_wo/update_ppm/ppm_calibration_tools_form.dart
Unescape Escape View File

@ -80,7 +80,7 @@ class _PpmCalibrationToolsFormState extends State<PpmCalibrationToolsForm> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
(index == 0 ? "$currentIndex /$totalTabs . Calibration Tools" : "").heading5(context), (index == 0 ? "$currentIndex /$totalTabs . Calibration Tools" : "").heading5(context).custom(color: AppColor.textStyleColor(context)),
"trash".toSvgAsset(height: 20, width: 15).onPress(() { "trash".toSvgAsset(height: 20, width: 15).onPress(() {
widget.models!.remove(model); widget.models!.remove(model);
setState(() {}); setState(() {});

2
lib/modules/pm_module/ppm_wo/update_ppm/ppm_external_details_form.dart
Unescape Escape View File

@ -134,7 +134,7 @@ class _ExternalDetailItemState extends State<ExternalDetailItem> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
(widget.index == 0 ? "1 /4 . External Details" : "").heading5(context), (widget.index == 0 ? "1 /4 . External Details" : "").heading5(context).custom(color: AppColor.textStyleColor(context)),
Container( Container(
height: 32, height: 32,
width: 32, width: 32,

2
lib/modules/pm_module/ppm_wo/update_ppm/ppm_pm_check_list_form.dart
Unescape Escape View File

@ -50,7 +50,7 @@ class _PpmPmChecklistFormState extends State<PpmPmChecklistForm> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (index == 0) ...[ if (index == 0) ...[
"$currentIndex /$totalTabs . PM Checklist".heading5(context), "$currentIndex /$totalTabs . PM Checklist".heading5(context).custom(color: AppColor.textStyleColor(context)),
16.height, 16.height,
], ],
AppTextFormField( AppTextFormField(

2
lib/modules/pm_module/ppm_wo/update_ppm/ppm_pm_kits_form.dart
Unescape Escape View File

@ -78,7 +78,7 @@ class _PpmPMKitsFormState extends State<PpmPMKitsForm> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
(index == 0 ? "$currentIndex /$totalTabs . PM Kits" : "").heading5(context), (index == 0 ? "$currentIndex /$totalTabs . PM Kits" : "").heading5(context).custom(color: AppColor.textStyleColor(context)),
Container( Container(
height: 32, height: 32,
width: 32, width: 32,

28
lib/modules/tm_module/device_transfer/device_filter_screen.dart
Unescape Escape View File

@ -7,13 +7,14 @@ 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/lookup.dart'; import 'package:test_sa/models/lookup.dart';
import 'package:test_sa/models/new_models/site.dart'; import 'package:test_sa/models/new_models/site.dart';
import 'package:test_sa/modules/cm_module/views/components/action_button/footer_action_button.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/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/multiple_item_drop_down_menu.dart'; import 'package:test_sa/new_views/common_widgets/multiple_item_drop_down_menu.dart';
import 'package:test_sa/providers/department_provider.dart'; import 'package:test_sa/providers/department_provider.dart';
import 'package:test_sa/providers/gas_request_providers/site_provider.dart'; import 'package:test_sa/providers/gas_request_providers/site_provider.dart';
import 'package:test_sa/views/widgets/date_and_time/date_picker.dart'; import 'package:test_sa/views/widgets/date_and_time/date_picker.dart';
import 'package:test_sa/views/widgets/equipment/commissioning_status_buttons.dart'; import 'package:test_sa/views/widgets/equipment/asset_status_buttons.dart';
import '../../../models/device/asset_search.dart'; import '../../../models/device/asset_search.dart';
import '../../../new_views/common_widgets/app_lazy_loading.dart'; import '../../../new_views/common_widgets/app_lazy_loading.dart';
@ -69,9 +70,7 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return Scaffold(
top: false,
child: Scaffold(
appBar: DefaultAppBar( appBar: DefaultAppBar(
title: context.translation.filter, title: context.translation.filter,
actions: [ actions: [
@ -96,11 +95,10 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
), ),
body: Column( body: Column(
children: [ children: [
SingleChildScrollView( ListView(
child: Column( padding: const EdgeInsets.all(16),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
CommissioningStatusButtons( AssetStatusButtons(
initialValue: _commissioningStatus, initialValue: _commissioningStatus,
onSelect: (value) { onSelect: (value) {
if (value != null) { if (value != null) {
@ -125,8 +123,8 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
}); });
} }
}, },
).paddingOnly(start: 16, end: 16), ),
8.height, 12.height,
MultipleItemDropDownMenu<Site, SiteProvider>( MultipleItemDropDownMenu<Site, SiteProvider>(
context: context, context: context,
title: context.translation.bySite, title: context.translation.bySite,
@ -143,9 +141,9 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
}); });
} }
}, },
).paddingOnly(start: 16, end: 16), ),
16.height, 16.height,
context.translation.pmDateRange.heading5(context).paddingOnly(start: 16, end: 16), context.translation.pmDateRange.heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
Row( Row(
children: [ children: [
@ -171,13 +169,11 @@ class _DeviceFilterScreenState extends State<DeviceFilterScreen> {
}, },
).expanded, ).expanded,
], ],
).paddingOnly(start: 16, end: 16),
],
), ),
],
).expanded, ).expanded,
AppFilledButton(onPressed: _search, label: context.translation.applyFilter).paddingOnly(start: 16, end: 16), FooterActionButton.footerContainer(context: context, child: AppFilledButton(onPressed: _search, label: context.translation.applyFilter)),
], ],
).paddingOnly(top: 16, bottom: 16),
), ),
); );
} }

39
lib/modules/tm_module/device_transfer/device_search_screen.dart
Unescape Escape View File

@ -5,6 +5,8 @@ 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/modules/cm_module/views/components/action_button/footer_action_button.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/app_filled_button.dart'; import 'package:test_sa/new_views/common_widgets/app_filled_button.dart';
import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart'; import 'package:test_sa/new_views/common_widgets/app_text_form_field.dart';
@ -62,13 +64,8 @@ class _DeviceSearchScreenState extends State<DeviceSearchScreen> {
title: context.translation.search, title: context.translation.search,
actions: [ actions: [
if (_showResetButton()) if (_showResetButton())
Row( TextButton(
crossAxisAlignment: CrossAxisAlignment.center, onPressed: () {
children: [
Text(
context.translation.reset,
style: AppTextStyles.bodyText2.copyWith(color: const Color(0xFF4A8DB7)),
).paddingAll(8).onPress(() {
setState(() { setState(() {
_assetNameController.text = ""; _assetNameController.text = "";
_assetNumberController.text = ""; _assetNumberController.text = "";
@ -79,22 +76,26 @@ class _DeviceSearchScreenState extends State<DeviceSearchScreen> {
_manufactureController.text = ""; _manufactureController.text = "";
_mdController.text = ""; _mdController.text = "";
}); });
}), },
], style: TextButton.styleFrom(padding: EdgeInsets.zero, tapTargetSize: MaterialTapTargetSize.shrinkWrap),
) child: Text(
'Clear Filters',
style: AppTextStyles.bodyText2.copyWith(color: AppColor.primary10),
),
).paddingOnly(start: 16, end: 16),
], ],
), ),
body: Form( body: Form(
key: _formKey, key: _formKey,
child: SafeArea(
child: Column( child: Column(
children: [ children: [
SingleChildScrollView( ListView(
child: Column( padding: const EdgeInsets.all(16),
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
context.translation.searchBy.heading5(context), context.translation.searchBy.heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 4.height,
context.translation.searchByDesc.bodyText(context), context.translation.searchByDesc.bodyText2(context).custom(color: AppColor.lightTextColor(context)),
16.height, 16.height,
AppTextFormField( AppTextFormField(
controller: _assetNameController, controller: _assetNameController,
@ -215,11 +216,11 @@ class _DeviceSearchScreenState extends State<DeviceSearchScreen> {
), ),
8.height, 8.height,
], ],
),
).expanded, ).expanded,
AppFilledButton(onPressed: _search, label: context.translation.search), FooterActionButton.footerContainer(context: context, child: AppFilledButton(onPressed: _search, label: context.translation.search)),
], ],
).paddingAll(16), ),
),
), ),
); );
} }

4
lib/modules/tm_module/device_transfer/device_transfer_details.dart
Unescape Escape View File

@ -252,7 +252,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
], ],
), ),
8.height, 8.height,
context.translation.workOrderDetails.heading5(context), context.translation.workOrderDetails.heading5(context).custom(color: AppColor.textStyleColor(context)),
infoText(label: context.translation.destinationSite, value: _model?.senderSiteName), infoText(label: context.translation.destinationSite, value: _model?.senderSiteName),
// infoText(label: "Sender Building".addTranslation, value: _model?.senderBuildingName), // infoText(label: "Sender Building".addTranslation, value: _model?.senderBuildingName),
// infoText(label: "Sender Floor".addTranslation, value: _model?.senderFloorName), // infoText(label: "Sender Floor".addTranslation, value: _model?.senderFloorName),
@ -332,7 +332,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
children: [ children: [
statusLabel ?? Container(), statusLabel ?? Container(),
if (statusLabel != null) 8.height, if (statusLabel != null) 8.height,
isSender ? context.translation.senderDetails.heading5(context) : context.translation.receiverDetails.heading5(context), isSender ? context.translation.senderDetails.heading5(context) : context.translation.receiverDetails.heading5(context).custom(color: AppColor.textStyleColor(context)),
], ],
).expanded, ).expanded,
if (context.userProvider.isEngineer || context.userProvider.isNurse) if (context.userProvider.isEngineer || context.userProvider.isNurse)

2
lib/modules/tm_module/gas_refill/create_gas_refill_request.dart
Unescape Escape View File

@ -242,7 +242,7 @@ class _RequestGasRefillState extends State<CreateGasRefillRequest> {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
context.translation.gasRefill.heading5(context), context.translation.gasRefill.heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
'${context.translation.gasRequest}: ${widget.gasRefillModel!.gasRefillDetails![0].gasType!.name}'.bodyText(context), '${context.translation.gasRequest}: ${widget.gasRefillModel!.gasRefillDetails![0].gasType!.name}'.bodyText(context),
'${context.translation.cylinderType}: ${widget.gasRefillModel!.gasRefillDetails![0].cylinderType!.name}'.bodyText(context), '${context.translation.cylinderType}: ${widget.gasRefillModel!.gasRefillDetails![0].cylinderType!.name}'.bodyText(context),

4
lib/modules/tm_module/gas_refill/gas_refill_request_form.dart
Unescape Escape View File

@ -300,7 +300,7 @@ class _GasRefillRequestFormState extends State<GasRefillRequestForm> {
// Column( // Column(
// crossAxisAlignment: CrossAxisAlignment.start, // crossAxisAlignment: CrossAxisAlignment.start,
// children: [ // children: [
// (_gasModel.gasRefillDetails![index].gasType?.name ?? "").heading5(context), // (_gasModel.gasRefillDetails![index].gasType?.name ?? "").heading5(context).custom(color: AppColor.textStyleColor(context)),
// 8.height, // 8.height,
// ("${context.translation.quantity}: ${_gasModel.gasRefillDetails![index].requestedQty}").bodyText(context), // ("${context.translation.quantity}: ${_gasModel.gasRefillDetails![index].requestedQty}").bodyText(context),
// ("${context.translation.cylinderSize}: ${_gasModel.gasRefillDetails![index].cylinderSize?.name}").bodyText(context), // ("${context.translation.cylinderSize}: ${_gasModel.gasRefillDetails![index].cylinderSize?.name}").bodyText(context),
@ -655,7 +655,7 @@ class _GasRefillRequestFormState extends State<GasRefillRequestForm> {
// // Column( // // Column(
// // crossAxisAlignment: CrossAxisAlignment.start, // // crossAxisAlignment: CrossAxisAlignment.start,
// // children: [ // // children: [
// // (_gasModel.gasRefillDetails![index].gasType?.name ?? "").heading5(context), // // (_gasModel.gasRefillDetails![index].gasType?.name ?? "").heading5(context).custom(color: AppColor.textStyleColor(context)),
// // 8.height, // // 8.height,
// // ("${context.translation.quantity}: ${_gasModel.gasRefillDetails![index].requestedQty}").bodyText(context), // // ("${context.translation.quantity}: ${_gasModel.gasRefillDetails![index].requestedQty}").bodyText(context),
// // ("${context.translation.cylinderSize}: ${_gasModel.gasRefillDetails![index].cylinderSize?.name}").bodyText(context), // // ("${context.translation.cylinderSize}: ${_gasModel.gasRefillDetails![index].cylinderSize?.name}").bodyText(context),

2
lib/new_views/common_widgets/asset_info_card.dart
Unescape Escape View File

@ -16,7 +16,7 @@ class AssetInfoCard extends StatelessWidget {
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
(asset.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "").heading5(context), (asset.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "").heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
"${context.translation.assetNo}: ${asset.assetNumber}".bodyText(context), "${context.translation.assetNo}: ${asset.assetNumber}".bodyText(context),
"${context.translation.manufacture}: ${asset.modelDefinition?.manufacturerName}".bodyText(context), "${context.translation.manufacture}: ${asset.modelDefinition?.manufacturerName}".bodyText(context),

2
lib/new_views/pages/help_center_page.dart
Unescape Escape View File

@ -41,7 +41,7 @@ class HelpCenterPage extends StatelessWidget {
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
title.heading5(context), title.heading5(context).custom(color: AppColor.textStyleColor(context)),
"arrow_right".toSvgAsset(width: 17), "arrow_right".toSvgAsset(width: 17),
], ],
); );

2
lib/new_views/pages/land_page/calender_fragments/calendar_header.dart
Unescape Escape View File

@ -19,7 +19,7 @@ class CalendarHeader extends StatelessWidget {
children: [ children: [
Row( Row(
children: [ children: [
dateFormat.format(dateTime).heading5(context), dateFormat.format(dateTime).heading5(context).custom(color: AppColor.textStyleColor(context)),
6.width, 6.width,
Align(alignment: AlignmentDirectional.centerEnd, child: Icon(Icons.keyboard_arrow_down_sharp, color: context.isDark ? AppColor.neutral10 : AppColor.neutral60, size: 24)), Align(alignment: AlignmentDirectional.centerEnd, child: Icon(Icons.keyboard_arrow_down_sharp, color: context.isDark ? AppColor.neutral10 : AppColor.neutral60, size: 24)),
const Spacer(), const Spacer(),

8
lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart
Unescape Escape View File

@ -166,7 +166,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
"WO Status".heading5(context), "WO Status".heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
RequestsTypeFilter( RequestsTypeFilter(
initialValues: search?.statuses ?? [], initialValues: search?.statuses ?? [],
@ -183,7 +183,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
}, },
), ),
16.height, 16.height,
"Type of WO".heading5(context), "Type of WO".heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
RequestsTypeFilter( RequestsTypeFilter(
initialValues: search?.typeTransaction ?? [], initialValues: search?.typeTransaction ?? [],
@ -194,7 +194,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
}, },
), ),
16.height, 16.height,
context.translation.pickDate.heading5(context), context.translation.pickDate.heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
Row( Row(
children: [ children: [
@ -226,7 +226,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
], ],
), ),
16.height, 16.height,
// "Archived WO".heading5(context), // "Archived WO".heading5(context).custom(color: AppColor.textStyleColor(context)),
// // 8.height, // // 8.height,
// Row( // Row(
// children: [ // children: [

2
lib/new_views/pages/report_bug_page.dart
Unescape Escape View File

@ -31,7 +31,7 @@ class ReportBugPage extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
user.clientName!.heading5(context), user.clientName!.heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
"Call ID: ${0}".bodyText(context), "Call ID: ${0}".bodyText(context),
"Date of Survey: ${DateFormat("dd MMM, yyyy").format(DateTime.now())}".bodyText(context), "Date of Survey: ${DateFormat("dd MMM, yyyy").format(DateTime.now())}".bodyText(context),

6
lib/new_views/pages/settings_page.dart
Unescape Escape View File

@ -105,7 +105,7 @@ class _SettingsPageState extends State<SettingsPage> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
context.translation.arabic.heading5(context), context.translation.arabic.heading5(context).custom(color: AppColor.textStyleColor(context)),
AdvancedSwitch( AdvancedSwitch(
controller: langController, controller: langController,
activeColor: AppColor.green50.withOpacity(0.5), activeColor: AppColor.green50.withOpacity(0.5),
@ -127,7 +127,7 @@ class _SettingsPageState extends State<SettingsPage> {
Row( Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
context.translation.lightTheme.heading5(context), context.translation.lightTheme.heading5(context).custom(color: AppColor.textStyleColor(context)),
AdvancedSwitch( AdvancedSwitch(
controller: themeController, controller: themeController,
activeColor: AppColor.green50.withOpacity(0.5), activeColor: AppColor.green50.withOpacity(0.5),
@ -158,7 +158,7 @@ class _SettingsPageState extends State<SettingsPage> {
return Row( return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
"Fingerprint/Face ID".heading5(context), "Fingerprint/Face ID".heading5(context).custom(color: AppColor.textStyleColor(context)),
customSwitch(localAuth).onPress(() { customSwitch(localAuth).onPress(() {
checkForLocalAuth(localAuth); checkForLocalAuth(localAuth);
}), }),

2
lib/new_views/pages/unsafe_device_view.dart
Unescape Escape View File

@ -32,7 +32,7 @@ class _UnsafeDeviceScreenState extends State<UnsafeDeviceScreen> {
// Center(child: Image.asset("assets/images/logos/main_mohemm_logo.png", width: 200, height: 50)), // Center(child: Image.asset("assets/images/logos/main_mohemm_logo.png", width: 200, height: 50)),
"logo".toSvgAsset(height: 64), "logo".toSvgAsset(height: 64),
50.height, 50.height,
"Sorry".heading5(context), "Sorry".heading5(context).custom(color: AppColor.textStyleColor(context)),
21.height, 21.height,
"You are using Atoms app on an unsafe device. To be able to use the app with all it's features, Please make sure that the below points are considered: " "You are using Atoms app on an unsafe device. To be able to use the app with all it's features, Please make sure that the below points are considered: "
.heading5(context).paddingOnly(start: 20, end: 20), .heading5(context).paddingOnly(start: 20, end: 20),

2
lib/new_views/swipe_module/mark_attendance_widget.dart
Unescape Escape View File

@ -144,7 +144,7 @@
// mainAxisSize: MainAxisSize.min, // mainAxisSize: MainAxisSize.min,
// children: [ // children: [
// 20.height, // 20.height,
// 'click me '.heading5(context), // 'click me '.heading5(context).custom(color: AppColor.textStyleColor(context)),
// // LocaleKeys.markAttendance.tr().toSectionHeading(), // // LocaleKeys.markAttendance.tr().toSectionHeading(),
// // LocaleKeys.selectMethodOfAttendance.tr().toText11(color: const Color(0xff535353)), // // LocaleKeys.selectMethodOfAttendance.tr().toText11(color: const Color(0xff535353)),
// GridView( // GridView(

4
lib/views/pages/user/profile_page.dart
Unescape Escape View File

@ -163,13 +163,13 @@ class _ProfilePageState extends State<ProfilePage> {
// if ((_user.phoneNumber ?? "").isNotEmpty) ...[ // if ((_user.phoneNumber ?? "").isNotEmpty) ...[
// const Divider().defaultStyle(context), // const Divider().defaultStyle(context),
// 8.height, // 8.height,
// (_user.phoneNumber??"").heading5(context), // (_user.phoneNumber??"").heading5(context).custom(color: AppColor.textStyleColor(context)),
// 8.height, // 8.height,
// ], // ],
// if ((_user.extensionNo ?? "").isNotEmpty) ...[ // if ((_user.extensionNo ?? "").isNotEmpty) ...[
// const Divider().defaultStyle(context), // const Divider().defaultStyle(context),
// 8.height, // 8.height,
// _user.extensionNo!.heading5(context), // _user.extensionNo!.heading5(context).custom(color: AppColor.textStyleColor(context)),
// 8.height, // 8.height,
// ], // ],
if ((_user.departmentName?.length ?? 0) > 0) const Divider().defaultStyle(context), if ((_user.departmentName?.length ?? 0) > 0) const Divider().defaultStyle(context),

2
lib/views/pages/user/requests/create_service_request_page.dart
Unescape Escape View File

@ -291,7 +291,7 @@
// //
// // Align( // // Align(
// // alignment: AlignmentDirectional.centerStart, // // alignment: AlignmentDirectional.centerStart,
// // child: context.translation.callComments.heading5(context), // // child: context.translation.callComments.heading5(context).custom(color: AppColor.textStyleColor(context)),
// // ), // // ),
// 8.height, // 8.height,
// // SpeechToTextButton( // // SpeechToTextButton(

2
lib/views/widgets/bottom_sheets/asset_detail_bottom_sheet.dart
Unescape Escape View File

@ -23,7 +23,7 @@ class AssetDetailBottomSheet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
(asset?.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-").heading5(context), (asset?.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-").heading5(context).custom(color: AppColor.textStyleColor(context)),
16.height, 16.height,
AspectRatio( AspectRatio(
aspectRatio: 358 / 136, aspectRatio: 358 / 136,

2
lib/views/widgets/equipment/asset_detail_page.dart
Unescape Escape View File

@ -96,7 +96,7 @@ class _AssetDetailPageState extends State<AssetDetailPage> {
backgroundColor: AppColor.getRequestStatusColorByName(context, assetModel.commissioningStatus!.name!), backgroundColor: AppColor.getRequestStatusColorByName(context, assetModel.commissioningStatus!.name!),
), ),
if (assetModel.commissioningStatus != null) 8.height, if (assetModel.commissioningStatus != null) 8.height,
(assetModel.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-").heading5(context), (assetModel.modelDefinition?.assetName?.cleanupWhitespace.capitalizeFirstOfEach ?? "-").heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
Row( Row(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,

24
lib/views/widgets/equipment/commissioning_status_buttons.dart → lib/views/widgets/equipment/asset_status_buttons.dart
Unescape Escape View File

@ -10,17 +10,17 @@ import '../../../models/lookup.dart';
import '../../../new_views/app_style/app_color.dart'; import '../../../new_views/app_style/app_color.dart';
import '../../../providers/service_request_providers/commissioning_status_provider.dart'; import '../../../providers/service_request_providers/commissioning_status_provider.dart';
class CommissioningStatusButtons extends StatefulWidget { class AssetStatusButtons extends StatefulWidget {
final Function(Lookup?)? onSelect; final Function(Lookup?)? onSelect;
final Lookup? initialValue; final Lookup? initialValue;
const CommissioningStatusButtons({Key? key, this.onSelect, this.initialValue}) : super(key: key); const AssetStatusButtons({Key? key, this.onSelect, this.initialValue}) : super(key: key);
@override @override
State<CommissioningStatusButtons> createState() => _CommissioningStatusButtonsState(); State<AssetStatusButtons> createState() => _AssetStatusButtonsState();
} }
class _CommissioningStatusButtonsState extends State<CommissioningStatusButtons> { class _AssetStatusButtonsState extends State<AssetStatusButtons> {
int _selectedIndex = 0; int _selectedIndex = 0;
@override @override
@ -36,7 +36,7 @@ class _CommissioningStatusButtonsState extends State<CommissioningStatusButtons>
} }
@override @override
void didUpdateWidget(covariant CommissioningStatusButtons oldWidget) { void didUpdateWidget(covariant AssetStatusButtons oldWidget) {
if (widget.initialValue != oldWidget.initialValue) { if (widget.initialValue != oldWidget.initialValue) {
final provider = Provider.of<CommissioningStatusProvider>(context, listen: false); final provider = Provider.of<CommissioningStatusProvider>(context, listen: false);
if (widget.initialValue != null) { if (widget.initialValue != null) {
@ -54,7 +54,7 @@ class _CommissioningStatusButtonsState extends State<CommissioningStatusButtons>
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.stretch, crossAxisAlignment: CrossAxisAlignment.stretch,
children: [ children: [
context.translation.assetStatus.heading5(context).paddingOnly(start: 16, end: 16), context.translation.assetStatus.heading5(context).custom(color: AppColor.textStyleColor(context)),
8.height, 8.height,
Consumer<CommissioningStatusProvider>( Consumer<CommissioningStatusProvider>(
builder: (context, snapshot, _) { builder: (context, snapshot, _) {
@ -69,17 +69,18 @@ class _CommissioningStatusButtonsState extends State<CommissioningStatusButtons>
8.width, 8.width,
const _Skelton().expanded, const _Skelton().expanded,
], ],
).paddingOnly(start: 16, end: 16), ),
) )
: SizedBox( : SizedBox(
height: 36.toScreenHeight, height: 36.toScreenHeight,
child: ListView.builder( child: ListView.separated(
itemCount: snapshot.items.length + 1, itemCount: snapshot.items.length + 1,
scrollDirection: Axis.horizontal, scrollDirection: Axis.horizontal,
shrinkWrap: true, shrinkWrap: true,
padding: EdgeInsetsDirectional.only(start: 16.toScreenWidth), padding: EdgeInsetsDirectional.only(start: 0.toScreenWidth),
separatorBuilder: (cxt, index) => 8.width,
itemBuilder: (context, index) => Container( itemBuilder: (context, index) => Container(
margin: EdgeInsets.symmetric(horizontal: 4.toScreenWidth), margin: EdgeInsets.symmetric(horizontal: 0.toScreenWidth),
padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth), padding: EdgeInsets.symmetric(vertical: 8.toScreenHeight, horizontal: 12.toScreenWidth),
alignment: Alignment.center, alignment: Alignment.center,
// foregroundDecoration: _selectedIndex != index // foregroundDecoration: _selectedIndex != index
@ -104,8 +105,7 @@ class _CommissioningStatusButtonsState extends State<CommissioningStatusButtons>
// color: AppColor.filterButtonTextColor(context) // color: AppColor.filterButtonTextColor(context)
color: _selectedIndex == index ? AppColor.primary10 : AppColor.filterButtonTextColor(context) color: _selectedIndex == index ? AppColor.primary10 : AppColor.filterButtonTextColor(context)),
),
).onPress(() { ).onPress(() {
setState(() { setState(() {
_selectedIndex = index; _selectedIndex = index;

2
lib/views/widgets/fullscreen_dialogs/multiple_selection_fullscreen_dialog.dart
Unescape Escape View File

@ -54,7 +54,7 @@ class _SelectionBottomSheetState<T extends Base> extends State<MultipleSelection
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: widget.title.heading5(context), title: widget.title.heading5(context).custom(color: AppColor.textStyleColor(context)),
actions: [ actions: [
if (widget.showCancel) if (widget.showCancel)
AnimatedContainer( AnimatedContainer(

2
lib/views/widgets/fullscreen_dialogs/selection_fullscreen_dialog.dart
Unescape Escape View File

@ -51,7 +51,7 @@ class _SelectionBottomSheetState<T extends Base> extends State<SelectionFullScre
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
title: widget.title.heading5(context), title: widget.title.heading5(context).custom(color: AppColor.textStyleColor(context)),
actions: [ actions: [
if (widget.showCancel) if (widget.showCancel)
AnimatedContainer( AnimatedContainer(

Write Preview
Loading…
Cancel
Save