TF-3410 Use TextTheme apply almost text style for text widget
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -1069,17 +1069,16 @@ class MailboxController extends BaseMailboxController
|
||||
.show();
|
||||
} else {
|
||||
Get.dialog(
|
||||
PointerInterceptor(child: (ConfirmDialogBuilder(imagePaths, useIconAsBasicLogo: true)
|
||||
..key(const Key('confirm_dialog_delete_multiple_mailbox'))
|
||||
..title(AppLocalizations.of(context).deleteFolders)
|
||||
..content(AppLocalizations.of(context).messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length))
|
||||
..onCloseButtonAction(() => popBack())
|
||||
..onConfirmButtonAction(AppLocalizations.of(context).delete, () =>
|
||||
_deleteMultipleMailboxAction(selectedMailboxList))
|
||||
..onCancelButtonAction(AppLocalizations.of(context).cancel, () =>
|
||||
popBack()))
|
||||
.build()
|
||||
),
|
||||
PointerInterceptor(child: ConfirmationDialogBuilder(
|
||||
key: const Key('confirm_dialog_delete_multiple_mailbox'),
|
||||
imagePath: imagePaths,
|
||||
useIconAsBasicLogo: true,
|
||||
title: AppLocalizations.of(context).deleteFolders,
|
||||
textContent: AppLocalizations.of(context).messageConfirmationDialogDeleteMultipleFolder(selectedMailboxList.length),
|
||||
onConfirmButtonAction: () => _deleteMultipleMailboxAction(selectedMailboxList),
|
||||
onCancelButtonAction: popBack,
|
||||
onCloseButtonAction: popBack,
|
||||
)),
|
||||
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
|
||||
);
|
||||
}
|
||||
@@ -1279,7 +1278,10 @@ class MailboxController extends BaseMailboxController
|
||||
break;
|
||||
case MailboxActions.copySubaddress:
|
||||
try{
|
||||
final subaddress = getSubaddress(mailboxDashBoardController.userEmail, findNodePathWithSeparator(mailbox.id, '.')!);
|
||||
final subaddress = getSubaddress(
|
||||
mailboxDashBoardController.getOwnEmailAddress(),
|
||||
findNodePathWithSeparator(mailbox.id, '.')!,
|
||||
);
|
||||
copySubaddressAction(context, subaddress);
|
||||
} catch (error) {
|
||||
appToast.showToastErrorMessage(context, AppLocalizations.of(context).errorWhileFetchingSubaddress);
|
||||
@@ -1294,7 +1296,10 @@ class MailboxController extends BaseMailboxController
|
||||
break;
|
||||
case MailboxActions.allowSubaddressing:
|
||||
try{
|
||||
final subaddress = getSubaddress(mailboxDashBoardController.userEmail, findNodePathWithSeparator(mailbox.id, '.')!);
|
||||
final subaddress = getSubaddress(
|
||||
mailboxDashBoardController.getOwnEmailAddress(),
|
||||
findNodePathWithSeparator(mailbox.id, '.')!,
|
||||
);
|
||||
openConfirmationDialogSubaddressingAction(
|
||||
context,
|
||||
responsiveUtils,
|
||||
@@ -1705,20 +1710,28 @@ class MailboxController extends BaseMailboxController
|
||||
} else {
|
||||
Get.dialog(
|
||||
PointerInterceptor(
|
||||
child: (ConfirmDialogBuilder(imagePaths, useIconAsBasicLogo: true)
|
||||
..key(const Key('confirm_dialog_subaddressing'))
|
||||
..title(AppLocalizations.of(context).allowSubaddressing)
|
||||
..content(AppLocalizations.of(context).message_confirmation_dialog_allow_subaddressing(mailboxName))
|
||||
..addWidgetContent(CopySubaddressWidget(
|
||||
context: context,
|
||||
imagePath: imagePaths,
|
||||
subaddress: subaddress,
|
||||
onCopyButtonAction: () => copySubaddressAction(context, subaddress),
|
||||
))
|
||||
..onCloseButtonAction(() => popBack())
|
||||
..onConfirmButtonAction(AppLocalizations.of(context).allow, () => onAllowSubaddressingAction(mailboxId, currentRights, MailboxActions.allowSubaddressing))
|
||||
..onCancelButtonAction(AppLocalizations.of(context).cancel, () => popBack())
|
||||
).build()),
|
||||
child: ConfirmationDialogBuilder(
|
||||
key: const Key('confirm_dialog_subaddressing'),
|
||||
imagePath: imagePaths,
|
||||
useIconAsBasicLogo: true,
|
||||
title: AppLocalizations.of(context).allowSubaddressing,
|
||||
textContent: AppLocalizations.of(context).message_confirmation_dialog_allow_subaddressing(mailboxName),
|
||||
confirmText: AppLocalizations.of(context).allow,
|
||||
cancelText: AppLocalizations.of(context).cancel,
|
||||
additionalWidgetContent: CopySubaddressWidget(
|
||||
imagePath: imagePaths,
|
||||
subaddress: subaddress,
|
||||
onCopyButtonAction: () => copySubaddressAction(context, subaddress),
|
||||
),
|
||||
onConfirmButtonAction: () => onAllowSubaddressingAction(
|
||||
mailboxId,
|
||||
currentRights,
|
||||
MailboxActions.allowSubaddressing,
|
||||
),
|
||||
onCancelButtonAction: popBack,
|
||||
onCloseButtonAction: popBack,
|
||||
),
|
||||
),
|
||||
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ import 'package:core/utils/direction_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/application_version_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox/presentation/base_mailbox_view.dart';
|
||||
@@ -140,12 +139,6 @@ class MailboxView extends BaseMailboxView {
|
||||
child: ApplicationVersionWidget(
|
||||
padding: EdgeInsets.zero,
|
||||
title: '${AppLocalizations.of(context).version} ',
|
||||
textStyle: Theme.of(context).textTheme.labelMedium?.copyWith(
|
||||
fontSize: 13,
|
||||
height: 16 / 13,
|
||||
color: AppColor.steelGray400,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -225,8 +218,8 @@ class MailboxView extends BaseMailboxView {
|
||||
}
|
||||
return UserInformationWidget(
|
||||
userName: controller.mailboxDashBoardController.accountId.value != null
|
||||
? UserName(controller.mailboxDashBoardController.sessionCurrent!.getOwnEmailAddress())
|
||||
: null,
|
||||
? controller.mailboxDashBoardController.getOwnEmailAddress()
|
||||
: '',
|
||||
subtitle: AppLocalizations.of(context).manage_account,
|
||||
onSubtitleClick: controller.mailboxDashBoardController.goToSettings,
|
||||
border: const Border(
|
||||
@@ -366,10 +359,8 @@ class MailboxView extends BaseMailboxView {
|
||||
categories.getTitle(context),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontSize: 14,
|
||||
style: ThemeUtils.textStyleBodyBody3(
|
||||
color: Colors.black,
|
||||
fontWeight: FontWeight.w400,
|
||||
)
|
||||
)
|
||||
),
|
||||
|
||||
@@ -2,7 +2,6 @@ import 'package:core/core.dart';
|
||||
import 'package:flutter/gestures.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/application_logo_with_text_widget.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/application_version_widget.dart';
|
||||
@@ -119,12 +118,6 @@ class MailboxView extends BaseMailboxView {
|
||||
child: ApplicationVersionWidget(
|
||||
padding: EdgeInsets.zero,
|
||||
title: '${AppLocalizations.of(context).version.toLowerCase()} ',
|
||||
textStyle: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||
fontSize: 13,
|
||||
height: 16 / 13,
|
||||
color: AppColor.steelGray400,
|
||||
fontWeight: FontWeight.w400,
|
||||
),
|
||||
),
|
||||
),
|
||||
]),
|
||||
@@ -142,8 +135,8 @@ class MailboxView extends BaseMailboxView {
|
||||
if (!controller.responsiveUtils.isDesktop(context))
|
||||
Obx(() => UserInformationWidget(
|
||||
userName: controller.mailboxDashBoardController.accountId.value != null
|
||||
? UserName(controller.mailboxDashBoardController.sessionCurrent!.getOwnEmailAddress())
|
||||
: null,
|
||||
? controller.mailboxDashBoardController.getOwnEmailAddress()
|
||||
: '',
|
||||
subtitle: AppLocalizations.of(context).manage_account,
|
||||
onSubtitleClick: controller.mailboxDashBoardController.goToSettings,
|
||||
border: const Border(
|
||||
|
||||
@@ -369,12 +369,7 @@ mixin MailboxWidgetMixin {
|
||||
maxLines: 1,
|
||||
overflow: CommonTextStyle.defaultTextOverFlow,
|
||||
softWrap: CommonTextStyle.defaultSoftWrap,
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
fontSize: 14,
|
||||
height: 18 / 14,
|
||||
color: Colors.black,
|
||||
fontWeight: FontWeight.w400,
|
||||
)
|
||||
style: ThemeUtils.textStyleBodyBody3(color: Colors.black)
|
||||
)),
|
||||
])
|
||||
);
|
||||
|
||||
@@ -7,7 +7,6 @@ typedef OnCopyButtonAction = void Function();
|
||||
|
||||
class CopySubaddressWidget extends StatelessWidget {
|
||||
|
||||
final BuildContext context;
|
||||
final ImagePaths imagePath;
|
||||
final String subaddress;
|
||||
|
||||
@@ -15,7 +14,6 @@ class CopySubaddressWidget extends StatelessWidget {
|
||||
|
||||
const CopySubaddressWidget({
|
||||
super.key,
|
||||
required this.context,
|
||||
required this.imagePath,
|
||||
required this.subaddress,
|
||||
required this.onCopyButtonAction
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/extensions/string_extension.dart';
|
||||
import 'package:core/presentation/views/image/avatar_builder.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:jmap_dart_client/jmap/core/user_name.dart';
|
||||
import 'package:model/extensions/username_extension.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/material_text_button.dart';
|
||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||
|
||||
typedef OnSubtitleClick = void Function();
|
||||
|
||||
class UserInformationWidget extends StatelessWidget {
|
||||
final UserName? userName;
|
||||
|
||||
final String userName;
|
||||
final String? subtitle;
|
||||
final EdgeInsetsGeometry? titlePadding;
|
||||
final OnSubtitleClick? onSubtitleClick;
|
||||
@@ -20,7 +20,7 @@ class UserInformationWidget extends StatelessWidget {
|
||||
|
||||
const UserInformationWidget({
|
||||
Key? key,
|
||||
this.userName,
|
||||
required this.userName,
|
||||
this.subtitle,
|
||||
this.titlePadding,
|
||||
this.onSubtitleClick,
|
||||
@@ -35,7 +35,7 @@ class UserInformationWidget extends StatelessWidget {
|
||||
decoration: BoxDecoration(border: border),
|
||||
child: Row(children: [
|
||||
(AvatarBuilder()
|
||||
..text(userName?.firstCharacter ?? '')
|
||||
..text(userName.firstCharacterToUpperCase)
|
||||
..backgroundColor(Colors.white)
|
||||
..textColor(Colors.black)
|
||||
..addBoxShadows([const BoxShadow(
|
||||
@@ -48,7 +48,7 @@ class UserInformationWidget extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
SelectableText(
|
||||
userName?.value ?? '',
|
||||
userName,
|
||||
maxLines: 1,
|
||||
style: const TextStyle(
|
||||
fontSize: 17,
|
||||
|
||||
Reference in New Issue
Block a user