6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit dd46a33c

AuthorEdmir Suljic<esu@dwarf.dk>
Date2025-06-03 09:28:56 +0200
Minor UI fix on accept terms in payment screen - pre reg

Changed files

comwell_key_app/assets/translations/da-DK.json     |  4 +++-
 comwell_key_app/assets/translations/en-US.json     |  6 ++++--
 .../components/approve_conditions_widget.dart      | 25 +++++++++++++++-------
 3 files changed, 24 insertions(+), 11 deletions(-)

Diff

diff --git a/comwell_key_app/assets/translations/da-DK.json b/comwell_key_app/assets/translations/da-DK.json
index f5e8cd61..a6cf76cb 100644
--- a/comwell_key_app/assets/translations/da-DK.json
+++ b/comwell_key_app/assets/translations/da-DK.json
@@ -252,6 +252,8 @@
"check_in_button_timer_days_hours_minutes": "Om {} dage, {} timer og {} minutter",
"check_in_button_timer_hours_minutes": "Om {} timer og {} minutter",
"check_in_button_timer_minutes": "Om {} minutter",
- "check_in_button_timer_seconds": "Om {} sekunder"
+ "check_in_button_timer_seconds": "Om {} sekunder",
+ "payment_cards_approve_conditions_title": "Jeg accepter ",
+ "payment_cards_approve_conditions_subtitle": "betingelserne"
}
\ No newline at end of file
diff --git a/comwell_key_app/assets/translations/en-US.json b/comwell_key_app/assets/translations/en-US.json
index e7fa0941..e0a94f68 100644
--- a/comwell_key_app/assets/translations/en-US.json
+++ b/comwell_key_app/assets/translations/en-US.json
@@ -185,7 +185,7 @@
"payment_cards_confirm_remove_subtitle": "This payment card will no longer be usable",
"payment_cards_remove_card_button": "Remove card",
"payment_cards_edit_card_title": "Edit card",
- "payment_cards_save_card_button": "Save card",
+ "payment_cards_save_card_button": "Save card",
"share_booking_page_title": "Share booking",
"share_booking_page_subtitle": "Here you can share your booking with another guest and give them access to booking information, keycard and Concierge",
"share_booking_page_share_button": "Share your booking",
@@ -251,5 +251,7 @@
"check_in_button_timer_days_hours_minutes": "In {} days, {} hours and {} minutes",
"check_in_button_timer_hours_minutes": "In {} hours and {} minutes",
"check_in_button_timer_minutes": "In {} minutes",
- "check_in_button_timer_seconds": "In {} seconds"
+ "check_in_button_timer_seconds": "In {} seconds",
+ "payment_cards_approve_conditions_title": "I accept ",
+ "payment_cards_approve_conditions_subtitle": "terms and conditions"
}
diff --git a/comwell_key_app/lib/payment_cards/components/approve_conditions_widget.dart b/comwell_key_app/lib/payment_cards/components/approve_conditions_widget.dart
index bb9f5d02..a6473942 100644
--- a/comwell_key_app/lib/payment_cards/components/approve_conditions_widget.dart
+++ b/comwell_key_app/lib/payment_cards/components/approve_conditions_widget.dart
@@ -1,33 +1,42 @@
import 'package:comwell_key_app/pregistration/bloc/preregistration_cubit.dart';
import 'package:comwell_key_app/pregistration/bloc/preregistration_state.dart';
+import 'package:comwell_key_app/themes/light_theme.dart';
+import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
+
class ApproveConditionsWidget extends StatelessWidget {
const ApproveConditionsWidget({super.key});
@override
Widget build(BuildContext context) {
+ final theme = Theme.of(context);
return BlocBuilder<PreregistrationCubit, PreregistrationState>(
builder: (context, state) {
final cubit = context.read<PreregistrationCubit>();
return Row(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
- Checkbox(
- value: cubit.state.isTermsAccepted,
+ Checkbox(
+ activeColor: sandColor,
+ checkColor: Colors.white,
+ side: const BorderSide(color: Colors.grey),
+ value: cubit.state.isTermsAccepted,
onChanged: (value) {
cubit.onTermsAndConditionsToggled(value ?? false);
},
),
- const Expanded(
+ Expanded(
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: [
- Text('Jeg accepter '),
+ Text('payment_cards_approve_conditions_title'.tr(), style: theme.textTheme.bodyMedium?.copyWith(
+ color: Colors.black.withValues(alpha: 0.65),
+ )),
Text(
- 'betingelserne',
- style: TextStyle(
- color: const Color(0xFF9B7B52),
+ 'payment_cards_approve_conditions_subtitle'.tr(),
+ style: theme.textTheme.bodyMedium?.copyWith(
+ color: sandColor,
decoration: TextDecoration.underline,
),
),
@@ -39,4 +48,4 @@ class ApproveConditionsWidget extends StatelessWidget {
},
);
}
-}
\ No newline at end of file
+}