6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 955a266d
Changed files
.../lib/booking_details/booking_details_page.dart | 69 +++++++++++----------- .../booking_details/components/share_button.dart | 10 ++-- 2 files changed, 41 insertions(+), 38 deletions(-)
Diff
diff --git a/comwell_key_app/lib/booking_details/booking_details_page.dart b/comwell_key_app/lib/booking_details/booking_details_page.dart
index 788fa4ec..0fbb2336 100644
--- a/comwell_key_app/lib/booking_details/booking_details_page.dart
+++ b/comwell_key_app/lib/booking_details/booking_details_page.dart
@@ -165,7 +165,6 @@ class BookingDetailsPage extends StatelessWidget {
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Expanded(
child: Column(
@@ -175,39 +174,43 @@ class BookingDetailsPage extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
- Text(
- cubit.booking.id,
- style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.white,
- fontWeight: FontWeight.w400,
- ),
- ),
- const SizedBox(width: 12),
- Text(
- 'Balance',
- style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.white,
- fontWeight: FontWeight.w400,
- ),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ cubit.booking.id,
+ style: theme.textTheme.bodySmall?.copyWith(
+ color: Colors.white.withValues(alpha: 0.65),
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ Text(
+ cubit.booking.roomType,
+ style: theme.textTheme.bodyMedium?.copyWith(
+ color: Colors.white,
+ ),
+ ),
+ ],
),
- ],
- ),
- Row(
- mainAxisAlignment: MainAxisAlignment.spaceBetween,
- children: [
- Text(
- cubit.booking.roomType,
- style: theme.textTheme.bodyMedium?.copyWith(
- color: Colors.white,
- ),
- ),
- const SizedBox(width: 12),
- Text(
- 'total_charge_value'
- .tr(args: [cubit.booking.totalCharge.toString()]),
- style: theme.textTheme.bodyMedium?.copyWith(
- color: Colors.white,
- ),
+ Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ 'BALANCE',
+ textAlign: TextAlign.end,
+ style: theme.textTheme.bodySmall?.copyWith(
+ color: Colors.white.withValues(alpha: 0.65),
+ fontWeight: FontWeight.w600,
+ ),
+ ),
+ Text(
+ 'total_charge_value'.tr(
+ args: [cubit.booking.totalCharge.toString()]),
+ style: theme.textTheme.bodyMedium?.copyWith(
+ color: Colors.white,
+ ),
+ ),
+ ],
),
],
),
diff --git a/comwell_key_app/lib/booking_details/components/share_button.dart b/comwell_key_app/lib/booking_details/components/share_button.dart
index 8d84562d..1f3a3ab4 100644
--- a/comwell_key_app/lib/booking_details/components/share_button.dart
+++ b/comwell_key_app/lib/booking_details/components/share_button.dart
@@ -20,7 +20,7 @@ class ShareButton extends StatelessWidget {
required this.guests,
this.buttonColor,
this.userButtonSize = 45,
- this.userButtonOverlap = 15});
+ this.userButtonOverlap = 10});
@override
Widget build(BuildContext context) {
@@ -52,13 +52,13 @@ class ShareButton extends StatelessWidget {
extra: booking);
},
style: ElevatedButton.styleFrom(
- backgroundColor: buttonColor ?? Colors.white,
+ backgroundColor: buttonColor ?? sandColor[10],
elevation: 0,
shape: const CircleBorder(),
padding: EdgeInsets.zero,
),
- child: const Center(
- child: Icon(Icons.add, color: Colors.black, size: 30),
+ child: Center(
+ child: Icon(Icons.add, color: Colors.black.withValues(alpha: 0.65), size: 30),
),
),
),
@@ -84,7 +84,7 @@ class ShareButton extends StatelessWidget {
},
style: ElevatedButton.styleFrom(
backgroundColor:
- index % 2 == 0 ? Colors.black : sandColor,
+ index % 2 == 0 ? sandColor : Colors.black,
elevation: 0,
shape: const CircleBorder(),
padding: EdgeInsets.zero,