Skip to content

Commit b684c2b

Browse files
authored
fix: align fields (#2764)
1 parent 344abc8 commit b684c2b

File tree

1 file changed

+70
-45
lines changed

1 file changed

+70
-45
lines changed

catalyst_voices/apps/voices/lib/widgets/cards/proposal/workspace_proposal_card.dart

Lines changed: 70 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -62,33 +62,61 @@ class _Body extends StatelessWidget {
6262
Widget build(BuildContext context) {
6363
final isSubmitted = _ProposalSubmitState.of(context)?.isSubmitted ?? false;
6464
final commentsCount = proposal.commentsCount;
65-
return Wrap(
66-
alignment: WrapAlignment.spaceBetween,
67-
spacing: 10,
68-
runSpacing: 10,
65+
return Row(
66+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
6967
children: [
70-
_BodyHeader(
71-
title: proposal.title,
72-
lastUpdate: proposal.updateDate,
73-
),
74-
ProposalIterationStageChip(
75-
status: proposal.publish,
76-
versionNumber: proposal.versions.versionNumber(
77-
proposal.selfRef.version ?? '',
68+
Expanded(
69+
child: Wrap(
70+
alignment: WrapAlignment.spaceBetween,
71+
spacing: 50,
72+
runSpacing: 20,
73+
children: [
74+
ConstrainedBox(
75+
constraints: const BoxConstraints(maxWidth: 750),
76+
child: Row(
77+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
78+
children: [
79+
_BodyHeader(
80+
title: proposal.title,
81+
lastUpdate: proposal.updateDate,
82+
),
83+
ProposalIterationStageChip(
84+
status: proposal.publish,
85+
versionNumber: proposal.versions.versionNumber(
86+
proposal.selfRef.version ?? '',
87+
),
88+
useInternalBackground: !isSubmitted,
89+
),
90+
],
91+
),
92+
),
93+
ConstrainedBox(
94+
constraints: const BoxConstraints(maxWidth: 630),
95+
child: Row(
96+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
97+
children: [
98+
SizedBox(
99+
width: 300,
100+
child: _CampaignData(
101+
leadValue: proposal.category,
102+
subValue: context.l10n.fundNoCategory(14),
103+
),
104+
),
105+
_CampaignData(
106+
leadValue: CryptocurrencyFormatter.decimalFormat(proposal.fundsRequested),
107+
subValue: context.l10n.proposalViewFundingRequested,
108+
),
109+
_CampaignData(
110+
leadValue: commentsCount == 0
111+
? context.l10n.notAvailableAbbr
112+
: commentsCount.toString(),
113+
subValue: context.l10n.comments(commentsCount),
114+
),
115+
],
116+
),
117+
),
118+
],
78119
),
79-
useInternalBackground: !isSubmitted,
80-
),
81-
_CampaignData(
82-
leadValue: proposal.category,
83-
subValue: context.l10n.fundNoCategory(14),
84-
),
85-
_CampaignData(
86-
leadValue: CryptocurrencyFormatter.decimalFormat(proposal.fundsRequested),
87-
subValue: context.l10n.proposalViewFundingRequested,
88-
),
89-
_CampaignData(
90-
leadValue: commentsCount == 0 ? context.l10n.notAvailableAbbr : commentsCount.toString(),
91-
subValue: context.l10n.comments(commentsCount),
92120
),
93121
ProposalMenuActionButton(
94122
ref: proposal.selfRef,
@@ -115,28 +143,25 @@ class _BodyHeader extends StatelessWidget {
115143
Widget build(BuildContext context) {
116144
final headerColor = _ProposalSubmitState.of(context)?.headerColor(context);
117145
final labelColor = _ProposalSubmitState.of(context)?.headerLabelColor(context);
118-
return ConstrainedBox(
119-
constraints: const BoxConstraints(maxWidth: 439),
120-
child: Column(
121-
spacing: 2,
122-
mainAxisSize: MainAxisSize.min,
123-
crossAxisAlignment: CrossAxisAlignment.stretch,
124-
children: [
125-
Text(
126-
title,
127-
style: context.textTheme.titleSmall?.copyWith(
128-
color: headerColor,
129-
),
146+
return Column(
147+
spacing: 2,
148+
mainAxisSize: MainAxisSize.min,
149+
crossAxisAlignment: CrossAxisAlignment.start,
150+
children: [
151+
Text(
152+
title,
153+
style: context.textTheme.titleSmall?.copyWith(
154+
color: headerColor,
130155
),
131-
LastEditDate(
132-
dateTime: lastUpdate,
133-
showTimezone: false,
134-
textStyle: context.textTheme.labelMedium?.copyWith(
135-
color: labelColor,
136-
),
156+
),
157+
LastEditDate(
158+
dateTime: lastUpdate,
159+
showTimezone: false,
160+
textStyle: context.textTheme.labelMedium?.copyWith(
161+
color: labelColor,
137162
),
138-
],
139-
),
163+
),
164+
],
140165
);
141166
}
142167
}

0 commit comments

Comments
 (0)