6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit c9fa86c6
Changed files
.../lib/common/components/bottom_sheet_widget.dart | 35 ++++++++++++---------- comwell_key_app/lib/home/home_page.dart | 16 ++++------ .../components/hotel_information_menu.dart | 2 +- comwell_key_app/lib/routing/app_router.dart | 4 +-- comwell_key_app/lib/routing/app_routes.dart | 2 +- 5 files changed, 29 insertions(+), 30 deletions(-)
Diff
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 fa73391c..3e481b7d 100644
--- a/comwell_key_app/lib/common/components/bottom_sheet_widget.dart
+++ b/comwell_key_app/lib/common/components/bottom_sheet_widget.dart
@@ -4,6 +4,7 @@ import 'package:sheet/sheet.dart';
class BottomSheetWidget extends StatelessWidget {
final List<Widget> widgetChildren;
+
const BottomSheetWidget({
required this.widgetChildren,
super.key,
@@ -12,21 +13,25 @@ class BottomSheetWidget extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Sheet(
- backgroundColor: sandColor[40],
- initialExtent: 200,
- shape: const RoundedRectangleBorder(
- borderRadius: BorderRadius.only(
- topLeft: Radius.circular(30),
- topRight: Radius.circular(30),
- ),
+ backgroundColor: sandColor[40],
+ initialExtent: 200,
+ shape: const RoundedRectangleBorder(
+ borderRadius: BorderRadius.only(
+ topLeft: Radius.circular(30),
+ topRight: Radius.circular(30),
),
- resizable: true,
- fit: SheetFit.expand,
- minExtent: 100,
- maxExtent: 600,
- child: SingleChildScrollView( child: Column(
- children: widgetChildren
- )),
- );
+ ),
+ resizable: true,
+ fit: SheetFit.expand,
+ minExtent: 100,
+ maxExtent: 600,
+ child: Padding(
+ padding: const EdgeInsets.all(16.0),
+ child: SingleChildScrollView(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: widgetChildren)),
+ ),
+ );
}
}
diff --git a/comwell_key_app/lib/home/home_page.dart b/comwell_key_app/lib/home/home_page.dart
index 80d7f9d8..583e3d2f 100644
--- a/comwell_key_app/lib/home/home_page.dart
+++ b/comwell_key_app/lib/home/home_page.dart
@@ -115,13 +115,11 @@ class _HomeWidget extends State<HomeWidget> {
),
BottomSheetWidget(
widgetChildren: [
- const SizedBox(
- height: 10,
- width: double.infinity,
- ),
+ HousekeepingButton(key: ValueKey(state.isHouseKeepingOrdered)),
+ const SizedBox(height: 20),
const Text("Practical information"),
+ const SizedBox(height: 20),
Row(children: [
- const SizedBox(width: 16),
Expanded(
child: AspectRatio(
aspectRatio: 175/220,
@@ -147,14 +145,10 @@ class _HomeWidget extends State<HomeWidget> {
}),
),
),
- const SizedBox(width: 16),
]),
+ const SizedBox(height: 16),
const Text('Rooms'),
- const SizedBox(height: 12),
- Padding(
- padding: const EdgeInsets.symmetric(horizontal: 16.0),
- child: HousekeepingButton(key: ValueKey(state.isHouseKeepingOrdered)),
- ),
+
const SizedBox(height: 12),
ElevatedButton(
onPressed: () {
diff --git a/comwell_key_app/lib/hotel_information/components/hotel_information_menu.dart b/comwell_key_app/lib/hotel_information/components/hotel_information_menu.dart
index 655f1c4c..ebc51765 100644
--- a/comwell_key_app/lib/hotel_information/components/hotel_information_menu.dart
+++ b/comwell_key_app/lib/hotel_information/components/hotel_information_menu.dart
@@ -44,7 +44,7 @@ class HotelInformationMenu extends StatelessWidget {
title: facility.title,
subtitle: facility.subtitle,
onClick: () {
- context.pushNamed("${AppRoutes.hotelInformation.name}/${facility.type}/");
+ context.pushNamed("${AppRoutes.hotelInformation.name}/${facility.type}");
},
),
);
diff --git a/comwell_key_app/lib/routing/app_router.dart b/comwell_key_app/lib/routing/app_router.dart
index 42098081..907bc2c0 100644
--- a/comwell_key_app/lib/routing/app_router.dart
+++ b/comwell_key_app/lib/routing/app_router.dart
@@ -99,8 +99,8 @@ GoRouter goRouter(AuthenticationBloc authBloc) {
return const SpaFacilityPage();
}),
GoRoute(
- path: "/${AppRoutes.hotelInformation.name}/${AppRoutes.restaurants.name}",
- name: "${AppRoutes.hotelInformation.name}/${AppRoutes.restaurants.name}",
+ path: "/${AppRoutes.hotelInformation.name}/${AppRoutes.restaurant.name}",
+ name: "${AppRoutes.hotelInformation.name}/${AppRoutes.restaurant.name}",
builder: (context, state) {
return const RestaurantPage();
}),
diff --git a/comwell_key_app/lib/routing/app_routes.dart b/comwell_key_app/lib/routing/app_routes.dart
index 5bff07e1..8252da41 100644
--- a/comwell_key_app/lib/routing/app_routes.dart
+++ b/comwell_key_app/lib/routing/app_routes.dart
@@ -19,7 +19,7 @@ enum AppRoutes {
contact,
preregistration,
hotelInformation,
- restaurants,
+ restaurant,
spa,
parking,
houseKeeping,