TF-2263 Fix recipient list in field "Cc" is not in correct position

Signed-off-by: dab246 <tdvu@linagora.com>
(cherry picked from commit 2f4d96dbaaf6ef2e089144e4df0bdb675b82c0ed)
This commit is contained in:
dab246
2023-12-06 16:24:07 +07:00
committed by Dat H. Pham
parent 8722210fc0
commit 47892494a1
@@ -3,9 +3,9 @@ import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/utils/responsive_utils.dart'; import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:core/presentation/utils/style_utils.dart'; import 'package:core/presentation/utils/style_utils.dart';
import 'package:core/presentation/views/button/tmail_button_widget.dart';
import 'package:core/utils/direction_utils.dart'; import 'package:core/utils/direction_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart'; import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/email/prefix_email_address.dart'; import 'package:model/email/prefix_email_address.dart';
@@ -38,7 +38,7 @@ class EmailReceiverWidget extends StatefulWidget {
class _EmailReceiverWidgetState extends State<EmailReceiverWidget> { class _EmailReceiverWidgetState extends State<EmailReceiverWidget> {
static const double _maxSizeFullDisplayEmailAddressArrowDownButton = 30.0; static const double _maxSizeFullDisplayEmailAddressArrowDownButton = 50.0;
final _imagePaths = Get.find<ImagePaths>(); final _imagePaths = Get.find<ImagePaths>();
final _responsiveUtils = Get.find<ResponsiveUtils>(); final _responsiveUtils = Get.find<ResponsiveUtils>();
@@ -120,32 +120,19 @@ class _EmailReceiverWidgetState extends State<EmailReceiverWidget> {
] ]
), ),
), ),
Material( Transform(
color: Colors.transparent, transform: Matrix4.translationValues(0.0, -5.0, 0.0),
child: InkWell( child: TMailButtonWidget.fromIcon(
onTap: () => setState(() => _isDisplayAll = true), icon: _imagePaths.icChevronDown,
customBorder: const CircleBorder(), backgroundColor: Colors.transparent,
child: Container( onTapActionCallback: () => setState(() => _isDisplayAll = true),
padding: const EdgeInsets.all(5),
color: Colors.transparent,
constraints: const BoxConstraints(
maxHeight: _maxSizeFullDisplayEmailAddressArrowDownButton,
maxWidth: _maxSizeFullDisplayEmailAddressArrowDownButton
),
child: SvgPicture.asset(
_imagePaths.icChevronDown,
width: 16,
height: 16,
fit: BoxFit.fill
),
),
), ),
), )
] ]
); );
} else { } else {
return Column( return Column(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
if (presentationEmail.to.numberEmailAddress() > 0) if (presentationEmail.to.numberEmailAddress() > 0)
@@ -181,14 +168,18 @@ class _EmailReceiverWidgetState extends State<EmailReceiverWidget> {
bool isDisplayFull bool isDisplayFull
) { ) {
return Row( return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Padding(
'${prefixEmailAddress.asName(context)}:', padding: const EdgeInsets.only(top: 5),
style: const TextStyle( child: Text(
fontSize: 16, '${prefixEmailAddress.asName(context)}:',
fontWeight: FontWeight.w500, style: const TextStyle(
color: AppColor.colorEmailAddressFull fontSize: 16,
) fontWeight: FontWeight.w500,
color: AppColor.colorEmailAddressFull
)
),
), ),
if (!isDisplayFull && presentationEmail.numberOfAllEmailAddress() > 1) if (!isDisplayFull && presentationEmail.numberOfAllEmailAddress() > 1)
_buildListEmailAddressWidget( _buildListEmailAddressWidget(