6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 53de5fbd
Changed files
.../lib/booking_details/booking_details_page.dart | 6 +++--- .../components/check_in_button.dart | 8 ++++---- .../components/check_in_button_timer.dart | 11 ++++++----- .../components/check_out_button.dart | 4 ++-- .../lib/booking_details/components/guest_list.dart | 7 ++++--- .../components/practical_information_button.dart | 2 +- .../components/preregister_button.dart | 5 +++-- .../booking_details/components/share_button.dart | 22 +++++++++++----------- comwell_key_app/lib/check_in/check_in_page.dart | 14 +++++++------- .../components/check_out_bottom_sheet.dart | 14 +++++++------- .../lib/check_out/pages/check_out_error_page.dart | 6 +++--- .../check_out/pages/check_out_success_page.dart | 6 +++--- .../choose_share_room/pages/share_room_page.dart | 16 ++++++++-------- .../lib/common/components/comwell_text_field.dart | 2 +- .../common/components/outlined_pill_button.dart | 5 +++-- .../lib/common/components/room_image_carousel.dart | 5 +++-- .../lib/find_booking/find_booking_page.dart | 4 ++-- .../lib/force_update/force_update_page.dart | 3 ++- .../components/spa_facility_page.dart | 4 ++-- .../lib/housekeeping/housekeeping_page.dart | 3 ++- comwell_key_app/lib/key/key_page.dart | 3 ++- .../components/balance_bottom_sheet.dart | 2 +- .../lib/my_booking/my_booking_page.dart | 2 +- .../components/booking_list_item_view.dart | 3 ++- .../components/current_booking_list_item_view.dart | 3 ++- .../overview/components/room_selection_widget.dart | 2 +- comwell_key_app/lib/overview/overview_page.dart | 14 +++++++------- .../payment_cards/components/edit_card_dialog.dart | 4 ++-- .../lib/pregistration/components/card_item.dart | 3 ++- .../lib/pregistration/preregistration_flow.dart | 2 +- .../lib/profile/components/error_page_widget.dart | 2 +- .../profile/components/profile_page_widget.dart | 6 +++--- .../profile/components/profile_settings_item.dart | 4 ++-- .../components/comwell_text_field.dart | 2 +- .../components/delete_profile_dialog_widget.dart | 5 +++-- .../components/intl_phone_field.dart | 4 ++-- .../profile_settings/profile_settings_page.dart | 2 +- .../lib/routing/go_router_observer.dart | 9 +++++---- comwell_key_app/lib/themes/dark_theme.dart | 4 ++-- comwell_key_app/lib/themes/light_theme.dart | 5 +++-- comwell_key_app/lib/up_sales/components/tags.dart | 2 +- .../pages/processing/up_sales_error_page.dart | 6 +++--- 42 files changed, 125 insertions(+), 111 deletions(-)
Diff
diff --git a/comwell_key_app/lib/booking_details/booking_details_page.dart b/comwell_key_app/lib/booking_details/booking_details_page.dart
index b01d0445..361b764d 100644
--- a/comwell_key_app/lib/booking_details/booking_details_page.dart
+++ b/comwell_key_app/lib/booking_details/booking_details_page.dart
@@ -90,9 +90,9 @@ class BookingDetailsPage extends StatelessWidget {
if (cubit.booking.roomNumber != '')
RoomNumberContainer(cubit: cubit),
_buildBookingDetailsInformation(context, state, cubit, theme),
- Padding(
- padding: const EdgeInsets.symmetric(horizontal: 16.0),
- child: Divider(color: Colors.grey[400]),
+ const Padding(
+ padding: EdgeInsets.symmetric(horizontal: 16.0),
+ child: Divider(color: colorDivider),
),
const SizedBox(height: 10),
if (state.keys.isNotEmpty && cubit.booking.roomNumber != '') //&& state.keys.where((key) => key.label == cubit.booking.roomNumber))
diff --git a/comwell_key_app/lib/booking_details/components/check_in_button.dart b/comwell_key_app/lib/booking_details/components/check_in_button.dart
index ea9d09f9..966f3416 100644
--- a/comwell_key_app/lib/booking_details/components/check_in_button.dart
+++ b/comwell_key_app/lib/booking_details/components/check_in_button.dart
@@ -44,14 +44,14 @@ class CheckInButton extends StatelessWidget {
style: Theme.of(context)
.textTheme
.titleMedium
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
Text(
"overview_page_check_in_button_subtitle".tr(),
style: Theme.of(context)
.textTheme
.bodySmall
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
softWrap: true,
),
],
@@ -86,14 +86,14 @@ class CheckInButton extends StatelessWidget {
style: Theme.of(context)
.textTheme
.titleMedium
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
Text(
"overview_page_check_in_physical_card_subtitle".tr(),
style: Theme.of(context)
.textTheme
.bodySmall
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
softWrap: true,
),
],
diff --git a/comwell_key_app/lib/booking_details/components/check_in_button_timer.dart b/comwell_key_app/lib/booking_details/components/check_in_button_timer.dart
index c6d9eda3..f42f3fe2 100644
--- a/comwell_key_app/lib/booking_details/components/check_in_button_timer.dart
+++ b/comwell_key_app/lib/booking_details/components/check_in_button_timer.dart
@@ -1,5 +1,6 @@
import 'package:comwell_key_app/booking_details/bloc/booking_details_bloc.dart';
import 'package:comwell_key_app/booking_details/components/check_in_button.dart';
+import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:comwell_key_app/utils/time_utils.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
@@ -71,7 +72,7 @@ class _CheckInButtonTimerState extends State<CheckInButtonTimer> {
SvgPicture.asset(
'assets/icons/ic_locked.svg',
colorFilter: const ColorFilter.mode(
- Colors.white,
+ colorBackground,
BlendMode.srcIn,
),
),
@@ -83,14 +84,14 @@ class _CheckInButtonTimerState extends State<CheckInButtonTimer> {
Text(
'Check-in',
style: theme.textTheme.titleMedium?.copyWith(
- color: Colors.white,
+ color: colorBackground,
fontWeight: FontWeight.w600,
),
),
Text(
timeStr,
style: theme.textTheme.bodyMedium
- ?.copyWith(color: Colors.white.withValues(alpha: 0.8)),
+ ?.copyWith(color: colorBackground.withValues(alpha: 0.8)),
),
],
),
@@ -101,14 +102,14 @@ class _CheckInButtonTimerState extends State<CheckInButtonTimer> {
Text(
dateStr.toUpperCase(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.white.withValues(alpha: 0.7),
+ color: colorBackground.withValues(alpha: 0.7),
fontWeight: FontWeight.w600,
),
),
Text(
DateFormat('HH:mm').format(checkInTime),
style: theme.textTheme.titleMedium?.copyWith(
- color: Colors.white,
+ color: colorBackground,
fontWeight: FontWeight.w600,
),
),
diff --git a/comwell_key_app/lib/booking_details/components/check_out_button.dart b/comwell_key_app/lib/booking_details/components/check_out_button.dart
index c8f362e2..151a7a25 100644
--- a/comwell_key_app/lib/booking_details/components/check_out_button.dart
+++ b/comwell_key_app/lib/booking_details/components/check_out_button.dart
@@ -44,7 +44,7 @@ class CheckOutButton extends StatelessWidget {
padding: const EdgeInsets.all(10.0),
child: SvgPicture.asset(
colorFilter: const ColorFilter.mode(
- Colors.black, BlendMode.srcATop),
+ colorTertiary, BlendMode.srcATop),
"assets/icons/ic_exit.svg"),
),
),
@@ -66,7 +66,7 @@ class CheckOutButton extends StatelessWidget {
Text("booking_details_page_checkout_time".tr()),
SvgPicture.asset("assets/icons/arrow-left.svg",
colorFilter: const ColorFilter.mode(
- Colors.black,
+ colorTertiary,
BlendMode.dst,
))
],
diff --git a/comwell_key_app/lib/booking_details/components/guest_list.dart b/comwell_key_app/lib/booking_details/components/guest_list.dart
index b9c0f33a..868082c8 100644
--- a/comwell_key_app/lib/booking_details/components/guest_list.dart
+++ b/comwell_key_app/lib/booking_details/components/guest_list.dart
@@ -1,3 +1,4 @@
+import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:flutter/material.dart';
class GuestList extends StatelessWidget {
@@ -42,7 +43,7 @@ class GuestList extends StatelessWidget {
child: Container(
decoration: BoxDecoration(
border: Border.all(
- color: Colors.grey[300]!,
+ color: colorDivider,
width: 1.0,
),
borderRadius: BorderRadius.circular(8.0),
@@ -54,14 +55,14 @@ class GuestList extends StatelessWidget {
width: 40,
height: 40,
decoration: const BoxDecoration(
- color: Colors.black,
+ color: colorTertiary,
shape: BoxShape.circle,
),
child: Center(
child: Text(
initials,
style: const TextStyle(
- color: Colors.white,
+ color: colorBackground,
fontWeight: FontWeight.w400,
fontSize: 16,
),
diff --git a/comwell_key_app/lib/booking_details/components/practical_information_button.dart b/comwell_key_app/lib/booking_details/components/practical_information_button.dart
index 808b25df..3d30574f 100644
--- a/comwell_key_app/lib/booking_details/components/practical_information_button.dart
+++ b/comwell_key_app/lib/booking_details/components/practical_information_button.dart
@@ -43,7 +43,7 @@ class PracticalInformationButton extends StatelessWidget {
width: 24,
height: 24,
colorFilter: const ColorFilter.mode(
- Colors.black,
+ colorTertiary,
BlendMode.dst,
)),
),
diff --git a/comwell_key_app/lib/booking_details/components/preregister_button.dart b/comwell_key_app/lib/booking_details/components/preregister_button.dart
index 9165318d..d5d6b8af 100644
--- a/comwell_key_app/lib/booking_details/components/preregister_button.dart
+++ b/comwell_key_app/lib/booking_details/components/preregister_button.dart
@@ -5,6 +5,7 @@ import 'package:flutter_svg/svg.dart';
import 'package:go_router/go_router.dart';
import '../../routing/app_routes.dart';
+import '../../themes/dark_theme.dart';
import '../bloc/booking_details_bloc.dart';
class PreregisterButton extends StatelessWidget {
@@ -53,12 +54,12 @@ class PreregisterButton extends StatelessWidget {
Text(
"prepare_room".tr(),
style: theme.textTheme.titleMedium?.copyWith(
- color: Colors.white, fontWeight: FontWeight.w600),
+ color: colorBackground, fontWeight: FontWeight.w600),
),
Text(
"jump_line_text".tr(),
style: theme.textTheme.bodySmall
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
],
)
diff --git a/comwell_key_app/lib/booking_details/components/share_button.dart b/comwell_key_app/lib/booking_details/components/share_button.dart
index b6a59445..01ab43b2 100644
--- a/comwell_key_app/lib/booking_details/components/share_button.dart
+++ b/comwell_key_app/lib/booking_details/components/share_button.dart
@@ -87,7 +87,7 @@ class ShareButton extends StatelessWidget {
},
style: ElevatedButton.styleFrom(
backgroundColor:
- index % 2 == 0 ? sandColor : Colors.black,
+ index % 2 == 0 ? sandColor : colorTertiary,
elevation: 0,
shape: const CircleBorder(),
padding: EdgeInsets.zero,
@@ -96,7 +96,7 @@ class ShareButton extends StatelessWidget {
child: Text(
allInitials.elementAt(index),
style: const TextStyle(
- color: Colors.white,
+ color: colorBackground,
fontWeight: FontWeight.w400,
fontSize: 18,
),
@@ -120,7 +120,7 @@ class ShareButton extends StatelessWidget {
return showModalBottomSheet<dynamic>(
context: context,
- backgroundColor: Colors.white,
+ backgroundColor: colorBackground,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(16),
@@ -159,7 +159,7 @@ class ShareButton extends StatelessWidget {
children: [
Text('handle_guests_title'.tr(),
style: theme.textTheme.titleLarge?.copyWith(
- color: Colors.black,
+ color: colorTertiary,
fontWeight: FontWeight.w600,
)),
ElevatedButton(
@@ -169,7 +169,7 @@ class ShareButton extends StatelessWidget {
elevation: 0,
minimumSize: const Size(40, 40)),
child: const Icon(Icons.close,
- color: Colors.black),
+ color: colorTertiary),
onPressed: () {
Navigator.pop(bottomSheetContext);
},
@@ -237,7 +237,7 @@ class ShareButton extends StatelessWidget {
style: ElevatedButton.styleFrom(
backgroundColor:
state.selectedGuests.isNotEmpty
- ? Colors.black
+ ? colorTertiary
: const Color(0xffE0E0E0),
minimumSize: const Size.fromHeight(50),
elevation: 0,
@@ -246,7 +246,7 @@ class ShareButton extends StatelessWidget {
'cancel_sharing'.tr(),
style: TextStyle(
color: state.selectedGuests.isNotEmpty
- ? Colors.white
+ ? colorBackground
: Colors.grey[500],
),
),
@@ -275,7 +275,7 @@ class ShareButton extends StatelessWidget {
borderRadius: BorderRadius.circular(8.0),
),
contentPadding: const EdgeInsets.all(24.0),
- backgroundColor: Colors.white,
+ backgroundColor: colorBackground,
title: Center(
child: Text(
'are_you_sure'.tr(),
@@ -302,7 +302,7 @@ class ShareButton extends StatelessWidget {
Navigator.pop(bottomSheetContext, true);
},
style: ElevatedButton.styleFrom(
- backgroundColor: Colors.white,
+ backgroundColor: colorBackground,
side: BorderSide(color: Colors.grey[300]!, width: 1),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(25),
@@ -316,7 +316,7 @@ class ShareButton extends StatelessWidget {
? 'remove_guests'.tr()
: 'remove_guest'.tr(),
style: const TextStyle(
- color: Colors.black,
+ color: colorTertiary,
fontSize: 16,
fontWeight: FontWeight.w500,
),
@@ -338,7 +338,7 @@ class ShareButton extends StatelessWidget {
child: Text(
'cancel'.tr(),
style: const TextStyle(
- color: Colors.white,
+ color: colorBackground,
fontSize: 16,
fontWeight: FontWeight.w500,
),
diff --git a/comwell_key_app/lib/check_in/check_in_page.dart b/comwell_key_app/lib/check_in/check_in_page.dart
index c75e7ba8..644900d1 100644
--- a/comwell_key_app/lib/check_in/check_in_page.dart
+++ b/comwell_key_app/lib/check_in/check_in_page.dart
@@ -91,13 +91,13 @@ class _CheckInPageState extends State<CheckInPage>
return Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(30)),
- border: Border.all(color: Colors.white, width: 2)),
+ border: Border.all(color: colorBackground, width: 2)),
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
"${"check_in_your_digital_card_room_prefix".tr()} ${(cubit.booking.roomNumber)}",
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
- color: Colors.white,
+ color: colorBackground,
),
),
),
@@ -154,7 +154,7 @@ class _CheckInPageState extends State<CheckInPage>
style: theme.textTheme.bodySmall),
const SizedBox(height: 15),
const Divider(
- color: Colors.black12,
+ color: colorDivider,
height: 0,
),
Row(
@@ -169,7 +169,7 @@ class _CheckInPageState extends State<CheckInPage>
style: ButtonStyle(
backgroundColor: WidgetStatePropertyAll(sandColor[80]),
foregroundColor:
- const WidgetStatePropertyAll(Colors.white)),
+ const WidgetStatePropertyAll(colorBackground)),
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 16.0),
@@ -193,7 +193,7 @@ class _CheckInPageState extends State<CheckInPage>
padding: const EdgeInsets.all(16.0),
child: Text("check_in_your_digital_card_nb".tr(),
textAlign: TextAlign.center,
- style: theme.textTheme.bodySmall?.copyWith(color: Colors.black45)),
+ style: theme.textTheme.bodySmall?.copyWith(color: colorHeadlineText)),
),
const SizedBox(height: 15),
Padding(
@@ -203,7 +203,7 @@ class _CheckInPageState extends State<CheckInPage>
),
const SizedBox(height: 15),
const Divider(
- color: Colors.black12,
+ color: colorDivider,
height: 0,
),
Row(
@@ -220,7 +220,7 @@ class _CheckInPageState extends State<CheckInPage>
backgroundColor: WidgetStatePropertyAll(
sandColor[80]),
foregroundColor:
- const WidgetStatePropertyAll(Colors.white)),
+ const WidgetStatePropertyAll(colorBackground)),
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 16.0),
diff --git a/comwell_key_app/lib/check_out/components/check_out_bottom_sheet.dart b/comwell_key_app/lib/check_out/components/check_out_bottom_sheet.dart
index da117cad..102327d1 100644
--- a/comwell_key_app/lib/check_out/components/check_out_bottom_sheet.dart
+++ b/comwell_key_app/lib/check_out/components/check_out_bottom_sheet.dart
@@ -21,7 +21,7 @@ class CheckOutBottomSheet extends StatelessWidget {
final theme = Theme.of(context);
return Container(
decoration:
- const BoxDecoration(shape: BoxShape.rectangle, color: Colors.white),
+ const BoxDecoration(shape: BoxShape.rectangle, color: colorBackground),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
@@ -51,7 +51,7 @@ class CheckOutBottomSheet extends StatelessWidget {
backgroundColor:
WidgetStatePropertyAll(sandColor[100]),
foregroundColor:
- const WidgetStatePropertyAll(Colors.white)),
+ const WidgetStatePropertyAll(colorBackground)),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 17.0),
child: Text(
@@ -59,7 +59,7 @@ class CheckOutBottomSheet extends StatelessWidget {
? "checkout_page_confirmation".tr()
: "checkout_page_confirmation_continue".tr(),
style: theme.textTheme.bodyMedium
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
));
} else {
@@ -79,16 +79,16 @@ class CheckOutBottomSheet extends StatelessWidget {
CheckoutPaymentMethod
.appleOrGooglePay &&
Platform.isIOS
- ? const WidgetStatePropertyAll(Colors.black)
+ ? const WidgetStatePropertyAll(colorTertiary)
: Platform.isAndroid &&
paymentMethod ==
CheckoutPaymentMethod
.appleOrGooglePay
? const WidgetStatePropertyAll(
- Colors.white)
+ colorBackground)
: const WidgetStatePropertyAll(sandColor),
foregroundColor:
- const WidgetStatePropertyAll(Colors.white),
+ const WidgetStatePropertyAll(colorBackground),
side: const WidgetStatePropertyAll(
BorderSide(color: colorDivider))),
child: Padding(
@@ -96,7 +96,7 @@ class CheckOutBottomSheet extends StatelessWidget {
child: Text(
"checkout_page_payment_payment_title".tr(),
style: theme.textTheme.bodyMedium
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
));
}
diff --git a/comwell_key_app/lib/check_out/pages/check_out_error_page.dart b/comwell_key_app/lib/check_out/pages/check_out_error_page.dart
index 8a84eef3..b053cd17 100644
--- a/comwell_key_app/lib/check_out/pages/check_out_error_page.dart
+++ b/comwell_key_app/lib/check_out/pages/check_out_error_page.dart
@@ -26,7 +26,7 @@ class CheckOutErrorPage extends StatelessWidget {
style: Theme.of(context)
.textTheme
.headlineMedium
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
Text("checkout_page_processing_error_subtitle".tr(),
textAlign: TextAlign.center,
@@ -47,12 +47,12 @@ class CheckOutErrorPage extends StatelessWidget {
},
style: const ButtonStyle(
backgroundColor:
- WidgetStatePropertyAll(Colors.white)),
+ WidgetStatePropertyAll(colorBackground)),
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
"generic_ok".tr(),
- style: const TextStyle(color: Colors.black),
+ style: const TextStyle(color: colorTertiary),
),
)),
),
diff --git a/comwell_key_app/lib/check_out/pages/check_out_success_page.dart b/comwell_key_app/lib/check_out/pages/check_out_success_page.dart
index 9dafe22f..15c41adc 100644
--- a/comwell_key_app/lib/check_out/pages/check_out_success_page.dart
+++ b/comwell_key_app/lib/check_out/pages/check_out_success_page.dart
@@ -29,7 +29,7 @@ class CheckOutSuccessPage extends StatelessWidget {
style: Theme.of(context)
.textTheme
.headlineMedium
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
Text(
digitalCard
@@ -54,12 +54,12 @@ class CheckOutSuccessPage extends StatelessWidget {
},
style: const ButtonStyle(
backgroundColor:
- WidgetStatePropertyAll(Colors.white)),
+ WidgetStatePropertyAll(colorBackground)),
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
"generic_ok".tr(),
- style: const TextStyle(color: Colors.black),
+ style: const TextStyle(color: colorTertiary),
),
)),
),
diff --git a/comwell_key_app/lib/choose_share_room/pages/share_room_page.dart b/comwell_key_app/lib/choose_share_room/pages/share_room_page.dart
index d9798e62..3f7978c8 100644
--- a/comwell_key_app/lib/choose_share_room/pages/share_room_page.dart
+++ b/comwell_key_app/lib/choose_share_room/pages/share_room_page.dart
@@ -31,7 +31,7 @@ class ShareRoomPage extends StatelessWidget {
const SizedBox(width: 52),
Text('share_room_page_title'.tr(),
style: theme.textTheme.headlineMedium
- ?.copyWith(color: Colors.white)),
+ ?.copyWith(color: colorBackground)),
Padding(
padding: const EdgeInsets.only(right: 16),
child: ElevatedButton(
@@ -41,13 +41,13 @@ class ShareRoomPage extends StatelessWidget {
style: ElevatedButton.styleFrom(
minimumSize: const Size(36, 36),
padding: EdgeInsets.zero,
- backgroundColor: Colors.white,
+ backgroundColor: colorBackground,
shape: const CircleBorder(),
elevation: 0,
),
child: const Icon(
Icons.close,
- color: Colors.black,
+ color: colorTertiary,
size: 24,
),
),
@@ -57,7 +57,7 @@ class ShareRoomPage extends StatelessWidget {
Padding(
padding: const EdgeInsets.symmetric(horizontal: 32),
child: Card(
- color: Colors.white,
+ color: colorBackground,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
@@ -87,7 +87,7 @@ class ShareRoomPage extends StatelessWidget {
child: Text(
booking.hotelName,
style: theme.textTheme.headlineLarge
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
),
],
@@ -141,7 +141,7 @@ class ShareRoomPage extends StatelessWidget {
child: Text(
'share_room_page_subtitle'.tr(),
style: Theme.of(context).textTheme.bodySmall?.copyWith(
- color: Colors.white.withValues(alpha: 0.65),
+ color: colorBackground.withValues(alpha: 0.65),
),
textAlign: TextAlign.center,
),
@@ -155,13 +155,13 @@ class ShareRoomPage extends StatelessWidget {
cubit.shareRoom(booking);
},
style: ElevatedButton.styleFrom(
- backgroundColor: Colors.white,
+ backgroundColor: colorBackground,
minimumSize: const Size.fromHeight(52),
elevation: 0,
),
child: Text('share_room_page_button'.tr(),
style: theme.textTheme.bodyMedium?.copyWith(
- color: Colors.black,
+ color: colorTertiary,
)),
),
),
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 0a00d521..69230466 100644
--- a/comwell_key_app/lib/common/components/comwell_text_field.dart
+++ b/comwell_key_app/lib/common/components/comwell_text_field.dart
@@ -51,7 +51,7 @@ class ComwellTextFieldState extends State<ComwellTextField> {
final theme = Theme.of(context);
final errorMessage = _isFocused ? null : widget.errorMessage;
final labelTextColor =
- errorMessage == null ? Colors.black : const Color(0xFFEB0026);
+ errorMessage == null ? colorTertiary : const Color(0xFFEB0026);
final textStyle = widget.readOnly
? theme.textTheme.headlineSmall?.copyWith(color: colorDivider)
: _isFocused
diff --git a/comwell_key_app/lib/common/components/outlined_pill_button.dart b/comwell_key_app/lib/common/components/outlined_pill_button.dart
index 947d6c79..84f03af2 100644
--- a/comwell_key_app/lib/common/components/outlined_pill_button.dart
+++ b/comwell_key_app/lib/common/components/outlined_pill_button.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:comwell_key_app/themes/comwell_colors.dart';
class OutlinedPillButton extends StatelessWidget {
final String text;
@@ -13,8 +14,8 @@ class OutlinedPillButton extends StatelessWidget {
super.key,
required this.text,
required this.onTap,
- this.borderColor = Colors.black,
- this.textColor = Colors.black,
+ this.borderColor = colorTertiary,
+ this.textColor = colorTertiary,
this.horizontalPadding = 12,
this.verticalPadding = 4,
this.borderWidth = 1,
diff --git a/comwell_key_app/lib/common/components/room_image_carousel.dart b/comwell_key_app/lib/common/components/room_image_carousel.dart
index 3829fede..b3364ba0 100644
--- a/comwell_key_app/lib/common/components/room_image_carousel.dart
+++ b/comwell_key_app/lib/common/components/room_image_carousel.dart
@@ -1,4 +1,5 @@
import 'package:comwell_key_app/common/const.dart';
+import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:flutter/material.dart';
class RoomImageCarousel extends StatefulWidget {
@@ -77,7 +78,7 @@ class _RoomImageCarouselState extends State<RoomImageCarousel> {
shape: BoxShape.circle,
),
child: const Icon(Icons.arrow_back_ios_new,
- color: Colors.black, size: 16),
+ color: colorTertiary, size: 16),
),
),
),
@@ -110,7 +111,7 @@ class _RoomImageCarouselState extends State<RoomImageCarousel> {
shape: BoxShape.circle,
),
child: const Icon(Icons.arrow_forward_ios,
- color: Colors.black, size: 16),
+ color: colorTertiary, size: 16),
),
),
),
diff --git a/comwell_key_app/lib/find_booking/find_booking_page.dart b/comwell_key_app/lib/find_booking/find_booking_page.dart
index bcbc6421..c01ff800 100644
--- a/comwell_key_app/lib/find_booking/find_booking_page.dart
+++ b/comwell_key_app/lib/find_booking/find_booking_page.dart
@@ -84,7 +84,7 @@ class FindBookingPageState extends State<FindBookingPage>
onTap: () {
showCupertinoModalBottomSheet(
backgroundColor: Colors.white,
- barrierColor: Colors.black.withOpacity(0.5),
+ barrierColor: colorTertiary.withOpacity(0.5),
topRadius: const Radius.circular(30),
context: context,
builder: (context) => Scaffold(
@@ -130,7 +130,7 @@ class FindBookingPageState extends State<FindBookingPage>
),
labelColor: Colors.white,
labelStyle: Theme.of(context).textTheme.labelLarge,
- unselectedLabelColor: Colors.black,
+ unselectedLabelColor: colorTertiary,
dividerColor: Colors.transparent,
tabAlignment: TabAlignment.start,
isScrollable: true,
diff --git a/comwell_key_app/lib/force_update/force_update_page.dart b/comwell_key_app/lib/force_update/force_update_page.dart
index 78fa6060..6e0f3f55 100644
--- a/comwell_key_app/lib/force_update/force_update_page.dart
+++ b/comwell_key_app/lib/force_update/force_update_page.dart
@@ -1,4 +1,5 @@
import 'package:comwell_key_app/force_update/force_update_cubit.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';
@@ -72,7 +73,7 @@ class ForceUpdatePage extends StatelessWidget {
style: ElevatedButton.styleFrom(
backgroundColor: Colors.white,
textStyle: textTheme.headlineSmall
- ?.copyWith(color: Colors.black),
+ ?.copyWith(color: colorTertiary),
),
onPressed: state.isLoading
? null
diff --git a/comwell_key_app/lib/hotel_information/components/spa_facility_page.dart b/comwell_key_app/lib/hotel_information/components/spa_facility_page.dart
index e11b5e52..d39313d5 100644
--- a/comwell_key_app/lib/hotel_information/components/spa_facility_page.dart
+++ b/comwell_key_app/lib/hotel_information/components/spa_facility_page.dart
@@ -1,5 +1,5 @@
import 'package:comwell_key_app/hotel_information/cubit/hotel_information_cubit.dart';
-import 'package:comwell_key_app/themes/dark_theme.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';
@@ -18,7 +18,7 @@ class SpaFacilityPage extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
children: [
const Divider(
- color: Colors.black12,
+ color: colorDivider,
height: 0,
),
Row(
diff --git a/comwell_key_app/lib/housekeeping/housekeeping_page.dart b/comwell_key_app/lib/housekeeping/housekeeping_page.dart
index 2f27081e..a81d014e 100644
--- a/comwell_key_app/lib/housekeeping/housekeeping_page.dart
+++ b/comwell_key_app/lib/housekeeping/housekeeping_page.dart
@@ -3,6 +3,7 @@ import 'package:comwell_key_app/housekeeping/components/selectable_service.dart'
import 'package:comwell_key_app/housekeeping/cubit/housekeeping_cubit.dart';
import 'package:comwell_key_app/housekeeping/cubit/housekeeping_state.dart';
import 'package:comwell_key_app/overview/models/booking.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';
@@ -35,7 +36,7 @@ class _HousekeepingPageState extends State<HousekeepingPage> {
mainAxisSize: MainAxisSize.min,
children: [
const Divider(
- color: Colors.black12,
+ color: colorDivider,
height: 0,
),
Row(
diff --git a/comwell_key_app/lib/key/key_page.dart b/comwell_key_app/lib/key/key_page.dart
index 5e4a8974..b5a97504 100644
--- a/comwell_key_app/lib/key/key_page.dart
+++ b/comwell_key_app/lib/key/key_page.dart
@@ -1,5 +1,6 @@
import 'package:comwell_key_app/common/components/round_icon_button.dart';
import 'package:comwell_key_app/key/bloc/key_bloc.dart';
+import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
@@ -19,7 +20,7 @@ class KeyPage extends StatelessWidget {
//if (state.status == KeyStatus.scanning || state.status != KeyStatus.openClosestReaderSuccess) {
return FocusDetector(
child: Scaffold(
- backgroundColor: Colors.black,
+ backgroundColor: colorTertiary,
body: Padding(
padding: const EdgeInsets.fromLTRB(8, 60, 10, 32),
child: Column(
diff --git a/comwell_key_app/lib/my_booking/components/balance_bottom_sheet.dart b/comwell_key_app/lib/my_booking/components/balance_bottom_sheet.dart
index 454348c9..46eb5ead 100644
--- a/comwell_key_app/lib/my_booking/components/balance_bottom_sheet.dart
+++ b/comwell_key_app/lib/my_booking/components/balance_bottom_sheet.dart
@@ -67,7 +67,7 @@ class BalanceBottomSheet extends StatelessWidget {
constraints: const BoxConstraints(),
icon: const Icon(Icons.keyboard_arrow_down, size: 20),
onPressed: () => Navigator.pop(context),
- color: Colors.black54,
+ color: colorDivider,
),
),
],
diff --git a/comwell_key_app/lib/my_booking/my_booking_page.dart b/comwell_key_app/lib/my_booking/my_booking_page.dart
index 69e463fd..d24a2d10 100644
--- a/comwell_key_app/lib/my_booking/my_booking_page.dart
+++ b/comwell_key_app/lib/my_booking/my_booking_page.dart
@@ -57,7 +57,7 @@ class MyBookingPage extends StatelessWidget {
'my_booking'.tr(),
style: theme.textTheme.titleLarge?.copyWith(
fontWeight: FontWeight.bold,
- color: Colors.black,
+ color: colorTertiary,
),
),
const SizedBox(height: 8),
diff --git a/comwell_key_app/lib/overview/components/booking_list_item_view.dart b/comwell_key_app/lib/overview/components/booking_list_item_view.dart
index 4bc360df..90ee0160 100644
--- a/comwell_key_app/lib/overview/components/booking_list_item_view.dart
+++ b/comwell_key_app/lib/overview/components/booking_list_item_view.dart
@@ -1,5 +1,6 @@
import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/routing/app_routes.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_svg/svg.dart';
@@ -79,7 +80,7 @@ class BookingListItemView extends StatelessWidget {
),
const SizedBox(width: 4),
const Icon(Icons.arrow_forward,
- size: 16, color: Colors.black),
+ size: 16, color: colorTertiary),
const SizedBox(width: 4),
Text(
DateFormat('d. MMM').format(endDate),
diff --git a/comwell_key_app/lib/overview/components/current_booking_list_item_view.dart b/comwell_key_app/lib/overview/components/current_booking_list_item_view.dart
index 2a131b29..9ff66971 100644
--- a/comwell_key_app/lib/overview/components/current_booking_list_item_view.dart
+++ b/comwell_key_app/lib/overview/components/current_booking_list_item_view.dart
@@ -1,6 +1,7 @@
import 'package:comwell_key_app/overview/components/prepare_room_widget.dart';
import 'package:comwell_key_app/overview/models/booking.dart';
import 'package:comwell_key_app/routing/app_routes.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_svg/svg.dart';
@@ -61,7 +62,7 @@ class CurrentBookingListItem extends StatelessWidget {
style: theme.textTheme.bodySmall),
const SizedBox(width: 4),
const Icon(Icons.arrow_forward,
- size: 16, color: Colors.black),
+ size: 16, color: colorTertiary),
const SizedBox(width: 4),
Text(DateFormat('d. MMM').format(booking.endDate),
style: theme.textTheme.bodySmall),
diff --git a/comwell_key_app/lib/overview/components/room_selection_widget.dart b/comwell_key_app/lib/overview/components/room_selection_widget.dart
index 28f9da49..eb1eb2b4 100644
--- a/comwell_key_app/lib/overview/components/room_selection_widget.dart
+++ b/comwell_key_app/lib/overview/components/room_selection_widget.dart
@@ -54,7 +54,7 @@ class RoomSelectionWidget extends StatelessWidget {
const SizedBox(width: 8),
const Icon(
Icons.arrow_forward_ios,
- color: Colors.black,
+ color: colorTertiary,
size: 28,
),
],
diff --git a/comwell_key_app/lib/overview/overview_page.dart b/comwell_key_app/lib/overview/overview_page.dart
index 2dcb6e03..ca027789 100644
--- a/comwell_key_app/lib/overview/overview_page.dart
+++ b/comwell_key_app/lib/overview/overview_page.dart
@@ -82,9 +82,9 @@ class OverviewTabViewState extends State<OverviewPage>
borderRadius: BorderRadius.circular(25),
color: sandColor,
),
- labelColor: Colors.white,
+ labelColor: colorBackground,
labelStyle: theme.textTheme.bodyMedium,
- unselectedLabelColor: Colors.black,
+ unselectedLabelColor: colorTertiary,
dividerColor: Colors.transparent,
tabs: [
Tab(
@@ -110,7 +110,7 @@ class OverviewTabViewState extends State<OverviewPage>
},
icon: const Icon(
Icons.refresh,
- color: Colors.black,
+ color: colorTertiary,
),
tooltip: 'refresh_bookings'.tr(),
),
@@ -160,7 +160,7 @@ class OverviewTabViewState extends State<OverviewPage>
context: context,
builder: (BuildContext context) {
return AlertDialog(
- backgroundColor: Colors.white,
+ backgroundColor: colorBackground,
contentPadding: const EdgeInsets.all(24),
title: Text(
'error_opening_website_title'.tr(),
@@ -176,7 +176,7 @@ class OverviewTabViewState extends State<OverviewPage>
Navigator.of(context).pop();
},
style: ElevatedButton.styleFrom(
- foregroundColor: Colors.white),
+ foregroundColor: colorBackground),
child: Text('generic_ok'.tr()),
),
),
@@ -201,7 +201,7 @@ class OverviewTabViewState extends State<OverviewPage>
),
child: Text('new_booking'.tr(),
style: theme.textTheme.bodyMedium
- ?.copyWith(color: Colors.white)),
+ ?.copyWith(color: colorBackground)),
),
),
],
@@ -222,7 +222,7 @@ class OverviewTabViewState extends State<OverviewPage>
title: "booking_not_found".tr(),
content: "booking_not_found_subtitle".tr(),
confirmButtonText: "booking_not_found_button".tr(),
- confirmButtonTextColor: Colors.black,
+ confirmButtonTextColor: colorTertiary,
cancelButtonText: "booking_not_found_cancel".tr(),
onConfirm: () {
context.pushNamed(AppRoutes.findBooking.name);
diff --git a/comwell_key_app/lib/payment_cards/components/edit_card_dialog.dart b/comwell_key_app/lib/payment_cards/components/edit_card_dialog.dart
index 88189f1a..537844dd 100644
--- a/comwell_key_app/lib/payment_cards/components/edit_card_dialog.dart
+++ b/comwell_key_app/lib/payment_cards/components/edit_card_dialog.dart
@@ -94,7 +94,7 @@ class EditCardDialog extends StatelessWidget {
width: 5,
height: 5,
decoration: const BoxDecoration(
- shape: BoxShape.circle, color: Colors.black),
+ shape: BoxShape.circle, color: colorTertiary),
),
);
}
@@ -170,7 +170,7 @@ class EditCardDialog extends StatelessWidget {
height: 5,
decoration: const BoxDecoration(
shape: BoxShape.circle,
- color: Colors.black),
+ color: colorTertiary),
),
);
}
diff --git a/comwell_key_app/lib/pregistration/components/card_item.dart b/comwell_key_app/lib/pregistration/components/card_item.dart
index 19ed1417..02096a32 100644
--- a/comwell_key_app/lib/pregistration/components/card_item.dart
+++ b/comwell_key_app/lib/pregistration/components/card_item.dart
@@ -1,6 +1,7 @@
import 'package:comwell_key_app/common/components/payment_card_image.dart';
import 'package:comwell_key_app/overview/models/payment_details.dart';
import 'package:comwell_key_app/services/adyen/stored_payment_method.dart';
+import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
@@ -44,7 +45,7 @@ class CardItem extends StatelessWidget {
width: 5,
height: 5,
decoration: const BoxDecoration(
- shape: BoxShape.circle, color: Colors.black),
+ shape: BoxShape.circle, color: colorTertiary),
),
);
}
diff --git a/comwell_key_app/lib/pregistration/preregistration_flow.dart b/comwell_key_app/lib/pregistration/preregistration_flow.dart
index e9cc0797..e2abec63 100644
--- a/comwell_key_app/lib/pregistration/preregistration_flow.dart
+++ b/comwell_key_app/lib/pregistration/preregistration_flow.dart
@@ -49,7 +49,7 @@ class _PreregistrationFlowState extends State<PreregistrationFlow> {
mainAxisSize: MainAxisSize.min,
children: [
const Divider(
- color: Colors.black12,
+ color: colorDivider,
height: 0,
),
Row(
diff --git a/comwell_key_app/lib/profile/components/error_page_widget.dart b/comwell_key_app/lib/profile/components/error_page_widget.dart
index 9e61a89c..a3c4eabf 100644
--- a/comwell_key_app/lib/profile/components/error_page_widget.dart
+++ b/comwell_key_app/lib/profile/components/error_page_widget.dart
@@ -70,7 +70,7 @@ class ErrorPageWidget extends StatelessWidget {
},
child: Text(
'logout_profile_menu'.tr(),
- style: TextStyle(color: Colors.grey[600]),
+ style: const TextStyle(color: colorGrey),
),
),
),
diff --git a/comwell_key_app/lib/profile/components/profile_page_widget.dart b/comwell_key_app/lib/profile/components/profile_page_widget.dart
index 47172258..cbfc1d7e 100644
--- a/comwell_key_app/lib/profile/components/profile_page_widget.dart
+++ b/comwell_key_app/lib/profile/components/profile_page_widget.dart
@@ -86,7 +86,7 @@ class ProfilePageWidget extends StatelessWidget {
Text("become_cc_member_title".tr(),
textAlign: TextAlign.start,
style: const TextStyle(
- color: Colors.black,
+ color: colorTertiary,
fontSize: 16,
fontWeight: FontWeight.w600)),
SizedBox(
@@ -96,7 +96,7 @@ class ProfilePageWidget extends StatelessWidget {
textAlign: TextAlign.start,
maxLines: 4,
style: const TextStyle(
- color: Colors.black,
+ color: colorTertiary,
fontSize: 14,
fontWeight: FontWeight.w500),
),
@@ -106,7 +106,7 @@ class ProfilePageWidget extends StatelessWidget {
),
const Icon(
Icons.chevron_right,
- color: Colors.black,
+ color: colorTertiary,
size: 24,
),
],
diff --git a/comwell_key_app/lib/profile/components/profile_settings_item.dart b/comwell_key_app/lib/profile/components/profile_settings_item.dart
index fb4e537f..23dbc0fd 100644
--- a/comwell_key_app/lib/profile/components/profile_settings_item.dart
+++ b/comwell_key_app/lib/profile/components/profile_settings_item.dart
@@ -19,8 +19,8 @@ Widget profileSettingsItem(
),
child: icon,
),
- title: Text(text, style: const TextStyle(color: Colors.black)),
- trailing: Icon(trailingIcon, color: Colors.black, size: 24),
+ title: Text(text, style: const TextStyle(color: colorTertiary)),
+ trailing: Icon(trailingIcon, color: colorTertiary, size: 24),
onTap: onTap,
);
}
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 40e4525f..4a2d2c76 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
@@ -58,7 +58,7 @@ class ComwellTextFieldState extends State<ComwellTextField> {
? theme.textTheme.bodySmall?.copyWith(
color: colorHeadlineText)
: theme.textTheme.headlineSmall
- ?.copyWith(color: Colors.black)),
+ ?.copyWith(color: colorTertiary)),
isDense: true,
border: InputBorder.none,
contentPadding: const EdgeInsets.symmetric(vertical: 0),
diff --git a/comwell_key_app/lib/profile_settings/components/delete_profile_dialog_widget.dart b/comwell_key_app/lib/profile_settings/components/delete_profile_dialog_widget.dart
index 1ad50ed1..2192e81d 100644
--- a/comwell_key_app/lib/profile_settings/components/delete_profile_dialog_widget.dart
+++ b/comwell_key_app/lib/profile_settings/components/delete_profile_dialog_widget.dart
@@ -1,4 +1,5 @@
import 'package:comwell_key_app/profile_settings/cubit/profile_settings_cubit.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';
@@ -23,7 +24,7 @@ class DeleteProfileDialogWidget extends StatelessWidget {
"delete_profile_title".tr(),
textAlign: TextAlign.center,
style: const TextStyle(
- color: Colors.black,
+ color: colorTertiary,
fontSize: 18,
fontWeight: FontWeight.w600,
),
@@ -75,7 +76,7 @@ class DeleteProfileDialogWidget extends StatelessWidget {
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
- color: Colors.black,
+ color: colorTertiary,
),
),
),
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 29877480..233409f2 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
@@ -112,7 +112,7 @@ class IntlPhoneFieldState extends State<IntlPhoneField> {
color:
colorHeadlineText)
: theme.textTheme.headlineSmall
- ?.copyWith(color: Colors.black)),
+ ?.copyWith(color: colorTertiary)),
),
),
/* InternationalPhoneNumberInput(
@@ -132,7 +132,7 @@ class IntlPhoneFieldState extends State<IntlPhoneField> {
ignoreBlank: false,
textStyle: theme.textTheme.headlineSmall,
autoValidateMode: AutovalidateMode.disabled,
- selectorTextStyle: const TextStyle(color: Colors.black),
+ selectorTextStyle: const TextStyle(color: colorTertiary),
initialValue: number,
textFieldController: controller,
diff --git a/comwell_key_app/lib/profile_settings/profile_settings_page.dart b/comwell_key_app/lib/profile_settings/profile_settings_page.dart
index 2295fcdc..d657ff28 100644
--- a/comwell_key_app/lib/profile_settings/profile_settings_page.dart
+++ b/comwell_key_app/lib/profile_settings/profile_settings_page.dart
@@ -140,7 +140,7 @@ class ProfileSettingsPage extends StatelessWidget {
cubit.updateProfile();
},
style: OutlinedButton.styleFrom(
- backgroundColor: Colors.black,
+ backgroundColor: colorTertiary,
elevation: 0,
minimumSize: const Size(135, 40),
maximumSize: const Size(155, 40),
diff --git a/comwell_key_app/lib/routing/go_router_observer.dart b/comwell_key_app/lib/routing/go_router_observer.dart
index ded2214e..b647ffc8 100644
--- a/comwell_key_app/lib/routing/go_router_observer.dart
+++ b/comwell_key_app/lib/routing/go_router_observer.dart
@@ -1,3 +1,4 @@
+import 'package:comwell_key_app/themes/light_theme.dart';
import 'package:comwell_key_app/tracking/comwell_tracking.dart';
import 'package:comwell_key_app/utils/locator.dart';
import 'package:flutter/material.dart';
@@ -15,15 +16,15 @@ final Map<String, SystemUiOverlayStyle> routeSystemUiStyles = {
'overview': kDefaultSystemUiOverlayStyle,
// Example custom style for login page:
'login': const SystemUiOverlayStyle(
- statusBarColor: Colors.black,
- systemNavigationBarColor: Colors.black,
+ statusBarColor: colorTertiary,
+ systemNavigationBarColor: colorTertiary,
statusBarIconBrightness: Brightness.light,
systemNavigationBarIconBrightness: Brightness.light,
),
// Custom style for key page:
'key': const SystemUiOverlayStyle(
- statusBarColor: Colors.black,
- systemNavigationBarColor: Colors.black,
+ statusBarColor: colorTertiary,
+ systemNavigationBarColor: colorTertiary,
statusBarIconBrightness: Brightness.light,
systemNavigationBarIconBrightness: Brightness.light,
),
diff --git a/comwell_key_app/lib/themes/dark_theme.dart b/comwell_key_app/lib/themes/dark_theme.dart
index 82df2b29..e66c5f07 100644
--- a/comwell_key_app/lib/themes/dark_theme.dart
+++ b/comwell_key_app/lib/themes/dark_theme.dart
@@ -6,7 +6,7 @@ ThemeData darkTheme = ThemeData(
brightness: Brightness.light,
appBarTheme: const AppBarTheme(
backgroundColor: colorPrimary,
- foregroundColor: Colors.white,
+ foregroundColor: colorBackground,
),
progressIndicatorTheme: const ProgressIndicatorThemeData(
color: Colors.lightBlueAccent,
@@ -48,7 +48,7 @@ ThemeData darkTheme = ThemeData(
backgroundColor: sandColor[80],
minimumSize: const Size(double.infinity, 52),
textStyle: const TextStyle(
- color: Colors.white,
+ color: colorBackground,
fontSize: 16,
fontWeight: FontWeight.w600,
),
diff --git a/comwell_key_app/lib/themes/light_theme.dart b/comwell_key_app/lib/themes/light_theme.dart
index 61029b86..10b024d7 100644
--- a/comwell_key_app/lib/themes/light_theme.dart
+++ b/comwell_key_app/lib/themes/light_theme.dart
@@ -6,7 +6,7 @@ ThemeData lightTheme = ThemeData(
brightness: Brightness.light,
appBarTheme: const AppBarTheme(
backgroundColor: colorPrimary,
- foregroundColor: Colors.white,
+ foregroundColor: colorBackground,
),
progressIndicatorTheme: const ProgressIndicatorThemeData(
color: Colors.lightBlueAccent,
@@ -51,7 +51,7 @@ ThemeData lightTheme = ThemeData(
backgroundColor: sandColor[80],
minimumSize: const Size(double.infinity, 52),
textStyle: const TextStyle(
- color: Colors.white,
+ color: colorBackground,
fontSize: 16,
fontWeight: FontWeight.w600,
),
@@ -78,6 +78,7 @@ const colorDivider = Color(0xFFE0E0E0);
const disabledButtonColor = Color(0xFFF0F0F0);
final colorHeadlineText = colorPrimaryText.withValues(alpha: 0.65);
const colorCallReceivedBackground = Color(0xFFF6F4F3);
+const colorGrey = Color(0xFF757575);
const colorBlack = MaterialColor(0xFF000000, {
75: Color(0xB3000000),
65: Color(0xA6000000),
diff --git a/comwell_key_app/lib/up_sales/components/tags.dart b/comwell_key_app/lib/up_sales/components/tags.dart
index 41ad0573..0128d673 100644
--- a/comwell_key_app/lib/up_sales/components/tags.dart
+++ b/comwell_key_app/lib/up_sales/components/tags.dart
@@ -18,7 +18,7 @@ class TagWidget extends StatelessWidget {
child: Text(
text,
style: theme.textTheme.headlineMedium?.copyWith(
- color: textColor == sandColor ? Colors.white : Colors.black,
+ color: textColor == sandColor ? Colors.white : colorTertiary,
fontSize: 11,
),
),
diff --git a/comwell_key_app/lib/up_sales/pages/processing/up_sales_error_page.dart b/comwell_key_app/lib/up_sales/pages/processing/up_sales_error_page.dart
index a9a8b05f..fe55d108 100644
--- a/comwell_key_app/lib/up_sales/pages/processing/up_sales_error_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/processing/up_sales_error_page.dart
@@ -24,7 +24,7 @@ class UpSalesErrorPage extends StatelessWidget {
style: Theme.of(context)
.textTheme
.headlineMedium
- ?.copyWith(color: Colors.white),
+ ?.copyWith(color: colorBackground),
),
Text("up_sales_processing_error_subtitle".tr(),
textAlign: TextAlign.center,
@@ -45,12 +45,12 @@ class UpSalesErrorPage extends StatelessWidget {
},
style: const ButtonStyle(
backgroundColor:
- WidgetStatePropertyAll(Colors.white)),
+ WidgetStatePropertyAll(colorBackground)),
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
"generic_ok".tr(),
- style: const TextStyle(color: Colors.black),
+ style: const TextStyle(color: colorTertiary),
),
)),
),