6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit c0bd9740
Changed files
.../lib/.generated/l10n/app_localizations.dart | 60 ++++++++++++++++++++++ .../lib/.generated/l10n/app_localizations_da.dart | 31 +++++++++++ .../lib/.generated/l10n/app_localizations_en.dart | 31 +++++++++++ .../cubit/choose_share_room_cubit.dart | 2 +- comwell_key_app/lib/routing/app_router.dart | 2 + comwell_key_app/lib/routing/app_routes.dart | 1 + .../components/up_sales_catalog_button.dart | 2 +- 7 files changed, 127 insertions(+), 2 deletions(-)
Diff
diff --git a/comwell_key_app/lib/.generated/l10n/app_localizations.dart b/comwell_key_app/lib/.generated/l10n/app_localizations.dart
index 89094095..7bf1f2cb 100644
--- a/comwell_key_app/lib/.generated/l10n/app_localizations.dart
+++ b/comwell_key_app/lib/.generated/l10n/app_localizations.dart
@@ -2480,6 +2480,66 @@ abstract class AppLocalizations {
/// In en, this message translates to:
/// **'Please allow tracking how you use the app'**
String get usage_tracking_rationale;
+
+ /// No description provided for @accept_notifications.
+ ///
+ /// In en, this message translates to:
+ /// **'Allow notifications'**
+ String get accept_notifications;
+
+ /// No description provided for @accept_notifications_rationale.
+ ///
+ /// In en, this message translates to:
+ /// **'To get the latest updates on your booking, please allow notifications'**
+ String get accept_notifications_rationale;
+
+ /// No description provided for @allow.
+ ///
+ /// In en, this message translates to:
+ /// **'Allow'**
+ String get allow;
+
+ /// No description provided for @skip.
+ ///
+ /// In en, this message translates to:
+ /// **'Skip'**
+ String get skip;
+
+ /// No description provided for @internet_disabled.
+ ///
+ /// In en, this message translates to:
+ /// **'Internet disconnected'**
+ String get internet_disabled;
+
+ /// No description provided for @please_enable_internet.
+ ///
+ /// In en, this message translates to:
+ /// **'Please check your internet connected'**
+ String get please_enable_internet;
+
+ /// No description provided for @bluetooth_disabled.
+ ///
+ /// In en, this message translates to:
+ /// **'Bluetooth is disabled'**
+ String get bluetooth_disabled;
+
+ /// No description provided for @please_enable_bluetooth.
+ ///
+ /// In en, this message translates to:
+ /// **'Please enable bluetooth'**
+ String get please_enable_bluetooth;
+
+ /// No description provided for @allow_usage_tracking.
+ ///
+ /// In en, this message translates to:
+ /// **'Allow usage tracking'**
+ String get allow_usage_tracking;
+
+ /// No description provided for @uasge_tracking_rationale.
+ ///
+ /// In en, this message translates to:
+ /// **'Please allow tracking how you use the app'**
+ String get uasge_tracking_rationale;
}
class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
diff --git a/comwell_key_app/lib/.generated/l10n/app_localizations_da.dart b/comwell_key_app/lib/.generated/l10n/app_localizations_da.dart
index 8421b65c..3f639030 100644
--- a/comwell_key_app/lib/.generated/l10n/app_localizations_da.dart
+++ b/comwell_key_app/lib/.generated/l10n/app_localizations_da.dart
@@ -1282,4 +1282,35 @@ class AppLocalizationsDa extends AppLocalizations {
@override
String get usage_tracking_rationale => 'Tillad venligst sporing af, hvordan du bruger appen';
+
+ @override
+ String get accept_notifications => 'Tillad notifikationer';
+
+ @override
+ String get accept_notifications_rationale =>
+ 'For at få de seneste opdateringer om din booking, bedes du tillade notifikationer';
+
+ @override
+ String get allow => 'Tillad';
+
+ @override
+ String get skip => 'Spring over';
+
+ @override
+ String get internet_disabled => 'Internettet er afbrudt';
+
+ @override
+ String get please_enable_internet => 'Tjek venligst din internetforbindelse';
+
+ @override
+ String get bluetooth_disabled => 'Bluetooth er deaktiveret';
+
+ @override
+ String get please_enable_bluetooth => 'Aktivér venligst Bluetooth';
+
+ @override
+ String get allow_usage_tracking => 'Tillad brugssporing';
+
+ @override
+ String get uasge_tracking_rationale => 'Tillad venligst sporing af, hvordan du bruger appen';
}
diff --git a/comwell_key_app/lib/.generated/l10n/app_localizations_en.dart b/comwell_key_app/lib/.generated/l10n/app_localizations_en.dart
index 6660ad5c..22bf2dc8 100644
--- a/comwell_key_app/lib/.generated/l10n/app_localizations_en.dart
+++ b/comwell_key_app/lib/.generated/l10n/app_localizations_en.dart
@@ -1278,4 +1278,35 @@ class AppLocalizationsEn extends AppLocalizations {
@override
String get usage_tracking_rationale => 'Please allow tracking how you use the app';
+
+ @override
+ String get accept_notifications => 'Allow notifications';
+
+ @override
+ String get accept_notifications_rationale =>
+ 'To get the latest updates on your booking, please allow notifications';
+
+ @override
+ String get allow => 'Allow';
+
+ @override
+ String get skip => 'Skip';
+
+ @override
+ String get internet_disabled => 'Internet disconnected';
+
+ @override
+ String get please_enable_internet => 'Please check your internet connected';
+
+ @override
+ String get bluetooth_disabled => 'Bluetooth is disabled';
+
+ @override
+ String get please_enable_bluetooth => 'Please enable bluetooth';
+
+ @override
+ String get allow_usage_tracking => 'Allow usage tracking';
+
+ @override
+ String get uasge_tracking_rationale => 'Please allow tracking how you use the app';
}
diff --git a/comwell_key_app/lib/choose_share_room/cubit/choose_share_room_cubit.dart b/comwell_key_app/lib/choose_share_room/cubit/choose_share_room_cubit.dart
index cfc1f909..1a23c023 100644
--- a/comwell_key_app/lib/choose_share_room/cubit/choose_share_room_cubit.dart
+++ b/comwell_key_app/lib/choose_share_room/cubit/choose_share_room_cubit.dart
@@ -17,7 +17,7 @@ class ChooseShareRoomCubit extends BaseCubit<ChooseShareRoomState> {
void init() async {
safeEmit(state.copyWith(isLoading: true));
final rooms = await _chooseShareRoomRepository.getMockRooms();
- safeEmit(state.copyWith(rooms: rooms));
+ safeEmit(state.copyWith(rooms: rooms, isLoading: false));
}
Future<void> shareRoom(BuildContext context,Booking booking) async {
diff --git a/comwell_key_app/lib/routing/app_router.dart b/comwell_key_app/lib/routing/app_router.dart
index 29acdc7f..51e06c28 100644
--- a/comwell_key_app/lib/routing/app_router.dart
+++ b/comwell_key_app/lib/routing/app_router.dart
@@ -2,6 +2,7 @@ import 'package:comwell_key_app/authentication/authentication_repository.dart';
import 'package:comwell_key_app/booking_details/booking_details_route.dart';
import 'package:comwell_key_app/check_out/checkout_routes.dart';
import 'package:comwell_key_app/choose_share_room/choose_share_room_route.dart';
+import 'package:comwell_key_app/hotel_information/hotel_information_route.dart';
import 'package:comwell_key_app/housekeeping/house_keeping_route.dart';
import 'package:comwell_key_app/my_booking/my_booking_route.dart';
import 'package:comwell_key_app/notifications/notifications_route.dart';
@@ -96,6 +97,7 @@ final router = GoRouter(
contactRoute,
findBookingRoute,
shareBookingRoute,
+ hotelInformationRoute,
forceUpdateRoute,
receivedSharedBookingRoute,
bookingDetailsWithIdRoute,
diff --git a/comwell_key_app/lib/routing/app_routes.dart b/comwell_key_app/lib/routing/app_routes.dart
index 551fc0c8..393795f4 100644
--- a/comwell_key_app/lib/routing/app_routes.dart
+++ b/comwell_key_app/lib/routing/app_routes.dart
@@ -25,6 +25,7 @@ abstract class AppRoutes {
static const contact = "/contact";
static const preregistration = "/preregistration";
static const hotelInformation = "/hotel-information";
+ static const concierge = "/concierge";
static const facility = "/facility";
static const houseKeeping = "/house-keeping";
static const checkOut = "/check-out";
diff --git a/comwell_key_app/lib/up_sales/components/up_sales_catalog_button.dart b/comwell_key_app/lib/up_sales/components/up_sales_catalog_button.dart
index 875793bf..88284a35 100644
--- a/comwell_key_app/lib/up_sales/components/up_sales_catalog_button.dart
+++ b/comwell_key_app/lib/up_sales/components/up_sales_catalog_button.dart
@@ -17,7 +17,7 @@ class UpSalesCatalogButton extends StatelessWidget {
return GestureDetector(
onTap: () {
- context.push(AppRoutes.upSalesCatalog, extra: [upSales, booking]);
+ context.push(AppRoutes.concierge, extra: [upSales, booking]);
},
child: Container(
width: double.infinity,