feat: Update OrderDetailsHeader and ShiftDetailsHeader layout for improved UI consistency
This commit is contained in:
@@ -58,7 +58,7 @@ class OrderDetailsHeader extends StatelessWidget {
|
|||||||
),
|
),
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
spacing: UiConstants.space4,
|
spacing: UiConstants.space6,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Row(
|
Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
@@ -68,7 +68,7 @@ class OrderDetailsHeader extends StatelessWidget {
|
|||||||
width: _kIconContainerSize,
|
width: _kIconContainerSize,
|
||||||
height: _kIconContainerSize,
|
height: _kIconContainerSize,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: UiColors.tagInProgress,
|
color: UiColors.primary.withAlpha(20),
|
||||||
borderRadius: UiConstants.radiusLg,
|
borderRadius: UiConstants.radiusLg,
|
||||||
border: Border.all(color: UiColors.primary, width: 0.5),
|
border: Border.all(color: UiColors.primary, width: 0.5),
|
||||||
),
|
),
|
||||||
@@ -86,13 +86,12 @@ class OrderDetailsHeader extends StatelessWidget {
|
|||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Text(
|
Text(
|
||||||
order.roleName,
|
order.roleName,
|
||||||
style: UiTypography.body1m.textPrimary,
|
style: UiTypography.headline1b.textPrimary,
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
order.clientName,
|
||||||
|
style: UiTypography.body1m.textSecondary,
|
||||||
),
|
),
|
||||||
if (order.clientName.isNotEmpty)
|
|
||||||
Text(
|
|
||||||
order.clientName,
|
|
||||||
style: UiTypography.body3r.textSecondary,
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -17,56 +17,34 @@ class ShiftDetailsHeader extends StatelessWidget {
|
|||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.all(UiConstants.space5),
|
padding: const EdgeInsets.all(UiConstants.space5),
|
||||||
child: Column(
|
child: Row(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
spacing: UiConstants.space4,
|
spacing: UiConstants.space4,
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
Row(
|
Container(
|
||||||
crossAxisAlignment: CrossAxisAlignment.center,
|
width: _kIconContainerSize,
|
||||||
spacing: UiConstants.space4,
|
height: _kIconContainerSize,
|
||||||
children: <Widget>[
|
decoration: BoxDecoration(
|
||||||
Container(
|
color: UiColors.primary.withAlpha(20),
|
||||||
width: _kIconContainerSize,
|
borderRadius: UiConstants.radiusLg,
|
||||||
height: _kIconContainerSize,
|
border: Border.all(color: UiColors.primary, width: 0.5),
|
||||||
decoration: BoxDecoration(
|
),
|
||||||
color: UiColors.primary.withAlpha(20),
|
child: const Center(
|
||||||
borderRadius: UiConstants.radiusLg,
|
child: Icon(
|
||||||
border: Border.all(color: UiColors.primary, width: 0.5),
|
UiIcons.briefcase,
|
||||||
),
|
color: UiColors.primary,
|
||||||
child: const Center(
|
size: 20,
|
||||||
child: Icon(
|
|
||||||
UiIcons.briefcase,
|
|
||||||
color: UiColors.primary,
|
|
||||||
size: 20,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
Expanded(
|
),
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: <Widget>[
|
|
||||||
Text(detail.roleName, style: UiTypography.headline1b.textPrimary),
|
|
||||||
Text(detail.clientName, style: UiTypography.body1m.textSecondary),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
Row(
|
Expanded(
|
||||||
spacing: UiConstants.space1,
|
child: Column(
|
||||||
children: <Widget>[
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
const Icon(
|
children: <Widget>[
|
||||||
UiIcons.mapPin,
|
Text(detail.roleName, style: UiTypography.headline1b.textPrimary),
|
||||||
size: 16,
|
Text(detail.clientName, style: UiTypography.body1m.textSecondary),
|
||||||
color: UiColors.textSecondary,
|
],
|
||||||
),
|
),
|
||||||
Expanded(
|
|
||||||
child: Text(
|
|
||||||
detail.address ?? detail.location,
|
|
||||||
style: UiTypography.body2r.textSecondary,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user