ui changes

main_production_RSG
Sikander Saleem 2 months ago
parent 07560f3b57
commit 252a03b219

@ -35,7 +35,7 @@ class FooterActionButton {
static Widget footerContainer({required Widget child, required BuildContext context}) { static Widget footerContainer({required Widget child, required BuildContext context}) {
return Container( return Container(
alignment: Alignment.bottomCenter, alignment: Alignment.bottomCenter,
padding: const EdgeInsets.only(left: 16, right: 16, top: 12, bottom: 8), padding: const EdgeInsets.only(left: 16, right: 16, top: 12, bottom: 12),
color: AppColor.background(context), color: AppColor.background(context),
child: SafeArea(child: child), child: SafeArea(child: child),
); );
@ -216,8 +216,7 @@ class FooterActionButton {
children: [ children: [
AppFilledButton( AppFilledButton(
label: context.translation.activities, label: context.translation.activities,
textColor: context.isDark ? AppColor.black10 : Colors.white, buttonColor: AppColor.primary10,
buttonColor: context.isDark ? AppColor.primary10 : AppColor.neutral50,
onPressed: () async { onPressed: () async {
// ServiceRequestBottomSheet.activityTypeBottomSheet(context: context); // ServiceRequestBottomSheet.activityTypeBottomSheet(context: context);
Navigator.push(context, MaterialPageRoute(builder: (context) => const ActivitiesListView())); Navigator.push(context, MaterialPageRoute(builder: (context) => const ActivitiesListView()));

@ -73,43 +73,43 @@ class _ServiceRequestDetailViewState extends State<ServiceRequestDetailView> {
: requestProvider.currentWorkOrder == null : requestProvider.currentWorkOrder == null
? const NoDataFound() ? const NoDataFound()
: Column( : Column(
children: [ children: [
SingleChildScrollView( SingleChildScrollView(
padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth), padding: EdgeInsets.symmetric(horizontal: 16.toScreenWidth),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
workOrderDetailCard(context, requestProvider.currentWorkOrder!.data!, _userProvider, requestProvider), workOrderDetailCard(context, requestProvider.currentWorkOrder!.data!, _userProvider, requestProvider),
initialVisitCard(requestDetailProvider: requestProvider, userProvider: _userProvider), initialVisitCard(requestDetailProvider: requestProvider, userProvider: _userProvider),
12.height, 12.height,
assetDetailCard(requestDetailProvider: requestProvider, userProvider: _userProvider), assetDetailCard(requestDetailProvider: requestProvider, userProvider: _userProvider),
12.height,
if (context.userProvider.user!.type == UsersTypes.engineer &&
!requestProvider.isReadOnlyRequest &&
requestProvider.currentWorkOrder!.data!.nextStep?.workOrderNextStepEnum == WorkOrderNextStepEnum.activity) ...[
costCard(context, requestProvider),
12.height, 12.height,
if (context.userProvider.user!.type == UsersTypes.engineer &&
!requestProvider.isReadOnlyRequest &&
requestProvider.currentWorkOrder!.data!.nextStep?.workOrderNextStepEnum == WorkOrderNextStepEnum.activity) ...[
costCard(context, requestProvider),
12.height,
],
contactInfoCard(context, requestProvider.currentWorkOrder!.data!),
20.height,
], ],
contactInfoCard(context, requestProvider.currentWorkOrder!.data!), ),
20.height, ).expanded,
], SafeArea(
), top: false,
).expanded, right: false,
SafeArea( left: false,
top: false, child: FooterActionButton.requestDetailsFooterWidget(
right: false, workOrderNextStepStatus: requestProvider.currentWorkOrder!.data!.nextStep!.workOrderNextStepEnum!,
left: false, status: requestProvider.currentWorkOrder?.data?.status,
child: FooterActionButton.requestDetailsFooterWidget( isEmpIsAssigned: requestProvider.currentWorkOrder!.data!.assignedEmployee != null,
workOrderNextStepStatus: requestProvider.currentWorkOrder!.data!.nextStep!.workOrderNextStepEnum!, activities: requestProvider.currentWorkOrder!.data?.activities ?? [],
status: requestProvider.currentWorkOrder?.data?.status, userProvider: _userProvider,
isEmpIsAssigned: requestProvider.currentWorkOrder!.data!.assignedEmployee != null, context: context),
activities: requestProvider.currentWorkOrder!.data?.activities ?? [], )
userProvider: _userProvider, ],
context: context), );
).toShadowContainer(context, padding: 0, showShadow: false, borderRadius: 0),
],
);
}); });
} }

@ -126,9 +126,10 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
padding: const EdgeInsets.only(left: 16, right: 8), padding: const EdgeInsets.only(left: 16, right: 8),
alignment: Alignment.center, alignment: Alignment.center,
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: AppColor.tabBarBackground(context), color: AppColor.dropDownBackground(context),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(6),
side: BorderSide(color: AppColor.borderColor(context)),
), ),
), ),
child: Row( child: Row(

@ -97,9 +97,10 @@ class _MyAssetsPageState extends State<MyAssetsPage> {
padding: const EdgeInsets.only(left: 16, right: 8), padding: const EdgeInsets.only(left: 16, right: 8),
alignment: Alignment.center, alignment: Alignment.center,
decoration: ShapeDecoration( decoration: ShapeDecoration(
color: context.isDark ? AppColor.neutral50 : AppColor.neutral30, color: AppColor.dropDownBackground(context),
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10), borderRadius: BorderRadius.circular(6),
side: BorderSide(color: AppColor.borderColor(context)),
), ),
), ),
child: Row( child: Row(

Loading…
Cancel
Save