From a0972be4a72376d27a62ecac0ed1247ba7bddc9c Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 28 Jul 2023 09:12:12 +0700 Subject: [PATCH] TF-2042 Add color to styles --- .../calendar_event_information_widget_styles.dart | 2 ++ .../event_attendee_information_widget_styles.dart | 6 ++++++ .../event_location_information_widget_styles.dart | 5 +++++ .../styles/event_time_information_widget_styles.dart | 5 +++++ .../calendar_event_information_widget.dart | 12 ++++++------ .../event_attendee_information_widget.dart | 7 +++---- .../event_location_information_widget.dart | 5 ++--- .../event_time_information_widget.dart | 5 ++--- 8 files changed, 31 insertions(+), 16 deletions(-) diff --git a/lib/features/email/presentation/styles/calendar_event_information_widget_styles.dart b/lib/features/email/presentation/styles/calendar_event_information_widget_styles.dart index 88de6fed18..4ef35f7ff1 100644 --- a/lib/features/email/presentation/styles/calendar_event_information_widget_styles.dart +++ b/lib/features/email/presentation/styles/calendar_event_information_widget_styles.dart @@ -14,4 +14,6 @@ class CalendarEventInformationWidgetStyles { static const double titleTextSize = 24; static const double fieldTopPadding = 16; static const double space = 8; + static const Color titleColor = Colors.black; + static const Color invitationMessageColor = Colors.black; } \ No newline at end of file diff --git a/lib/features/email/presentation/styles/event_attendee_information_widget_styles.dart b/lib/features/email/presentation/styles/event_attendee_information_widget_styles.dart index 3458ec5040..f76346d0a2 100644 --- a/lib/features/email/presentation/styles/event_attendee_information_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_attendee_information_widget_styles.dart @@ -1,5 +1,11 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class EventAttendeeInformationWidgetStyles { static const double maxWidth = 100; static const double textSize = 16; + static const Color labelColor = AppColor.colorSubTitleEventActionText; + static const Color valueColor = Colors.black; + static const Color valueOrganizerColor = AppColor.colorOrganizerMailto; } \ No newline at end of file diff --git a/lib/features/email/presentation/styles/event_location_information_widget_styles.dart b/lib/features/email/presentation/styles/event_location_information_widget_styles.dart index 029d7f87d1..c6208b5e5e 100644 --- a/lib/features/email/presentation/styles/event_location_information_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_location_information_widget_styles.dart @@ -1,5 +1,10 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class EventLocationInformationWidgetStyles { static const double maxWidth = 100; static const double textSize = 16; + static const Color labelColor = AppColor.colorSubTitleEventActionText; + static const Color valueColor = Colors.black; } \ No newline at end of file diff --git a/lib/features/email/presentation/styles/event_time_information_widget_styles.dart b/lib/features/email/presentation/styles/event_time_information_widget_styles.dart index b2f3eef618..874e389f22 100644 --- a/lib/features/email/presentation/styles/event_time_information_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_time_information_widget_styles.dart @@ -1,5 +1,10 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class EventTimeInformationWidgetStyles { static const double maxWidth = 100; static const double textSize = 16; + static const Color labelColor = AppColor.colorSubTitleEventActionText; + static const Color valueColor = Colors.black; } \ No newline at end of file diff --git a/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart b/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart index f59a49b28f..ed1cde64b8 100644 --- a/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart @@ -66,13 +66,13 @@ class CalendarEventInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize, fontWeight: FontWeight.w500, - color: Colors.black + color: CalendarEventInformationWidgetStyles.invitationMessageColor ), children: [ TextSpan( text: calendarEvent.organizer?.name, style: const TextStyle( - color: Colors.black, + color: CalendarEventInformationWidgetStyles.invitationMessageColor, fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize, fontWeight: FontWeight.w700 ), @@ -87,7 +87,7 @@ class CalendarEventInformationWidget extends StatelessWidget { style: const TextStyle( fontWeight: FontWeight.w500, fontSize: CalendarEventInformationWidgetStyles.titleTextSize, - color: Colors.black + color: CalendarEventInformationWidgetStyles.titleColor ) ), if (calendarEvent.dateTimeEventAsString.isNotEmpty) @@ -137,13 +137,13 @@ class CalendarEventInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize, fontWeight: FontWeight.w500, - color: Colors.black + color: CalendarEventInformationWidgetStyles.invitationMessageColor ), children: [ TextSpan( text: calendarEvent.organizer?.name, style: const TextStyle( - color: Colors.black, + color: CalendarEventInformationWidgetStyles.invitationMessageColor, fontSize: CalendarEventInformationWidgetStyles.invitationMessageTextSize, fontWeight: FontWeight.w700 ), @@ -158,7 +158,7 @@ class CalendarEventInformationWidget extends StatelessWidget { style: const TextStyle( fontWeight: FontWeight.w500, fontSize: CalendarEventInformationWidgetStyles.titleTextSize, - color: Colors.black + color: CalendarEventInformationWidgetStyles.titleColor ) ), if (calendarEvent.dateTimeEventAsString.isNotEmpty) diff --git a/lib/features/email/presentation/widgets/calendar_event/event_attendee_information_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_attendee_information_widget.dart index bc373d6bcb..4567c94926 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_attendee_information_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_attendee_information_widget.dart @@ -1,5 +1,4 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/material.dart'; import 'package:jmap_dart_client/jmap/mail/calendar/properties/attendee/calendar_attendee.dart'; import 'package:jmap_dart_client/jmap/mail/calendar/properties/calendar_organizer.dart'; @@ -30,7 +29,7 @@ class EventAttendeeInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: EventAttendeeInformationWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: AppColor.colorSubTitleEventActionText + color: EventAttendeeInformationWidgetStyles.labelColor ), ), ), @@ -39,13 +38,13 @@ class EventAttendeeInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: EventAttendeeInformationWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: Colors.black + color: EventAttendeeInformationWidgetStyles.valueColor ), children: [ TextSpan( text: '${organizer.mailto?.value} (${AppLocalizations.of(context).organizer})', style: const TextStyle( - color: AppColor.colorOrganizerMailto, + color: EventAttendeeInformationWidgetStyles.valueOrganizerColor, fontSize: EventAttendeeInformationWidgetStyles.textSize, fontWeight: FontWeight.w500 ), diff --git a/lib/features/email/presentation/widgets/calendar_event/event_location_information_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_location_information_widget.dart index 089f8e266e..f19c917d71 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_location_information_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_location_information_widget.dart @@ -1,5 +1,4 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/utils/style_utils.dart'; import 'package:flutter/material.dart'; import 'package:tmail_ui_user/features/email/presentation/styles/event_location_information_widget_styles.dart'; @@ -26,7 +25,7 @@ class EventLocationInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: EventLocationInformationWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: AppColor.colorSubTitleEventActionText + color: EventLocationInformationWidgetStyles.labelColor ), ), ), @@ -37,7 +36,7 @@ class EventLocationInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: EventLocationInformationWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: Colors.black + color: EventLocationInformationWidgetStyles.valueColor ), )) ], diff --git a/lib/features/email/presentation/widgets/calendar_event/event_time_information_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_time_information_widget.dart index df737dc757..4d8af58d42 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_time_information_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_time_information_widget.dart @@ -1,5 +1,4 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/presentation/utils/style_utils.dart'; import 'package:flutter/material.dart'; import 'package:tmail_ui_user/features/email/presentation/styles/event_time_information_widget_styles.dart'; @@ -26,7 +25,7 @@ class EventTimeInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: EventTimeInformationWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: AppColor.colorSubTitleEventActionText + color: EventTimeInformationWidgetStyles.labelColor ), ), ), @@ -37,7 +36,7 @@ class EventTimeInformationWidget extends StatelessWidget { style: const TextStyle( fontSize: EventTimeInformationWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: Colors.black + color: EventTimeInformationWidgetStyles.valueColor ), )) ],