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

ui changes

Browse Source
main_production_RSG
Sikander Saleem 2 months ago
parent 839f878d35
commit 3429dcff60
54 changed files with 198 additions and 169 deletions
Show Stats Download Patch File Download Diff File

6
assets/images/dashboard/sort_descending.svg
Unescape Escape View File

@ -0,0 +1,6 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.00001 3C2.00001 2.44772 2.44772 2 3.00001 2H19C19.5523 2 20 2.44772 20 3C20 3.55228 19.5523 4 19 4H3.00001C2.44772 4 2.00001 3.55228 2.00001 3Z" fill="#212936"/>
<path d="M3.00001 8.00001C2.44772 8 2 8.44772 2 9C2 9.55228 2.44771 10 2.99999 10L14 10.0001C14.5523 10.0001 15 9.55238 15 9.00009C15 8.44781 14.5523 8.00009 14 8.00009L3.00001 8.00001Z" fill="#212936"/>
<path d="M3.00001 14C2.44772 14 2.00001 14.4477 2.00001 15C2.00001 15.5523 2.44772 16 3.00001 16H10C10.5523 16 11 15.5523 11 15C11 14.4477 10.5523 14 10 14H3.00001Z" fill="#212936"/>
<path d="M17.1616 17.5C16.986 17.4999 16.7703 17.4997 16.5939 17.5218L16.5905 17.5222C16.4641 17.538 15.888 17.6098 15.6137 18.1754C15.3387 18.7422 15.6407 19.2424 15.706 19.3506L16.0451 19.819C16.3398 20.1949 16.7455 20.7093 17.1259 21.1003C17.3157 21.2954 17.533 21.4967 17.7639 21.6555C17.9691 21.7967 18.3193 22 18.75 22C19.1807 22 19.5309 21.7967 19.7361 21.6555C19.967 21.4967 20.1843 21.2954 20.3741 21.1003C20.7546 20.7093 21.1603 20.1949 21.4549 19.8191L21.794 19.3506C21.8594 19.2424 22.1613 18.7422 21.8863 18.1754C21.612 17.6098 21.0359 17.538 20.9095 17.5222L20.9061 17.5218C20.7297 17.4997 20.514 17.4999 20.3384 17.5L19.75 17.5V8.99996C19.75 8.44768 19.3023 7.99996 18.75 7.99996C18.1977 7.99996 17.75 8.44768 17.75 8.99996V17.5L17.1616 17.5Z" fill="#212936"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

4
assets/images/search.svg
Unescape Escape View File

@ -1,3 +1,3 @@
<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M11.9499 9.51862C12.6027 8.54479 12.984 7.37301 12.984 6.11339C12.984 2.74246 10.2534 0 6.89703 0C3.54065 0 0.810059 2.74246 0.810059 6.11336C0.810059 9.48425 3.54068 12.2267 6.89706 12.2267C8.176 12.2267 9.36378 11.8282 10.3445 11.1488L15.1958 16L16.8101 14.3788L11.9499 9.51862ZM6.89706 10.5097C4.48871 10.5097 2.52931 8.54181 2.52931 6.12299C2.52931 3.70421 4.48868 1.73634 6.89706 1.73634C9.30543 1.73634 11.2648 3.70421 11.2648 6.12302C11.2648 8.54184 9.3054 10.5097 6.89706 10.5097Z" fill="#767676"/> <path fill-rule="evenodd" clip-rule="evenodd" d="M11 1.25C5.61522 1.25 1.25 5.61522 1.25 11C1.25 16.3848 5.61522 20.75 11 20.75C13.4224 20.75 15.6385 19.8666 17.3437 18.4043L21.4697 22.5303C21.7626 22.8232 22.2374 22.8232 22.5303 22.5303C22.8232 22.2374 22.8232 21.7626 22.5303 21.4697L18.4043 17.3437C19.8666 15.6385 20.75 13.4224 20.75 11C20.75 5.61522 16.3848 1.25 11 1.25ZM2.75 11C2.75 6.44365 6.44365 2.75 11 2.75C15.5563 2.75 19.25 6.44365 19.25 11C19.25 15.5563 15.5563 19.25 11 19.25C6.44365 19.25 2.75 15.5563 2.75 11Z" fill="#3B3D4A"/>
</svg> </svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 619 B

After

Width:  |  Height:  |  Size: 649 B

122
lib/dashboard_latest/widgets/progress_fragment.dart
Unescape Escape View File

@ -235,65 +235,73 @@ class ProgressFragment extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceEvenly, mainAxisAlignment: MainAxisAlignment.spaceEvenly,
spacing: 60.toScreenWidth, spacing: 60.toScreenWidth,
children: [ children: [
SizedBox( Expanded(
height: 124.toScreenWidth, flex: 3,
width: 124.toScreenWidth, child: SizedBox(
child: PieChart( height: 124.toScreenWidth,
dataMap: {for (var v in chartData) v.x: v.y}, width: 124.toScreenWidth,
animationDuration: const Duration(milliseconds: 750), child: PieChart(
chartLegendSpacing: 0, dataMap: {for (var v in chartData) v.x: v.y},
chartRadius: 124, animationDuration: const Duration(milliseconds: 750),
colorList: chartData.map((element) => element.color).toList(), chartLegendSpacing: 0,
initialAngleInDegree: 270, chartRadius: 124,
chartType: ChartType.ring, colorList: chartData.map((element) => element.color).toList(),
ringStrokeWidth: 32, initialAngleInDegree: 270,
legendOptions: LegendOptions( chartType: ChartType.ring,
showLegendsInRow: true, ringStrokeWidth: 32,
legendPosition: LegendPosition.top, legendOptions: LegendOptions(
showLegends: false, showLegendsInRow: true,
legendTextStyle: AppTextStyles.textStyle9, legendPosition: LegendPosition.top,
), showLegends: false,
chartValuesOptions: ChartValuesOptions( legendTextStyle: AppTextStyles.textStyle9,
showChartValueBackground: true, ),
chartValueBackgroundColor: const Color(0xff226187).withValues(alpha: .75), chartValuesOptions: ChartValuesOptions(
chartValueStyle: AppTextStyles.textStyle9.copyWith(height: 1.5, color: Colors.white), showChartValueBackground: true,
showChartValues: true, chartValueBackgroundColor: const Color(0xff226187).withValues(alpha: .75),
showChartValuesInPercentage: true, chartValueStyle: AppTextStyles.tinyFont2.copyWith(height: 1.5, color: Colors.white),
showChartValuesOutside: true, showChartValues: true,
decimalPlaces: 0, showChartValuesInPercentage: true,
), showChartValuesOutside: true,
).toShimmer(isShow: snapshot.isAllCountLoading, radius: 250, context: context).paddingAll(0), decimalPlaces: 0,
),
).toShimmer(isShow: snapshot.isAllCountLoading, radius: 250, context: context).paddingAll(0),
),
), ),
Column( Expanded(
mainAxisAlignment: MainAxisAlignment.end, flex: 2,
spacing: 8, child: Column(
children: [ mainAxisAlignment: MainAxisAlignment.end,
for (int i = 0; i < chartData.length; i++) crossAxisAlignment: CrossAxisAlignment.start,
Row( spacing: 8,
spacing: 16, children: [
children: [ for (int i = 0; i < chartData.length; i++)
chartData[i].icon.toSvgAsset(height: 26, width: 26, color: chartData[i].color).toShimmer(isShow: snapshot.isAllCountLoading, context: context), Row(
Column( spacing: 16,
spacing: 4, children: [
crossAxisAlignment: CrossAxisAlignment.start, chartData[i].icon.toSvgAsset(height: 26, width: 26, color: chartData[i].color).toShimmer(isShow: snapshot.isAllCountLoading, context: context),
children: [ Column(
Text(chartData[i].x, style: AppTextStyles.textStyle9.copyWith(color: AppColor.text9Color(context))).toShimmer(isShow: snapshot.isAllCountLoading, context: context), spacing: 4,
RichText( crossAxisAlignment: CrossAxisAlignment.start,
text: TextSpan( children: [
text: "${chartData[i].y.toInt()}", Text(chartData[i].x, style: AppTextStyles.textStyle9.copyWith(color: AppColor.text9Color(context)))
style: AppTextStyles.bodyText.copyWith(color: AppColor.headingTextColor(context)), .toShimmer(isShow: snapshot.isAllCountLoading, context: context),
children: [ RichText(
TextSpan(text: " | ", style: AppTextStyles.bodyText.copyWith(color: AppColor.headingTextColor(context))), text: TextSpan(
TextSpan(text: "${chartData[i].y}", style: AppTextStyles.bodyText.copyWith(color: AppColor.headingTextColor(context))), text: "${chartData[i].y.toInt()}",
], style: AppTextStyles.bodyText.copyWith(color: AppColor.headingTextColor(context)),
children: [
// TextSpan(text: " | ", style: AppTextStyles.bodyText.copyWith(color: AppColor.headingTextColor(context))),
// TextSpan(text: "${chartData[i].y}", style: AppTextStyles.bodyText.copyWith(color: AppColor.headingTextColor(context))),
],
),
), ),
), ],
], )
) ],
], )
) ],
], ),
) ),
], ],
).expanded, ).expanded,
], ],

44
lib/dashboard_latest/widgets/request_category_fragment.dart
Unescape Escape View File

@ -1,3 +1,4 @@
import 'package:date_picker_timeline/extra/color.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:test_sa/controllers/providers/api/user_provider.dart'; import 'package:test_sa/controllers/providers/api/user_provider.dart';
@ -10,6 +11,7 @@ import 'package:test_sa/extensions/widget_extensions.dart';
import 'package:test_sa/models/enums/user_types.dart'; import 'package:test_sa/models/enums/user_types.dart';
import 'package:test_sa/models/new_models/dashboard_detail.dart'; import 'package:test_sa/models/new_models/dashboard_detail.dart';
import 'package:test_sa/modules/cm_module/views/components/weekly_calendar_fragment.dart'; import 'package:test_sa/modules/cm_module/views/components/weekly_calendar_fragment.dart';
import 'package:test_sa/new_views/app_style/app_color.dart';
import 'package:test_sa/new_views/common_widgets/tab_button.dart'; import 'package:test_sa/new_views/common_widgets/tab_button.dart';
import 'package:test_sa/views/widgets/loaders/no_data_found.dart'; import 'package:test_sa/views/widgets/loaders/no_data_found.dart';
import 'package:test_sa/controllers/providers/settings/setting_provider.dart'; import 'package:test_sa/controllers/providers/settings/setting_provider.dart';
@ -33,7 +35,7 @@ class RequestCategoryFragment extends StatelessWidget {
? Column( ? Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
context.translation.allWorkOrder.heading4(context), Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))),
// Row( // Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween, // mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [ // children: [
@ -53,17 +55,35 @@ class RequestCategoryFragment extends StatelessWidget {
: const SizedBox(), : const SizedBox(),
], ],
).paddingOnly(start: 14, end: 12) ).paddingOnly(start: 14, end: 12)
: isFMSEngineer : Row(
? Row( spacing: 16,
mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
children: [ Text(context.translation.allWorkOrder, style: AppTextStyles.heading4.copyWith(color: AppColor.headingTextColor(context))).expanded,
context.translation.allWorkOrder.heading4(context), if (!isFMSEngineer)
'search'.toSvgAsset(width: 20, height: 20).onPress(() { 'search'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() {
Navigator.of(context).pushNamed('/cleaner_search'); Navigator.of(context).pushNamed('/cleaner_search');
}), }),
], Transform.flip(
).paddingOnly(start: 16, end: 16) flipY: false,
: context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16), child: 'dashboard/sort_descending'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() {
Navigator.of(context).pushNamed('/cleaner_search');
}),
)
],
).paddingOnly(start: 16, end: 16),
// isFMSEngineer
// ? Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// context.translation.allWorkOrder.heading4(context),
// 'search'.toSvgAsset(width: 24, height: 24, color: AppColor.headingTextColor(context)).onPress(() {
// Navigator.of(context).pushNamed('/cleaner_search');
// }),
// ],
// ).paddingOnly(start: 16, end: 16)
// : context.translation.allWorkOrder.heading4(context).paddingOnly(start: 16, end: 16),
getTabs( getTabs(
requestsProvider: dashboardProvider, requestsProvider: dashboardProvider,
context: context, context: context,

2
lib/dashboard_latest/widgets/request_category_list.dart
Unescape Escape View File

@ -36,7 +36,7 @@ class RequestCategoryList extends StatelessWidget {
separatorBuilder: (cxt, index) => 16.height, separatorBuilder: (cxt, index) => 16.height,
itemBuilder: (context, index) { itemBuilder: (context, index) {
if (index == list.length) { if (index == list.length) {
return const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 1).center; return CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 1).center;
} }
return _buildRequestItem(list[index]); return _buildRequestItem(list[index]);
}, },

4
lib/modules/asset_delivery_module/pages/asset_delivery_page.dart
Unescape Escape View File

@ -83,7 +83,7 @@ class _AssetDeliveryPageState extends State<AssetDeliveryPage> {
selector: (_, provider) => provider.assetDeliveryDataModel, selector: (_, provider) => provider.assetDeliveryDataModel,
builder: (context, dataModel, child) { builder: (context, dataModel, child) {
if (loading) { if (loading) {
return const CircularProgressIndicator(color: AppColor.primary10).center; return CircularProgressIndicator(color: AppColor.loadingColor(context),).center;
} }
if (dataModel == null) { if (dataModel == null) {
return const NoDataFound().center; return const NoDataFound().center;
@ -306,7 +306,7 @@ class _AssetDeliveryPageState extends State<AssetDeliveryPage> {
Widget assetDeliveryTableList({required BuildContext context, required AssetDeliveryProvider assetDeliveryProvider}) { Widget assetDeliveryTableList({required BuildContext context, required AssetDeliveryProvider assetDeliveryProvider}) {
List<AssetDeliveryTableModel> assetDeliveryTableList = assetDeliveryProvider.assetDeliveryTableList; List<AssetDeliveryTableModel> assetDeliveryTableList = assetDeliveryProvider.assetDeliveryTableList;
return assetDeliveryProvider.isDeliveryTableListLoading return assetDeliveryProvider.isDeliveryTableListLoading
? SizedBox(height: 200.toScreenHeight, child: const CircularProgressIndicator(color: AppColor.primary10).center) ? SizedBox(height: 200.toScreenHeight, child: CircularProgressIndicator(color: AppColor.loadingColor(context)).center)
: assetDeliveryTableList.isEmpty : assetDeliveryTableList.isEmpty
? const NoDataFound().center ? const NoDataFound().center
: ListView.separated( : ListView.separated(

2
lib/modules/asset_delivery_module/pages/delivery_inspection/cost_center_form_view.dart
Unescape Escape View File

@ -113,7 +113,7 @@ class _CostCenterFormViewState extends State<CostCenterFormView> {
), ),
body: Consumer<AssetDeliveryProvider>(builder: (context, provider, child) { body: Consumer<AssetDeliveryProvider>(builder: (context, provider, child) {
return provider.isLoading return provider.isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Column( : Column(
children: [ children: [
itemDetails(), itemDetails(),

4
lib/modules/asset_delivery_module/pages/delivery_inspection/delivery_inspection_form_view.dart
Unescape Escape View File

@ -96,7 +96,7 @@ class _DeliveryInspectionFormViewState extends State<DeliveryInspectionFormView>
return Scaffold( return Scaffold(
backgroundColor: Theme.of(context).scaffoldBackgroundColor, backgroundColor: Theme.of(context).scaffoldBackgroundColor,
body: isLoading body: isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Form( : Form(
key: _formKey, key: _formKey,
child: Column( child: Column(
@ -177,7 +177,7 @@ class _DeliveryInspectionFormViewState extends State<DeliveryInspectionFormView>
return Consumer<AssetDeliveryProvider>(builder: (context, provider, child) { return Consumer<AssetDeliveryProvider>(builder: (context, provider, child) {
List<DeliveryLineModel> linesList = provider.deliveryLinesList; List<DeliveryLineModel> linesList = provider.deliveryLinesList;
return provider.isDeliveryLineListLoading return provider.isDeliveryLineListLoading
? SizedBox.expand(child: const CircularProgressIndicator(color: AppColor.primary10).center) ? SizedBox.expand(child: CircularProgressIndicator(color: AppColor.loadingColor(context)).center)
: linesList.isEmpty : linesList.isEmpty
? const NoDataFound().center ? const NoDataFound().center
: ListView.separated( : ListView.separated(

2
lib/modules/asset_delivery_module/pages/end_user_acceptance/end_user_cost_center_list_view.dart
Unescape Escape View File

@ -79,7 +79,7 @@ class _EndUserCostCenterLIstViewState extends State<EndUserCostCenterLIstView> {
body: Form( body: Form(
key: _formKey, key: _formKey,
child: isLoading child: isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Column( : Column(
children: [ children: [
//Refactor this //Refactor this

2
lib/modules/asset_delivery_module/pages/end_user_acceptance/update_end_user_cost_center_details_view.dart
Unescape Escape View File

@ -147,7 +147,7 @@ class _UpdateEndUserCostCenterDetailsViewState extends State<UpdateEndUserCostCe
Widget endUserAssetList(BuildContext context) { Widget endUserAssetList(BuildContext context) {
return isLoading return isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: ListView.separated( : ListView.separated(
itemCount: assetList.length, itemCount: assetList.length,
separatorBuilder: (_, __) => 8.height, separatorBuilder: (_, __) => 8.height,

2
lib/modules/asset_delivery_module/pages/history_log_view.dart
Unescape Escape View File

@ -56,7 +56,7 @@ class _AssetDeliveryHistoryLogViewState extends State<AssetDeliveryHistoryLogVie
// }, // },
// ), // ),
body: loading body: loading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Stack( : Stack(
children: [ children: [
Padding( Padding(

2
lib/modules/asset_delivery_module/pages/technical_inpection/technical_inspection_lines_list_view.dart
Unescape Escape View File

@ -87,7 +87,7 @@ class _TechnicalInspectionLinesListViewState extends State<TechnicalInspectionLi
body: Form( body: Form(
key: _formKey, key: _formKey,
child: (isLoading) child: (isLoading)
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: (technicalInspectionLinesList.isEmpty) : (technicalInspectionLinesList.isEmpty)
? const NoDataFound().center ? const NoDataFound().center
: Column( : Column(

2
lib/modules/asset_delivery_module/pages/technical_inpection/technical_inspection_parent_asset_list_view.dart
Unescape Escape View File

@ -85,7 +85,7 @@ class _TechnicalInspectionParentAssetListViewState extends State<TechnicalInspec
Widget parentAssetList(BuildContext context) { Widget parentAssetList(BuildContext context) {
if (isLoading) { if (isLoading) {
return SizedBox.expand( return SizedBox.expand(
child: const CircularProgressIndicator(color: AppColor.primary10).center, child: CircularProgressIndicator(color: AppColor.loadingColor(context)).center,
); );
} }

2
lib/modules/asset_delivery_module/pages/technical_inpection/update_child_asset_view.dart
Unescape Escape View File

@ -101,7 +101,7 @@ class _UpdateChildAssetViewState extends State<UpdateChildAssetView> {
key: _formKey, key: _formKey,
child: Consumer<AssetDeliveryProvider>(builder: (context, provider, child) { child: Consumer<AssetDeliveryProvider>(builder: (context, provider, child) {
return provider.isChildAssetDataLoading return provider.isChildAssetDataLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Column( : Column(
children: [ children: [
SingleChildScrollView( SingleChildScrollView(

2
lib/modules/asset_delivery_module/pages/technical_inpection/update_parent_asset_view.dart
Unescape Escape View File

@ -110,7 +110,7 @@ class _UpdateParentAssetViewState extends State<UpdateParentAssetView> {
key: _formKey, key: _formKey,
child: Consumer<AssetDeliveryProvider>(builder: (context, provider, child) { child: Consumer<AssetDeliveryProvider>(builder: (context, provider, child) {
return provider.isLoading return provider.isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Column( : Column(
children: [ children: [
SingleChildScrollView( SingleChildScrollView(

2
lib/modules/asset_delivery_module/pages/technical_inpection/update_technical_inspection_lines_view.dart
Unescape Escape View File

@ -85,7 +85,7 @@ class _UpdateTechnicalInspectionLinesViewState extends State<UpdateTechnicalInsp
body: Form( body: Form(
key: _formKey, key: _formKey,
child: isLoading child: isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Column( : Column(
children: [ children: [
SingleChildScrollView( SingleChildScrollView(

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

@ -71,7 +71,7 @@ class _AssetInventoryPageState extends State<AssetInventoryPage> {
return DefaultTabController( return DefaultTabController(
length: 2, length: 2,
child: provider.isLoading child: provider.isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Column( : Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: <Widget>[ children: <Widget>[

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

@ -149,7 +149,7 @@ class _SiteInformationPageState extends State<SiteInformationPage> {
if (provider.isLoading) { if (provider.isLoading) {
return SizedBox( return SizedBox(
height: 300.toScreenHeight, height: 300.toScreenHeight,
child: const CircularProgressIndicator(color: AppColor.primary10).center, child: CircularProgressIndicator(color: AppColor.loadingColor(context)).center,
); );
} }

37
lib/modules/cleaner_module/pages/cleaner_search_form_view.dart
Unescape Escape View File

@ -194,30 +194,19 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
appBar: DefaultAppBar( appBar: const DefaultAppBar(title: 'Search Request'),
title: 'Search Request',
titleStyle: AppTextStyles.heading3.copyWith(
fontWeight: FontWeight.w500,
color: Theme.of(context).brightness == Brightness.dark ? AppColor.neutral30 : AppColor.neutral50,
),
),
body: Column( body: Column(
children: [ children: [
Expanded( Expanded(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
spacing: 8,
children: [ children: [
// Site Autocomplete Field // Site Autocomplete Field
Container( Container(
padding: EdgeInsets.symmetric( padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 8.toScreenHeight),
horizontal: 16.toScreenWidth, decoration: BoxDecoration(color: AppColor.fieldBgColor(context), borderRadius: BorderRadius.circular(16), border: Border.all(color: AppColor.borderColor(context))),
vertical: 8.toScreenHeight,
),
decoration: BoxDecoration(
color: AppColor.fieldBgColor(context),
borderRadius: BorderRadius.circular(10),
),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -296,13 +285,10 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
), ),
), ),
if (_isLoadingSites) if (_isLoadingSites)
const SizedBox( SizedBox(
width: 20, width: 20,
height: 20, height: 20,
child: CircularProgressIndicator( child: CircularProgressIndicator(strokeWidth: 2, color: AppColor.loadingColor(context)),
strokeWidth: 2,
color: AppColor.primary10,
),
) )
else if (controller.text.isNotEmpty) else if (controller.text.isNotEmpty)
GestureDetector( GestureDetector(
@ -336,7 +322,6 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
], ],
), ),
), ),
const SizedBox(height: 18),
// Building Dropdown // Building Dropdown
SingleItemDropDownMenu<Building, NullableLoadingProvider>( SingleItemDropDownMenu<Building, NullableLoadingProvider>(
@ -345,7 +330,7 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
initialValue: selectedBuilding, initialValue: selectedBuilding,
showShadow: false, showShadow: false,
showAsBottomSheet: true, showAsBottomSheet: true,
backgroundColor: AppColor.fieldBgColor(context), // backgroundColor: AppColor.fieldBgColor(context),
enabled: _buildingOptions.isNotEmpty, enabled: _buildingOptions.isNotEmpty,
loading: _isLoadingBuildings, loading: _isLoadingBuildings,
staticData: _buildingOptions, staticData: _buildingOptions,
@ -354,7 +339,6 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
setState(() { setState(() {
_siteOptions = []; _siteOptions = [];
print('site options length ${_siteOptions.length}');
selectedBuilding = value; selectedBuilding = value;
selectedFloor = null; selectedFloor = null;
selectedLocationDescription = null; selectedLocationDescription = null;
@ -370,7 +354,6 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
} }
}, },
), ),
const SizedBox(height: 18),
// Floor Dropdown // Floor Dropdown
SingleItemDropDownMenu<Floor, NullableLoadingProvider>( SingleItemDropDownMenu<Floor, NullableLoadingProvider>(
@ -379,7 +362,7 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
initialValue: selectedFloor, initialValue: selectedFloor,
showShadow: false, showShadow: false,
showAsBottomSheet: true, showAsBottomSheet: true,
backgroundColor: AppColor.fieldBgColor(context), // backgroundColor: AppColor.fieldBgColor(context),
enabled: _floorOptions.isNotEmpty, enabled: _floorOptions.isNotEmpty,
loading: _isLoadingFloors, loading: _isLoadingFloors,
staticData: _floorOptions, staticData: _floorOptions,
@ -402,7 +385,6 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
} }
}, },
), ),
const SizedBox(height: 18),
// Location Description Dropdown // Location Description Dropdown
SingleItemDropDownMenu<Lookup, NullableLoadingProvider>( SingleItemDropDownMenu<Lookup, NullableLoadingProvider>(
@ -411,7 +393,7 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
initialValue: selectedLocationDescription, initialValue: selectedLocationDescription,
showShadow: false, showShadow: false,
showAsBottomSheet: true, showAsBottomSheet: true,
backgroundColor: AppColor.fieldBgColor(context), // backgroundColor: AppColor.fieldBgColor(context),
enabled: _locationDescriptionOptions.isNotEmpty, enabled: _locationDescriptionOptions.isNotEmpty,
loading: _isLoadingLocationDescriptions, loading: _isLoadingLocationDescriptions,
staticData: _locationDescriptionOptions, staticData: _locationDescriptionOptions,
@ -425,7 +407,6 @@ class _CleanerSearchFormViewState extends State<CleanerSearchFormView> {
_autoSelectDepartmentRoom(); _autoSelectDepartmentRoom();
}, },
), ),
const SizedBox(height: 18),
// Department & Room Combined Dropdown // Department & Room Combined Dropdown
SingleItemDropDownMenu<DepartmentRoomCombined, NullableLoadingProvider>( SingleItemDropDownMenu<DepartmentRoomCombined, NullableLoadingProvider>(

2
lib/modules/cm_module/views/components/history_log_view.dart
Unescape Escape View File

@ -25,7 +25,7 @@ class HistoryLogView extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Consumer<CMDetailProvider>(builder: (context, requestProvider, _) { return Consumer<CMDetailProvider>(builder: (context, requestProvider, _) {
return requestProvider.isLoading return requestProvider.isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: (requestProvider.currentWorkOrder == null || (requestProvider.currentWorkOrder?.data?.workOrderHistory.isEmpty ?? true) : (requestProvider.currentWorkOrder == null || (requestProvider.currentWorkOrder?.data?.workOrderHistory.isEmpty ?? true)
? const NoDataFound() ? const NoDataFound()
: Stack( : Stack(

2
lib/modules/cm_module/views/components/service_request_detail_view.dart
Unescape Escape View File

@ -69,7 +69,7 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
} }
return requestProvider.isLoading return requestProvider.isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: requestProvider.currentWorkOrder == null : requestProvider.currentWorkOrder == null
? const NoDataFound() ? const NoDataFound()
: Column( : Column(

4
lib/modules/cm_module/views/components/verify_arrival_view.dart
Unescape Escape View File

@ -50,7 +50,7 @@ class _VerifyArrivalViewState extends State<VerifyArrivalView> {
body: Consumer<CMDetailProvider>(builder: (context, CMDetailProvider requestDetailProvider, child) { body: Consumer<CMDetailProvider>(builder: (context, CMDetailProvider requestDetailProvider, child) {
return SafeArea( return SafeArea(
child: requestDetailProvider.isArrivalLoading || requestDetailProvider.isLoading child: requestDetailProvider.isArrivalLoading || requestDetailProvider.isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: requestDetailProvider.arrivalTypeList.isEmpty : requestDetailProvider.arrivalTypeList.isEmpty
? const NoDataFound().center ? const NoDataFound().center
: ListView.builder( : ListView.builder(
@ -104,7 +104,7 @@ class _VerifyArrivalViewState extends State<VerifyArrivalView> {
), ),
), ),
12.width, 12.width,
SizedBox(width: 24, height: 24, child: isLoading ? const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2) : const SizedBox()) SizedBox(width: 24, height: 24, child: isLoading ? CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 2) : const SizedBox())
], ],
).paddingAll(12), ).paddingAll(12),
), ),

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

@ -388,7 +388,7 @@ class PartDetailBottomSheetSheet extends StatelessWidget {
'Parts Availability'.heading6(context).paddingOnly(top: 12, start: 12), 'Parts Availability'.heading6(context).paddingOnly(top: 12, start: 12),
Consumer<CMDetailProvider>(builder: (context, requestDetailProvider, child) { Consumer<CMDetailProvider>(builder: (context, requestDetailProvider, child) {
return requestDetailProvider.isLoading return requestDetailProvider.isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: requestDetailProvider.storeAvailability.isEmpty : requestDetailProvider.storeAvailability.isEmpty
? const NoDataFound().center ? const NoDataFound().center
: ListView.separated( : ListView.separated(

2
lib/modules/cx_module/chat/chat_page.dart
Unescape Escape View File

@ -208,7 +208,7 @@ class _ChatPageState extends State<ChatPage> {
loginResponse: provider.chatLoginResponse, loginResponse: provider.chatLoginResponse,
), ),
builder: (context, connectionState, child) { builder: (context, connectionState, child) {
if (connectionState.isLoading) return const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 3).center; if (connectionState.isLoading) return CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3).center;
if (connectionState.loginResponse == null) { if (connectionState.loginResponse == null) {
return Column( return Column(

2
lib/modules/cx_module/chat/helper/chat_file_viewer.dart
Unescape Escape View File

@ -42,7 +42,7 @@ class ChatFileViewer extends StatelessWidget {
borderRadius: BorderRadius.circular(32), borderRadius: BorderRadius.circular(32),
), ),
), ),
child: const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2).center, child: CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2).center,
); );
} }
if (snapshot.data == null) { if (snapshot.data == null) {

2
lib/modules/cx_module/chat/view_all_attachment_page.dart
Unescape Escape View File

@ -116,7 +116,7 @@ class AttachmentFileViewer extends StatelessWidget {
borderRadius: BorderRadius.circular(32), borderRadius: BorderRadius.circular(32),
), ),
), ),
child: SizedBox(width: 24, height: 24, child: const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2).center), child: SizedBox(width: 24, height: 24, child: CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 2).center),
); );
} }
widget = const SizedBox(width: 24, height: 24, child: CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2)); widget = const SizedBox(width: 24, height: 24, child: CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2));

2
lib/modules/cx_module/survey/survey_page.dart
Unescape Escape View File

@ -78,7 +78,7 @@ class _SurveyPageState extends State<SurveyPage> {
backgroundColor: AppColor.neutral100, backgroundColor: AppColor.neutral100,
appBar: const DefaultAppBar(title: "Survey"), appBar: const DefaultAppBar(title: "Survey"),
body: loading body: loading
? const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 3).center ? CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3).center
: (questionnaire == null) : (questionnaire == null)
? Column( ? Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,

2
lib/modules/demo_module/demo_activities_page.dart
Unescape Escape View File

@ -23,7 +23,7 @@ class DemoActivitiesPage extends StatelessWidget {
body: FutureBuilder<void>( body: FutureBuilder<void>(
future: Future.delayed(Duration(seconds: 1)), future: Future.delayed(Duration(seconds: 1)),
builder: (BuildContext context, AsyncSnapshot<void> snapshot) { builder: (BuildContext context, AsyncSnapshot<void> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
List<String> allAttachments = []; List<String> allAttachments = [];
return Column( return Column(
children: [ children: [

2
lib/modules/demo_module/demo_detail_view_page.dart
Unescape Escape View File

@ -86,7 +86,7 @@ class _DemoDetailViewPageState extends State<DemoDetailViewPage> {
body: FutureBuilder<DemoRequestModel?>( body: FutureBuilder<DemoRequestModel?>(
future: Provider.of<DemoProvider>(context, listen: false).getDemoById(widget.demoId), future: Provider.of<DemoProvider>(context, listen: false).getDemoById(widget.demoId),
builder: (BuildContext context, AsyncSnapshot<DemoRequestModel?> snapshot) { builder: (BuildContext context, AsyncSnapshot<DemoRequestModel?> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
if (snapshot.data == null) return const NoDataFound().center; if (snapshot.data == null) return const NoDataFound().center;
List<DemoAttachments> allAttachments = snapshot.data!.demoAttachments! ?? []; List<DemoAttachments> allAttachments = snapshot.data!.demoAttachments! ?? [];

2
lib/modules/demo_module/update_demo-request_view.dart
Unescape Escape View File

@ -180,7 +180,7 @@ class _UpdateDemoRequestViewState extends State<UpdateDemoRequestView> with Tick
key: _scaffoldKey, key: _scaffoldKey,
appBar: DefaultAppBar(title: 'Update Request'.addTranslation), appBar: DefaultAppBar(title: 'Update Request'.addTranslation),
body: isLoading body: isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Form( : Form(
key: _formKey, key: _formKey,
child: Column( child: Column(

2
lib/modules/incident_module/create_incident_request_page.dart
Unescape Escape View File

@ -418,7 +418,7 @@ class _CreateIncidentRequestPageState extends State<CreateIncidentRequestPage> {
? SizedBox( ? SizedBox(
width: 16.toScreenHeight, width: 16.toScreenHeight,
height: 16.toScreenHeight, height: 16.toScreenHeight,
child: const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2), child: CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 2),
) )
: isOvrVerified : isOvrVerified
? const Row( ? const Row(

4
lib/modules/incident_module/incident_detail_page.dart
Unescape Escape View File

@ -42,7 +42,7 @@ class IncidentDetailPage extends StatelessWidget {
body: FutureBuilder<IncidentDataModel?>( body: FutureBuilder<IncidentDataModel?>(
future: Provider.of<IncidentProvider>(context, listen: false).getIncidentById(incidentId), future: Provider.of<IncidentProvider>(context, listen: false).getIncidentById(incidentId),
builder: (BuildContext context, AsyncSnapshot<IncidentDataModel?> snapshot) { builder: (BuildContext context, AsyncSnapshot<IncidentDataModel?> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
if (snapshot.data == null) return const NoDataFound().center; if (snapshot.data == null) return const NoDataFound().center;
List<IncidentAttachments> allAttachments = snapshot.data!.incidentAttachments!; List<IncidentAttachments> allAttachments = snapshot.data!.incidentAttachments!;
@ -116,7 +116,7 @@ class IncidentDetailPage extends StatelessWidget {
return FutureBuilder<Map<String, dynamic>?>( return FutureBuilder<Map<String, dynamic>?>(
future: Provider.of<IncidentProvider>(context, listen: false).getOvrTicketDetails(ovrNumber), future: Provider.of<IncidentProvider>(context, listen: false).getOvrTicketDetails(ovrNumber),
builder: (BuildContext context, AsyncSnapshot<Map<String, dynamic>?> snapshot) { builder: (BuildContext context, AsyncSnapshot<Map<String, dynamic>?> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
if (snapshot.data == null) return const NoDataFound().center; if (snapshot.data == null) return const NoDataFound().center;
Map<String, dynamic>? data = snapshot.data; Map<String, dynamic>? data = snapshot.data;

2
lib/modules/internal_audit_module/pages/system_internal_audit/system_audit_work_order_auto_complete_field.dart
Unescape Escape View File

@ -109,7 +109,7 @@ class _SystemAuditWoAutoCompleteFieldState extends State<SystemAuditWoAutoComple
floatingLabelStyle: AppTextStyle.body1.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? null : AppColor.neutral20), floatingLabelStyle: AppTextStyle.body1.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? null : AppColor.neutral20),
labelText: context.translation.woNumber, labelText: context.translation.woNumber,
labelStyle: AppTextStyles.tinyFont.copyWith(color: AppColor.textColor(context)), labelStyle: AppTextStyles.tinyFont.copyWith(color: AppColor.textColor(context)),
suffixIcon: loading ? const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 3.0).paddingOnly(end: 8) : null, suffixIcon: loading ? CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3.0).paddingOnly(end: 8) : null,
), ),
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
onChanged: (text) { onChanged: (text) {

2
lib/modules/loan_module/pages/loan_equipment_detail_page.dart
Unescape Escape View File

@ -54,7 +54,7 @@ class _LoanEquipmentDetailPageState extends State<LoanEquipmentDetailPage> {
child: FutureBuilder<LoanRequestModel?>( child: FutureBuilder<LoanRequestModel?>(
future: Provider.of<LoanProvider>(context, listen: false).getLoanById(widget.loanId), future: Provider.of<LoanProvider>(context, listen: false).getLoanById(widget.loanId),
builder: (BuildContext context, AsyncSnapshot<LoanRequestModel?> snapshot) { builder: (BuildContext context, AsyncSnapshot<LoanRequestModel?> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
if (snapshot.data == null) return const NoDataFound().center; if (snapshot.data == null) return const NoDataFound().center;
List<LoanAttachmentModel> allAttachments = snapshot.data!.loanAttachments!; List<LoanAttachmentModel> allAttachments = snapshot.data!.loanAttachments!;

9
lib/modules/medical_gas_inspection/create_medical_gas_request_page.dart
Unescape Escape View File

@ -107,7 +107,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
}, },
initialValue: _medicalGasFormModel.orderType, initialValue: _medicalGasFormModel.orderType,
showShadow: false, showShadow: false,
backgroundColor: AppColor.fieldBgColor(context), // backgroundColor: AppColor.fieldBgColor(context),
showAsBottomSheet: true, showAsBottomSheet: true,
onSelect: (value) { onSelect: (value) {
_medicalGasFormModel.orderType = value; _medicalGasFormModel.orderType = value;
@ -123,7 +123,6 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
}, },
initialValue: _medicalGasFormModel.itemType, initialValue: _medicalGasFormModel.itemType,
showShadow: false, showShadow: false,
backgroundColor: AppColor.fieldBgColor(context),
showAsBottomSheet: true, showAsBottomSheet: true,
onSelect: (value) { onSelect: (value) {
_medicalGasFormModel.itemType = value; _medicalGasFormModel.itemType = value;
@ -141,7 +140,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
if (value == null) return "Please select a site"; if (value == null) return "Please select a site";
return null; return null;
}, },
backgroundColor: AppColor.fieldBgColor(context), // backgroundColor: AppColor.fieldBgColor(context),
showAsBottomSheet: true, showAsBottomSheet: true,
onSelect: (value) { onSelect: (value) {
_medicalGasFormModel.site = value; _medicalGasFormModel.site = value;
@ -155,7 +154,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
title: context.translation.supplier, title: context.translation.supplier,
initialValue: _medicalGasFormModel.supplier, initialValue: _medicalGasFormModel.supplier,
showAsBottomSheet: true, showAsBottomSheet: true,
backgroundColor: AppColor.fieldBgColor(context), // backgroundColor: AppColor.fieldBgColor(context),
showShadow: false, showShadow: false,
validator: (value) { validator: (value) {
if (value == null) return "Please select a supplier"; if (value == null) return "Please select a supplier";
@ -217,7 +216,7 @@ class _CreateMedicalGasRequestPageState extends State<CreateMedicalGasRequestPag
Widget medicalGasInfoWidget() { Widget medicalGasInfoWidget() {
return isGasInfoLoading return isGasInfoLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Column( : Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [

2
lib/modules/medical_gas_inspection/medical_gas_inspection_detail_page.dart
Unescape Escape View File

@ -54,7 +54,7 @@ class _MedicalGasInspectionDetailPageState extends State<MedicalGasInspectionDet
return Scaffold( return Scaffold(
appBar: const DefaultAppBar(title: "Request Details"), appBar: const DefaultAppBar(title: "Request Details"),
body: _isLoading body: _isLoading
? SizedBox.expand(child: const CircularProgressIndicator(color: AppColor.primary10).center) ? SizedBox.expand(child: CircularProgressIndicator(color: AppColor.loadingColor(context)).center)
: model == null : model == null
? const NoDataFound().center ? const NoDataFound().center
: Column( : Column(

2
lib/modules/medical_gas_inspection/update_medical_gas_inspection_page.dart
Unescape Escape View File

@ -74,7 +74,7 @@ class _UpdateMedicalGasInspectionPageState extends State<UpdateMedicalGasInspect
child: FutureBuilder<LoanRequestModel?>( child: FutureBuilder<LoanRequestModel?>(
future: Provider.of<LoanProvider>(context, listen: false).getLoanById(0), future: Provider.of<LoanProvider>(context, listen: false).getLoanById(0),
builder: (BuildContext context, AsyncSnapshot<LoanRequestModel?> snapshot) { builder: (BuildContext context, AsyncSnapshot<LoanRequestModel?> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
// if (snapshot.data == null) return const NoDataFound().center; // if (snapshot.data == null) return const NoDataFound().center;
// //

12
lib/modules/tm_module/tasks/create_task_view.dart
Unescape Escape View File

@ -117,7 +117,7 @@ class _CreateTaskViewState extends State<CreateTaskView> with TickerProviderStat
attachment: attachments, attachment: attachments,
buttonColor: AppColor.black10, buttonColor: AppColor.black10,
onlyImages: false, onlyImages: false,
buttonIcon: 'image-plus'.toSvgAsset(color:context.isDark?AppColor.primary10: AppColor.neutral120), buttonIcon: 'image-plus'.toSvgAsset(color: context.isDark ? AppColor.primary10 : AppColor.neutral120),
//verify this if not required delete this .. //verify this if not required delete this ..
onChange: (attachments) { onChange: (attachments) {
attachments = attachments; attachments = attachments;
@ -162,7 +162,7 @@ class _CreateTaskViewState extends State<CreateTaskView> with TickerProviderStat
title: context.translation.destinationSite, title: context.translation.destinationSite,
initialValue: _addTaskModel?.site, initialValue: _addTaskModel?.site,
showAsBottomSheet: true, showAsBottomSheet: true,
backgroundColor: AppColor.neutral100, // backgroundColor: AppColor.neutral100,
showShadow: false, showShadow: false,
onSelect: (value) { onSelect: (value) {
_addTaskModel?.site = value; _addTaskModel?.site = value;
@ -176,7 +176,7 @@ class _CreateTaskViewState extends State<CreateTaskView> with TickerProviderStat
SingleItemDropDownMenu<MappedBuilding, NullableLoadingProvider>( SingleItemDropDownMenu<MappedBuilding, NullableLoadingProvider>(
context: context, context: context,
title: context.translation.building, title: context.translation.building,
backgroundColor: AppColor.neutral100, // backgroundColor: AppColor.neutral100,
showAsBottomSheet: true, showAsBottomSheet: true,
showShadow: false, showShadow: false,
initialValue: _addTaskModel?.building, initialValue: _addTaskModel?.building,
@ -193,7 +193,7 @@ class _CreateTaskViewState extends State<CreateTaskView> with TickerProviderStat
SingleItemDropDownMenu<MappedFloor, NullableLoadingProvider>( SingleItemDropDownMenu<MappedFloor, NullableLoadingProvider>(
context: context, context: context,
showAsBottomSheet: true, showAsBottomSheet: true,
backgroundColor: AppColor.neutral100, // backgroundColor: AppColor.neutral100,
showShadow: false, showShadow: false,
title: context.translation.floor, title: context.translation.floor,
initialValue: _addTaskModel?.floor, initialValue: _addTaskModel?.floor,
@ -209,7 +209,7 @@ class _CreateTaskViewState extends State<CreateTaskView> with TickerProviderStat
SingleItemDropDownMenu<MappedDepartment, NullableLoadingProvider>( SingleItemDropDownMenu<MappedDepartment, NullableLoadingProvider>(
context: context, context: context,
title: context.translation.department, title: context.translation.department,
backgroundColor: AppColor.neutral100, // backgroundColor: AppColor.neutral100,
showAsBottomSheet: true, showAsBottomSheet: true,
showShadow: false, showShadow: false,
initialValue: _addTaskModel?.department, initialValue: _addTaskModel?.department,
@ -225,7 +225,7 @@ class _CreateTaskViewState extends State<CreateTaskView> with TickerProviderStat
SingleItemDropDownMenu<Rooms, NullableLoadingProvider>( SingleItemDropDownMenu<Rooms, NullableLoadingProvider>(
context: context, context: context,
title: context.translation.room, title: context.translation.room,
backgroundColor: AppColor.neutral100, // backgroundColor: AppColor.neutral100,
showShadow: false, showShadow: false,
showAsBottomSheet: true, showAsBottomSheet: true,
initialValue: _addTaskModel?.room, initialValue: _addTaskModel?.room,

2
lib/modules/traf_module/asset_auto_complete_field.dart
Unescape Escape View File

@ -107,7 +107,7 @@ class _AssetAutoCompleteFieldState extends State<AssetAutoCompleteField> {
floatingLabelStyle: AppTextStyle.body1.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? null : AppColor.neutral20), floatingLabelStyle: AppTextStyle.body1.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? null : AppColor.neutral20),
labelText: "Name/Oracle Code", labelText: "Name/Oracle Code",
labelStyle: AppTextStyles.tinyFont.copyWith(color: AppColor.textColor(context)), labelStyle: AppTextStyles.tinyFont.copyWith(color: AppColor.textColor(context)),
suffixIcon: loading ? const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 3.0).paddingOnly(end: 8) : null, suffixIcon: loading ? CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3.0).paddingOnly(end: 8) : null,
), ),
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
onChanged: (text) { onChanged: (text) {

2
lib/modules/traf_module/users_auto_complete_field.dart
Unescape Escape View File

@ -109,7 +109,7 @@ class _UsersAutoCompleteFieldState extends State<SearchUserAutoCompleteField> {
floatingLabelStyle: AppTextStyle.body1.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? null : AppColor.neutral20), floatingLabelStyle: AppTextStyle.body1.copyWith(fontWeight: FontWeight.w500, color: context.isDark ? null : AppColor.neutral20),
labelText: "Users going to use technology", labelText: "Users going to use technology",
labelStyle: AppTextStyles.tinyFont.copyWith(color: AppColor.textColor(context)), labelStyle: AppTextStyles.tinyFont.copyWith(color: AppColor.textColor(context)),
suffixIcon: loading ? const CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 3.0).paddingOnly(end: 8) : null, suffixIcon: loading ? CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 3.0).paddingOnly(end: 8) : null,
), ),
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
onChanged: (text) { onChanged: (text) {

2
lib/new_views/app_style/app_color.dart
Unescape Escape View File

@ -109,7 +109,9 @@ class AppColor {
static Color yellowIcon(BuildContext context) => context.isDark ? const Color(0xffFFC945) : orange70; static Color yellowIcon(BuildContext context) => context.isDark ? const Color(0xffFFC945) : orange70;
static Color background(BuildContext context) => context.isDark ? containerDark : Colors.white; static Color background(BuildContext context) => context.isDark ? containerDark : Colors.white;
static Color scaffoldBackground(BuildContext context) => context.isDark ? backgroundDark : backgroundLight; static Color scaffoldBackground(BuildContext context) => context.isDark ? backgroundDark : backgroundLight;
static Color assetGroupBackground(BuildContext context) => context.isDark ? containerDark : Colors.white30; static Color assetGroupBackground(BuildContext context) => context.isDark ? containerDark : Colors.white30;
static Color backgroundTabBarColor(BuildContext context) => context.isDark ? backgroundTabBarDark : Colors.white; static Color backgroundTabBarColor(BuildContext context) => context.isDark ? backgroundTabBarDark : Colors.white;

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

@ -64,7 +64,7 @@ class AppTextFormField extends StatefulWidget {
this.initialValue, // Provide default value this.initialValue, // Provide default value
this.enable = true, this.enable = true,
this.showSpeechToText = false, this.showSpeechToText = false,
this.showBorder = false, this.showBorder = true,
this.style, this.style,
this.contentPadding, this.contentPadding,
this.textAlign, this.textAlign,

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

@ -232,7 +232,7 @@ class _SingleItemDropDownMenuState<T extends Base, X extends LoadingListNotifier
? AppColor.neutral20 ? AppColor.neutral20
: (widget.enabled == false || isEmpty) : (widget.enabled == false || isEmpty)
? AppColor.neutral40 ? AppColor.neutral40
: widget.backgroundColor ?? AppColor.scaffoldBackground(context), : AppColor.scaffoldBackground(context),
borderRadius: BorderRadius.circular(16), borderRadius: BorderRadius.circular(16),
border: Border.all( border: Border.all(
color: AppColor.borderColor(context), width: 1 color: AppColor.borderColor(context), width: 1

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

@ -25,7 +25,7 @@ class ContactUsBottomSheet extends StatelessWidget {
clipBehavior: Clip.antiAlias, clipBehavior: Clip.antiAlias,
height: MediaQuery.sizeOf(context).height * .5, height: MediaQuery.sizeOf(context).height * .5,
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).scaffoldBackgroundColor, color: AppColor.bottomSheetColor(context),
borderRadius: const BorderRadius.only( borderRadius: const BorderRadius.only(
topRight: Radius.circular(30), topRight: Radius.circular(30),
topLeft: Radius.circular(30), topLeft: Radius.circular(30),

7
lib/new_views/pages/land_page/my_request/all_requests_search_page.dart
Unescape Escape View File

@ -116,7 +116,12 @@ class _AllRequestsSearchPageState extends State<AllRequestsSearchPage> {
controller: search!.searchBySelectedValue?.controller, controller: search!.searchBySelectedValue?.controller,
labelText: search!.searchBySelectedValue?.label, labelText: search!.searchBySelectedValue?.label,
textInputType: search!.searchBySelectedValue?.inputType, textInputType: search!.searchBySelectedValue?.inputType,
labelStyle: AppTextStyles.bodyText2, // labelStyle: AppTextStyles.bodyText2,
style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff767676)),
showBorder: true,
onChange: (text) { onChange: (text) {
search!.searchBySelectedValue?.controller?.text = text; search!.searchBySelectedValue?.controller?.text = text;
search!.searchBySelectedValue?.controller?.selection = TextSelection.fromPosition(TextPosition(offset: search!.searchBySelectedValue!.controller!.text.length)); search!.searchBySelectedValue?.controller?.selection = TextSelection.fromPosition(TextPosition(offset: search!.searchBySelectedValue!.controller!.text.length));

22
lib/new_views/pages/login_page.dart
Unescape Escape View File

@ -111,34 +111,35 @@ class _LoginPageState extends State<LoginPage> {
AppTextFormField( AppTextFormField(
initialValue: _user.userName ?? "", initialValue: _user.userName ?? "",
controller: userNameController, controller: userNameController,
backgroundColor: AppColor.fieldBgColor(context), showBorder: true,
// backgroundColor: AppColor.fieldBgColor(context),
validator: (value) => Validator.hasValue(value!) ? null : context.translation.requiredField, validator: (value) => Validator.hasValue(value!) ? null : context.translation.requiredField,
labelText: context.translation.username, labelText: context.translation.username,
style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)), style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)), floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff767676)), labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff767676)),
textInputType: TextInputType.text, textInputType: TextInputType.text,
showWithoutDecoration: true, // showWithoutDecoration: true,
contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight), contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight),
onSaved: (value) { onSaved: (value) {
_user.userName = value; _user.userName = value;
}, },
), ),
16.height, 12.height,
AppTextFormField( AppTextFormField(
initialValue: _user.password ?? "", initialValue: _user.password ?? "",
showWithoutDecoration: true, // showWithoutDecoration: true,
showBorder: true,
labelText: context.translation.password, labelText: context.translation.password,
backgroundColor: AppColor.fieldBgColor(context), // backgroundColor: AppColor.fieldBgColor(context),
style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)), style: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff767676)), labelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff767676)),
floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)), floatingLabelStyle: TextStyle(fontWeight: FontWeight.w500, fontSize: context.isTablet() ? 16 : 12, color: context.isDark ? Colors.white : const Color(0xff3B3D4A)),
contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight), contentPadding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth, vertical: 12.toScreenHeight),
obscureText: !_passwordVisible, obscureText: !_passwordVisible,
suffixIcon: Icon( suffixIcon: Icon(
// Based on passwordVisible state choose the icon
_passwordVisible ? Icons.visibility : Icons.visibility_off, _passwordVisible ? Icons.visibility : Icons.visibility_off,
color: context.isDark ? AppColor.neutral10 : AppColor.neutral20, color: AppColor.headingTextColor(context),
).paddingOnly(end: 12).onPress(() { ).paddingOnly(end: 12).onPress(() {
setState(() { setState(() {
_passwordVisible = !_passwordVisible; _passwordVisible = !_passwordVisible;
@ -180,27 +181,34 @@ class _LoginPageState extends State<LoginPage> {
Checkbox( Checkbox(
value: rememberMe, value: rememberMe,
activeColor: AppColor.blueStatus(context), activeColor: AppColor.blueStatus(context),
side: BorderSide(color: AppColor.loadingColor(context), width: 1.0),
visualDensity: const VisualDensity(horizontal: -4.0, vertical: -4.0),
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (value) { onChanged: (value) {
setState(() { setState(() {
rememberMe = value!; rememberMe = value!;
}); });
}), }),
8.width,
"Remember Me".bodyText(context).custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral50).expanded, "Remember Me".bodyText(context).custom(color: context.isDark ? AppColor.primary50 : AppColor.neutral50).expanded,
], ],
), ),
8.height,
Row( Row(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Checkbox( Checkbox(
value: privacyPolicyChecked, value: privacyPolicyChecked,
side: BorderSide(color: AppColor.loadingColor(context), width: 1.0),
activeColor: AppColor.blueStatus(context), activeColor: AppColor.blueStatus(context),
visualDensity: const VisualDensity(horizontal: -4.0, vertical: -4.0),
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap, materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
onChanged: (value) { onChanged: (value) {
if (value == null) return; if (value == null) return;
privacyPolicyChecked = value; privacyPolicyChecked = value;
setState(() {}); setState(() {});
}), }),
8.width,
RichText( RichText(
text: TextSpan(text: "I have read and agree to ", style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.primary50 : AppColor.neutral50), children: [ text: TextSpan(text: "I have read and agree to ", style: AppTextStyles.bodyText.copyWith(color: context.isDark ? AppColor.primary50 : AppColor.neutral50), children: [
TextSpan( TextSpan(

2
lib/new_views/swipe_module/utils/swipe_general_utils.dart
Unescape Escape View File

@ -620,7 +620,7 @@ class SwipeGeneralUtils {
top: Radius.circular(20), top: Radius.circular(20),
), ),
), ),
backgroundColor: Theme.of(context).scaffoldBackgroundColor, backgroundColor: AppColor.bottomSheetColor(context),
clipBehavior: Clip.antiAliasWithSaveLayer, clipBehavior: Clip.antiAliasWithSaveLayer,
builder: (BuildContext context) => Padding( builder: (BuildContext context) => Padding(
padding: EdgeInsets.only( padding: EdgeInsets.only(

2
lib/views/pages/user/notifications/unread_chat_list.dart
Unescape Escape View File

@ -22,7 +22,7 @@ class UnReadChatList extends StatelessWidget {
body: FutureBuilder<List<UnReadMessage>>( body: FutureBuilder<List<UnReadMessage>>(
future: Provider.of<ChatProvider>(context, listen: false).getUnReadMessages(context.userProvider.user!.employeeId ?? context.userProvider.user!.username!), future: Provider.of<ChatProvider>(context, listen: false).getUnReadMessages(context.userProvider.user!.employeeId ?? context.userProvider.user!.username!),
builder: (BuildContext context, AsyncSnapshot<List<UnReadMessage>> snapshot) { builder: (BuildContext context, AsyncSnapshot<List<UnReadMessage>> snapshot) {
if (snapshot.connectionState == ConnectionState.waiting) return const CircularProgressIndicator(color: AppColor.primary10).center; if (snapshot.connectionState == ConnectionState.waiting) return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
if (snapshot.data?.isEmpty ?? true) return const NoDataFound().center; if (snapshot.data?.isEmpty ?? true) return const NoDataFound().center;
List<UnReadMessage> messages = snapshot.data!; List<UnReadMessage> messages = snapshot.data!;

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

@ -197,7 +197,7 @@ class _ProfilePageState extends State<ProfilePage> {
width: MediaQuery.sizeOf(context).width / 2, width: MediaQuery.sizeOf(context).width / 2,
padding: EdgeInsets.all(4), padding: EdgeInsets.all(4),
icon: isLoading icon: isLoading
? const SizedBox(height: 16, width: 16, child: CircularProgressIndicator(color: AppColor.primary10, strokeWidth: 2)) ? SizedBox(height: 16, width: 16, child: CircularProgressIndicator(color: AppColor.loadingColor(context), strokeWidth: 2))
: 'attachment_icon'.toSvgAsset(height: 24, width: 24), : 'attachment_icon'.toSvgAsset(height: 24, width: 24),
buttonColor: AppColor.primary10, buttonColor: AppColor.primary10,
onPressed: () async { onPressed: () async {

2
lib/views/widgets/dialogs/loading_dialog.dart
Unescape Escape View File

@ -22,7 +22,7 @@ class UploadingDialog extends StatelessWidget {
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
const CircularProgressIndicator(strokeWidth: 3), CircularProgressIndicator(strokeWidth: 3),
16.height, 16.height,
Text( Text(
"Uploading...", "Uploading...",

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

@ -219,7 +219,7 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
}, },
), ),
), ),
if (_devicesProvider.isLoading) Align(alignment: Alignment.bottomCenter, child: const CircularProgressIndicator().paddingOnly(top: 16, bottom: 16)), if (_devicesProvider.isLoading) Align(alignment: Alignment.bottomCenter, child: CircularProgressIndicator().paddingOnly(top: 16, bottom: 16)),
], ],
), ),
)), )),

2
lib/views/widgets/loaders/app_loading.dart
Unescape Escape View File

@ -7,6 +7,6 @@ class ALoading extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return const CircularProgressIndicator(color: AppColor.primary10).center; return CircularProgressIndicator(color: AppColor.loadingColor(context)).center;
} }
} }

8
lib/views/widgets/qr/asset_scan_qr.dart
Unescape Escape View File

@ -207,7 +207,7 @@ class _AssetScanQrState extends State<AssetScanQr> {
body: Column( body: Column(
children: [ children: [
_isLoading _isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Stack( : Stack(
children: [ children: [
_isHuawei _isHuawei
@ -259,9 +259,9 @@ class _AssetScanQrState extends State<AssetScanQr> {
shape: BoxShape.circle, shape: BoxShape.circle,
color: Colors.white, color: Colors.white,
), ),
child: const CircularProgressIndicator( child: CircularProgressIndicator(
color: AppColor.primary10, color: AppColor.loadingColor(context),
strokeWidth: 3, strokeWidth: 3
), ),
).center, ).center,
], ],

2
lib/views/widgets/qr/scan_qr.dart
Unescape Escape View File

@ -85,7 +85,7 @@ class _ScanQrState extends State<ScanQr> {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Scaffold( return Scaffold(
body: _isLoading body: _isLoading
? const CircularProgressIndicator(color: AppColor.primary10).center ? CircularProgressIndicator(color: AppColor.loadingColor(context)).center
: Stack( : Stack(
children: [ children: [
_isHuawei _isHuawei

Write Preview
Loading…
Cancel
Save