TF-3410 Synchronize all color for app
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -133,7 +133,6 @@ class MailboxView extends BaseMailboxView {
|
||||
Obx(() {
|
||||
if (!controller.isSelectionEnabled() && controller.responsiveUtils.isPortraitMobile(context)) {
|
||||
return Container(
|
||||
color: AppColor.colorBgMailbox,
|
||||
width: double.infinity,
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: SafeArea(
|
||||
@@ -142,9 +141,10 @@ class MailboxView extends BaseMailboxView {
|
||||
padding: EdgeInsets.zero,
|
||||
title: '${AppLocalizations.of(context).version} ',
|
||||
textStyle: Theme.of(context).textTheme.labelMedium?.copyWith(
|
||||
fontSize: 16,
|
||||
color: AppColor.colorContentEmail,
|
||||
fontWeight: FontWeight.w500
|
||||
fontSize: 13,
|
||||
height: 16 / 13,
|
||||
color: AppColor.steelGray400,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -111,7 +111,6 @@ class MailboxView extends BaseMailboxView {
|
||||
],
|
||||
),
|
||||
Container(
|
||||
color: AppColor.colorBgMailbox,
|
||||
width: double.infinity,
|
||||
alignment: controller.responsiveUtils.isDesktop(context)
|
||||
? AlignmentDirectional.centerStart
|
||||
@@ -122,8 +121,9 @@ class MailboxView extends BaseMailboxView {
|
||||
title: '${AppLocalizations.of(context).version.toLowerCase()} ',
|
||||
textStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||
fontSize: 13,
|
||||
color: AppColor.colorTextBody,
|
||||
fontWeight: FontWeight.normal
|
||||
height: 16 / 13,
|
||||
color: AppColor.steelGray400,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
),
|
||||
),
|
||||
|
||||
@@ -371,6 +371,7 @@ mixin MailboxWidgetMixin {
|
||||
softWrap: CommonTextStyle.defaultSoftWrap,
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontSize: 14,
|
||||
height: 18 / 14,
|
||||
color: Colors.black,
|
||||
fontWeight: FontWeight.w400,
|
||||
)
|
||||
|
||||
@@ -3,16 +3,11 @@ import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class LabelMailboxItemWidgetStyles {
|
||||
static const double labelTeamMailboxTextSize = 16;
|
||||
static const double labelFolderTextSize = 15;
|
||||
static const double teamMailboxTextSize = 15;
|
||||
static const double labelFolderTextSize = 14;
|
||||
|
||||
static const Color labelTeamMailboxTextColor = Colors.black;
|
||||
static const Color labelFolderTextColor = AppColor.colorNameEmail;
|
||||
static const Color teamMailboxTextColor = AppColor.colorEmailAddressFull;
|
||||
static const Color labelFolderTextColor = Colors.black;
|
||||
static const Color teamMailboxEmailTextColor = AppColor.steelGray400;
|
||||
|
||||
static const FontWeight labelTeamMailboxTextFontWeight = FontWeight.bold;
|
||||
static const FontWeight labelFolderTextFontWeight = FontWeight.normal;
|
||||
static const FontWeight teamMailboxTextFontWeight = FontWeight.w400;
|
||||
static const FontWeight labelFolderTextFontWeight = FontWeight.w400;
|
||||
static const FontWeight labelFolderSelectedFontWeight = FontWeight.bold;
|
||||
}
|
||||
@@ -34,6 +34,7 @@ class LabelMailboxItemWidget extends StatelessWidget {
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
if (showTrailing)
|
||||
Row(
|
||||
@@ -41,9 +42,9 @@ class LabelMailboxItemWidget extends StatelessWidget {
|
||||
Expanded(
|
||||
child: TextOverflowBuilder(
|
||||
mailboxNode.item.getDisplayName(context),
|
||||
style: TextStyle(
|
||||
fontSize: _mailboxNameTextSize,
|
||||
color: _mailboxNameTextColor,
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontSize: LabelMailboxItemWidgetStyles.labelFolderTextSize,
|
||||
color: LabelMailboxItemWidgetStyles.labelFolderTextColor,
|
||||
fontWeight: _mailboxNameTextFontWeight
|
||||
),
|
||||
),
|
||||
@@ -63,40 +64,30 @@ class LabelMailboxItemWidget extends StatelessWidget {
|
||||
else
|
||||
TextOverflowBuilder(
|
||||
mailboxNode.item.getDisplayName(context),
|
||||
style: TextStyle(
|
||||
fontSize: _mailboxNameTextSize,
|
||||
color: _mailboxNameTextColor,
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontSize: LabelMailboxItemWidgetStyles.labelFolderTextSize,
|
||||
color: LabelMailboxItemWidgetStyles.labelFolderTextColor,
|
||||
fontWeight: _mailboxNameTextFontWeight
|
||||
),
|
||||
),
|
||||
if (mailboxNode.item.isTeamMailboxes)
|
||||
TextOverflowBuilder(
|
||||
mailboxNode.item.emailTeamMailBoxes,
|
||||
style: const TextStyle(
|
||||
fontSize: LabelMailboxItemWidgetStyles.teamMailboxTextSize,
|
||||
color: LabelMailboxItemWidgetStyles.teamMailboxTextColor,
|
||||
fontWeight: LabelMailboxItemWidgetStyles.teamMailboxTextFontWeight
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontSize: LabelMailboxItemWidgetStyles.labelFolderTextSize,
|
||||
color: LabelMailboxItemWidgetStyles.teamMailboxEmailTextColor,
|
||||
fontWeight: LabelMailboxItemWidgetStyles.labelFolderTextFontWeight
|
||||
),
|
||||
)
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
double get _mailboxNameTextSize => mailboxNode.item.isTeamMailboxes
|
||||
? LabelMailboxItemWidgetStyles.labelTeamMailboxTextSize
|
||||
: LabelMailboxItemWidgetStyles.labelFolderTextSize;
|
||||
|
||||
Color get _mailboxNameTextColor => mailboxNode.item.isTeamMailboxes
|
||||
? LabelMailboxItemWidgetStyles.labelTeamMailboxTextColor
|
||||
: LabelMailboxItemWidgetStyles.labelFolderTextColor;
|
||||
|
||||
FontWeight get _mailboxNameTextFontWeight {
|
||||
if (isSelected) {
|
||||
if (isSelected || mailboxNode.item.isTeamMailboxes) {
|
||||
return LabelMailboxItemWidgetStyles.labelFolderSelectedFontWeight;
|
||||
} else {
|
||||
return mailboxNode.item.isTeamMailboxes
|
||||
? LabelMailboxItemWidgetStyles.labelTeamMailboxTextFontWeight
|
||||
: LabelMailboxItemWidgetStyles.labelFolderTextFontWeight;
|
||||
return LabelMailboxItemWidgetStyles.labelFolderTextFontWeight;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
|
||||
import 'package:model/email/presentation_email.dart';
|
||||
import 'package:model/extensions/presentation_mailbox_extension.dart';
|
||||
import 'package:model/mailbox/presentation_mailbox.dart';
|
||||
import 'package:model/mailbox/select_mode.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_actions.dart';
|
||||
@@ -81,6 +82,9 @@ class _MailboxItemWidgetState extends State<MailboxItemWidget> {
|
||||
),
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: widget.mailboxNode.item.isTeamMailboxes
|
||||
? CrossAxisAlignment.start
|
||||
: CrossAxisAlignment.center,
|
||||
children: [
|
||||
LeadingMailboxItemWidget(
|
||||
imagePaths: _imagePaths,
|
||||
|
||||
Reference in New Issue
Block a user