TF-2057 Add color/size to styles

(cherry picked from commit 68b621471197105b2a846a2827afdaa23ec03edc)
This commit is contained in:
dab246
2023-07-28 09:29:31 +07:00
committed by Dat Vu
parent 2268b18809
commit f1d0b41267
27 changed files with 151 additions and 61 deletions
@@ -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
),
@@ -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)),
),
@@ -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<EventAttendeeDetailWidget> {
style: const TextStyle(
fontSize: EventAttendeeDetailWidgetStyles.textSize,
fontWeight: FontWeight.w500,
color: AppColor.colorSubTitleEventActionText
color: EventAttendeeDetailWidgetStyles.labelColor
),
),
),
@@ -1,6 +1,5 @@
import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/presentation/utils/style_utils.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/mail/calendar/properties/attendee/calendar_attendee.dart';
@@ -58,8 +57,8 @@ class EventAttendeeInformationWidget extends StatelessWidget {
]
),
overflow: responsiveUtils.isPortraitMobile(context)
? TextOverflow.ellipsis
: CommonTextStyle.defaultTextOverFlow,
? TextOverflow.clip
: TextOverflow.ellipsis,
maxLines: responsiveUtils.isPortraitMobile(context) ? null : 2,
))
],
@@ -33,7 +33,7 @@ class EventDescriptionDetailWidget extends StatelessWidget {
style: const TextStyle(
fontWeight: FontWeight.w500,
fontSize: EventDescriptionDetailWidgetStyles.textSize,
color: Colors.black
color: EventDescriptionDetailWidgetStyles.valueColor
)
),
PositionedDirectional(
@@ -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
),
),
),
@@ -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
),
))
],
@@ -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
),
))
],
@@ -15,7 +15,7 @@ class EventTitleWidget extends StatelessWidget {
style: const TextStyle(
fontWeight: FontWeight.w500,
fontSize: EventTitleWidgetStyles.textSize,
color: Colors.black
color: EventTitleWidgetStyles.textColor
)
);
}
@@ -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
),
),
@@ -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
),
),
);
@@ -0,0 +1,34 @@
import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:dartz/dartz.dart';
import 'package:flutter/material.dart';
import 'package:model/email/presentation_email.dart';
import 'package:tmail_ui_user/features/base/widget/cupertino_loading_widget.dart';
import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart';
import 'package:tmail_ui_user/features/email/domain/state/parse_calendar_event_state.dart';
class EmailViewLoadingBarWidget extends StatelessWidget {
final PresentationEmail selectedEmail;
final Either<Failure, Success> viewState;
const EmailViewLoadingBarWidget({
super.key,
required this.viewState,
required this.selectedEmail
});
@override
Widget build(BuildContext context) {
return viewState.fold(
(failure) => const SizedBox.shrink(),
(success) {
if (success is GetEmailContentLoading || (success is ParseCalendarEventLoading && selectedEmail.hasCalendarEvent)) {
return const CupertinoLoadingWidget();
} else {
return const SizedBox.shrink();
}
}
);
}
}