6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 906ed39d
Changed files
.../lib/.generated/assets/assets.gen.dart | 34 ++++++++++++++++++- comwell_key_app/lib/comwell_app.dart | 1 - .../profile/components/profile_page_widget.dart | 2 +- concierge/example/pubspec.lock | 20 +++++------ .../lib/presentation/components/add_card.dart | 2 +- .../presentation/screens/payment_cards_page.dart | 39 ++++++++++++++-------- 6 files changed, 71 insertions(+), 27 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 3d9bc7bb..d2a282fe 100644
--- a/comwell_key_app/lib/.generated/assets/assets.gen.dart
+++ b/comwell_key_app/lib/.generated/assets/assets.gen.dart
@@ -30,6 +30,18 @@ class $EnvGen {
class $AssetsAnimationsGen {
const $AssetsAnimationsGen();
+ /// File path: assets/animations/champagne.json
+ String get champagne => 'assets/animations/champagne.json';
+
+ /// File path: assets/animations/coffee.json
+ String get coffee => 'assets/animations/coffee.json';
+
+ /// File path: assets/animations/early_checkin.json
+ String get earlyCheckin => 'assets/animations/early_checkin.json';
+
+ /// File path: assets/animations/late_checkout.json
+ String get lateCheckout => 'assets/animations/late_checkout.json';
+
/// File path: assets/animations/load_animation.json
String get loadAnimation => 'assets/animations/load_animation.json';
@@ -40,7 +52,15 @@ class $AssetsAnimationsGen {
String get scan => 'assets/animations/scan.json';
/// List of all assets
- List<String> get values => [loadAnimation, loadingKey, scan];
+ List<String> get values => [
+ champagne,
+ coffee,
+ earlyCheckin,
+ lateCheckout,
+ loadAnimation,
+ loadingKey,
+ scan,
+ ];
}
class $AssetsIconsGen {
@@ -357,9 +377,15 @@ class $AssetsImagesGen {
/// File path: assets/images/cc_inactive.png
AssetGenImage get ccInactive => const AssetGenImage('assets/images/cc_inactive.png');
+ /// File path: assets/images/champagne_bg.png
+ AssetGenImage get champagneBg => const AssetGenImage('assets/images/champagne_bg.png');
+
/// File path: assets/images/co.svg
SvgGenImage get co => const SvgGenImage('assets/images/co.svg');
+ /// File path: assets/images/coffe_bg.png
+ AssetGenImage get coffeBg => const AssetGenImage('assets/images/coffe_bg.png');
+
/// File path: assets/images/current_room.png
AssetGenImage get currentRoom => const AssetGenImage('assets/images/current_room.png');
@@ -414,6 +440,9 @@ class $AssetsImagesGen {
/// File path: assets/images/visa.svg
SvgGenImage get visa => const SvgGenImage('assets/images/visa.svg');
+ /// File path: assets/images/watch_bg.png
+ AssetGenImage get watchBg => const AssetGenImage('assets/images/watch_bg.png');
+
/// File path: assets/images/welcome_image.jpeg
AssetGenImage get welcomeImage => const AssetGenImage('assets/images/welcome_image.jpeg');
@@ -427,7 +456,9 @@ class $AssetsImagesGen {
cardBkg,
catalogImage,
ccInactive,
+ champagneBg,
co,
+ coffeBg,
currentRoom,
key,
koegestrand,
@@ -445,6 +476,7 @@ class $AssetsImagesGen {
seosKeyLogo,
v,
visa,
+ watchBg,
welcomeImage,
];
}
diff --git a/comwell_key_app/lib/comwell_app.dart b/comwell_key_app/lib/comwell_app.dart
index 3ac66650..bd2ce3ae 100644
--- a/comwell_key_app/lib/comwell_app.dart
+++ b/comwell_key_app/lib/comwell_app.dart
@@ -65,7 +65,6 @@ class ComwellApp extends StatelessWidget {
),
),
BlocProvider<ProfileCubit>(
- lazy: false,
create: (BuildContext context) => ProfileCubit(
locator.get(),
locator.get(),
diff --git a/comwell_key_app/lib/presentation/screens/profile/components/profile_page_widget.dart b/comwell_key_app/lib/presentation/screens/profile/components/profile_page_widget.dart
index e5fb86a0..789e24ca 100644
--- a/comwell_key_app/lib/presentation/screens/profile/components/profile_page_widget.dart
+++ b/comwell_key_app/lib/presentation/screens/profile/components/profile_page_widget.dart
@@ -86,7 +86,7 @@ class ProfilePageWidget extends StatelessWidget {
),
profileSettingsItem(
context,
- icon: Assets.icons.calendarPng.image(),
+ icon: Assets.icons.card.image(),
text: context.strings.payment_card_profile_menu,
trailingIcon: Icons.chevron_right,
onTap: () {
diff --git a/concierge/example/pubspec.lock b/concierge/example/pubspec.lock
index 1405973d..4380d09d 100644
--- a/concierge/example/pubspec.lock
+++ b/concierge/example/pubspec.lock
@@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: characters
- sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b
+ sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
- version: "1.4.1"
+ version: "1.4.0"
checked_yaml:
dependency: transitive
description:
@@ -503,26 +503,26 @@ packages:
dependency: transitive
description:
name: matcher
- sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6"
+ sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
- version: "0.12.18"
+ version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
- sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b"
+ sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
- version: "0.13.0"
+ version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
- sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
+ sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
- version: "1.17.0"
+ version: "1.16.0"
mime:
dependency: transitive
description:
@@ -836,10 +836,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636"
+ sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
url: "https://pub.dev"
source: hosted
- version: "0.7.9"
+ version: "0.7.6"
typed_data:
dependency: transitive
description:
diff --git a/payment_plugin/lib/presentation/components/add_card.dart b/payment_plugin/lib/presentation/components/add_card.dart
index d4fcb88d..0c444f74 100644
--- a/payment_plugin/lib/presentation/components/add_card.dart
+++ b/payment_plugin/lib/presentation/components/add_card.dart
@@ -56,7 +56,7 @@ class AddCard extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Text(
- "preregistration_payment_add_card".tr(),
+ context.strings.preregistration_payment_add_card,
style: Theme.of(context).textTheme.bodyMedium,
),
const SizedBox(width: 12),
diff --git a/payment_plugin/lib/presentation/screens/payment_cards_page.dart b/payment_plugin/lib/presentation/screens/payment_cards_page.dart
index ed16d64b..fd600b23 100644
--- a/payment_plugin/lib/presentation/screens/payment_cards_page.dart
+++ b/payment_plugin/lib/presentation/screens/payment_cards_page.dart
@@ -1,4 +1,3 @@
-
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -15,7 +14,11 @@ class PaymentCardsPage extends StatelessWidget {
final bool needScaffold;
final PreferredSizeWidget appBar;
- const PaymentCardsPage({super.key, this.needScaffold = false, required this.appBar});
+ const PaymentCardsPage({
+ super.key,
+ this.needScaffold = false,
+ required this.appBar,
+ });
@override
Widget build(BuildContext context) {
@@ -35,8 +38,8 @@ class PaymentCardsPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
ComwellErrorWidget(
- title: 'generic_error_title'.tr(),
- subtitle: 'payment_cards_error_subtitle'.tr(),
+ title: context.strings.generic_error_title,
+ subtitle: context.strings.payment_cards_error_subtitle,
border: false,
),
],
@@ -59,8 +62,8 @@ class PaymentCardsPage extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center,
children: [
ComwellErrorWidget(
- title: 'generic_error_title'.tr(),
- subtitle: 'payment_cards_error_subtitle'.tr(),
+ title: context.strings.generic_error_title,
+ subtitle: context.strings.payment_cards_error_subtitle,
border: false,
),
],
@@ -73,7 +76,10 @@ class PaymentCardsPage extends StatelessWidget {
}
Widget _buildPaymentCards(
- BuildContext context, PaymentCardsState state, PaymentCardsCubit cubit) {
+ BuildContext context,
+ PaymentCardsState state,
+ PaymentCardsCubit cubit,
+ ) {
final cards = state.cards;
final theme = Theme.of(context);
final showPaymentError =
@@ -98,12 +104,14 @@ class PaymentCardsPage extends StatelessWidget {
children: [
const SizedBox(height: 40),
Text(
- "payment_cards_title".tr(),
+ context.strings.payment_cards_title,
style: theme.textTheme.headlineLarge,
),
const SizedBox(height: 40),
- Text("payment_cards_my_cards".tr(),
- style: theme.textTheme.headlineMedium),
+ Text(
+ context.strings.payment_cards_my_cards,
+ style: theme.textTheme.headlineMedium,
+ ),
const SizedBox(height: 20),
if (showPaymentError) ...[
Container(
@@ -116,12 +124,17 @@ class PaymentCardsPage extends StatelessWidget {
),
child: Row(
children: [
- Icon(Icons.error_outline,
- color: theme.colorScheme.error, size: 20),
+ Icon(
+ Icons.error_outline,
+ color: theme.colorScheme.error,
+ size: 20,
+ ),
const SizedBox(width: 8),
Expanded(
child: Text(
- "payment_cards_missing_payment_method_subtitle".tr(),
+ context
+ .strings
+ .payment_cards_missing_payment_method_subtitle,
style: theme.textTheme.bodyMedium?.copyWith(
color: theme.colorScheme.error,
),