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

AuthorNKL<nikolaj.king@gmail.com>
Date2025-07-11 15:11:06 +0200
cleaned colors

Changed files

.../lib/login/components/create_user_button.dart           |  4 +---
 .../lib/login/components/forced_logout_banner.dart         |  2 +-
 comwell_key_app/lib/login/components/login_button.dart     |  6 +++---
 .../lib/notifications/components/communications_list.dart  |  6 +++---
 comwell_key_app/lib/notifications/notifications_page.dart  |  6 +++---
 .../lib/up_sales/components/confirm_up_sales_dialog.dart   |  4 ++--
 .../lib/up_sales/components/facilities_bottom_sheet.dart   |  6 +++---
 comwell_key_app/lib/up_sales/components/item_counter.dart  | 14 +++++++-------
 .../lib/up_sales/components/up_sales_bottom_button.dart    |  2 +-
 .../lib/up_sales/components/upgrades_counter.dart          |  2 +-
 comwell_key_app/lib/up_sales/pages/other_upgrade_page.dart |  2 +-
 comwell_key_app/lib/up_sales/pages/room_upgrade_page.dart  |  6 +++---
 .../lib/up_sales/pages/services_upgrade_page.dart          |  4 ++--
 .../lib/up_sales/pages/up_sale_confirmation_page.dart      |  4 ++--
 14 files changed, 33 insertions(+), 35 deletions(-)

Diff

diff --git a/comwell_key_app/lib/login/components/create_user_button.dart b/comwell_key_app/lib/login/components/create_user_button.dart
index a1775d98..69702b55 100644
--- a/comwell_key_app/lib/login/components/create_user_button.dart
+++ b/comwell_key_app/lib/login/components/create_user_button.dart
@@ -13,7 +13,6 @@ class CreateUserButton extends StatelessWidget {
Widget build(BuildContext context) {
return OutlinedButton(
style: OutlinedButton.styleFrom(
-
backgroundColor: Colors.transparent,
side: const BorderSide(color: Colors.transparent),
),
@@ -22,8 +21,7 @@ class CreateUserButton extends StatelessWidget {
},
child: Text(
'create_user_button'.tr(),
- style: const TextStyle(color: Colors.white, fontSize: 16, fontWeight: FontWeight.w600, backgroundColor: Colors.transparent),
-
+ style: TextStyle(color: Theme.of(context).colorScheme.surface, fontSize: 16, fontWeight: FontWeight.w600, backgroundColor: Colors.transparents),
),
);
}
diff --git a/comwell_key_app/lib/login/components/forced_logout_banner.dart b/comwell_key_app/lib/login/components/forced_logout_banner.dart
index f536f2ad..6657ffca 100644
--- a/comwell_key_app/lib/login/components/forced_logout_banner.dart
+++ b/comwell_key_app/lib/login/components/forced_logout_banner.dart
@@ -13,7 +13,7 @@ class ForcedLogoutBanner extends StatelessWidget {
height: 100,
width: double.infinity,
decoration: BoxDecoration(
- color: Colors.white,
+ color: theme.colorScheme.surface,
borderRadius: BorderRadius.circular(10),
),
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 16),
diff --git a/comwell_key_app/lib/login/components/login_button.dart b/comwell_key_app/lib/login/components/login_button.dart
index 97946776..f12d658b 100644
--- a/comwell_key_app/lib/login/components/login_button.dart
+++ b/comwell_key_app/lib/login/components/login_button.dart
@@ -19,9 +19,9 @@ class LoginButton extends StatelessWidget {
},
style: ElevatedButton.styleFrom(
minimumSize: const Size(358, 52),
- backgroundColor: Colors.white,
- textStyle: const TextStyle(
- color: Colors.black,
+ backgroundColor: Theme.of(context).colorScheme.surface,
+ textStyle: TextStyle(
+ color: Theme.of(context).colorScheme.onSurface,
fontSize: 16,
fontWeight: FontWeight.w600,
),
diff --git a/comwell_key_app/lib/notifications/components/communications_list.dart b/comwell_key_app/lib/notifications/components/communications_list.dart
index ffb11e07..e14ff817 100644
--- a/comwell_key_app/lib/notifications/components/communications_list.dart
+++ b/comwell_key_app/lib/notifications/components/communications_list.dart
@@ -26,11 +26,11 @@ class CommunicationsList extends StatelessWidget {
activeColor: sandColor,
inactiveTrackColor: Colors.grey[200],
inactiveThumbColor: Colors.white,
- trackOutlineColor: const WidgetStatePropertyAll(Colors.white),
+ trackOutlineColor: WidgetStatePropertyAll(Theme.of(context).colorScheme.surface),
title: Text(
notificationPermissions.elementAt(index).name,
style: theme.textTheme.titleMedium?.copyWith(
- color: Colors.black,
+ color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.w600,
),
),
@@ -40,7 +40,7 @@ class CommunicationsList extends StatelessWidget {
.notificationPermissionDescription ??
'',
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: Theme.of(context).colorScheme.surfaceTint,
fontSize: 12,
fontWeight: FontWeight.w400,
),
diff --git a/comwell_key_app/lib/notifications/notifications_page.dart b/comwell_key_app/lib/notifications/notifications_page.dart
index 62c131cd..4ea39e60 100644
--- a/comwell_key_app/lib/notifications/notifications_page.dart
+++ b/comwell_key_app/lib/notifications/notifications_page.dart
@@ -64,7 +64,7 @@ class NotificationsPage extends StatelessWidget {
activeColor: sandColor,
inactiveTrackColor: Colors.grey[200],
inactiveThumbColor: Colors.white,
- trackOutlineColor: const WidgetStatePropertyAll(Colors.white),
+ trackOutlineColor: WidgetStatePropertyAll(Theme.of(context).colorScheme.surface),
value: cubit.state.allNotifications.every((e) => e.allowed),
onChanged: (bool value) {
cubit.updateAllPermissionsUI(value);
@@ -92,8 +92,8 @@ class NotificationsPage extends StatelessWidget {
Column(
mainAxisSize: MainAxisSize.min,
children: [
- const Divider(
- color: Colors.black12,
+ Divider(
+ color: Theme.of(context).colorScheme.onSurface,
thickness: 1,
height: 0,
),
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 6cb9dde0..bb54ec5d 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
@@ -1,4 +1,4 @@
-import 'package:comwell_key_app/themes/light_theme.dart';
+
import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart';
@@ -12,7 +12,7 @@ class ConfirmUpSalesDialog extends StatelessWidget {
final theme = Theme.of(context);
return Dialog(
- backgroundColor: Colors.white,
+ backgroundColor: Theme.of(context).colorScheme.surface,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(20),
),
diff --git a/comwell_key_app/lib/up_sales/components/facilities_bottom_sheet.dart b/comwell_key_app/lib/up_sales/components/facilities_bottom_sheet.dart
index 1774c5ff..a90fc22d 100644
--- a/comwell_key_app/lib/up_sales/components/facilities_bottom_sheet.dart
+++ b/comwell_key_app/lib/up_sales/components/facilities_bottom_sheet.dart
@@ -22,8 +22,8 @@ class FacilitiesBottomSheet extends StatelessWidget {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 16),
- decoration: const BoxDecoration(
- color: Colors.white,
+ decoration: BoxDecoration(
+ color: theme.colorScheme.surface,
borderRadius: BorderRadius.vertical(top: Radius.circular(24)),
),
child: ListView(
@@ -51,7 +51,7 @@ class FacilitiesBottomSheet extends StatelessWidget {
Text(entry.key.name.toUpperCase(),
style: theme.textTheme.bodySmall?.copyWith(
fontWeight: FontWeight.bold,
- color: colorHeadlineText)),
+ color: theme.colorScheme.onSurface)),
const SizedBox(height: 8),
Wrap(
direction: entry.key == FacilityType.bed
diff --git a/comwell_key_app/lib/up_sales/components/item_counter.dart b/comwell_key_app/lib/up_sales/components/item_counter.dart
index e92e8e92..fccc1e4b 100644
--- a/comwell_key_app/lib/up_sales/components/item_counter.dart
+++ b/comwell_key_app/lib/up_sales/components/item_counter.dart
@@ -15,7 +15,7 @@ class ItemCounter extends StatelessWidget {
final cubit = context.read<UpSalesCubit>();
return Container(
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
child: Padding(
padding: const EdgeInsets.only(
left: 16.0,
@@ -35,11 +35,11 @@ class ItemCounter extends StatelessWidget {
child: Container(
width: 44,
height: 44,
- decoration: const BoxDecoration(
- color: Colors.black,
+ decoration: BoxDecoration(
+ color: Theme.of(context).colorScheme.onSurface,
shape: BoxShape.circle,
),
- child: const Icon(Icons.remove, color: Colors.white),
+ child: Icon(Icons.remove, color: Theme.of(context).colorScheme.surface),
),
),
const SizedBox(width: 16),
@@ -53,11 +53,11 @@ class ItemCounter extends StatelessWidget {
child: Container(
width: 44,
height: 44,
- decoration: const BoxDecoration(
- color: Colors.black,
+ decoration: BoxDecoration(
+ color: Theme.of(context).colorScheme.onSurface,
shape: BoxShape.circle,
),
- child: const Icon(Icons.add, color: Colors.white),
+ child: Icon(Icons.add, color: Theme.of(context).colorScheme.surface),
),
),
],
diff --git a/comwell_key_app/lib/up_sales/components/up_sales_bottom_button.dart b/comwell_key_app/lib/up_sales/components/up_sales_bottom_button.dart
index 7b995a0b..2d7bf0ff 100644
--- a/comwell_key_app/lib/up_sales/components/up_sales_bottom_button.dart
+++ b/comwell_key_app/lib/up_sales/components/up_sales_bottom_button.dart
@@ -22,7 +22,7 @@ class UpSalesBottomButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Container(
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
child: Padding(
padding: const EdgeInsets.only(
left: 16.0,
diff --git a/comwell_key_app/lib/up_sales/components/upgrades_counter.dart b/comwell_key_app/lib/up_sales/components/upgrades_counter.dart
index 004f6b89..8920debd 100644
--- a/comwell_key_app/lib/up_sales/components/upgrades_counter.dart
+++ b/comwell_key_app/lib/up_sales/components/upgrades_counter.dart
@@ -12,7 +12,7 @@ class UpgradesCounter extends StatelessWidget {
width: 24,
height: 24,
decoration: BoxDecoration(
- color: quantity > 0 ? Colors.black : Colors.transparent ,
+ color: quantity > 0 ? Theme.of(context).colorScheme.onSurface : Colors.transparent ,
shape: BoxShape.circle,
border: Border.all(color: colorDivider, width: 1.5),
),
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 7edcf50b..7889a528 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
@@ -57,7 +57,7 @@ class OtherUpgradePage extends StatelessWidget {
),
Container(
width: double.infinity,
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
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 36b03c9b..743e64e8 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
@@ -50,9 +50,9 @@ class _RoomUpgradePageState extends State<RoomUpgradePage> {
RoomImageCarousel(images: widget.roomUpgradeList.roomUpgrade.images!.toList()),
Container(
width: double.infinity,
- decoration: const BoxDecoration(
- color: Colors.white,
- borderRadius: BorderRadius.only(
+ decoration: BoxDecoration(
+ color: Theme.of(context).colorScheme.surface,
+ borderRadius: const BorderRadius.only(
topLeft: Radius.circular(24),
topRight: Radius.circular(24),
),
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 8aaad8da..65c2318c 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
@@ -60,7 +60,7 @@ class ServicesUpgradePage extends StatelessWidget {
),
Container(
width: double.infinity,
- color: Colors.white,
+ color: Theme.of(context).colorScheme.surface,
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 24),
child: Column(
@@ -81,7 +81,7 @@ class ServicesUpgradePage extends StatelessWidget {
child: Text(
roomUpgradeList.roomUpgrade.description,
style: theme.textTheme.bodySmall
- ?.copyWith(color: colorHeadlineText),
+ ?.copyWith(color: Theme.of(context).colorScheme.onSurface),
),
),
],
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 d493d3d3..34d509fd 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
@@ -135,8 +135,8 @@ class UpSaleConfirmationPage extends StatelessWidget {
width: double.infinity,
icon: Center(
child: state.termsAccepted
- ? const Icon(Icons.chevron_right,
- size: 32, color: Colors.black)
+ ? Icon(Icons.chevron_right,
+ size: 32, color: Theme.of(context).colorScheme.onSurface)
: null,
),
action: () async {