6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 6d894b21
Changed files
comwell_key_app/lib/check_out/check_out_flow.dart | 2 +- .../choose_share_room/choose_share_room_page.dart | 2 +- .../lib/find_booking/find_booking_page.dart | 2 +- .../hotel_information/hotel_information_page.dart | 2 +- .../lib/notifications/notifications_page.dart | 2 +- comwell_key_app/lib/overview/overview_page.dart | 2 +- .../past_cancelled_booking_detail_page.dart | 2 +- .../components/remove_card_button.dart | 2 +- .../lib/payment_cards/payment_cards_page.dart | 2 +- .../lib/pregistration/preregistration_flow.dart | 2 +- .../profile/components/card_content_widget.dart | 8 ++--- .../components/empty_card_content_widget.dart | 6 ++-- .../profile/components/logout_dialog_widget.dart | 12 +++---- comwell_key_app/lib/share/share_booking_page.dart | 24 ++++++------- comwell_key_app/lib/themes/comwell_colors.dart | 9 +++-- comwell_key_app/lib/themes/dark_theme.dart | 37 +++++++++++--------- comwell_key_app/lib/themes/light_theme.dart | 39 ++++++++++++---------- .../components/confirm_up_sales_dialog.dart | 2 +- .../lib/up_sales/pages/other_upgrade_page.dart | 2 +- .../lib/up_sales/pages/room_upgrade_page.dart | 2 +- .../lib/up_sales/pages/services_upgrade_page.dart | 2 +- .../up_sales/pages/up_sale_confirmation_page.dart | 2 +- comwell_key_app/lib/up_sales/up_sales_catalog.dart | 2 +- 23 files changed, 90 insertions(+), 77 deletions(-)
Diff
diff --git a/comwell_key_app/lib/check_out/check_out_flow.dart b/comwell_key_app/lib/check_out/check_out_flow.dart
index 8f4d6b40..a5e3e327 100644
--- a/comwell_key_app/lib/check_out/check_out_flow.dart
+++ b/comwell_key_app/lib/check_out/check_out_flow.dart
@@ -26,7 +26,7 @@ class CheckOutFlow extends StatelessWidget {
},
),
bottomSheet: const CheckOutBottomSheet(),
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
body: PageView(
controller: cubit.pageController,
key: const PageStorageKey("check_out_flow"),
diff --git a/comwell_key_app/lib/choose_share_room/choose_share_room_page.dart b/comwell_key_app/lib/choose_share_room/choose_share_room_page.dart
index 9aa330db..c7fe544b 100644
--- a/comwell_key_app/lib/choose_share_room/choose_share_room_page.dart
+++ b/comwell_key_app/lib/choose_share_room/choose_share_room_page.dart
@@ -17,7 +17,7 @@ class ChooseShareRoomPage extends StatelessWidget {
Widget build(BuildContext context) {
final theme = Theme.of(context);
return Scaffold(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
appBar: const ComwellAppBar(),
body: BlocBuilder<ChooseShareRoomCubit, ChooseShareRoomState>(
builder: (context, state) {
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 d0126aec..bcbc6421 100644
--- a/comwell_key_app/lib/find_booking/find_booking_page.dart
+++ b/comwell_key_app/lib/find_booking/find_booking_page.dart
@@ -69,7 +69,7 @@ class FindBookingPageState extends State<FindBookingPage>
return Scaffold(
appBar: const ComwellAppBar(),
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
body: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
diff --git a/comwell_key_app/lib/hotel_information/hotel_information_page.dart b/comwell_key_app/lib/hotel_information/hotel_information_page.dart
index fe5797c7..65e7bef7 100644
--- a/comwell_key_app/lib/hotel_information/hotel_information_page.dart
+++ b/comwell_key_app/lib/hotel_information/hotel_information_page.dart
@@ -15,7 +15,7 @@ class HotelInformationPage extends StatelessWidget {
return Scaffold(
extendBodyBehindAppBar: true,
appBar: const ComwellAppBar(),
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
body: Builder(builder: (context) {
return switch (state.hotelState) {
HotelState.loading => const Center(child: HotelInformationShimmerLoader()),
diff --git a/comwell_key_app/lib/notifications/notifications_page.dart b/comwell_key_app/lib/notifications/notifications_page.dart
index c3289b79..62c131cd 100644
--- a/comwell_key_app/lib/notifications/notifications_page.dart
+++ b/comwell_key_app/lib/notifications/notifications_page.dart
@@ -17,7 +17,7 @@ class NotificationsPage extends StatelessWidget {
Widget build(BuildContext context) {
final cubit = context.read<NotificationsCubit>();
return Scaffold(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
appBar: const ComwellAppBar(),
body: BlocBuilder<NotificationsCubit, NotificationsState>(
builder: (context, state) {
diff --git a/comwell_key_app/lib/overview/overview_page.dart b/comwell_key_app/lib/overview/overview_page.dart
index 97b56877..0401066d 100644
--- a/comwell_key_app/lib/overview/overview_page.dart
+++ b/comwell_key_app/lib/overview/overview_page.dart
@@ -55,7 +55,7 @@ class OverviewTabViewState extends State<OverviewPage>
child: BlocBuilder<OverviewCubit, OverviewState>(
builder: (context, state) {
return Scaffold(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
appBar: const ComwellAppBar(
shouldShowBackButton: false,
),
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 5cb6c5d6..526877d5 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
@@ -17,7 +17,7 @@ class PastCancelledBookingDetailPage extends StatelessWidget {
appBar: const ComwellAppBar(
shouldShowProfileButton: false,
),
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
body: Padding(
padding: const EdgeInsets.all(16.0),
child: ListView(
diff --git a/comwell_key_app/lib/payment_cards/components/remove_card_button.dart b/comwell_key_app/lib/payment_cards/components/remove_card_button.dart
index 1ab8be97..9c21cfb7 100644
--- a/comwell_key_app/lib/payment_cards/components/remove_card_button.dart
+++ b/comwell_key_app/lib/payment_cards/components/remove_card_button.dart
@@ -32,7 +32,7 @@ class RemoveCardButton extends StatelessWidget {
.textTheme
.bodySmall
?.copyWith(
- color: colorPrimaryText)),
+ color: Theme.of(context).colorScheme.onSurface)),
MaterialButton(
minWidth: double.infinity,
shape: RoundedRectangleBorder(
diff --git a/comwell_key_app/lib/payment_cards/payment_cards_page.dart b/comwell_key_app/lib/payment_cards/payment_cards_page.dart
index 386bee13..da6af3d3 100644
--- a/comwell_key_app/lib/payment_cards/payment_cards_page.dart
+++ b/comwell_key_app/lib/payment_cards/payment_cards_page.dart
@@ -33,7 +33,7 @@ class PaymentCardsPage extends StatelessWidget {
}
return needScaffold
? Scaffold(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
appBar: const ComwellAppBar(
shouldShowProfileButton: true,
),
diff --git a/comwell_key_app/lib/pregistration/preregistration_flow.dart b/comwell_key_app/lib/pregistration/preregistration_flow.dart
index 7520bfc9..57113e0d 100644
--- a/comwell_key_app/lib/pregistration/preregistration_flow.dart
+++ b/comwell_key_app/lib/pregistration/preregistration_flow.dart
@@ -27,7 +27,7 @@ class _PreregistrationFlowState extends State<PreregistrationFlow> {
builder: (context, state) {
final cubit = context.read<PreregistrationCubit>();
return Scaffold(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
appBar: const ComwellAppBar(),
body: Builder(
builder: (context) {
diff --git a/comwell_key_app/lib/profile/components/card_content_widget.dart b/comwell_key_app/lib/profile/components/card_content_widget.dart
index 55574dc6..252c2bf3 100644
--- a/comwell_key_app/lib/profile/components/card_content_widget.dart
+++ b/comwell_key_app/lib/profile/components/card_content_widget.dart
@@ -23,13 +23,13 @@ class CardContentWidget extends StatelessWidget {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
decoration: BoxDecoration(
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(32),
),
child: Text(
isActive ? 'Comwell Club' : 'comwell_club_inactive'.tr(),
style: theme.textTheme.bodySmall!.copyWith(
- color: Colors.black,
+ color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.w600,
),
),
@@ -44,7 +44,7 @@ class CardContentWidget extends StatelessWidget {
Text(
'Navn',
style: TextStyle(
- color: isActive ? Colors.white : Colors.black,
+ color: isActive ? Colors.white : Theme.of(context).colorScheme.onSurface,
fontSize: 14,
fontWeight: FontWeight.w400,
),
@@ -52,7 +52,7 @@ class CardContentWidget extends StatelessWidget {
Text(
'${user.firstName} ${user.lastName}',
style: TextStyle(
- color: isActive ? Colors.white : Colors.black,
+ color: isActive ? Colors.white : Theme.of(context).colorScheme.onSurface,
fontSize: 16,
fontWeight: FontWeight.w600,
),
diff --git a/comwell_key_app/lib/profile/components/empty_card_content_widget.dart b/comwell_key_app/lib/profile/components/empty_card_content_widget.dart
index 7d0027c5..1fbd6cc8 100644
--- a/comwell_key_app/lib/profile/components/empty_card_content_widget.dart
+++ b/comwell_key_app/lib/profile/components/empty_card_content_widget.dart
@@ -19,13 +19,13 @@ class EmptyCardContentWidget extends StatelessWidget {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 6),
decoration: BoxDecoration(
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
borderRadius: BorderRadius.circular(32),
),
child: Text(
'error'.tr(),
style: theme.textTheme.bodySmall!.copyWith(
- color: Colors.black,
+ color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.w600,
),
),
@@ -40,7 +40,7 @@ class EmptyCardContentWidget extends StatelessWidget {
Text(
'profile_error_name'.tr(),
style: theme.textTheme.bodySmall!.copyWith(
- color: Colors.black,
+ color: Theme.of(context).colorScheme.onSurface,
fontSize: 16,
fontWeight: FontWeight.w600,
),
diff --git a/comwell_key_app/lib/profile/components/logout_dialog_widget.dart b/comwell_key_app/lib/profile/components/logout_dialog_widget.dart
index 26a17cde..9084f96e 100644
--- a/comwell_key_app/lib/profile/components/logout_dialog_widget.dart
+++ b/comwell_key_app/lib/profile/components/logout_dialog_widget.dart
@@ -22,8 +22,8 @@ class LogoutDialogWidget extends StatelessWidget {
Text(
"logout_dialog_title".tr(),
textAlign: TextAlign.center,
- style: const TextStyle(
- color: Colors.black,
+ style: TextStyle(
+ color: Theme.of(context).colorScheme.onSurface,
fontSize: 18,
fontWeight: FontWeight.w600,
),
@@ -41,10 +41,10 @@ class LogoutDialogWidget extends StatelessWidget {
},
child: Text(
"logout_profile_menu".tr(),
- style: const TextStyle(
+ style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
),
),
),
@@ -62,10 +62,10 @@ class LogoutDialogWidget extends StatelessWidget {
},
child: Text(
"cancel".tr(),
- style: const TextStyle(
+ style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
- color: Colors.black,
+ color: Theme.of(context).colorScheme.onSurface,
),
),
),
diff --git a/comwell_key_app/lib/share/share_booking_page.dart b/comwell_key_app/lib/share/share_booking_page.dart
index 4cd51b31..240b3089 100644
--- a/comwell_key_app/lib/share/share_booking_page.dart
+++ b/comwell_key_app/lib/share/share_booking_page.dart
@@ -37,13 +37,13 @@ class ShareBookingPage extends StatelessWidget {
style: ElevatedButton.styleFrom(
minimumSize: const Size(36, 36),
padding: EdgeInsets.zero,
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
shape: const CircleBorder(),
elevation: 0,
),
- child: const Icon(
+ child: Icon(
Icons.close,
- color: Colors.black,
+ color: Theme.of(context).colorScheme.onSurface,
size: 24,
),
),
@@ -66,7 +66,7 @@ class ShareBookingPage extends StatelessWidget {
child: Text(
booking.hotelName,
style: theme.textTheme.headlineLarge?.copyWith(
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
),
),
),
@@ -80,20 +80,20 @@ class ShareBookingPage extends StatelessWidget {
children: [
Text(DateFormat('d. MMM').format(booking.startDate),
style: theme.textTheme.bodyMedium?.copyWith(
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
)),
- const Icon(Icons.arrow_forward,
- size: 16, color: Colors.white),
+ Icon(Icons.arrow_forward,
+ size: 16, color: Theme.of(context).colorScheme.surface),
Text(DateFormat('d. MMM').format(booking.endDate),
style: theme.textTheme.bodyMedium?.copyWith(
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
)),
],
),
Text(
'${booking.adults} ${booking.adults > 1 ? 'adults'.tr() : 'adult'.tr()}${booking.children > 0 ? ' | ${booking.children} ${booking.children > 1 ? 'children'.tr() : 'child'.tr()}' : ''}',
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.white.withValues(alpha: 0.7),
+ color: Theme.of(context).colorScheme.surface.withValues(alpha: 0.7),
),
),
],
@@ -107,7 +107,7 @@ class ShareBookingPage extends StatelessWidget {
child: Text(
'share_booking_page_subtitle'.tr(),
style: Theme.of(context).textTheme.bodySmall?.copyWith(
- color: Colors.white.withValues(alpha: 0.8),
+ color: Theme.of(context).colorScheme.surface.withValues(alpha: 0.8),
),
textAlign: TextAlign.center,
),
@@ -121,13 +121,13 @@ class ShareBookingPage extends StatelessWidget {
cubit.shareBooking(booking);
},
style: ElevatedButton.styleFrom(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
minimumSize: const Size.fromHeight(52),
elevation: 0,
),
child: Text('share_booking_page_share_button'.tr(),
style: theme.textTheme.bodyMedium?.copyWith(
- color: Colors.black,
+ color: Theme.of(context).colorScheme.onSurface,
)),
),
),
diff --git a/comwell_key_app/lib/themes/comwell_colors.dart b/comwell_key_app/lib/themes/comwell_colors.dart
index 9b93b658..f09d20e4 100644
--- a/comwell_key_app/lib/themes/comwell_colors.dart
+++ b/comwell_key_app/lib/themes/comwell_colors.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
const colorPrimary = Color(0xFF677169);
const colorSecondary = Color(0xffF0EAE2);
-const colorBackground = Color(0xFFE8E8E8);
+const colorBackground = Color(0xFFFFFFFF);
const colorPrimaryText = Color(0xFF000000);
const colorSecondaryText = Color(0xFF000000);
const colorOnPrimaryTextColor = Color(0xFFFFFFFF);
@@ -41,4 +41,9 @@ const sandColor = MaterialColor(_sandColor, <int, Color>{
40: Color.fromRGBO(237, 227, 216, 1.0),
20: Color.fromRGBO(240, 234, 226, 1.0),
10: Color.fromRGBO(249, 246, 242, 1.0),
-});
\ No newline at end of file
+});
+
+extension CustomColors on ColorScheme {
+ Color get secondaryText => const Color(0xFF888888); // medium gray
+ Color get disabledText => const Color(0xFFCCCCCC); // light gray
+}
\ No newline at end of file
diff --git a/comwell_key_app/lib/themes/dark_theme.dart b/comwell_key_app/lib/themes/dark_theme.dart
index c3990b3a..424c3174 100644
--- a/comwell_key_app/lib/themes/dark_theme.dart
+++ b/comwell_key_app/lib/themes/dark_theme.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:comwell_key_app/themes/comwell_colors.dart';
ThemeData darkTheme = ThemeData(
fontFamily: 'Fellix',
@@ -21,21 +22,25 @@ ThemeData darkTheme = ThemeData(
bodyMedium: TextStyle(fontSize: 16.0, fontWeight: FontWeight.w600),
bodySmall: TextStyle(fontSize: 14.0, fontWeight: FontWeight.w500)),
colorScheme: ColorScheme(
- primary: colorPrimary,
- secondary: colorSecondary,
- surface: colorBackground,
- error: colorSecondarySystem,
- scrim: colorPrimarySystem,
- onPrimary: colorOnPrimaryTextColor,
- onSecondary: colorSecondaryText,
- onSurface: colorPrimaryText,
- tertiary: colorTertiary,
- onTertiary: colorTertiaryText,
- tertiaryContainer: colorTertiarySystem,
- onError: Colors.white,
- brightness: Brightness.light,
- shadow: colorShadow,
- surfaceTint: colorHeadlineText),
+ primary: colorPrimary,
+ onPrimary: colorOnPrimaryTextColor,
+ secondary: colorSecondary,
+ onSecondary: colorSecondaryText,
+ surface: colorBackground, // main backgrounds
+ onSurface: colorPrimaryText, // main text/icons
+ error: colorError,
+ onError: colorOnPrimaryTextColor,
+ outline: colorDivider,
+ shadow: colorShadow,
+ scrim: colorPrimarySystem,
+ brightness: Brightness.light,
+ // Material 3+ surface roles:
+ surfaceContainerLow: colorCallReceivedBackground, // custom container background
+ tertiary: colorTertiary,
+ onTertiary: colorTertiaryText,
+ tertiaryContainer: colorTertiarySystem,
+ surfaceTint: colorHeadlineText,
+ ),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
elevation: 0,
@@ -55,7 +60,7 @@ ThemeData darkTheme = ThemeData(
const colorPrimary = Color(0xFF677169);
const colorSecondary = Color(0xffF0EAE2);
-const colorBackground = Color(0xFFE8E8E8);
+const colorBackground = Color(0xFFFFFFFF);
const colorPrimaryText = Color(0xFF000000);
const colorSecondaryText = Color(0xFF000000);
const colorOnPrimaryTextColor = Color(0xFFFFFFFF);
diff --git a/comwell_key_app/lib/themes/light_theme.dart b/comwell_key_app/lib/themes/light_theme.dart
index 320af959..ace5d7b3 100644
--- a/comwell_key_app/lib/themes/light_theme.dart
+++ b/comwell_key_app/lib/themes/light_theme.dart
@@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
+import 'package:comwell_key_app/themes/comwell_colors.dart';
ThemeData lightTheme = ThemeData(
fontFamily: 'Fellix',
@@ -25,23 +26,25 @@ ThemeData lightTheme = ThemeData(
titleLarge: TextStyle(fontSize: 28.0, fontWeight: FontWeight.w600),
),
colorScheme: ColorScheme(
- primary: colorPrimary,
- secondary: colorSecondary,
- surface: colorBackground,
- error: colorSecondarySystem,
- scrim: colorPrimarySystem,
- onPrimary: colorOnPrimaryTextColor,
- onSecondary: colorSecondaryText,
- onSurface: colorPrimaryText,
- tertiary: colorTertiary,
- onTertiary: colorTertiaryText,
- tertiaryContainer: colorTertiarySystem,
- onError: Colors.white,
- brightness: Brightness.light,
- shadow: colorShadow,
- surfaceTint: colorHeadlineText,
- surfaceContainerLow: colorCallReceivedBackground,
- ),
+ primary: colorPrimary,
+ onPrimary: colorOnPrimaryTextColor,
+ secondary: colorSecondary,
+ onSecondary: colorSecondaryText,
+ surface: colorBackground, // main backgrounds
+ onSurface: colorPrimaryText, // main text/icons
+ error: colorError,
+ onError: colorOnPrimaryTextColor,
+ outline: colorDivider,
+ shadow: colorShadow,
+ scrim: colorPrimarySystem,
+ brightness: Brightness.light,
+ // Material 3+ surface roles:
+ surfaceContainerLow: colorCallReceivedBackground, // custom container background
+ tertiary: colorTertiary,
+ onTertiary: colorTertiaryText,
+ tertiaryContainer: colorTertiarySystem,
+ surfaceTint: colorHeadlineText,
+ ),
elevatedButtonTheme: ElevatedButtonThemeData(
style: ElevatedButton.styleFrom(
elevation: 0,
@@ -61,7 +64,7 @@ ThemeData lightTheme = ThemeData(
const colorPrimary = Color(0xFF677169);
const colorSecondary = Color(0xffF0EAE2);
-const colorBackground = Color(0xFFE8E8E8);
+const colorBackground = Color(0xFFFFFFFF);
const colorPrimaryText = Color(0xFF000000);
const colorSecondaryText = Color(0xFF000000);
const colorOnPrimaryTextColor = Color(0xFFFFFFFF);
diff --git a/comwell_key_app/lib/up_sales/components/confirm_up_sales_dialog.dart b/comwell_key_app/lib/up_sales/components/confirm_up_sales_dialog.dart
index 5340d34d..6cb9dde0 100644
--- a/comwell_key_app/lib/up_sales/components/confirm_up_sales_dialog.dart
+++ b/comwell_key_app/lib/up_sales/components/confirm_up_sales_dialog.dart
@@ -25,7 +25,7 @@ class ConfirmUpSalesDialog extends StatelessWidget {
"confirm_up_sales_dialog_title".tr(),
textAlign: TextAlign.center,
style: theme.textTheme.headlineMedium?.copyWith(
- color: colorHeadlineText,
+ color: Theme.of(context).colorScheme.surfaceTint,
),
),
Text(
diff --git a/comwell_key_app/lib/up_sales/pages/other_upgrade_page.dart b/comwell_key_app/lib/up_sales/pages/other_upgrade_page.dart
index cd738a2c..7edcf50b 100644
--- a/comwell_key_app/lib/up_sales/pages/other_upgrade_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/other_upgrade_page.dart
@@ -20,7 +20,7 @@ class OtherUpgradePage extends StatelessWidget {
final cubit = context.read<UpSalesCubit>();
return Scaffold(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
appBar: const ComwellAppBar(),
extendBodyBehindAppBar: true,
body: Column(
diff --git a/comwell_key_app/lib/up_sales/pages/room_upgrade_page.dart b/comwell_key_app/lib/up_sales/pages/room_upgrade_page.dart
index 381bab68..36b03c9b 100644
--- a/comwell_key_app/lib/up_sales/pages/room_upgrade_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/room_upgrade_page.dart
@@ -36,7 +36,7 @@ class _RoomUpgradePageState extends State<RoomUpgradePage> {
return Scaffold(
extendBodyBehindAppBar: true,
appBar: const ComwellAppBar(),
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
body: SingleChildScrollView(
physics: const AlwaysScrollableScrollPhysics(),
child: ConstrainedBox(
diff --git a/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart b/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart
index d93ab4e8..8aaad8da 100644
--- a/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/services_upgrade_page.dart
@@ -23,7 +23,7 @@ class ServicesUpgradePage extends StatelessWidget {
final cubit = context.read<UpSalesCubit>();
final bool isSelected = roomUpgradeList.roomUpgrades.contains(roomUpgradeList.roomUpgrade);
return Scaffold(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
appBar: const ComwellAppBar(),
extendBodyBehindAppBar: true,
body: Column(
diff --git a/comwell_key_app/lib/up_sales/pages/up_sale_confirmation_page.dart b/comwell_key_app/lib/up_sales/pages/up_sale_confirmation_page.dart
index 1e46dc8d..d493d3d3 100644
--- a/comwell_key_app/lib/up_sales/pages/up_sale_confirmation_page.dart
+++ b/comwell_key_app/lib/up_sales/pages/up_sale_confirmation_page.dart
@@ -32,7 +32,7 @@ class UpSaleConfirmationPage extends StatelessWidget {
}
return Scaffold(
appBar: const ComwellAppBar(),
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
body: Padding(
padding:
const EdgeInsets.symmetric(horizontal: 20.0, vertical: 24.0),
diff --git a/comwell_key_app/lib/up_sales/up_sales_catalog.dart b/comwell_key_app/lib/up_sales/up_sales_catalog.dart
index 193c637e..e423e1fd 100644
--- a/comwell_key_app/lib/up_sales/up_sales_catalog.dart
+++ b/comwell_key_app/lib/up_sales/up_sales_catalog.dart
@@ -36,7 +36,7 @@ class UpSalesCatalog extends StatelessWidget {
return Scaffold(
appBar: const ComwellAppBar(),
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
body: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.only(