6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit adb28a04
Changed files
.../lib/.generated/assets/assets.gen.dart | 17 -------- .../lib/overview/cubit/overview_cubit.dart | 11 ++++-- comwell_key_app/lib/utils/locator.dart | 2 - comwell_key_app/pubspec.yaml | 5 +-- concierge/example/pubspec.lock | 20 +++++----- .../data/remote/api/concierge_service.g.dart | 4 +- concierge/pubspec.yaml | 46 ---------------------- .../_generated/data/remote/api/api_client.g.dart | 2 +- .../data/remote/models/api_response.g.dart | 1 - payment_plugin/pubspec.yaml | 1 - 10 files changed, 22 insertions(+), 87 deletions(-)
Diff
diff --git a/comwell_key_app/lib/.generated/assets/assets.gen.dart b/comwell_key_app/lib/.generated/assets/assets.gen.dart
index baf03c86..fc85cd03 100644
--- a/comwell_key_app/lib/.generated/assets/assets.gen.dart
+++ b/comwell_key_app/lib/.generated/assets/assets.gen.dart
@@ -14,22 +14,6 @@ import 'package:flutter/widgets.dart';
import 'package:flutter_svg/flutter_svg.dart' as _svg;
import 'package:vector_graphics/vector_graphics.dart' as _vg;
-class $EnvGen {
- const $EnvGen();
-
- /// File path: env/.env.dev
- String get aEnvDev => 'env/.env.dev';
-
- /// File path: env/.env.prod
- String get aEnvProd => 'env/.env.prod';
-
- /// File path: env/.env.stage
- String get aEnvStage => 'env/.env.stage';
-
- /// List of all assets
- List<String> get values => [aEnvDev, aEnvProd, aEnvStage];
-}
-
class $AssetsAnimationsGen {
const $AssetsAnimationsGen();
@@ -489,7 +473,6 @@ class Assets {
static const $AssetsImagesGen images = $AssetsImagesGen();
static const $AssetsMsalGen msal = $AssetsMsalGen();
static const $AssetsTranslationsGen translations = $AssetsTranslationsGen();
- static const $EnvGen env = $EnvGen();
}
class AssetGenImage {
diff --git a/comwell_key_app/lib/overview/cubit/overview_cubit.dart b/comwell_key_app/lib/overview/cubit/overview_cubit.dart
index 08bb02c7..743332c7 100644
--- a/comwell_key_app/lib/overview/cubit/overview_cubit.dart
+++ b/comwell_key_app/lib/overview/cubit/overview_cubit.dart
@@ -1,4 +1,3 @@
-import 'package:aad_b2c_webview/aad_b2c_webview.dart';
import 'package:comwell_key_app/base/base_cubit.dart';
import 'package:comwell_key_app/overview/cubit/overview_state.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
@@ -43,9 +42,13 @@ class OverviewCubit extends BaseCubit<OverviewState> {
}
Booking? getCheckedInBooking() {
- return state.bookings.current.firstWhereOrNull(
- (booking) => booking.reservationStatus == ReservationStatus.checkedin,
- );
+ try {
+ return state.bookings.current.firstWhere(
+ (booking) => booking.reservationStatus == ReservationStatus.checkedin,
+ );
+ } catch (_) {
+ return null;
+ }
}
Future<Booking?> findBooking(String bookingReference, String lastName) async {
diff --git a/comwell_key_app/lib/utils/locator.dart b/comwell_key_app/lib/utils/locator.dart
index 62028a89..672d0594 100644
--- a/comwell_key_app/lib/utils/locator.dart
+++ b/comwell_key_app/lib/utils/locator.dart
@@ -1,4 +1,3 @@
-import 'package:aad_b2c_webview/aad_b2c_webview.dart';
import 'package:comwell_key_app/authentication/authentication_repository.dart';
import 'package:comwell_key_app/check_out/check_out_repository.dart';
import 'package:comwell_key_app/choose_share_room/choose_share_room_repository.dart';
@@ -19,7 +18,6 @@ import 'package:comwell_key_app/profile/profile_repository.dart';
import 'package:comwell_key_app/profile_settings/repostiory/profile_settings_repository.dart';
import 'package:comwell_key_app/services/api.dart';
import 'package:comwell_key_app/services/http_client.dart';
-import 'package:comwell_key_app/services/http_client.dart';
import 'package:comwell_key_app/share/share_booking_repository.dart';
import 'package:comwell_key_app/push_notifications/push_notification_repository.dart';
import 'package:comwell_key_app/tracking/comwell_tracking.dart';
diff --git a/comwell_key_app/pubspec.yaml b/comwell_key_app/pubspec.yaml
index cdf1492b..288cf09c 100644
--- a/comwell_key_app/pubspec.yaml
+++ b/comwell_key_app/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
path: ../mobilekeys_sdk_plugin
payment_plugin:
path: ../payment_plugin
- concierge_plugin:
+ concierge:
path: ../concierge
cupertino_icons: ^1.0.2
focus_detector: ^2.0.0
@@ -28,12 +28,11 @@ dependencies:
bloc_test: ^10.0.0
#mockito: ^5.5.1
fake_async: ^1.3.1
- get_it: ^7.7.0
+ get_it: ^8.0.3
flutter_native_splash: ^2.4.6
dio: ^5.5.0+1
device_info_plus: ^10.1.2
sheet: ^1.0.0
- aad_b2c_webview: ^0.1.3
modal_bottom_sheet: ^3.0.0
mocktail: ^1.0.4
flutter_svg: ^2.0.10+1
diff --git a/concierge/example/pubspec.lock b/concierge/example/pubspec.lock
index a7c6fada..539e0b94 100644
--- a/concierge/example/pubspec.lock
+++ b/concierge/example/pubspec.lock
@@ -415,26 +415,26 @@ packages:
dependency: transitive
description:
name: leak_tracker
- sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+ sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de"
url: "https://pub.dev"
source: hosted
- version: "10.0.9"
+ version: "11.0.2"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
- sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+ sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev"
source: hosted
- version: "3.0.9"
+ version: "3.0.10"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
- sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+ sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev"
source: hosted
- version: "3.0.1"
+ version: "3.0.2"
lints:
dependency: transitive
description:
@@ -788,10 +788,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
+ sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
url: "https://pub.dev"
source: hosted
- version: "0.7.4"
+ version: "0.7.6"
typed_data:
dependency: transitive
description:
@@ -828,10 +828,10 @@ packages:
dependency: transitive
description:
name: vector_math
- sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
+ sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b
url: "https://pub.dev"
source: hosted
- version: "2.1.4"
+ version: "2.2.0"
vm_service:
dependency: transitive
description:
diff --git a/concierge/lib/_generated/data/remote/api/concierge_service.g.dart b/concierge/lib/_generated/data/remote/api/concierge_service.g.dart
index 1fdeb9e6..35291432 100644
--- a/concierge/lib/_generated/data/remote/api/concierge_service.g.dart
+++ b/concierge/lib/_generated/data/remote/api/concierge_service.g.dart
@@ -40,7 +40,7 @@ class _ConciergeService implements ConciergeService {
try {
_value = GetPropertyResponseDto.fromJson(_result.data!);
} on Object catch (e, s) {
- errorLogger?.logError(e, s, _options, _result);
+ errorLogger?.logError(e, s, _options, response: _result);
rethrow;
}
return _value;
@@ -67,7 +67,7 @@ class _ConciergeService implements ConciergeService {
try {
_value = GetAreaResponseDto.fromJson(_result.data!);
} on Object catch (e, s) {
- errorLogger?.logError(e, s, _options, _result);
+ errorLogger?.logError(e, s, _options, response: _result);
rethrow;
}
return _value;
diff --git a/concierge/pubspec.yaml b/concierge/pubspec.yaml
index 117701f3..d9d559ae 100644
--- a/concierge/pubspec.yaml
+++ b/concierge/pubspec.yaml
@@ -39,21 +39,7 @@ dev_dependencies:
freezed: ^3.0.6
json_pretty: ^1.0.4
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
-# The following section is specific to Flutter packages.
flutter:
- # This section identifies this Flutter project as a plugin project.
- # The 'pluginClass' specifies the class (in Java, Kotlin, Swift, Objective-C, etc.)
- # which should be registered in the plugin registry. This is required for
- # using method channels.
- # The Android 'package' specifies package in which the registered class is.
- # This is required for using method channels on Android.
- # The 'ffiPlugin' specifies that native code should be built and bundled.
- # This is required for using `dart:ffi`.
- # All these are used by the tooling to maintain consistency when
- # adding or updating assets for this project.
plugin:
platforms:
android:
@@ -62,38 +48,6 @@ flutter:
ios:
pluginClass: ConciergePlugin
- # To add assets to your plugin package, add an assets section, like this:
assets:
- - assets/images/
- assets/icons/
- assets/
- - lib/data/mock/
- - dotenv/
- # - images/a_dot_burr.jpeg
- # - images/a_dot_ham.jpeg
- #
- # For details regarding assets in packages, see
- # https://flutter.dev/to/asset-from-package
- #
- # An image asset can refer to one or more resolution-specific "variants", see
- # https://flutter.dev/to/resolution-aware-images
-
- # To add custom fonts to your plugin package, add a fonts section here,
- # in this "flutter" section. Each entry in this list should have a
- # "family" key with the font family name, and a "fonts" key with a
- # list giving the asset and other descriptors for the font. For
- # example:
- # fonts:
- # - family: Schyler
- # fonts:
- # - asset: fonts/Schyler-Regular.ttf
- # - asset: fonts/Schyler-Italic.ttf
- # style: italic
- # - family: Trajan Pro
- # fonts:
- # - asset: fonts/TrajanPro.ttf
- # - asset: fonts/TrajanPro_Bold.ttf
- # weight: 700
- #
- # For details regarding fonts in packages, see
- # https://flutter.dev/to/font-from-package
diff --git a/payment_plugin/lib/_generated/data/remote/api/api_client.g.dart b/payment_plugin/lib/_generated/data/remote/api/api_client.g.dart
index c9353cbc..fbce2f27 100644
--- a/payment_plugin/lib/_generated/data/remote/api/api_client.g.dart
+++ b/payment_plugin/lib/_generated/data/remote/api/api_client.g.dart
@@ -40,7 +40,7 @@ class _ApiClient implements ApiClient {
try {
_value = StoredPaymentsResponse.fromJson(_result.data!);
} on Object catch (e, s) {
- errorLogger?.logError(e, s, _options, _result);
+ errorLogger?.logError(e, s, _options, response: _result);
rethrow;
}
return _value;
diff --git a/payment_plugin/lib/_generated/data/remote/models/api_response.g.dart b/payment_plugin/lib/_generated/data/remote/models/api_response.g.dart
index fd8655df..528f108e 100644
--- a/payment_plugin/lib/_generated/data/remote/models/api_response.g.dart
+++ b/payment_plugin/lib/_generated/data/remote/models/api_response.g.dart
@@ -10,4 +10,3 @@ ApiResponse<T> _$ApiResponseFromJson<T>(
Map json,
T Function(Object? json) fromJsonT,
) => ApiResponse<T>(data: fromJsonT(json['data']));
-
diff --git a/payment_plugin/pubspec.yaml b/payment_plugin/pubspec.yaml
index 5907656f..3ad53959 100644
--- a/payment_plugin/pubspec.yaml
+++ b/payment_plugin/pubspec.yaml
@@ -27,7 +27,6 @@ dependencies:
flutter_dotenv: ^6.0.0
go_router: ^16.2.0
flutter_svg: ^2.0.10+1
-
dev_dependencies:
flutter_test: