TF-2042 Add color to styles

linagora · Jul 28, 2023 · a0972be · a0972be
1 parent 711b2b9
commit a0972be
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 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
@@ -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;
 }
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
@@ -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;
 }
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
@@ -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;
 }
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
@@ -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;
 }
diff --git a/...features/email/presentation/widgets/calendar_event/calendar_event_information_widget.dart b/...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/...features/email/presentation/widgets/calendar_event/event_attendee_information_widget.dart b/...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/...features/email/presentation/widgets/calendar_event/event_location_information_widget.dart b/...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
@@ -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
           ),
         ))
       ],