6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 9ba1ab88

AuthorEdmir Suljic<esu@dwarf.dk>
Date2025-05-21 10:05:19 +0200
Resolved PR comments

Changed files

.../components/check_out_button.dart               | 23 ++++++++++---------
 .../components/housekeeping_button.dart            | 26 ++++++++++++----------
 .../booking_details/components/share_button.dart   |  2 +-
 .../lib/common/components/bottom_sheet_widget.dart |  2 +-
 4 files changed, 28 insertions(+), 25 deletions(-)

Diff

diff --git a/comwell_key_app/lib/booking_details/components/check_out_button.dart b/comwell_key_app/lib/booking_details/components/check_out_button.dart
index 70bcb51f..097629d4 100644
--- a/comwell_key_app/lib/booking_details/components/check_out_button.dart
+++ b/comwell_key_app/lib/booking_details/components/check_out_button.dart
@@ -13,18 +13,19 @@ class CheckOutButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final cubit = context.read<BookingDetailsBloc>();
- return InkWell(
- borderRadius: const BorderRadius.all(Radius.circular(15)),
- onTap: () {
- context.pushNamed(AppRoutes.checkOut.name, extra: cubit.booking);
- },
- child: Container(
- decoration: BoxDecoration(
- border: Border.all(
- color: colorDivider,
- ),
- borderRadius: BorderRadius.circular(10),
+ return Material(
+ color: Colors.transparent,
+ shape: RoundedRectangleBorder(
+ side: const BorderSide(
+ color: colorDivider,
),
+ borderRadius: BorderRadius.circular(10),
+ ),
+ child: InkWell(
+ borderRadius: const BorderRadius.all(Radius.circular(15)),
+ onTap: () {
+ context.pushNamed(AppRoutes.checkOut.name, extra: cubit.booking);
+ },
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
diff --git a/comwell_key_app/lib/booking_details/components/housekeeping_button.dart b/comwell_key_app/lib/booking_details/components/housekeeping_button.dart
index 0cda88ee..2b463876 100644
--- a/comwell_key_app/lib/booking_details/components/housekeeping_button.dart
+++ b/comwell_key_app/lib/booking_details/components/housekeeping_button.dart
@@ -14,19 +14,21 @@ class HousekeepingButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
final bloc = context.read<BookingDetailsBloc>();
- return InkWell(
- onTap: () async {
- if (bloc.state.isHouseKeepingOrdered) return;
- await context.pushNamed(AppRoutes.houseKeeping.name);
- if(!bloc.isClosed) bloc.add(CheckIfHouseKeepingOrdered());
- },
- child: Container(
- decoration: BoxDecoration(
- borderRadius: BorderRadius.circular(10),
- border: Border.all(
- color: colorDivider,
- ),
+ return Material(
+ color: Colors.transparent,
+ shape: RoundedRectangleBorder(
+ side: const BorderSide(
+ color: colorDivider,
),
+ borderRadius: BorderRadius.circular(10),
+ ),
+ child: InkWell(
+ borderRadius: BorderRadius.circular(10),
+ onTap: () async {
+ if (bloc.state.isHouseKeepingOrdered) return;
+ await context.pushNamed(AppRoutes.houseKeeping.name);
+ if(!bloc.isClosed) bloc.add(CheckIfHouseKeepingOrdered());
+ },
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Row(
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 86bfe91e..8d84562d 100644
--- a/comwell_key_app/lib/booking_details/components/share_button.dart
+++ b/comwell_key_app/lib/booking_details/components/share_button.dart
@@ -40,7 +40,7 @@ class ShareButton extends StatelessWidget {
child: Stack(
children: [
Positioned(
- left: (numberOfUsers - 1) * (userButtonSize) +
+ left: (numberOfUsers - 1) * (userButtonSize - userButtonOverlap) +
userButtonSize -
userButtonOverlap,
child: SizedBox(
diff --git a/comwell_key_app/lib/common/components/bottom_sheet_widget.dart b/comwell_key_app/lib/common/components/bottom_sheet_widget.dart
index 167c5a1b..7109e3aa 100644
--- a/comwell_key_app/lib/common/components/bottom_sheet_widget.dart
+++ b/comwell_key_app/lib/common/components/bottom_sheet_widget.dart
@@ -17,7 +17,7 @@ class BottomSheetWidget extends StatelessWidget {
final safeHeight = height - padding.top - padding.bottom;
const grabbingHeight = 75.0;
// Calculate the position factor that will maintain consistent visual position
- // We want the sheet to take up roughly 78% of the safe area height
+ // We want the sheet to take up roughly 90% of the safe area height
// We subtract the grabbing height (75) from the total height to get the actual content area
final contentHeight = safeHeight - grabbingHeight;
final topPositionFactor = (contentHeight * 0.9) / safeHeight;