6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit c167e02b
Changed files
comwell_key_app/lib/authentication/authentication_repository.dart | 1 - comwell_key_app/lib/choose_share_room/choose_share_room_route.dart | 1 - comwell_key_app/lib/common/components/comwell_app_bar.dart | 1 - .../lib/connection_state/connection_state_listener.dart | 1 - comwell_key_app/lib/database/daos/bookings_dao.dart | 2 +- comwell_key_app/lib/find_booking/find_booking_repository.dart | 2 +- comwell_key_app/lib/find_booking/find_booking_route.dart | 1 - .../lib/hotel_information/cubit/hotel_information_cubit.dart | 1 - .../lib/hotel_information/pages/hotel_information_menu.dart | 2 -- comwell_key_app/lib/my_booking/my_booking_page.dart | 3 +-- comwell_key_app/lib/overview/repository/overview_repository.dart | 2 +- .../presentation/screens/booking_details/booking_details_page.dart | 2 +- .../screens/booking_details/components/concierge_button.dart | 7 ------- .../past_cancelled_booking_detail_page.dart | 2 +- .../screens/payment_processing/payment_processing_route.dart | 1 - .../screens/profile_settings/components/date_time_picker.dart | 2 -- comwell_key_app/lib/routing/go_router_observer.dart | 2 -- comwell_key_app/lib/services/mappers/bookings_mapper.dart | 2 +- comwell_key_app/lib/tracking/comwell_tracking.dart | 1 - .../lib/up_sales/components/up_sales_services_widget.dart | 1 - .../lib/up_sales/components/up_sales_upgrades_widget.dart | 3 --- comwell_key_app/lib/up_sales/cubit/up_sales_cubit.dart | 1 - comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart | 1 - comwell_key_app/lib/utils/upsale_utils.dart | 3 --- 24 files changed, 7 insertions(+), 38 deletions(-)
Diff
diff --git a/comwell_key_app/lib/authentication/authentication_repository.dart b/comwell_key_app/lib/authentication/authentication_repository.dart
index 5ee78d19..34b3259c 100644
--- a/comwell_key_app/lib/authentication/authentication_repository.dart
+++ b/comwell_key_app/lib/authentication/authentication_repository.dart
@@ -3,7 +3,6 @@ import 'dart:async';
import 'package:common/services/msal_service.dart';
import 'package:comwell_key_app/database/comwell_db.dart';
import 'package:comwell_key_app/tracking/comwell_tracking.dart';
-import 'package:comwell_key_app/utils/secure_storage.dart';
import 'package:firebase_analytics/firebase_analytics.dart';
import 'package:msal_auth/msal_auth.dart';
diff --git a/comwell_key_app/lib/choose_share_room/choose_share_room_route.dart b/comwell_key_app/lib/choose_share_room/choose_share_room_route.dart
index be4ae2f0..fb4d164d 100644
--- a/comwell_key_app/lib/choose_share_room/choose_share_room_route.dart
+++ b/comwell_key_app/lib/choose_share_room/choose_share_room_route.dart
@@ -1,5 +1,4 @@
import 'package:comwell_key_app/choose_share_room/choose_share_room_mvp.dart';
-import 'package:comwell_key_app/choose_share_room/choose_share_room_page.dart';
import 'package:comwell_key_app/choose_share_room/cubit/choose_share_room_cubit.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
diff --git a/comwell_key_app/lib/common/components/comwell_app_bar.dart b/comwell_key_app/lib/common/components/comwell_app_bar.dart
index 7077b8ab..476b5219 100644
--- a/comwell_key_app/lib/common/components/comwell_app_bar.dart
+++ b/comwell_key_app/lib/common/components/comwell_app_bar.dart
@@ -3,7 +3,6 @@ import 'package:comwell_key_app/common/const.dart';
import 'package:comwell_key_app/presentation/screens/profile/profile_route.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
import 'package:comwell_key_app/themes/light_theme.dart';
-import 'package:comwell_key_app/utils/navigation_utils.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
diff --git a/comwell_key_app/lib/connection_state/connection_state_listener.dart b/comwell_key_app/lib/connection_state/connection_state_listener.dart
index 33984694..315c28e0 100644
--- a/comwell_key_app/lib/connection_state/connection_state_listener.dart
+++ b/comwell_key_app/lib/connection_state/connection_state_listener.dart
@@ -1,6 +1,5 @@
import 'package:comwell_key_app/connection_state/connection_state_cubit.dart';
import 'package:comwell_key_app/presentation/screens/onboarding/onboarding_routes.dart';
-import 'package:comwell_key_app/utils/context_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/comwell_key_app/lib/database/daos/bookings_dao.dart b/comwell_key_app/lib/database/daos/bookings_dao.dart
index 119cda11..c69041c4 100644
--- a/comwell_key_app/lib/database/daos/bookings_dao.dart
+++ b/comwell_key_app/lib/database/daos/bookings_dao.dart
@@ -1,6 +1,6 @@
import 'dart:convert';
import 'package:comwell_key_app/database/comwell_db.dart';
-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';
+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';
import 'package:comwell_key_app/services/models/booking_dto.dart';
import 'package:comwell_key_app/services/models/bookings_dto.dart';
import 'package:comwell_key_app/utils/json.dart';
diff --git a/comwell_key_app/lib/find_booking/find_booking_repository.dart b/comwell_key_app/lib/find_booking/find_booking_repository.dart
index 37746555..6e6be575 100644
--- a/comwell_key_app/lib/find_booking/find_booking_repository.dart
+++ b/comwell_key_app/lib/find_booking/find_booking_repository.dart
@@ -1,6 +1,6 @@
import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/services/api.dart';
-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';
+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';
class FindBookingRepository {
final Api api = Api();
diff --git a/comwell_key_app/lib/find_booking/find_booking_route.dart b/comwell_key_app/lib/find_booking/find_booking_route.dart
index 50ca3439..ec8fc57d 100644
--- a/comwell_key_app/lib/find_booking/find_booking_route.dart
+++ b/comwell_key_app/lib/find_booking/find_booking_route.dart
@@ -1,6 +1,5 @@
import 'package:comwell_key_app/find_booking/cubit/find_booking_cubit.dart';
import 'package:comwell_key_app/find_booking/find_booking_mvp.dart';
-import 'package:comwell_key_app/find_booking/find_booking_page.dart';
import 'package:comwell_key_app/find_booking/loading_page.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/comwell_key_app/lib/hotel_information/cubit/hotel_information_cubit.dart b/comwell_key_app/lib/hotel_information/cubit/hotel_information_cubit.dart
index 93aee03e..aba9637f 100644
--- a/comwell_key_app/lib/hotel_information/cubit/hotel_information_cubit.dart
+++ b/comwell_key_app/lib/hotel_information/cubit/hotel_information_cubit.dart
@@ -1,4 +1,3 @@
-import 'package:bloc/bloc.dart';
import 'package:comwell_key_app/hotel_information/models/hotel.dart';
import 'package:comwell_key_app/hotel_information/repository/hotel_information_repository.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
diff --git a/comwell_key_app/lib/hotel_information/pages/hotel_information_menu.dart b/comwell_key_app/lib/hotel_information/pages/hotel_information_menu.dart
index afd19865..73e9ee61 100644
--- a/comwell_key_app/lib/hotel_information/pages/hotel_information_menu.dart
+++ b/comwell_key_app/lib/hotel_information/pages/hotel_information_menu.dart
@@ -1,6 +1,4 @@
-import 'package:comwell_key_app/.generated/assets/assets.gen.dart';
import 'package:comwell_key_app/hotel_information/components/image_widget.dart';
-import 'package:comwell_key_app/utils/l10n_utils.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
diff --git a/comwell_key_app/lib/my_booking/my_booking_page.dart b/comwell_key_app/lib/my_booking/my_booking_page.dart
index c6365374..2055cb02 100644
--- a/comwell_key_app/lib/my_booking/my_booking_page.dart
+++ b/comwell_key_app/lib/my_booking/my_booking_page.dart
@@ -1,4 +1,3 @@
-import 'package:comwell_key_app/domain/repositories/booking_details_repository.dart';
import 'package:comwell_key_app/common/components/comwell_app_bar.dart';
import 'package:comwell_key_app/my_booking/cubit/my_booking_cubit.dart';
import 'package:comwell_key_app/my_booking/cubit/my_booking_state.dart';
@@ -6,7 +5,7 @@ import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/presentation/screens/booking_details/bloc/booking_details_cubit.dart';
import 'package:comwell_key_app/presentation/screens/booking_details/components/share_button.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';
+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';
import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:comwell_key_app/utils/l10n_utils.dart';
import 'package:comwell_key_app/utils/locator.dart';
diff --git a/comwell_key_app/lib/overview/repository/overview_repository.dart b/comwell_key_app/lib/overview/repository/overview_repository.dart
index 1f5097c1..1188430c 100644
--- a/comwell_key_app/lib/overview/repository/overview_repository.dart
+++ b/comwell_key_app/lib/overview/repository/overview_repository.dart
@@ -1,7 +1,7 @@
import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/overview/models/bookings.dart';
import 'package:comwell_key_app/services/api.dart';
-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';
+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';
import 'package:comwell_key_app/services/models/booking_dto.dart';
class OverviewRepository {
diff --git a/comwell_key_app/lib/presentation/screens/booking_details/booking_details_page.dart b/comwell_key_app/lib/presentation/screens/booking_details/booking_details_page.dart
index ae4ac437..58c77154 100644
--- a/comwell_key_app/lib/presentation/screens/booking_details/booking_details_page.dart
+++ b/comwell_key_app/lib/presentation/screens/booking_details/booking_details_page.dart
@@ -9,7 +9,7 @@ import 'package:comwell_key_app/presentation/screens/booking_details/components/
import 'package:comwell_key_app/presentation/screens/booking_details/components/room_number_container.dart';
import 'package:comwell_key_app/presentation/screens/booking_details/components/share_button.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';
+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';
import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:comwell_key_app/up_sales/models/room_upgrade_list.dart';
import 'package:flutter/material.dart';
diff --git a/comwell_key_app/lib/presentation/screens/booking_details/components/concierge_button.dart b/comwell_key_app/lib/presentation/screens/booking_details/components/concierge_button.dart
index 7b76c8d1..0192ad3a 100644
--- a/comwell_key_app/lib/presentation/screens/booking_details/components/concierge_button.dart
+++ b/comwell_key_app/lib/presentation/screens/booking_details/components/concierge_button.dart
@@ -1,15 +1,8 @@
-import 'package:common/services/msal_service.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
-import 'package:comwell_key_app/presentation/app/bloc/profile_cubit.dart';
import 'package:comwell_key_app/themes/light_theme.dart';
-import 'package:common/utils/env_utils.dart';
import 'package:comwell_key_app/utils/l10n_utils.dart';
-import 'package:comwell_key_app/utils/locator.dart';
-import 'package:concierge/flavors.dart';
import 'package:concierge/presentation/screens/hotel_overview_page/hotel_overview_page_route.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flutter_dotenv/flutter_dotenv.dart';
class ConciergeButton extends StatelessWidget {
final Booking booking;
diff --git a/comwell_key_app/lib/presentation/screens/past_cancelled_booking_details/past_cancelled_booking_detail_page.dart b/comwell_key_app/lib/presentation/screens/past_cancelled_booking_details/past_cancelled_booking_detail_page.dart
index c011ebdc..93873c52 100644
--- a/comwell_key_app/lib/presentation/screens/past_cancelled_booking_details/past_cancelled_booking_detail_page.dart
+++ b/comwell_key_app/lib/presentation/screens/past_cancelled_booking_details/past_cancelled_booking_detail_page.dart
@@ -1,7 +1,7 @@
import 'package:comwell_key_app/common/components/comwell_app_bar.dart';
import 'package:comwell_key_app/overview/components/bill_download_modal.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';
+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';
import 'package:comwell_key_app/themes/comwell_colors.dart' show colorError;
import 'package:comwell_key_app/utils/l10n_utils.dart';
import 'package:flutter/material.dart';
diff --git a/comwell_key_app/lib/presentation/screens/payment_processing/payment_processing_route.dart b/comwell_key_app/lib/presentation/screens/payment_processing/payment_processing_route.dart
index 4729b948..e9f9e320 100644
--- a/comwell_key_app/lib/presentation/screens/payment_processing/payment_processing_route.dart
+++ b/comwell_key_app/lib/presentation/screens/payment_processing/payment_processing_route.dart
@@ -1,5 +1,4 @@
import 'package:comwell_key_app/common/components/comwell_app_bar.dart';
-import 'package:comwell_key_app/common/const.dart';
import 'package:comwell_key_app/presentation/navigation/transitions/slide_in_transition.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
import 'package:flutter/cupertino.dart';
diff --git a/comwell_key_app/lib/presentation/screens/profile_settings/components/date_time_picker.dart b/comwell_key_app/lib/presentation/screens/profile_settings/components/date_time_picker.dart
index 73a97419..cac3d791 100644
--- a/comwell_key_app/lib/presentation/screens/profile_settings/components/date_time_picker.dart
+++ b/comwell_key_app/lib/presentation/screens/profile_settings/components/date_time_picker.dart
@@ -1,9 +1,7 @@
-import 'package:comwell_key_app/presentation/screens/profile_settings/bloc/profile_settings_cubit.dart';
import 'package:comwell_key_app/themes/comwell_colors.dart';
import 'package:comwell_key_app/themes/light_theme.dart' hide colorDivider, sandColor;
import 'package:comwell_key_app/utils/l10n_utils.dart';
import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:comwell_key_app/common/components/generic_dialog.dart';
import 'package:intl/intl.dart';
diff --git a/comwell_key_app/lib/routing/go_router_observer.dart b/comwell_key_app/lib/routing/go_router_observer.dart
index c2ef6759..cff95996 100644
--- a/comwell_key_app/lib/routing/go_router_observer.dart
+++ b/comwell_key_app/lib/routing/go_router_observer.dart
@@ -1,7 +1,5 @@
import 'package:comwell_key_app/themes/light_theme.dart';
-import 'package:comwell_key_app/tracking/comwell_tracking.dart';
import 'package:comwell_key_app/utils/cubit_utils.dart';
-import 'package:comwell_key_app/utils/locator.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:comwell_key_app/common/system_ui.dart';
diff --git a/comwell_key_app/lib/services/mappers/bookings_mapper.dart b/comwell_key_app/lib/services/mappers/bookings_mapper.dart
index 4b5ea622..2e0a3955 100644
--- a/comwell_key_app/lib/services/mappers/bookings_mapper.dart
+++ b/comwell_key_app/lib/services/mappers/bookings_mapper.dart
@@ -1,5 +1,5 @@
import 'package:comwell_key_app/overview/models/bookings.dart';
-import 'package:comwell_key_app/services/interceptors/mappers/booking_mapper.dart';
+import 'package:comwell_key_app/services/mappers/booking_mapper.dart';
import 'package:comwell_key_app/services/models/bookings_dto.dart';
extension BookingsMapper on BookingsDTO {
diff --git a/comwell_key_app/lib/tracking/comwell_tracking.dart b/comwell_key_app/lib/tracking/comwell_tracking.dart
index 4dfab762..e65ffca4 100644
--- a/comwell_key_app/lib/tracking/comwell_tracking.dart
+++ b/comwell_key_app/lib/tracking/comwell_tracking.dart
@@ -2,7 +2,6 @@ import 'package:comwell_key_app/tracking/models/analytics_event_item.dart';
import 'package:comwell_key_app/tracking/trackers/firebase_tracker.dart';
import 'package:comwell_key_app/utils/route_utils.dart';
import 'package:flutter/cupertino.dart';
-import 'package:go_router/go_router.dart';
class ComwellTracking {
final _firebaseTracking = FirebaseTracker();
diff --git a/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart b/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart
index a47068bc..552f87b1 100644
--- a/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart
+++ b/comwell_key_app/lib/up_sales/components/up_sales_services_widget.dart
@@ -4,7 +4,6 @@ import 'package:comwell_key_app/up_sales/components/comwell_radio_button.dart';
import 'package:comwell_key_app/up_sales/components/tags.dart';
import 'package:comwell_key_app/up_sales/components/upsale_header_media.dart';
import 'package:comwell_key_app/up_sales/models/addon_upgrade.dart';
-import 'package:comwell_key_app/up_sales/models/upgrade.dart';
import 'package:comwell_key_app/utils/l10n_utils.dart';
import 'package:flutter/material.dart';
diff --git a/comwell_key_app/lib/up_sales/components/up_sales_upgrades_widget.dart b/comwell_key_app/lib/up_sales/components/up_sales_upgrades_widget.dart
index 50744110..41f17cb6 100644
--- a/comwell_key_app/lib/up_sales/components/up_sales_upgrades_widget.dart
+++ b/comwell_key_app/lib/up_sales/components/up_sales_upgrades_widget.dart
@@ -1,12 +1,9 @@
-import 'package:comwell_key_app/common/const.dart';
-import 'package:comwell_key_app/up_sales/components/background_animation.dart';
import 'package:comwell_key_app/up_sales/components/upgrades_counter.dart';
import 'package:comwell_key_app/up_sales/components/upsale_header_media.dart';
import 'package:comwell_key_app/up_sales/models/addon_upgrade.dart';
import 'package:comwell_key_app/up_sales/models/room_upgrade.dart';
import 'package:comwell_key_app/up_sales/models/upgrade.dart';
import 'package:comwell_key_app/utils/l10n_utils.dart';
-import 'package:comwell_key_app/utils/upsale_utils.dart';
import 'package:flutter/material.dart';
import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:comwell_key_app/up_sales/components/comwell_radio_button.dart';
diff --git a/comwell_key_app/lib/up_sales/cubit/up_sales_cubit.dart b/comwell_key_app/lib/up_sales/cubit/up_sales_cubit.dart
index 4e900c91..e6ab5b00 100644
--- a/comwell_key_app/lib/up_sales/cubit/up_sales_cubit.dart
+++ b/comwell_key_app/lib/up_sales/cubit/up_sales_cubit.dart
@@ -1,4 +1,3 @@
-import 'package:bloc/bloc.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/presentation/base/base_cubit.dart';
import 'package:comwell_key_app/up_sales/cubit/up_sales_state.dart';
diff --git a/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart b/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart
index c2a1b3d5..2df10485 100644
--- a/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/addon_upgrade_page.dart
@@ -1,5 +1,4 @@
import 'package:comwell_key_app/common/components/comwell_app_bar.dart';
-import 'package:comwell_key_app/common/const.dart';
import 'package:comwell_key_app/up_sales/components/addon_item_counter.dart';
import 'package:comwell_key_app/up_sales/components/upsale_header_media.dart';
import 'package:comwell_key_app/up_sales/models/addon_upgrade.dart';
diff --git a/comwell_key_app/lib/utils/upsale_utils.dart b/comwell_key_app/lib/utils/upsale_utils.dart
index 8060c541..f1d9622c 100644
--- a/comwell_key_app/lib/utils/upsale_utils.dart
+++ b/comwell_key_app/lib/utils/upsale_utils.dart
@@ -1,6 +1,3 @@
-import 'package:comwell_key_app/common/const.dart';
-import 'package:comwell_key_app/up_sales/components/background_animation.dart';
-import 'package:flutter/widgets.dart';
class UpsaleVisualConfig {
final String animationAsset;