6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 663cd70a
Changed files
README.md | 2 +- comwell_key_app/assets/translations/intl_da.arb | 12 ++++- comwell_key_app/assets/translations/intl_en.arb | 12 ++++- .../lib/.generated/assets/assets.gen.dart | 5 +- .../lib/.generated/l10n/app_localizations.dart | 60 ++++++++++++++++++++++ .../lib/.generated/l10n/app_localizations_da.dart | 31 +++++++++++ .../lib/.generated/l10n/app_localizations_en.dart | 31 +++++++++++ .../bluetooth/bluetooth_permission_screen.dart | 8 +-- .../internet/internet_permission_screen.dart | 8 +-- .../notification_permission_screen.dart | 10 ++-- .../usage_tracking_permission_screen.dart | 10 ++-- comwell_key_app/pubspec.yaml | 6 +-- concierge/pubspec.yaml | 2 +- payment_plugin/example/pubspec.lock | 4 +- payment_plugin/pubspec.yaml | 2 +- 15 files changed, 174 insertions(+), 29 deletions(-)
Diff
diff --git a/README.md b/README.md
index 85342579..c9275add 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ A Flutter monorepo containing:
- Flutter (Dart >= 3.5)
- State & navigation: `bloc`, `flutter_bloc`, `go_router`
-- Localization: `easy_localization`
+- Localization: `intl`
- Analytics: `firebase_core`, `firebase_analytics`
- Error monitoring: `sentry_flutter`
- Payments: `adyen_checkout`
diff --git a/comwell_key_app/assets/translations/intl_da.arb b/comwell_key_app/assets/translations/intl_da.arb
index 8eb0a2a8..6d3fa581 100644
--- a/comwell_key_app/assets/translations/intl_da.arb
+++ b/comwell_key_app/assets/translations/intl_da.arb
@@ -387,5 +387,15 @@
"received_shared_room_page_subtitle": "text {name}",
"received_shared_room_page_title": "",
"received_shared_booking_page_title": "",
- "received_shared_booking_page_subtitle": "text {name}"
+ "received_shared_booking_page_subtitle": "text {name}",
+ "accept_notifications": "Tillad notifikationer",
+ "accept_notifications_rationale": "For at få de seneste opdateringer om din booking, bedes du tillade notifikationer",
+ "allow": "Tillad",
+ "skip": "Spring over",
+ "internet_disabled": "Internettet er afbrudt",
+ "please_enable_internet": "Tjek venligst din internetforbindelse",
+ "bluetooth_disabled": "Bluetooth er deaktiveret",
+ "please_enable_bluetooth": "Aktivér venligst Bluetooth",
+ "allow_usage_tracking": "Tillad brugssporing",
+ "usage_tracking_rationale": "Tillad venligst sporing af, hvordan du bruger appen"
}
\ No newline at end of file
diff --git a/comwell_key_app/assets/translations/intl_en.arb b/comwell_key_app/assets/translations/intl_en.arb
index 9b1c279d..20c614ee 100644
--- a/comwell_key_app/assets/translations/intl_en.arb
+++ b/comwell_key_app/assets/translations/intl_en.arb
@@ -387,5 +387,15 @@
"received_shared_room_page_subtitle": "text {name}",
"received_shared_room_page_title": "",
"received_shared_booking_page_title": "",
- "received_shared_booking_page_subtitle": "text {name}"
+ "received_shared_booking_page_subtitle": "text {name}",
+ "accept_notifications": "Allow notifications",
+ "accept_notifications_rationale": "To get the latest updates on your booking, please allow notifications",
+ "allow": "Allow",
+ "skip": "Skip",
+ "internet_disabled": "Internet disconnected",
+ "please_enable_internet": "Please check your internet connected",
+ "bluetooth_disabled": "Bluetooth is disabled",
+ "please_enable_bluetooth": "Please enable bluetooth",
+ "allow_usage_tracking": "Allow usage tracking",
+ "usage_tracking_rationale": "Please allow tracking how you use the app"
}
\ No newline at end of file
diff --git a/comwell_key_app/lib/.generated/assets/assets.gen.dart b/comwell_key_app/lib/.generated/assets/assets.gen.dart
index 3d9bc7bb..5436c09a 100644
--- a/comwell_key_app/lib/.generated/assets/assets.gen.dart
+++ b/comwell_key_app/lib/.generated/assets/assets.gen.dart
@@ -23,8 +23,11 @@ class $EnvGen {
/// File path: env/.stage.env
String get aStage => 'env/.stage.env';
+ /// File path: env/Archive.zip
+ String get archive => 'env/Archive.zip';
+
/// List of all assets
- List<String> get values => [aProd, aStage];
+ List<String> get values => [aProd, aStage, archive];
}
class $AssetsAnimationsGen {
diff --git a/comwell_key_app/lib/.generated/l10n/app_localizations.dart b/comwell_key_app/lib/.generated/l10n/app_localizations.dart
index 0bc12aff..89094095 100644
--- a/comwell_key_app/lib/.generated/l10n/app_localizations.dart
+++ b/comwell_key_app/lib/.generated/l10n/app_localizations.dart
@@ -2420,6 +2420,66 @@ abstract class AppLocalizations {
/// In en, this message translates to:
/// **'text {name}'**
String received_shared_booking_page_subtitle(Object name);
+
+ /// 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 @usage_tracking_rationale.
+ ///
+ /// In en, this message translates to:
+ /// **'Please allow tracking how you use the app'**
+ String get usage_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 9849a3b3..8421b65c 100644
--- a/comwell_key_app/lib/.generated/l10n/app_localizations_da.dart
+++ b/comwell_key_app/lib/.generated/l10n/app_localizations_da.dart
@@ -1251,4 +1251,35 @@ class AppLocalizationsDa extends AppLocalizations {
String received_shared_booking_page_subtitle(Object name) {
return 'text $name';
}
+
+ @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 usage_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 935e413f..6660ad5c 100644
--- a/comwell_key_app/lib/.generated/l10n/app_localizations_en.dart
+++ b/comwell_key_app/lib/.generated/l10n/app_localizations_en.dart
@@ -1247,4 +1247,35 @@ class AppLocalizationsEn extends AppLocalizations {
String received_shared_booking_page_subtitle(Object name) {
return 'text $name';
}
+
+ @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 usage_tracking_rationale => 'Please allow tracking how you use the app';
}
diff --git a/comwell_key_app/lib/presentation/screens/onboarding/bluetooth/bluetooth_permission_screen.dart b/comwell_key_app/lib/presentation/screens/onboarding/bluetooth/bluetooth_permission_screen.dart
index 4b6a5fda..0d726cbb 100644
--- a/comwell_key_app/lib/presentation/screens/onboarding/bluetooth/bluetooth_permission_screen.dart
+++ b/comwell_key_app/lib/presentation/screens/onboarding/bluetooth/bluetooth_permission_screen.dart
@@ -1,7 +1,7 @@
import 'package:comwell_key_app/.generated/assets/assets.gen.dart';
import 'package:comwell_key_app/connection_state/connection_state_cubit.dart';
import 'package:comwell_key_app/themes/comwell_colors.dart';
-import 'package:easy_localization/easy_localization.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';
@@ -36,9 +36,9 @@ class BluetoothPermissionScreen extends StatelessWidget {
);
}
return PermissionScreenTemplate(
- title: "bluetooth_disabled".tr(),
- subtitle: "please_enable_bluetooth".tr(),
- primaryButtonText: "generic_ok".tr(),
+ title: context.strings.bluetooth_disabled,
+ subtitle: context.strings.please_enable_bluetooth,
+ primaryButtonText: context.strings.generic_ok,
primaryButtonOnClick: () async {
context.pop();
},
diff --git a/comwell_key_app/lib/presentation/screens/onboarding/internet/internet_permission_screen.dart b/comwell_key_app/lib/presentation/screens/onboarding/internet/internet_permission_screen.dart
index 5adfaf31..aa33f92e 100644
--- a/comwell_key_app/lib/presentation/screens/onboarding/internet/internet_permission_screen.dart
+++ b/comwell_key_app/lib/presentation/screens/onboarding/internet/internet_permission_screen.dart
@@ -1,6 +1,6 @@
import 'package:comwell_key_app/.generated/assets/assets.gen.dart';
import 'package:comwell_key_app/connection_state/connection_state_cubit.dart';
-import 'package:easy_localization/easy_localization.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';
@@ -24,9 +24,9 @@ class InternetStatusScreen extends StatelessWidget {
child: Builder(
builder: (context) {
return PermissionScreenTemplate(
- title: "internet_disabled".tr(),
- subtitle: "please_enable_internet".tr(),
- primaryButtonText: "generic_ok".tr(),
+ title: context.strings.internet_disabled,
+ subtitle: context.strings.please_enable_internet,
+ primaryButtonText: context.strings.generic_ok,
primaryButtonOnClick: () async {
context.pop();
},
diff --git a/comwell_key_app/lib/presentation/screens/onboarding/notifications/notification_permission_screen.dart b/comwell_key_app/lib/presentation/screens/onboarding/notifications/notification_permission_screen.dart
index 5ed166f5..5c8ad970 100644
--- a/comwell_key_app/lib/presentation/screens/onboarding/notifications/notification_permission_screen.dart
+++ b/comwell_key_app/lib/presentation/screens/onboarding/notifications/notification_permission_screen.dart
@@ -1,6 +1,6 @@
import 'package:comwell_key_app/.generated/assets/assets.gen.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
-import 'package:easy_localization/easy_localization.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';
@@ -16,11 +16,11 @@ class NotificationPermissionScreen extends StatelessWidget {
final cubit = context.watch<NotificationPermissionCubit>();
final state = cubit.state;
return PermissionScreenTemplate(
- title: "accept_notifications".tr(),
- subtitle: "accept_notifications_rationale".tr(),
+ title: context.strings.accept_notifications,
+ subtitle: context.strings.accept_notifications_rationale,
image: Assets.icons.bellCircled,
- primaryButtonText: "accept_notifications".tr(),
- secondaryButtonText: "skip".tr(),
+ primaryButtonText: context.strings.accept_notifications,
+ secondaryButtonText: context.strings.skip,
primaryButtonOnClick: () async {
await cubit.onAcceptClicked();
if (context.mounted) {
diff --git a/comwell_key_app/lib/presentation/screens/onboarding/usage_tracking/usage_tracking_permission_screen.dart b/comwell_key_app/lib/presentation/screens/onboarding/usage_tracking/usage_tracking_permission_screen.dart
index f94a0907..0a065e42 100644
--- a/comwell_key_app/lib/presentation/screens/onboarding/usage_tracking/usage_tracking_permission_screen.dart
+++ b/comwell_key_app/lib/presentation/screens/onboarding/usage_tracking/usage_tracking_permission_screen.dart
@@ -1,7 +1,7 @@
import 'package:comwell_key_app/.generated/assets/assets.gen.dart';
import 'package:comwell_key_app/presentation/screens/onboarding/permission_screen_template.dart';
import 'package:comwell_key_app/routing/app_routes.dart';
-import 'package:easy_localization/easy_localization.dart';
+import 'package:comwell_key_app/utils/l10n_utils.dart';
import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart';
@@ -11,13 +11,13 @@ class UsageTrackingPermissionScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
return PermissionScreenTemplate(
- title: "allow_usage_tracking".tr(),
- subtitle: "uasge_tracking_rationale".tr(),
- primaryButtonText: "allow_tracking".tr(),
+ title: context.strings.allow_usage_tracking,
+ subtitle: context.strings.usage_tracking_rationale,
+ primaryButtonText: context.strings.allow,
primaryButtonOnClick: () {
if (context.mounted) context.go(AppRoutes.overview);
},
- secondaryButtonText: "skip".tr(),
+ secondaryButtonText: context.strings.skip,
secondaryButtonOnClick: () {
context.go(AppRoutes.overview);
},
diff --git a/comwell_key_app/pubspec.yaml b/comwell_key_app/pubspec.yaml
index 94247baa..6581a301 100644
--- a/comwell_key_app/pubspec.yaml
+++ b/comwell_key_app/pubspec.yaml
@@ -18,9 +18,9 @@ dependencies:
concierge:
path: ../concierge
cupertino_icons: ^1.0.2
- focus_detector: ^2.0.0
permission_handler: ^11.3.0
- go_router: ^16.2.0
+ focus_detector: ^2.0.0
+ go_router: ^17.1.0
bloc: ^9.1.0
flutter_bloc: ^9.1.1
flutter_dotenv: ^6.0.0
@@ -73,7 +73,6 @@ dependencies:
app_tracking_transparency: ^2.0.6+1
webview_flutter: ^4.13.1
-
dependency_overrides:
#Remove override when slider button updates
vibration: 3.1.3
@@ -91,6 +90,7 @@ dev_dependencies:
csv: ^6.0.0
change_case: ^2.2.0
json_pretty: ^1.0.4
+ go_router_builder: ^4.1.0
flutter:
generate: true
diff --git a/concierge/pubspec.yaml b/concierge/pubspec.yaml
index d9d559ae..988e9edb 100644
--- a/concierge/pubspec.yaml
+++ b/concierge/pubspec.yaml
@@ -21,7 +21,7 @@ dependencies:
shimmer: ^3.0.0
lottie: ^3.1.2
flutter_dotenv: ^6.0.0
- go_router: ^16.2.0
+ go_router: ^17.1.0
get_it: ^8.0.3
pretty_dio_logger: any
gap: ^3.0.1
diff --git a/payment_plugin/example/pubspec.lock b/payment_plugin/example/pubspec.lock
index 0abd50e0..83c269ba 100644
--- a/payment_plugin/example/pubspec.lock
+++ b/payment_plugin/example/pubspec.lock
@@ -227,10 +227,10 @@ packages:
dependency: transitive
description:
name: go_router
- sha256: d8f590a69729f719177ea68eb1e598295e8dbc41bbc247fed78b2c8a25660d7c
+ sha256: "7974313e217a7771557add6ff2238acb63f635317c35fa590d348fb238f00896"
url: "https://pub.dev"
source: hosted
- version: "16.3.0"
+ version: "17.1.0"
http:
dependency: transitive
description:
diff --git a/payment_plugin/pubspec.yaml b/payment_plugin/pubspec.yaml
index 3ad53959..0cbbc024 100644
--- a/payment_plugin/pubspec.yaml
+++ b/payment_plugin/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
shimmer: ^3.0.0
lottie: ^3.1.2
flutter_dotenv: ^6.0.0
- go_router: ^16.2.0
+ go_router: ^17.1.0
flutter_svg: ^2.0.10+1
dev_dependencies: