6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit fc214df3
Changed files
.../lib/common/components/comwell_text_field.dart | 2 +- comwell_key_app/lib/common/components/generic_dialog.dart | 2 +- .../lib/overview/past_cancelled_booking_detail_page.dart | 14 +++++++------- .../profile_settings/components/comwell_text_field.dart | 2 +- .../lib/profile_settings/components/date_time_picker.dart | 4 +--- .../lib/profile_settings/components/intl_phone_field.dart | 2 +- .../components/text_field_with_trailing_icon.dart | 2 +- 7 files changed, 13 insertions(+), 15 deletions(-)
Diff
diff --git a/comwell_key_app/lib/common/components/comwell_text_field.dart b/comwell_key_app/lib/common/components/comwell_text_field.dart
index 3e1e1ccb..0a00d521 100644
--- a/comwell_key_app/lib/common/components/comwell_text_field.dart
+++ b/comwell_key_app/lib/common/components/comwell_text_field.dart
@@ -56,7 +56,7 @@ class ComwellTextFieldState extends State<ComwellTextField> {
? theme.textTheme.headlineSmall?.copyWith(color: colorDivider)
: _isFocused
? theme.textTheme.bodySmall
- ?.copyWith(color: Colors.black.withAlpha((0.65 * 255).toInt()))
+ ?.copyWith(color: colorHeadlineText)
: theme.textTheme.headlineSmall?.copyWith(color: labelTextColor);
return Column(
children: [
diff --git a/comwell_key_app/lib/common/components/generic_dialog.dart b/comwell_key_app/lib/common/components/generic_dialog.dart
index 47e83321..292192b2 100644
--- a/comwell_key_app/lib/common/components/generic_dialog.dart
+++ b/comwell_key_app/lib/common/components/generic_dialog.dart
@@ -45,7 +45,7 @@ class GenericDialog extends StatelessWidget {
Text(
content,
textAlign: TextAlign.center,
- style: theme.textTheme.bodySmall?.copyWith(color: Colors.black.withAlpha((0.65 * 255).toInt()))
+ style: theme.textTheme.bodySmall?.copyWith(color: colorHeadlineText)
),
const SizedBox(height: 20),
Padding(
diff --git a/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart b/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart
index 8f12574e..a78cbe90 100644
--- a/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart
+++ b/comwell_key_app/lib/overview/past_cancelled_booking_detail_page.dart
@@ -34,7 +34,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {
contentPadding: const EdgeInsets.symmetric(horizontal: 0),
title: Text('booking_reference'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha((0.65 * 255).toInt()))),
+ color: colorHeadlineText)),
subtitle: Text(booking.id, style: theme.textTheme.headlineSmall),
),
const Divider(color: colorDivider),
@@ -83,7 +83,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {
contentPadding: const EdgeInsets.symmetric(horizontal: 0),
title: Text('booking_details'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha((0.65 * 255).toInt()))),
+ color: colorHeadlineText)),
subtitle: Text(
booking.roomType,
style: theme.textTheme.headlineSmall,
@@ -94,7 +94,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {
contentPadding: const EdgeInsets.symmetric(horizontal: 0),
title: Text('number_of_guests'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha((0.65 * 255).toInt()))),
+ color: colorHeadlineText)),
subtitle: Text(
"${booking.adults} ${booking.adults > 1 ? 'adults'.tr() : 'adult'.tr()}${booking.children >= 1 ? ', ${booking.children} ${booking.children > 1 ? 'children'.tr() : 'child'.tr()}' : ''}",
style: theme.textTheme.headlineSmall),
@@ -104,7 +104,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {
contentPadding: const EdgeInsets.symmetric(horizontal: 0),
title: Text('booker'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha((0.65 * 255).toInt()))),
+ color: colorHeadlineText)),
subtitle: Text(booking.booker.name,
style: theme.textTheme.headlineSmall),
),
@@ -113,7 +113,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {
contentPadding: const EdgeInsets.symmetric(horizontal: 0),
title: Text('booking_date'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha((0.65 * 255).toInt()))),
+ color: colorHeadlineText)),
subtitle: Text(
DateFormat('d. MMM yyyy')
.format(booking.bookingDate)
@@ -130,8 +130,8 @@ class PastCancelledBookingDetailPage extends StatelessWidget {
children: [
Text('bill'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black
- .withAlpha((0.65 * 255).toInt()))),
+ color: colorHeadlineText,
+ )),
Text('get_bill'.tr(),
style: theme.textTheme.headlineSmall),
]),
diff --git a/comwell_key_app/lib/profile_settings/components/comwell_text_field.dart b/comwell_key_app/lib/profile_settings/components/comwell_text_field.dart
index b49dc2c3..40e4525f 100644
--- a/comwell_key_app/lib/profile_settings/components/comwell_text_field.dart
+++ b/comwell_key_app/lib/profile_settings/components/comwell_text_field.dart
@@ -56,7 +56,7 @@ class ComwellTextFieldState extends State<ComwellTextField> {
label: Text(widget.fieldName,
style: _isFocused && !widget.readOnly
? theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha((0.65 * 255).toInt()))
+ color: colorHeadlineText)
: theme.textTheme.headlineSmall
?.copyWith(color: Colors.black)),
isDense: true,
diff --git a/comwell_key_app/lib/profile_settings/components/date_time_picker.dart b/comwell_key_app/lib/profile_settings/components/date_time_picker.dart
index 6bfa5fc3..4a29a1ac 100644
--- a/comwell_key_app/lib/profile_settings/components/date_time_picker.dart
+++ b/comwell_key_app/lib/profile_settings/components/date_time_picker.dart
@@ -123,9 +123,7 @@ class _DatePickerState extends State<DateTimePicker> {
widget.title,
textAlign: TextAlign.start,
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha(
- (0.65 * 255).toInt(),
- ),
+ color: colorHeadlineText,
),
),
const SizedBox(height: 0.0),
diff --git a/comwell_key_app/lib/profile_settings/components/intl_phone_field.dart b/comwell_key_app/lib/profile_settings/components/intl_phone_field.dart
index fdecff75..29877480 100644
--- a/comwell_key_app/lib/profile_settings/components/intl_phone_field.dart
+++ b/comwell_key_app/lib/profile_settings/components/intl_phone_field.dart
@@ -110,7 +110,7 @@ class IntlPhoneFieldState extends State<IntlPhoneField> {
style: _isFocused
? theme.textTheme.bodySmall?.copyWith(
color:
- Colors.black.withAlpha((0.65 * 255).toInt()))
+ colorHeadlineText)
: theme.textTheme.headlineSmall
?.copyWith(color: Colors.black)),
),
diff --git a/comwell_key_app/lib/profile_settings/components/text_field_with_trailing_icon.dart b/comwell_key_app/lib/profile_settings/components/text_field_with_trailing_icon.dart
index 0a379e8b..6e645c4b 100644
--- a/comwell_key_app/lib/profile_settings/components/text_field_with_trailing_icon.dart
+++ b/comwell_key_app/lib/profile_settings/components/text_field_with_trailing_icon.dart
@@ -42,7 +42,7 @@ class TextFieldWithTrailingIcon extends StatelessWidget {
title,
textAlign: TextAlign.start,
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withAlpha((0.65 * 255).toInt())
+ color: colorHeadlineText,
),
),
const SizedBox(height: 0.0),