From 7dcb952c036f699692d0dad670bdc3374f86a5ee Mon Sep 17 00:00:00 2001 From: dab246 Date: Fri, 28 Jul 2023 09:29:31 +0700 Subject: [PATCH] TF-2057 Add color/size to styles --- .../base/styles/hyper_link_widget_styles.dart | 8 ++++++++ lib/features/base/widget/hyper_link_widget.dart | 6 +++--- .../presentation/styles/attendee_widget_styles.dart | 5 +++++ .../styles/calendar_event_detail_widget_styles.dart | 5 +++++ .../styles/event_attendee_detail_widget_styles.dart | 5 +++++ .../event_description_detail_widget_styles.dart | 4 +++- .../styles/event_link_detail_widget_styles.dart | 10 ++++++++++ .../styles/event_location_detail_widget_styles.dart | 5 +++++ .../styles/event_time_detail_widget_styles.dart | 5 +++++ .../styles/event_title_widget_styles.dart | 3 +++ .../presentation/styles/organizer_widget_styles.dart | 10 ++++++++++ .../see_all_attendees_button_widget_styles.dart | 4 ++++ .../widgets/calendar_event/attendee_widget.dart | 5 ++--- .../calendar_event/calendar_event_detail_widget.dart | 5 ++--- .../calendar_event/event_attendee_detail_widget.dart | 3 +-- .../event_description_detail_widget.dart | 2 +- .../calendar_event/event_link_detail_widget.dart | 9 ++++----- .../calendar_event/event_location_detail_widget.dart | 5 ++--- .../calendar_event/event_time_detail_widget.dart | 5 ++--- .../widgets/calendar_event/event_title_widget.dart | 2 +- .../widgets/calendar_event/organizer_widget.dart | 11 +++++------ .../see_all_attendees_button_widget.dart | 3 +-- 22 files changed, 87 insertions(+), 33 deletions(-) create mode 100644 lib/features/base/styles/hyper_link_widget_styles.dart create mode 100644 lib/features/email/presentation/styles/event_link_detail_widget_styles.dart create mode 100644 lib/features/email/presentation/styles/organizer_widget_styles.dart diff --git a/lib/features/base/styles/hyper_link_widget_styles.dart b/lib/features/base/styles/hyper_link_widget_styles.dart new file mode 100644 index 0000000000..996a10b9df --- /dev/null +++ b/lib/features/base/styles/hyper_link_widget_styles.dart @@ -0,0 +1,8 @@ + +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + +class HyperLinkWidgetStyles { + static const Color textColor = AppColor.primaryColor; + static const double textSize = 16; +} \ No newline at end of file diff --git a/lib/features/base/widget/hyper_link_widget.dart b/lib/features/base/widget/hyper_link_widget.dart index 39c0d93147..f0249179ea 100644 --- a/lib/features/base/widget/hyper_link_widget.dart +++ b/lib/features/base/widget/hyper_link_widget.dart @@ -1,6 +1,6 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/widgets.dart'; +import 'package:tmail_ui_user/features/base/styles/hyper_link_widget_styles.dart'; import 'package:url_launcher/url_launcher_string.dart'; class HyperLinkWidget extends StatelessWidget { @@ -15,8 +15,8 @@ class HyperLinkWidget extends StatelessWidget { text: TextSpan( text: urlString, style: const TextStyle( - color: AppColor.primaryColor, - fontSize: 16, + color: HyperLinkWidgetStyles.textColor, + fontSize: HyperLinkWidgetStyles.textSize, decoration: TextDecoration.underline ), recognizer: TapGestureRecognizer()..onTap = () async { diff --git a/lib/features/email/presentation/styles/attendee_widget_styles.dart b/lib/features/email/presentation/styles/attendee_widget_styles.dart index cbc59f6dbf..0a66107c97 100644 --- a/lib/features/email/presentation/styles/attendee_widget_styles.dart +++ b/lib/features/email/presentation/styles/attendee_widget_styles.dart @@ -1,5 +1,10 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class AttendeeWidgetStyles { static const double maxWidth = 100; static const double textSize = 16; + static const Color textColor = Colors.black; + static const Color mailtoColor = AppColor.colorMailto; } \ No newline at end of file diff --git a/lib/features/email/presentation/styles/calendar_event_detail_widget_styles.dart b/lib/features/email/presentation/styles/calendar_event_detail_widget_styles.dart index f76e337173..80d262e2d9 100644 --- a/lib/features/email/presentation/styles/calendar_event_detail_widget_styles.dart +++ b/lib/features/email/presentation/styles/calendar_event_detail_widget_styles.dart @@ -1,4 +1,7 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class CalendarEventDetailWidgetStyles { static const double textSize = 24; static const double borderRadius = 16; @@ -6,4 +9,6 @@ class CalendarEventDetailWidgetStyles { static const double horizontalMargin = 16; static const double contentPadding = 16; static const double fieldTopPadding = 16; + static const Color borderStrokeColor = AppColor.colorCalendarEventInformationStroke; + static const double borderStrokeWidth = 0.5; } \ No newline at end of file diff --git a/lib/features/email/presentation/styles/event_attendee_detail_widget_styles.dart b/lib/features/email/presentation/styles/event_attendee_detail_widget_styles.dart index 6c11de9b4a..f510184b20 100644 --- a/lib/features/email/presentation/styles/event_attendee_detail_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_attendee_detail_widget_styles.dart @@ -1,6 +1,11 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class EventAttendeeDetailWidgetStyles { static const double maxWidth = 100; static const double textSize = 16; static const double fieldTopPadding = 8; + 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_description_detail_widget_styles.dart b/lib/features/email/presentation/styles/event_description_detail_widget_styles.dart index 427b7a794b..82b3591bd9 100644 --- a/lib/features/email/presentation/styles/event_description_detail_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_description_detail_widget_styles.dart @@ -1,7 +1,9 @@ +import 'package:flutter/material.dart'; + class EventDescriptionDetailWidgetStyles { static const double textSize = 16; static const double borderRadius = 16; static const double contentPadding = 16; - static const double fieldTopPadding = 16; + static const Color valueColor = Colors.black; } \ No newline at end of file diff --git a/lib/features/email/presentation/styles/event_link_detail_widget_styles.dart b/lib/features/email/presentation/styles/event_link_detail_widget_styles.dart new file mode 100644 index 0000000000..e91c8ba779 --- /dev/null +++ b/lib/features/email/presentation/styles/event_link_detail_widget_styles.dart @@ -0,0 +1,10 @@ + +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + +class EventLinkDetailWidgetStyles { + 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_location_detail_widget_styles.dart b/lib/features/email/presentation/styles/event_location_detail_widget_styles.dart index 94030be48e..8abe0cdf06 100644 --- a/lib/features/email/presentation/styles/event_location_detail_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_location_detail_widget_styles.dart @@ -1,5 +1,10 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class EventLocationDetailWidgetStyles { 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_detail_widget_styles.dart b/lib/features/email/presentation/styles/event_time_detail_widget_styles.dart index ca2c78ecfc..af54d01924 100644 --- a/lib/features/email/presentation/styles/event_time_detail_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_time_detail_widget_styles.dart @@ -1,5 +1,10 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class EventTimeDetailWidgetStyles { 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_title_widget_styles.dart b/lib/features/email/presentation/styles/event_title_widget_styles.dart index fdcf622414..f53abaf925 100644 --- a/lib/features/email/presentation/styles/event_title_widget_styles.dart +++ b/lib/features/email/presentation/styles/event_title_widget_styles.dart @@ -1,4 +1,7 @@ +import 'package:flutter/material.dart'; + class EventTitleWidgetStyles { static const double textSize = 24; + static const Color textColor = Colors.black; } \ No newline at end of file diff --git a/lib/features/email/presentation/styles/organizer_widget_styles.dart b/lib/features/email/presentation/styles/organizer_widget_styles.dart new file mode 100644 index 0000000000..1ea478c4bc --- /dev/null +++ b/lib/features/email/presentation/styles/organizer_widget_styles.dart @@ -0,0 +1,10 @@ + +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + +class OrganizerWidgetStyles { + static const double maxWidth = 100; + static const double textSize = 16; + static const Color textColor = Colors.black; + static const Color mailtoColor = AppColor.colorMailto; +} \ No newline at end of file diff --git a/lib/features/email/presentation/styles/see_all_attendees_button_widget_styles.dart b/lib/features/email/presentation/styles/see_all_attendees_button_widget_styles.dart index 37e0787ec5..a64f3ce54e 100644 --- a/lib/features/email/presentation/styles/see_all_attendees_button_widget_styles.dart +++ b/lib/features/email/presentation/styles/see_all_attendees_button_widget_styles.dart @@ -1,8 +1,12 @@ +import 'package:core/presentation/extensions/color_extension.dart'; +import 'package:flutter/material.dart'; + class SeeAllAttendeesButtonWidgetStyles { static const double textSize = 16; static const double horizontalPadding = 8; static const double verticalPadding = 4; static const double borderRadius = 20; static const double horizontalMargin = -8; + static const Color textColor = AppColor.primaryColor; } \ No newline at end of file diff --git a/lib/features/email/presentation/widgets/calendar_event/attendee_widget.dart b/lib/features/email/presentation/widgets/calendar_event/attendee_widget.dart index c3d601e702..03ebcf3d3d 100644 --- a/lib/features/email/presentation/widgets/calendar_event/attendee_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/attendee_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:tmail_ui_user/features/email/presentation/styles/attendee_widget_styles.dart'; @@ -20,7 +19,7 @@ class AttendeeWidget extends StatelessWidget { style: const TextStyle( fontSize: AttendeeWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: Colors.black + color: AttendeeWidgetStyles.textColor ), children: [ if (attendee.name?.name.isNotEmpty == true) @@ -29,7 +28,7 @@ class AttendeeWidget extends StatelessWidget { TextSpan( text: ' <${attendee.mailto!.mailAddress.value}> ', style: const TextStyle( - color: AppColor.colorMailto, + color: AttendeeWidgetStyles.mailtoColor, fontSize: AttendeeWidgetStyles.textSize, fontWeight: FontWeight.w500 ), diff --git a/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_widget.dart index 9e3f823905..0d6c39bf21 100644 --- a/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/calendar_event_detail_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/calendar_event.dart'; import 'package:tmail_ui_user/features/email/presentation/extensions/calendar_event_extension.dart'; @@ -28,8 +27,8 @@ class CalendarEventDetailWidget extends StatelessWidget { color: Colors.white, shape: RoundedRectangleBorder( side: BorderSide( - width: 0.5, - color: AppColor.colorCalendarEventInformationStroke, + width: CalendarEventDetailWidgetStyles.borderStrokeWidth, + color: CalendarEventDetailWidgetStyles.borderStrokeColor, ), borderRadius: BorderRadius.all(Radius.circular(CalendarEventDetailWidgetStyles.borderRadius)), ), diff --git a/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart index 26a640f3a4..13f3026e6d 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_attendee_detail_widget.dart @@ -1,5 +1,4 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:core/utils/app_logger.dart'; import 'package:flutter/material.dart'; import 'package:jmap_dart_client/jmap/mail/calendar/properties/attendee/calendar_attendee.dart'; @@ -53,7 +52,7 @@ class _EventAttendeeDetailWidgetState extends State { style: const TextStyle( fontSize: EventAttendeeDetailWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: AppColor.colorSubTitleEventActionText + color: EventAttendeeDetailWidgetStyles.labelColor ), ), ), diff --git a/lib/features/email/presentation/widgets/calendar_event/event_description_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_description_detail_widget.dart index 33cb2212bf..298a5465e7 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_description_detail_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_description_detail_widget.dart @@ -33,7 +33,7 @@ class EventDescriptionDetailWidget extends StatelessWidget { style: const TextStyle( fontWeight: FontWeight.w500, fontSize: EventDescriptionDetailWidgetStyles.textSize, - color: Colors.black + color: EventDescriptionDetailWidgetStyles.valueColor ) ), PositionedDirectional( diff --git a/lib/features/email/presentation/widgets/calendar_event/event_link_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_link_detail_widget.dart index b7bcaaf9ac..32bbccd945 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_link_detail_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_link_detail_widget.dart @@ -1,8 +1,7 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/material.dart'; import 'package:tmail_ui_user/features/base/widget/hyper_link_widget.dart'; -import 'package:tmail_ui_user/features/email/presentation/styles/event_location_detail_widget_styles.dart'; +import 'package:tmail_ui_user/features/email/presentation/styles/event_link_detail_widget_styles.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; class EventLinkDetailWidget extends StatelessWidget { @@ -20,13 +19,13 @@ class EventLinkDetailWidget extends StatelessWidget { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox( - width: EventLocationDetailWidgetStyles.maxWidth, + width: EventLinkDetailWidgetStyles.maxWidth, child: Text( AppLocalizations.of(context).link, style: const TextStyle( - fontSize: EventLocationDetailWidgetStyles.textSize, + fontSize: EventLinkDetailWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: AppColor.colorSubTitleEventActionText + color: EventLinkDetailWidgetStyles.labelColor ), ), ), diff --git a/lib/features/email/presentation/widgets/calendar_event/event_location_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_location_detail_widget.dart index fef6ba7aae..36b046848d 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_location_detail_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_location_detail_widget.dart @@ -1,5 +1,4 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/material.dart'; import 'package:tmail_ui_user/features/email/presentation/styles/event_location_detail_widget_styles.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; @@ -25,7 +24,7 @@ class EventLocationDetailWidget extends StatelessWidget { style: const TextStyle( fontSize: EventLocationDetailWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: AppColor.colorSubTitleEventActionText + color: EventLocationDetailWidgetStyles.labelColor ), ), ), @@ -34,7 +33,7 @@ class EventLocationDetailWidget extends StatelessWidget { style: const TextStyle( fontSize: EventLocationDetailWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: Colors.black + color: EventLocationDetailWidgetStyles.valueColor ), )) ], diff --git a/lib/features/email/presentation/widgets/calendar_event/event_time_detail_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_time_detail_widget.dart index 487034d282..1af9a6ca94 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_time_detail_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_time_detail_widget.dart @@ -1,5 +1,4 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/material.dart'; import 'package:tmail_ui_user/features/email/presentation/styles/event_time_detail_widget_styles.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; @@ -25,7 +24,7 @@ class EventTimeWidgetWidget extends StatelessWidget { style: const TextStyle( fontSize: EventTimeDetailWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: AppColor.colorSubTitleEventActionText + color: EventTimeDetailWidgetStyles.labelColor ), ), ), @@ -34,7 +33,7 @@ class EventTimeWidgetWidget extends StatelessWidget { style: const TextStyle( fontSize: EventTimeDetailWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: Colors.black + color: EventTimeDetailWidgetStyles.valueColor ), )) ], diff --git a/lib/features/email/presentation/widgets/calendar_event/event_title_widget.dart b/lib/features/email/presentation/widgets/calendar_event/event_title_widget.dart index 416a685476..99284c95c1 100644 --- a/lib/features/email/presentation/widgets/calendar_event/event_title_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/event_title_widget.dart @@ -15,7 +15,7 @@ class EventTitleWidget extends StatelessWidget { style: const TextStyle( fontWeight: FontWeight.w500, fontSize: EventTitleWidgetStyles.textSize, - color: Colors.black + color: EventTitleWidgetStyles.textColor ) ); } diff --git a/lib/features/email/presentation/widgets/calendar_event/organizer_widget.dart b/lib/features/email/presentation/widgets/calendar_event/organizer_widget.dart index 0925bb7587..4ac0dce035 100644 --- a/lib/features/email/presentation/widgets/calendar_event/organizer_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/organizer_widget.dart @@ -1,8 +1,7 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/material.dart'; import 'package:jmap_dart_client/jmap/mail/calendar/properties/calendar_organizer.dart'; -import 'package:tmail_ui_user/features/email/presentation/styles/attendee_widget_styles.dart'; +import 'package:tmail_ui_user/features/email/presentation/styles/organizer_widget_styles.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; class OrganizerWidget extends StatelessWidget { @@ -19,9 +18,9 @@ class OrganizerWidget extends StatelessWidget { return RichText( text: TextSpan( style: const TextStyle( - fontSize: AttendeeWidgetStyles.textSize, + fontSize: OrganizerWidgetStyles.textSize, fontWeight: FontWeight.w500, - color: Colors.black + color: OrganizerWidgetStyles.textColor ), children: [ if (organizer.name?.isNotEmpty == true) @@ -30,8 +29,8 @@ class OrganizerWidget extends StatelessWidget { TextSpan( text: ' <${organizer.mailto!.value}> ', style: const TextStyle( - color: AppColor.colorMailto, - fontSize: AttendeeWidgetStyles.textSize, + color: OrganizerWidgetStyles.mailtoColor, + fontSize: OrganizerWidgetStyles.textSize, fontWeight: FontWeight.w500 ), ), diff --git a/lib/features/email/presentation/widgets/calendar_event/see_all_attendees_button_widget.dart b/lib/features/email/presentation/widgets/calendar_event/see_all_attendees_button_widget.dart index 038a44ddb7..78ce4d4dcf 100644 --- a/lib/features/email/presentation/widgets/calendar_event/see_all_attendees_button_widget.dart +++ b/lib/features/email/presentation/widgets/calendar_event/see_all_attendees_button_widget.dart @@ -1,5 +1,4 @@ -import 'package:core/presentation/extensions/color_extension.dart'; import 'package:flutter/cupertino.dart'; import 'package:tmail_ui_user/features/base/widget/material_text_button.dart'; import 'package:tmail_ui_user/features/email/presentation/styles/see_all_attendees_button_widget_styles.dart'; @@ -28,7 +27,7 @@ class SeeAllAttendeesButtonWidget extends StatelessWidget { ), customStyle: const TextStyle( fontSize: SeeAllAttendeesButtonWidgetStyles.textSize, - color: AppColor.colorTextButton + color: SeeAllAttendeesButtonWidgetStyles.textColor ), ), );