Skip to content

Commit cbad601

Browse files
committed
fix(ui): clean up as much as possible without fully refactoring
1 parent 73269af commit cbad601

1 file changed

Lines changed: 52 additions & 37 deletions

File tree

lib/pages/shopinbit/shopinbit_ticket_detail.dart

Lines changed: 52 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -386,45 +386,56 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail> {
386386
final isDesktop = Util.isDesktop;
387387
final model = widget.model;
388388

389-
final statusBar = RoundedWhiteContainer(
390-
child: Row(
391-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
392-
children: [
393-
Text(
394-
model.ticketId ?? "Request",
395-
style: isDesktop
396-
? STextStyles.desktopTextSmall(context)
397-
: STextStyles.titleBold12(context),
398-
),
399-
Container(
400-
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
401-
decoration: BoxDecoration(
402-
borderRadius: BorderRadius.circular(8),
403-
color: model.status
404-
.getColor(Theme.of(context).extension<StackColors>()!)
405-
.withOpacity(0.2),
389+
final statusBar = Padding(
390+
padding: .only(bottom: isDesktop ? 12 : 8),
391+
child: RoundedWhiteContainer(
392+
borderColor: isDesktop
393+
? Theme.of(context).extension<StackColors>()!.textFieldDefaultBG
394+
: null,
395+
child: Row(
396+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
397+
children: [
398+
SelectableText(
399+
model.ticketId ?? "Request",
400+
style: isDesktop
401+
? STextStyles.desktopTextSmall(context)
402+
: STextStyles.titleBold12(context),
406403
),
407-
child: Text(
408-
model.status.label,
409-
style:
410-
(isDesktop
411-
? STextStyles.desktopTextExtraExtraSmall(context)
412-
: STextStyles.itemSubtitle12(context))
413-
.copyWith(
414-
color: model.status.getColor(
415-
Theme.of(context).extension<StackColors>()!,
404+
Container(
405+
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
406+
decoration: BoxDecoration(
407+
borderRadius: BorderRadius.circular(8),
408+
color: model.status
409+
.getColor(Theme.of(context).extension<StackColors>()!)
410+
.withOpacity(0.2),
411+
),
412+
child: Text(
413+
model.status.label,
414+
style:
415+
(isDesktop
416+
? STextStyles.desktopTextExtraExtraSmall(context)
417+
: STextStyles.itemSubtitle12(context))
418+
.copyWith(
419+
color: model.status.getColor(
420+
Theme.of(context).extension<StackColors>()!,
421+
),
416422
),
417-
),
423+
),
418424
),
419-
),
420-
],
425+
],
426+
),
421427
),
422428
);
423429

424430
final offerBanner = model.status == ShopInBitOrderStatus.offerAvailable
425431
? Padding(
426-
padding: EdgeInsets.only(bottom: isDesktop ? 16 : 12),
432+
padding: .only(bottom: isDesktop ? 12 : 8),
427433
child: RoundedWhiteContainer(
434+
borderColor: isDesktop
435+
? Theme.of(
436+
context,
437+
).extension<StackColors>()!.textFieldDefaultBG
438+
: null,
428439
child: Column(
429440
crossAxisAlignment: CrossAxisAlignment.start,
430441
children: [
@@ -494,12 +505,9 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail> {
494505
),
495506
);
496507

497-
final inputBar = Container(
498-
padding: Util.isDesktop ? null : const EdgeInsets.all(8),
499-
decoration: BoxDecoration(
500-
color: Theme.of(context).extension<StackColors>()!.popupBG,
501-
borderRadius: BorderRadius.circular(12),
502-
),
508+
final inputBar = RoundedContainer(
509+
padding: Util.isDesktop ? .zero : const .all(8),
510+
color: Theme.of(context).extension<StackColors>()!.popupBG,
503511
child: Row(
504512
children: [
505513
Expanded(
@@ -548,6 +556,11 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail> {
548556
? Padding(
549557
padding: EdgeInsets.only(bottom: isDesktop ? 12 : 8),
550558
child: RoundedWhiteContainer(
559+
borderColor: isDesktop
560+
? Theme.of(
561+
context,
562+
).extension<StackColors>()!.textFieldDefaultBG
563+
: null,
551564
child: Column(
552565
crossAxisAlignment: CrossAxisAlignment.start,
553566
children: [
@@ -558,7 +571,7 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail> {
558571
: STextStyles.titleBold12(context),
559572
),
560573
const SizedBox(height: 8),
561-
Text(
574+
SelectableText(
562575
model.requestDescription,
563576
style: isDesktop
564577
? STextStyles.desktopTextExtraExtraSmall(context)
@@ -586,6 +599,8 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail> {
586599
: const SizedBox.shrink();
587600

588601
final body = Column(
602+
mainAxisSize: .min,
603+
crossAxisAlignment: .stretch,
589604
children: [
590605
statusBar,
591606
retryButton,

0 commit comments

Comments
 (0)