6177214e-ce7c-49e3-99de-ff9721b26f63 — Commit 043a54de

AuthorEdmir Suljic<esu@dwarf.dk>
Date2025-06-04 10:15:08 +0200
Refactored opacity color on text to global theme

Changed files

comwell_key_app/lib/my_booking/my_booking_page.dart  | 20 ++++++++++----------
 .../payment_cards/components/remove_card_button.dart |  2 +-
 comwell_key_app/lib/themes/light_theme.dart          |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

Diff

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 165c759a..a0691a5f 100644
--- a/comwell_key_app/lib/my_booking/my_booking_page.dart
+++ b/comwell_key_app/lib/my_booking/my_booking_page.dart
@@ -42,7 +42,7 @@ class MyBookingPage extends StatelessWidget {
Text(
'booking_reference'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
),
),
Text(
@@ -112,7 +112,7 @@ class MyBookingPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('check_in'.tr(), style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
)),
const SizedBox(height: 4),
Text(DateFormat('d. MMM').format(booking.startDate),
@@ -128,7 +128,7 @@ class MyBookingPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('check_out'.tr(), style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
)),
const SizedBox(height: 4),
Text(
@@ -152,7 +152,7 @@ class MyBookingPage extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text('booking_details'.tr(), style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
)),
Text(booking.roomType, style: theme.textTheme.bodyMedium),
const SizedBox(height: 16),
@@ -160,7 +160,7 @@ class MyBookingPage extends StatelessWidget {
Text(
'number_of_guests'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
),
),
Text(
@@ -171,7 +171,7 @@ class MyBookingPage extends StatelessWidget {
Text(
'booker'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
),
),
Text(booking.booker.name, style: theme.textTheme.bodyMedium),
@@ -187,7 +187,7 @@ class MyBookingPage extends StatelessWidget {
Text(
'share_booking'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
),
),
Text('not_shared'.tr(), style: theme.textTheme.bodyMedium),
@@ -232,7 +232,7 @@ class MyBookingPage extends StatelessWidget {
Column(
children: [
Text('payment_method'.tr(), style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
)),
const SizedBox(width: 8),
Text('•••• •••• •••• 1234', style: theme.textTheme.bodyMedium),
@@ -246,7 +246,7 @@ class MyBookingPage extends StatelessWidget {
const Divider(color: colorDivider),
const SizedBox(height: 8),
Text('payment_date'.tr(), style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
)),
const SizedBox(height: 4),
Text(DateFormat('d. MMM').format(booking.bookingDate),
@@ -263,7 +263,7 @@ class MyBookingPage extends StatelessWidget {
Text(
'cancellation_policy'.tr(),
style: theme.textTheme.bodySmall?.copyWith(
- color: Colors.black.withValues(alpha: 0.65),
+ color: colorPrimaryText,
),
),
const SizedBox(height: 8),
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 2c90dc51..1ab8be97 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: Colors.black.withValues(alpha: 0.65))),
+ color: colorPrimaryText)),
MaterialButton(
minWidth: double.infinity,
shape: RoundedRectangleBorder(
diff --git a/comwell_key_app/lib/themes/light_theme.dart b/comwell_key_app/lib/themes/light_theme.dart
index 6065ca98..ac24f160 100644
--- a/comwell_key_app/lib/themes/light_theme.dart
+++ b/comwell_key_app/lib/themes/light_theme.dart
@@ -24,7 +24,7 @@ ThemeData lightTheme = ThemeData(
labelLarge: TextStyle(fontSize: 14.0, fontWeight: FontWeight.w600),
titleLarge: TextStyle(fontSize: 28.0, fontWeight: FontWeight.w600),
),
- colorScheme: const ColorScheme(
+ colorScheme: ColorScheme(
primary: colorPrimary,
secondary: colorSecondary,
surface: colorBackground,
@@ -44,7 +44,7 @@ ThemeData lightTheme = ThemeData(
const colorPrimary = Color(0xFF677169);
const colorSecondary = Color(0xffF0EAE2);
const colorBackground = Color(0xFFE8E8E8);
-const colorPrimaryText = Color(0xFF000000);
+final colorPrimaryText = const Color(0xFF000000).withValues(alpha: 0.65);
const colorSecondaryText = Color(0xFF000000);
const colorOnPrimaryTextColor = Color(0xFFFFFFFF);
const colorPrimarySystem = Color(0xFF000000);