eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Support RTL mode for alignment mailbox view

Browse Source 
(cherry picked from commit 9136f16236305ef65ebbc3c0415e7ffdc637bef7)
This commit is contained in:
dab246
2023-06-15 15:06:17 +07:00
committed by Dat H. Pham
parent 96145aae7a
commit b7a4e3f585
14 changed files with 198 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/lib/presentation/views/text/slogan_builder.dart
+3 -3
View File
@@ -18,8 +18,8 @@ class SloganBuilder extends StatelessWidget {
final String? logo; final String? logo;
final double? sizeLogo; final double? sizeLogo;
final OnTapCallback? onTapCallback; final OnTapCallback? onTapCallback;
final EdgeInsets? paddingText; final EdgeInsetsGeometry? paddingText;
final EdgeInsets? padding; final EdgeInsetsGeometry? padding;
final bool enableOverflow; final bool enableOverflow;
final Color? hoverColor; final Color? hoverColor;
final double? hoverRadius; final double? hoverRadius;
@@ -55,7 +55,7 @@ class SloganBuilder extends StatelessWidget {
child: Column(children: [ child: Column(children: [
_logoApp(), _logoApp(),
Padding( Padding(
padding: paddingText ?? const EdgeInsets.only(top: 16, left: 16, right: 16), padding: paddingText ?? const EdgeInsetsDirectional.only(top: 16, start: 16, end: 16),
child: Text( child: Text(
text ?? '', text ?? '',
style: textStyle, style: textStyle,
lib/features/mailbox/presentation/base_mailbox_view.dart
+44
View File
@@ -0,0 +1,44 @@
import 'package:core/presentation/extensions/color_extension.dart';
import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/state/success.dart';
import 'package:core/presentation/utils/responsive_utils.dart';
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget_builder.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
abstract class BaseMailboxView extends GetWidget<MailboxController>
with
AppLoaderMixin,
MailboxWidgetMixin {
BaseMailboxView({Key? key}) : super(key: key);
final responsiveUtils = Get.find<ResponsiveUtils>();
final imagePaths = Get.find<ImagePaths>();
Widget buildUserInformation(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(vertical: 10),
child: Column(children: [
Obx(() => UserInformationWidgetBuilder(
imagePaths,
controller.mailboxDashBoardController.userProfile.value,
subtitle: AppLocalizations.of(context).manage_account,
onSubtitleClick: controller.mailboxDashBoardController.goToSettings)),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2)
]),
);
}
Widget buildLoadingView() {
return Obx(() => controller.viewState.value.fold(
(failure) => const SizedBox.shrink(),
(success) => success is LoadingState
? Padding(padding: const EdgeInsets.only(top: 16), child: loadingWidget)
: const SizedBox.shrink()));
}
}
lib/features/mailbox/presentation/mailbox_view.dart
+43 -90
View File
@@ -1,30 +1,22 @@
import 'package:core/core.dart'; import 'package:core/core.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:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:model/model.dart'; import 'package:model/model.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/base_mailbox_view.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/bottom_bar_selection_mailbox_widget.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/bottom_bar_selection_mailbox_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/sending_queue_mailbox_widget.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/sending_queue_mailbox_widget.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget_builder.dart';
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart'; import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/dashboard_routes.dart';
import 'package:tmail_ui_user/features/quotas/presentation/widget/quotas_footer_widget.dart'; import 'package:tmail_ui_user/features/quotas/presentation/widget/quotas_footer_widget.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/utils/app_config.dart'; import 'package:tmail_ui_user/main/utils/app_config.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
class MailboxView extends GetWidget<MailboxController> class MailboxView extends BaseMailboxView {
with MailboxWidgetMixin,
AppLoaderMixin {
final _imagePaths = Get.find<ImagePaths>();
final _responsiveUtils = Get.find<ResponsiveUtils>();
MailboxView({Key? key}) : super(key: key); MailboxView({Key? key}) : super(key: key);
@@ -33,9 +25,9 @@ class MailboxView extends GetWidget<MailboxController>
ThemeUtils.setStatusBarTransparentColor(); ThemeUtils.setStatusBarTransparentColor();
return SafeArea(bottom: false, left: false, right: false, return SafeArea(bottom: false, left: false, right: false,
top: _responsiveUtils.isMobile(context), top: responsiveUtils.isMobile(context),
child: ClipRRect( child: ClipRRect(
borderRadius: _responsiveUtils.isPortraitMobile(context) borderRadius: responsiveUtils.isPortraitMobile(context)
? const BorderRadius.only( ? const BorderRadius.only(
topRight: Radius.circular(14), topRight: Radius.circular(14),
topLeft: Radius.circular(14)) topLeft: Radius.circular(14))
@@ -80,7 +72,7 @@ class MailboxView extends GetWidget<MailboxController>
final appInformation = controller.mailboxDashBoardController.appInformation.value; final appInformation = controller.mailboxDashBoardController.appInformation.value;
if (appInformation != null if (appInformation != null
&& !controller.isSelectionEnabled()) { && !controller.isSelectionEnabled()) {
if (_responsiveUtils.isLandscapeMobile(context)) { if (responsiveUtils.isLandscapeMobile(context)) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
return _buildVersionInformation(context, appInformation); return _buildVersionInformation(context, appInformation);
@@ -100,15 +92,12 @@ class MailboxView extends GetWidget<MailboxController>
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only(top: _responsiveUtils.isMobile(context) ? 10 : 30, bottom: 8), padding: EdgeInsets.only(top: responsiveUtils.isMobile(context) ? 10 : 30, bottom: 8),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
children: [ children: [
Padding( Padding(
padding: EdgeInsets.only( padding: const EdgeInsetsDirectional.only(start: 10),
left: AppUtils.isDirectionRTL(context) ? 0 : 10,
right: AppUtils.isDirectionRTL(context) ? 19 : 0,
),
child: _buildCloseScreenButton(context)), child: _buildCloseScreenButton(context)),
SizedBox(width: controller.isSelectionEnabled() ? 49 : 40), SizedBox(width: controller.isSelectionEnabled() ? 49 : 40),
Expanded(child: Text( Expanded(child: Text(
@@ -119,7 +108,7 @@ class MailboxView extends GetWidget<MailboxController>
] ]
) )
), ),
if (!_responsiveUtils.isTabletLarge(context)) if (!responsiveUtils.isTabletLarge(context))
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2),
] ]
); );
@@ -127,14 +116,14 @@ class MailboxView extends GetWidget<MailboxController>
Widget _buildCloseScreenButton(BuildContext context) { Widget _buildCloseScreenButton(BuildContext context) {
return buildIconWeb( return buildIconWeb(
icon: SvgPicture.asset(_imagePaths.icCloseMailbox, width: 28, height: 28, fit: BoxFit.fill), icon: SvgPicture.asset(imagePaths.icCloseMailbox, width: 28, height: 28, fit: BoxFit.fill),
tooltip: AppLocalizations.of(context).close, tooltip: AppLocalizations.of(context).close,
onTap: () => controller.closeMailboxScreen(context)); onTap: () => controller.closeMailboxScreen(context));
} }
Widget _buildEditMailboxButton(BuildContext context, bool isSelectionEnabled) { Widget _buildEditMailboxButton(BuildContext context, bool isSelectionEnabled) {
return Padding( return Padding(
padding: const EdgeInsets.only(right: 10), padding: const EdgeInsetsDirectional.only(end: 10),
child: Material( child: Material(
shape: const CircleBorder(), shape: const CircleBorder(),
color: Colors.transparent, color: Colors.transparent,
@@ -150,29 +139,6 @@ class MailboxView extends GetWidget<MailboxController>
); );
} }
Widget _buildUserInformation(BuildContext context) {
return Column(children: [
Padding(
padding: EdgeInsets.only(
left: AppUtils.isDirectionRTL(context) ? 16 : _responsiveUtils.isLandscapeMobile(context) ? 0 : 16,
right: AppUtils.isDirectionRTL(context) ?_responsiveUtils.isLandscapeMobile(context) ? 0 : 16 : 16),
child: UserInformationWidgetBuilder(
_imagePaths,
controller.mailboxDashBoardController.userProfile.value,
subtitle: AppLocalizations.of(context).manage_account,
onSubtitleClick: () => controller.mailboxDashBoardController.goToSettings())),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2)
]);
}
Widget _buildLoadingView() {
return Obx(() => controller.viewState.value.fold(
(failure) => const SizedBox.shrink(),
(success) => success is LoadingState
? Padding(padding: const EdgeInsets.only(top: 16), child: loadingWidget)
: const SizedBox.shrink()));
}
Widget _buildListMailbox(BuildContext context) { Widget _buildListMailbox(BuildContext context) {
return NotificationListener( return NotificationListener(
onNotification: (_) { onNotification: (_) {
@@ -186,17 +152,14 @@ class MailboxView extends GetWidget<MailboxController>
padding: const EdgeInsets.only(bottom: 16), padding: const EdgeInsets.only(bottom: 16),
child: Column(children: [ child: Column(children: [
Obx(() { Obx(() {
if (controller.isSelectionEnabled() && _responsiveUtils.isLandscapeMobile(context)) { if (controller.isSelectionEnabled() && responsiveUtils.isLandscapeMobile(context)) {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
return _buildUserInformation(context); return buildUserInformation(context);
}), }),
_buildLoadingView(), buildLoadingView(),
AppConfig.appGridDashboardAvailable AppConfig.appGridDashboardAvailable
? Column(children: [ ? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller)
buildAppGridDashboard(context, _responsiveUtils, _imagePaths, controller),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2),
])
: const SizedBox.shrink(), : const SizedBox.shrink(),
const SizedBox(height: 8), const SizedBox(height: 8),
Obx(() { Obx(() {
@@ -227,13 +190,10 @@ class MailboxView extends GetWidget<MailboxController>
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2),
const SizedBox(height: 12), const SizedBox(height: 12),
Container( Container(
margin: EdgeInsets.only( margin: EdgeInsetsDirectional.only(
left: AppUtils.isDirectionRTL(context) ? 16 : _responsiveUtils.isLandscapeMobile(context) ? 0 : 8, start: responsiveUtils.isLandscapeMobile(context) ? 0 : 8,
right: AppUtils.isDirectionRTL(context) ? _responsiveUtils.isLandscapeMobile(context) ? 0 : 8 : 16), end: 16),
padding: EdgeInsets.only( padding: const EdgeInsetsDirectional.only(start: 8),
left: AppUtils.isDirectionRTL(context) ? 0 : 8,
right: AppUtils.isDirectionRTL(context) ? 8 : 0,
),
child: Row( child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween, mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [ children: [
@@ -247,7 +207,7 @@ class MailboxView extends GetWidget<MailboxController>
minSize: 40, minSize: 40,
iconPadding: EdgeInsets.zero, iconPadding: EdgeInsets.zero,
icon: SvgPicture.asset( icon: SvgPicture.asset(
_imagePaths.icSearchBar, imagePaths.icSearchBar,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill fit: BoxFit.fill
), ),
@@ -260,7 +220,7 @@ class MailboxView extends GetWidget<MailboxController>
iconPadding: EdgeInsets.zero, iconPadding: EdgeInsets.zero,
splashRadius: 15, splashRadius: 15,
icon: SvgPicture.asset( icon: SvgPicture.asset(
_imagePaths.icAddNewFolder, imagePaths.icAddNewFolder,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill), fit: BoxFit.fill),
tooltip: AppLocalizations.of(context).new_mailbox, tooltip: AppLocalizations.of(context).new_mailbox,
@@ -299,9 +259,9 @@ class MailboxView extends GetWidget<MailboxController>
Widget _buildHeaderMailboxCategory(BuildContext context, MailboxCategories categories) { Widget _buildHeaderMailboxCategory(BuildContext context, MailboxCategories categories) {
return Padding( return Padding(
padding: EdgeInsets.only( padding: EdgeInsetsDirectional.only(
right: AppUtils.isDirectionRTL(context) ? 4 : _responsiveUtils.isLandscapeMobile(context) ? 8 : 28, start: 4,
left: AppUtils.isDirectionRTL(context) ? _responsiveUtils.isLandscapeMobile(context) ? 8 : 28 : 4), end: responsiveUtils.isLandscapeMobile(context) ? 8 : 28),
child: Row(children: [ child: Row(children: [
buildIconWeb( buildIconWeb(
minSize: 40, minSize: 40,
@@ -310,8 +270,8 @@ class MailboxView extends GetWidget<MailboxController>
splashRadius: 15, splashRadius: 15,
icon: SvgPicture.asset( icon: SvgPicture.asset(
categories.getExpandMode(controller.mailboxCategoriesExpandMode.value) == ExpandMode.EXPAND categories.getExpandMode(controller.mailboxCategoriesExpandMode.value) == ExpandMode.EXPAND
? _imagePaths.icExpandFolder ? imagePaths.icExpandFolder
: _imagePaths.icCollapseFolder, : DirectionUtils.isDirectionRTLByLanguage(context) ? imagePaths.icBack : imagePaths.icCollapseFolder,
colorFilter: AppColor.primaryColor.asFilter(), colorFilter: AppColor.primaryColor.asFilter(),
fit: BoxFit.fill), fit: BoxFit.fill),
tooltip: AppLocalizations.of(context).collapse, tooltip: AppLocalizations.of(context).collapse,
@@ -327,14 +287,11 @@ class MailboxView extends GetWidget<MailboxController>
final lastNode = mailboxNode.childrenItems?.last; final lastNode = mailboxNode.childrenItems?.last;
return Container( return Container(
margin: EdgeInsets.only( margin: EdgeInsetsDirectional.only(
left: AppUtils.isDirectionRTL(context) ? 16 : _responsiveUtils.isLandscapeMobile(context) ? 0 : 8, start: responsiveUtils.isLandscapeMobile(context) ? 0 : 8,
right: AppUtils.isDirectionRTL(context) ? _responsiveUtils.isLandscapeMobile(context) ? 0 : 8 : 16 end: 16
),
padding: EdgeInsets.only(
left: AppUtils.isDirectionRTL(context) ? 0 : 12,
right: AppUtils.isDirectionRTL(context) ? 12 : 0,
), ),
padding: const EdgeInsetsDirectional.only(start: 12),
child: TreeView( child: TreeView(
key: Key('${categories.keyValue}_mailbox_list'), key: Key('${categories.keyValue}_mailbox_list'),
children: _buildListChildTileWidget(context, mailboxNode, lastNode: lastNode))); children: _buildListChildTileWidget(context, mailboxNode, lastNode: lastNode)));
@@ -362,14 +319,10 @@ class MailboxView extends GetWidget<MailboxController>
context, context,
key: const Key('children_tree_mailbox_child'), key: const Key('children_tree_mailbox_child'),
isExpanded: mailboxNode.expandMode == ExpandMode.EXPAND, isExpanded: mailboxNode.expandMode == ExpandMode.EXPAND,
isDirectionRTL: AppUtils.isDirectionRTL(context), paddingChild: const EdgeInsetsDirectional.only(start: 14),
paddingChild: EdgeInsets.only(
left: AppUtils.isDirectionRTL(context) ? 0 : 14,
right: AppUtils.isDirectionRTL(context) ? 14 : 0,
),
parent: Obx(() => (MailBoxFolderTileBuilder( parent: Obx(() => (MailBoxFolderTileBuilder(
context, context,
_imagePaths, imagePaths,
mailboxNode, mailboxNode,
lastNode: lastNode, lastNode: lastNode,
allSelectMode: controller.currentSelectMode.value, allSelectMode: controller.currentSelectMode.value,
@@ -377,7 +330,7 @@ class MailboxView extends GetWidget<MailboxController>
..addOnLongPressMailboxNodeAction((mailboxNode) { ..addOnLongPressMailboxNodeAction((mailboxNode) {
openMailboxMenuActionOnMobile( openMailboxMenuActionOnMobile(
context, context,
_imagePaths, imagePaths,
mailboxNode.item, mailboxNode.item,
controller controller
); );
@@ -392,7 +345,7 @@ class MailboxView extends GetWidget<MailboxController>
} else { } else {
return Obx(() => (MailBoxFolderTileBuilder( return Obx(() => (MailBoxFolderTileBuilder(
context, context,
_imagePaths, imagePaths,
mailboxNode, mailboxNode,
lastNode: lastNode, lastNode: lastNode,
allSelectMode: controller.currentSelectMode.value, allSelectMode: controller.currentSelectMode.value,
@@ -400,7 +353,7 @@ class MailboxView extends GetWidget<MailboxController>
..addOnLongPressMailboxNodeAction((mailboxNode) { ..addOnLongPressMailboxNodeAction((mailboxNode) {
openMailboxMenuActionOnMobile( openMailboxMenuActionOnMobile(
context, context,
_imagePaths, imagePaths,
mailboxNode.item, mailboxNode.item,
controller controller
); );
@@ -425,8 +378,8 @@ class MailboxView extends GetWidget<MailboxController>
right: false, right: false,
top: false, top: false,
child: BottomBarSelectionMailboxWidget( child: BottomBarSelectionMailboxWidget(
_responsiveUtils, responsiveUtils,
_imagePaths, imagePaths,
controller.listMailboxSelected, controller.listMailboxSelected,
controller.listActionOfMailboxSelected, controller.listActionOfMailboxSelected,
onMailboxActionsClick: (actions, listMailboxSelected) => onMailboxActionsClick: (actions, listMailboxSelected) =>
@@ -442,12 +395,12 @@ class MailboxView extends GetWidget<MailboxController>
} }
Widget _buildVersionInformation(BuildContext context, PackageInfo packageInfo) { Widget _buildVersionInformation(BuildContext context, PackageInfo packageInfo) {
return SafeArea( return Container(
top: false, color: AppColor.colorBgMailbox,
child: Container( width: double.infinity,
color: AppColor.colorBgMailbox, padding: const EdgeInsets.all(16),
width: double.infinity, child: SafeArea(
padding: const EdgeInsets.symmetric(vertical: 16, horizontal: 16), top: false,
child: Text( child: Text(
'${AppLocalizations.of(context).version} ${packageInfo.version}', '${AppLocalizations.of(context).version} ${packageInfo.version}',
textAlign: TextAlign.center, textAlign: TextAlign.center,
lib/features/mailbox/presentation/mailbox_view_web.dart
+37 -96
View File
@@ -4,47 +4,38 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:model/model.dart'; import 'package:model/model.dart';
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import 'package:tmail_ui_user/features/base/mixin/app_loader_mixin.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/base_mailbox_view.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_categories.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget_builder.dart';
import 'package:tmail_ui_user/features/quotas/presentation/widget/quotas_footer_widget.dart'; import 'package:tmail_ui_user/features/quotas/presentation/widget/quotas_footer_widget.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/utils/app_config.dart'; import 'package:tmail_ui_user/main/utils/app_config.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
class MailboxView extends GetWidget<MailboxController> class MailboxView extends BaseMailboxView {
with AppLoaderMixin,
MailboxWidgetMixin {
final _imagePaths = Get.find<ImagePaths>();
final _responsiveUtils = Get.find<ResponsiveUtils>();
MailboxView({Key? key}) : super(key: key); MailboxView({Key? key}) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Drawer( return Drawer(
elevation: _responsiveUtils.isDesktop(context) ? 0 : 16.0, elevation: responsiveUtils.isDesktop(context) ? 0 : 16.0,
child: Scaffold( child: Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.white,
body: Column(children: [ body: Column(children: [
if (!_responsiveUtils.isDesktop(context)) _buildLogoApp(context), if (!responsiveUtils.isDesktop(context)) _buildLogoApp(context),
if (!_responsiveUtils.isDesktop(context)) if (!responsiveUtils.isDesktop(context))
const Divider( const Divider(
color: AppColor.colorDividerMailbox, color: AppColor.colorDividerMailbox,
height: 0.5, height: 0.5,
thickness: 0.2), thickness: 0.2),
Expanded(child: Container( Expanded(child: Container(
padding: _getViewPadding(context), padding: EdgeInsetsDirectional.only(start: responsiveUtils.isDesktop(context) ? 16 : 0),
color: _responsiveUtils.isDesktop(context) color: responsiveUtils.isDesktop(context)
? AppColor.colorBgDesktop ? AppColor.colorBgDesktop
: Colors.white, : Colors.white,
child: Container( child: Container(
color: _responsiveUtils.isDesktop(context) color: responsiveUtils.isDesktop(context)
? AppColor.colorBgDesktop ? AppColor.colorBgDesktop
: Colors.white, : Colors.white,
child: RefreshIndicator( child: RefreshIndicator(
@@ -60,22 +51,13 @@ class MailboxView extends GetWidget<MailboxController>
); );
} }
EdgeInsets _getViewPadding(BuildContext context) {
if (AppUtils.isDirectionRTL(context)) {
return EdgeInsets.only(right: _responsiveUtils.isDesktop(context) ? 16 : 0);
} else {
return EdgeInsets.only(left: _responsiveUtils.isDesktop(context) ? 16 : 0);
}
}
Widget _buildLogoApp(BuildContext context) { Widget _buildLogoApp(BuildContext context) {
return Container( return Container(
color: Colors.white, color: Colors.white,
padding: EdgeInsets.only( padding: EdgeInsetsDirectional.only(
top: _responsiveUtils.isDesktop(context) ? 25 : 16, top: responsiveUtils.isDesktop(context) ? 25 : 16,
bottom: _responsiveUtils.isDesktop(context) ? 25 : 16, bottom: responsiveUtils.isDesktop(context) ? 25 : 16,
left: AppUtils.isDirectionRTL(context) ? 0 : _responsiveUtils.isDesktop(context) ? 32 : 16, start: responsiveUtils.isDesktop(context) ? 32 : 16,
right: AppUtils.isDirectionRTL(context) ? _responsiveUtils.isDesktop(context) ? 32 : 16 : 0
), ),
child: Row(children: [ child: Row(children: [
SloganBuilder( SloganBuilder(
@@ -83,7 +65,7 @@ class MailboxView extends GetWidget<MailboxController>
text: AppLocalizations.of(context).app_name, text: AppLocalizations.of(context).app_name,
textAlign: TextAlign.center, textAlign: TextAlign.center,
textStyle: const TextStyle(color: Colors.black, fontSize: 20, fontWeight: FontWeight.bold), textStyle: const TextStyle(color: Colors.black, fontSize: 20, fontWeight: FontWeight.bold),
logo: _imagePaths.icLogoTMail logo: imagePaths.icLogoTMail
), ),
Obx(() { Obx(() {
if (controller.mailboxDashBoardController.appInformation.value != null) { if (controller.mailboxDashBoardController.appInformation.value != null) {
@@ -96,14 +78,6 @@ class MailboxView extends GetWidget<MailboxController>
); );
} }
Widget _buildLoadingView() {
return Obx(() => controller.viewState.value.fold(
(failure) => const SizedBox.shrink(),
(success) => success is LoadingState
? Padding(padding: const EdgeInsets.only(top: 16), child: loadingWidget)
: const SizedBox.shrink()));
}
Widget _buildListMailbox(BuildContext context) { Widget _buildListMailbox(BuildContext context) {
return Stack( return Stack(
children: [ children: [
@@ -111,21 +85,13 @@ class MailboxView extends GetWidget<MailboxController>
controller: controller.mailboxListScrollController, controller: controller.mailboxListScrollController,
key: const PageStorageKey('mailbox_list'), key: const PageStorageKey('mailbox_list'),
physics: const ClampingScrollPhysics(), physics: const ClampingScrollPhysics(),
padding: EdgeInsets.only( padding: EdgeInsetsDirectional.only(end: responsiveUtils.isDesktop(context) ? 16 : 0),
right: AppUtils.isDirectionRTL(context) ? 0 : _responsiveUtils.isDesktop(context) ? 16 : 0,
left: AppUtils.isDirectionRTL(context) ? _responsiveUtils.isDesktop(context) ? 16 : 0 : 0
),
child: Column(children: [ child: Column(children: [
if (!_responsiveUtils.isDesktop(context)) if (!responsiveUtils.isDesktop(context))
_buildUserInformation(context), buildUserInformation(context),
_buildLoadingView(), buildLoadingView(),
AppConfig.appGridDashboardAvailable && _responsiveUtils.isWebNotDesktop(context) AppConfig.appGridDashboardAvailable && responsiveUtils.isWebNotDesktop(context)
? Column(children: [ ? buildAppGridDashboard(context, responsiveUtils, imagePaths, controller)
buildAppGridDashboard(context, _responsiveUtils, _imagePaths, controller),
const SizedBox(height: 8),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2),
const SizedBox(height: 8),
])
: const SizedBox.shrink(), : const SizedBox.shrink(),
Obx(() { Obx(() {
if (controller.defaultMailboxIsNotEmpty) { if (controller.defaultMailboxIsNotEmpty) {
@@ -142,9 +108,8 @@ class MailboxView extends GetWidget<MailboxController>
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2), const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2),
const SizedBox(height: 13), const SizedBox(height: 13),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsetsDirectional.only(
left: AppUtils.isDirectionRTL(context) ? 0 : _responsiveUtils.isDesktop(context) ? 0 : 12, start: responsiveUtils.isDesktop(context) ? 0 : 12,
right: AppUtils.isDirectionRTL(context) ? _responsiveUtils.isDesktop(context) ? 0 : 12 : 0,
bottom: 8 bottom: 8
), ),
child: Row( child: Row(
@@ -156,17 +121,14 @@ class MailboxView extends GetWidget<MailboxController>
color: Colors.black, color: Colors.black,
fontWeight: FontWeight.bold)), fontWeight: FontWeight.bold)),
Padding( Padding(
padding: EdgeInsets.only( padding: EdgeInsetsDirectional.only(end: responsiveUtils.isDesktop(context) ? 0 : 12),
right: AppUtils.isDirectionRTL(context) ? 0 : _responsiveUtils.isDesktop(context) ? 0 : 12,
left: AppUtils.isDirectionRTL(context) ? _responsiveUtils.isDesktop(context) ? 0 : 12 : 0,
),
child: Row( child: Row(
children: [ children: [
buildIconWeb( buildIconWeb(
minSize: 40, minSize: 40,
iconPadding: EdgeInsets.zero, iconPadding: EdgeInsets.zero,
icon: SvgPicture.asset( icon: SvgPicture.asset(
_imagePaths.icSearchBar, imagePaths.icSearchBar,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill fit: BoxFit.fill
), ),
@@ -178,7 +140,7 @@ class MailboxView extends GetWidget<MailboxController>
iconPadding: EdgeInsets.zero, iconPadding: EdgeInsets.zero,
splashRadius: 15, splashRadius: 15,
icon: SvgPicture.asset( icon: SvgPicture.asset(
_imagePaths.icAddNewFolder, imagePaths.icAddNewFolder,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill), fit: BoxFit.fill),
tooltip: AppLocalizations.of(context).new_mailbox, tooltip: AppLocalizations.of(context).new_mailbox,
@@ -233,23 +195,6 @@ class MailboxView extends GetWidget<MailboxController>
); );
} }
Widget _buildUserInformation(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(vertical: 10),
child: Column(children: [
Padding(
padding: const EdgeInsets.only(left: 16, bottom: 10, right: 16),
child: Obx(() => UserInformationWidgetBuilder(
_imagePaths,
controller.mailboxDashBoardController.userProfile.value,
subtitle: AppLocalizations.of(context).manage_account,
onSubtitleClick: () => controller.mailboxDashBoardController.goToSettings()),
)),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2)
]),
);
}
Widget _buildBodyMailboxCategory( Widget _buildBodyMailboxCategory(
BuildContext context, BuildContext context,
MailboxCategories categories, MailboxCategories categories,
@@ -259,8 +204,8 @@ class MailboxView extends GetWidget<MailboxController>
return Container( return Container(
padding: EdgeInsets.only( padding: EdgeInsets.only(
right: _responsiveUtils.isDesktop(context) ? 0 : 16, right: responsiveUtils.isDesktop(context) ? 0 : 16,
left: _responsiveUtils.isDesktop(context) ? 0 : 16), left: responsiveUtils.isDesktop(context) ? 0 : 16),
child: TreeView( child: TreeView(
key: Key('${categories.keyValue}_mailbox_list'), key: Key('${categories.keyValue}_mailbox_list'),
children: _buildListChildTileWidget( children: _buildListChildTileWidget(
@@ -281,8 +226,8 @@ class MailboxView extends GetWidget<MailboxController>
children: [ children: [
buildHeaderMailboxCategory( buildHeaderMailboxCategory(
context, context,
_responsiveUtils, responsiveUtils,
_imagePaths, imagePaths,
categories, categories,
controller, controller,
toggleMailboxCategories: controller.toggleMailboxCategories toggleMailboxCategories: controller.toggleMailboxCategories
@@ -309,17 +254,13 @@ class MailboxView extends GetWidget<MailboxController>
return TreeViewChild( return TreeViewChild(
context, context,
key: const Key('children_tree_mailbox_child'), key: const Key('children_tree_mailbox_child'),
isDirectionRTL: AppUtils.isDirectionRTL(context),
isExpanded: mailboxNode.expandMode == ExpandMode.EXPAND, isExpanded: mailboxNode.expandMode == ExpandMode.EXPAND,
paddingChild: EdgeInsets.only( paddingChild: const EdgeInsetsDirectional.only(start: 14),
left: AppUtils.isDirectionRTL(context) ? 0 : 14,
right: AppUtils.isDirectionRTL(context) ? 14 : 0,
),
parent: Obx(() => (MailBoxFolderTileBuilder( parent: Obx(() => (MailBoxFolderTileBuilder(
context, context,
_imagePaths, imagePaths,
mailboxNode, mailboxNode,
responsiveUtils: _responsiveUtils, responsiveUtils: responsiveUtils,
lastNode: lastNode, lastNode: lastNode,
mailboxNodeSelected: controller.mailboxDashBoardController.selectedMailbox.value) mailboxNodeSelected: controller.mailboxDashBoardController.selectedMailbox.value)
..addOnClickOpenMailboxNodeAction((mailboxNode) => controller.openMailbox(context, mailboxNode.item)) ..addOnClickOpenMailboxNodeAction((mailboxNode) => controller.openMailbox(context, mailboxNode.item))
@@ -328,8 +269,8 @@ class MailboxView extends GetWidget<MailboxController>
..addOnClickOpenMenuMailboxNodeAction((position, mailboxNode) { ..addOnClickOpenMenuMailboxNodeAction((position, mailboxNode) {
openMailboxMenuActionOnWeb( openMailboxMenuActionOnWeb(
context, context,
_imagePaths, imagePaths,
_responsiveUtils, responsiveUtils,
position, position,
mailboxNode.item, mailboxNode.item,
controller controller
@@ -343,17 +284,17 @@ class MailboxView extends GetWidget<MailboxController>
} else { } else {
return Obx(() => (MailBoxFolderTileBuilder( return Obx(() => (MailBoxFolderTileBuilder(
context, context,
_imagePaths, imagePaths,
mailboxNode, mailboxNode,
responsiveUtils: _responsiveUtils, responsiveUtils: responsiveUtils,
lastNode: lastNode, lastNode: lastNode,
mailboxNodeSelected: controller.mailboxDashBoardController.selectedMailbox.value) mailboxNodeSelected: controller.mailboxDashBoardController.selectedMailbox.value)
..addOnClickOpenMailboxNodeAction((mailboxNode) => controller.openMailbox(context, mailboxNode.item)) ..addOnClickOpenMailboxNodeAction((mailboxNode) => controller.openMailbox(context, mailboxNode.item))
..addOnClickOpenMenuMailboxNodeAction((position, mailboxNode) { ..addOnClickOpenMenuMailboxNodeAction((position, mailboxNode) {
openMailboxMenuActionOnWeb( openMailboxMenuActionOnWeb(
context, context,
_imagePaths, imagePaths,
_responsiveUtils, responsiveUtils,
position, position,
mailboxNode.item, mailboxNode.item,
controller controller
lib/features/mailbox/presentation/mixin/mailbox_widget_mixin.dart
+7 -5
View File
@@ -4,6 +4,7 @@ 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/icon_button_web.dart'; import 'package:core/presentation/views/button/icon_button_web.dart';
import 'package:core/utils/direction_utils.dart';
import 'package:core/utils/platform_info.dart'; import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
@@ -300,7 +301,7 @@ mixin MailboxWidgetMixin {
icon: SvgPicture.asset( icon: SvgPicture.asset(
expandMode == ExpandMode.EXPAND expandMode == ExpandMode.EXPAND
? imagePaths.icExpandFolder ? imagePaths.icExpandFolder
: imagePaths.icCollapseFolder, : DirectionUtils.isDirectionRTLByLanguage(context) ? imagePaths.icBack : imagePaths.icCollapseFolder,
colorFilter: AppColor.primaryColor.asFilter(), colorFilter: AppColor.primaryColor.asFilter(),
fit: BoxFit.fill fit: BoxFit.fill
), ),
@@ -345,7 +346,8 @@ mixin MailboxWidgetMixin {
? _buildAppGridInMailboxView(context, controller) ? _buildAppGridInMailboxView(context, controller)
: const Offstage(); : const Offstage();
}) })
) ),
const Divider(color: AppColor.colorDividerMailbox, height: 0.5, thickness: 0.2),
]); ]);
} }
@@ -357,7 +359,7 @@ mixin MailboxWidgetMixin {
MailboxController controller MailboxController controller
) { ) {
return Padding( return Padding(
padding: const EdgeInsets.only(left: 32, top: 8, bottom: 8, right: 4), padding: const EdgeInsetsDirectional.only(start: 32, bottom: 8, end: 4),
child: Row(children: [ child: Row(children: [
SvgPicture.asset( SvgPicture.asset(
imagePaths.icAppDashboard, imagePaths.icAppDashboard,
@@ -381,7 +383,7 @@ mixin MailboxWidgetMixin {
buildIconWeb( buildIconWeb(
icon: Obx(() => SvgPicture.asset( icon: Obx(() => SvgPicture.asset(
controller.mailboxDashBoardController.appGridDashboardController.appDashboardExpandMode.value == ExpandMode.COLLAPSE controller.mailboxDashBoardController.appGridDashboardController.appDashboardExpandMode.value == ExpandMode.COLLAPSE
? imagePaths.icCollapseFolder ? DirectionUtils.isDirectionRTLByLanguage(context) ? imagePaths.icBack : imagePaths.icCollapseFolder
: imagePaths.icExpandFolder, : imagePaths.icExpandFolder,
colorFilter: controller.mailboxDashBoardController.appGridDashboardController.appDashboardExpandMode.value == ExpandMode.COLLAPSE colorFilter: controller.mailboxDashBoardController.appGridDashboardController.appDashboardExpandMode.value == ExpandMode.COLLAPSE
? AppColor.colorIconUnSubscribedMailbox.asFilter() ? AppColor.colorIconUnSubscribedMailbox.asFilter()
@@ -402,7 +404,7 @@ mixin MailboxWidgetMixin {
return ListView.builder( return ListView.builder(
shrinkWrap: true, shrinkWrap: true,
primary: false, primary: false,
padding: const EdgeInsets.only(left: 16, right: 16, bottom: 8), padding: const EdgeInsetsDirectional.only(start: 16, end: 16, bottom: 8),
itemCount: linagoraApps.apps.length, itemCount: linagoraApps.apps.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
return AppListDashboardItem(linagoraApps.apps[index]); return AppListDashboardItem(linagoraApps.apps[index]);
lib/features/mailbox/presentation/widgets/mailbox_folder_tile_builder.dart
+15 -27
View File
@@ -4,7 +4,8 @@ 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/icon_button_web.dart'; import 'package:core/presentation/views/button/icon_button_web.dart';
import 'package:core/utils/build_utils.dart'; import 'package:core/utils/direction_utils.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
@@ -18,7 +19,6 @@ import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_displa
import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/model/mailbox_node.dart';
import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart'; import 'package:tmail_ui_user/features/mailbox/presentation/utils/mailbox_method_action_define.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
class MailBoxFolderTileBuilder { class MailBoxFolderTileBuilder {
@@ -94,7 +94,7 @@ class MailBoxFolderTileBuilder {
Widget _buildMailboxItem(BuildContext context) { Widget _buildMailboxItem(BuildContext context) {
if (mailboxDisplayed == MailboxDisplayed.mailbox) { if (mailboxDisplayed == MailboxDisplayed.mailbox) {
if (BuildUtils.isWeb) { if (PlatformInfo.isWeb) {
return StatefulBuilder( return StatefulBuilder(
builder: (context, setState) { builder: (context, setState) {
return InkWell( return InkWell(
@@ -194,7 +194,7 @@ class MailBoxFolderTileBuilder {
icon: SvgPicture.asset( icon: SvgPicture.asset(
_mailboxNode.expandMode == ExpandMode.EXPAND _mailboxNode.expandMode == ExpandMode.EXPAND
? _imagePaths.icExpandFolder ? _imagePaths.icExpandFolder
: _imagePaths.icCollapseFolder, : DirectionUtils.isDirectionRTLByLanguage(context) ? _imagePaths.icBack : _imagePaths.icCollapseFolder,
colorFilter: _mailboxNode.item.allowedToDisplay colorFilter: _mailboxNode.item.allowedToDisplay
? AppColor.primaryColor.asFilter() ? AppColor.primaryColor.asFilter()
: AppColor.colorIconUnSubscribedMailbox.asFilter(), : AppColor.colorIconUnSubscribedMailbox.asFilter(),
@@ -213,7 +213,7 @@ class MailBoxFolderTileBuilder {
const SizedBox(width: 32), const SizedBox(width: 32),
Transform( Transform(
transform: Matrix4.translationValues( transform: Matrix4.translationValues(
AppUtils.isDirectionRTL(context) ? 0.0 : -4.0, DirectionUtils.isDirectionRTLByLanguage(context) ? 0.0 : -4.0,
0.0, 0.0,
0.0 0.0
), ),
@@ -223,16 +223,13 @@ class MailBoxFolderTileBuilder {
} }
Widget _buildTrailingItemForMailboxView(BuildContext context) { Widget _buildTrailingItemForMailboxView(BuildContext context) {
if (BuildUtils.isWeb) { if (PlatformInfo.isWeb) {
if (isHoverItem) { if (isHoverItem) {
return _buildMenuIcon(context); return _buildMenuIcon(context);
} else if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty } else if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty
&& _mailboxNode.item.matchCountingRules()) { && _mailboxNode.item.matchCountingRules()) {
return Padding( return Padding(
padding: EdgeInsets.only( padding: const EdgeInsetsDirectional.only(start: 10),
right: AppUtils.isDirectionRTL(context) ? 0 : 10,
left: AppUtils.isDirectionRTL(context) ? 10 : 0,
),
child: _buildCounter(), child: _buildCounter(),
); );
} else { } else {
@@ -241,10 +238,7 @@ class MailBoxFolderTileBuilder {
} else { } else {
if (_mailboxNode.hasChildren()) { if (_mailboxNode.hasChildren()) {
return Padding( return Padding(
padding: EdgeInsets.only( padding: const EdgeInsetsDirectional.only(start: 12),
right: AppUtils.isDirectionRTL(context) ? 0 : 12,
left: AppUtils.isDirectionRTL(context) ? 12 : 0,
),
child: Row( child: Row(
children: [ children: [
if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty
@@ -256,10 +250,7 @@ class MailBoxFolderTileBuilder {
} else if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty } else if (_mailboxNode.item.getCountUnReadEmails().isNotEmpty
&& _mailboxNode.item.matchCountingRules()) { && _mailboxNode.item.matchCountingRules()) {
return Padding( return Padding(
padding: EdgeInsets.only( padding: const EdgeInsetsDirectional.only(start: 12),
right: AppUtils.isDirectionRTL(context) ? 0 : 12,
left: AppUtils.isDirectionRTL(context) ? 12 : 0,
),
child: _buildCounter(), child: _buildCounter(),
); );
} else { } else {
@@ -269,7 +260,7 @@ class MailBoxFolderTileBuilder {
} }
Widget _buildLeadingIcon() { Widget _buildLeadingIcon() {
if (BuildUtils.isWeb) { if (PlatformInfo.isWeb) {
return _buildLeadingIconTeamMailboxes(); return _buildLeadingIconTeamMailboxes();
} else { } else {
return allSelectMode == SelectMode.ACTIVE return allSelectMode == SelectMode.ACTIVE
@@ -346,17 +337,14 @@ class MailBoxFolderTileBuilder {
Widget _buildMailboxIcon() { Widget _buildMailboxIcon() {
return SvgPicture.asset(_mailboxNode.item.getMailboxIcon(_imagePaths), return SvgPicture.asset(_mailboxNode.item.getMailboxIcon(_imagePaths),
width: BuildUtils.isWeb ? 20 : 24, width: PlatformInfo.isWeb ? 20 : 24,
height: BuildUtils.isWeb ? 20 : 24, height: PlatformInfo.isWeb ? 20 : 24,
fit: BoxFit.fill); fit: BoxFit.fill);
} }
Widget _buildMenuIcon(BuildContext context) { Widget _buildMenuIcon(BuildContext context) {
return Padding( return Padding(
padding: EdgeInsets.only( padding: const EdgeInsetsDirectional.only(start: 8),
right: AppUtils.isDirectionRTL(context) ? 0 : 8,
left: AppUtils.isDirectionRTL(context) ? 8 : 0,
),
child: InkWell( child: InkWell(
onTapDown: (detail) { onTapDown: (detail) {
final screenSize = MediaQuery.of(_context).size; final screenSize = MediaQuery.of(_context).size;
@@ -384,8 +372,8 @@ class MailBoxFolderTileBuilder {
_mailboxNode.selectMode == SelectMode.ACTIVE _mailboxNode.selectMode == SelectMode.ACTIVE
? _imagePaths.icSelected ? _imagePaths.icSelected
: _imagePaths.icUnSelected, : _imagePaths.icUnSelected,
width: BuildUtils.isWeb ? 20 : 24, width: PlatformInfo.isWeb ? 20 : 24,
height: BuildUtils.isWeb ? 20 : 24, height: PlatformInfo.isWeb ? 20 : 24,
fit: BoxFit.fill) fit: BoxFit.fill)
); );
} }
lib/features/mailbox/presentation/widgets/user_information_widget_builder.dart
+37 -60
View File
@@ -4,13 +4,13 @@ import 'package:core/presentation/extensions/string_extension.dart';
import 'package:core/presentation/resources/image_paths.dart'; import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/utils/style_utils.dart'; import 'package:core/presentation/utils/style_utils.dart';
import 'package:core/presentation/views/image/avatar_builder.dart'; import 'package:core/presentation/views/image/avatar_builder.dart';
import 'package:flutter/foundation.dart'; import 'package:core/utils/direction_utils.dart';
import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get_utils/src/platform/platform.dart'; import 'package:model/user/user_profile.dart';
import 'package:model/model.dart'; import 'package:tmail_ui_user/features/base/widget/material_text_button.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
typedef OnSubtitleClick = void Function(); typedef OnSubtitleClick = void Function();
@@ -18,8 +18,9 @@ class UserInformationWidgetBuilder extends StatelessWidget {
final ImagePaths _imagePaths; final ImagePaths _imagePaths;
final UserProfile? _userProfile; final UserProfile? _userProfile;
final String? subtitle; final String? subtitle;
final EdgeInsets? titlePadding; final EdgeInsetsGeometry? titlePadding;
final OnSubtitleClick? onSubtitleClick; final OnSubtitleClick? onSubtitleClick;
final EdgeInsetsGeometry? padding;
const UserInformationWidgetBuilder( const UserInformationWidgetBuilder(
this._imagePaths, this._imagePaths,
@@ -29,16 +30,14 @@ class UserInformationWidgetBuilder extends StatelessWidget {
this.subtitle, this.subtitle,
this.titlePadding, this.titlePadding,
this.onSubtitleClick, this.onSubtitleClick,
this.padding,
} }
) : super(key: key); ) : super(key: key);
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Container( return Padding(
key: const Key('user_information_widget'), padding: padding ?? const EdgeInsetsDirectional.only(start: 16, end: 4, top: 16, bottom: 16),
color: Colors.transparent,
padding: EdgeInsets.zero,
margin: EdgeInsets.zero,
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
(AvatarBuilder() (AvatarBuilder()
..text(_userProfile != null ? _userProfile!.getAvatarText() : '') ..text(_userProfile != null ? _userProfile!.getAvatarText() : '')
@@ -47,62 +46,40 @@ class UserInformationWidgetBuilder extends StatelessWidget {
..addBoxShadows([const BoxShadow( ..addBoxShadows([const BoxShadow(
color: AppColor.colorShadowBgContentEmail, color: AppColor.colorShadowBgContentEmail,
spreadRadius: 1, blurRadius: 1, offset: Offset(0, 0.5))]) spreadRadius: 1, blurRadius: 1, offset: Offset(0, 0.5))])
..size(GetPlatform.isWeb ? 48 : 56)) ..size(PlatformInfo.isWeb ? 48 : 56))
.build(), .build(),
const SizedBox(width: 16),
Expanded(child: Column( Expanded(child: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Padding( Text(
padding: titlePadding ?? EdgeInsets.only( _userProfile != null ? '${_userProfile?.email}'.withUnicodeCharacter : '',
left: AppUtils.isDirectionRTL(context) ? 0 : 16, maxLines: 1,
right: AppUtils.isDirectionRTL(context) ? 16 : 0, overflow: CommonTextStyle.defaultTextOverFlow,
top: 10 softWrap: CommonTextStyle.defaultSoftWrap,
), style: const TextStyle(
child: Text( fontSize: 17,
_userProfile != null ? '${_userProfile?.email}'.withUnicodeCharacter : '', color: AppColor.colorNameEmail,
maxLines: 1, fontWeight: FontWeight.w600
overflow: CommonTextStyle.defaultTextOverFlow, )
softWrap: CommonTextStyle.defaultSoftWrap,
style: const TextStyle(fontSize: 17, color: AppColor.colorNameEmail, fontWeight: FontWeight.w600)
)
), ),
subtitle != null const SizedBox(height: 10),
? Padding( if (subtitle != null)
padding: EdgeInsets.only( MaterialTextButton(
left: AppUtils.isDirectionRTL(context) ? 0 : 10, label: AppLocalizations.of(context).manage_account,
right: AppUtils.isDirectionRTL(context) ? 10 : 0 onTap: onSubtitleClick,
), borderRadius: 20,
child: Material( padding: const EdgeInsetsDirectional.symmetric(horizontal: 8, vertical: 8),
borderRadius: BorderRadius.circular(20), customStyle: const TextStyle(fontSize: 14, color: AppColor.colorTextButton),
color: Colors.transparent, )
child: Align(
alignment: Alignment.centerLeft,
child: TextButton(
onPressed: () => onSubtitleClick?.call(),
child: Text(
AppLocalizations.of(context).manage_account,
style: const TextStyle(fontSize: 14, color: AppColor.colorTextButton),
),
)
)
)
)
: const SizedBox.shrink()
])), ])),
if (!kIsWeb) if (PlatformInfo.isMobile)
Transform( SvgPicture.asset(
transform: Matrix4.translationValues( DirectionUtils.isDirectionRTLByLanguage(context) ? _imagePaths.icBack : _imagePaths.icCollapseFolder,
AppUtils.isDirectionRTL(context) ? -14.0 : 14.0, fit: BoxFit.fill,
0.0, colorFilter: AppColor.colorCollapseMailbox.asFilter()
0.0 ),
), const SizedBox(width: 16),
child: IconButton(
icon: SvgPicture.asset(
AppUtils.isDirectionRTL(context) ? _imagePaths.icBack : _imagePaths.icCollapseFolder,
fit: BoxFit.fill,
colorFilter: AppColor.colorCollapseMailbox.asFilter()),
onPressed: () => {}))
]), ]),
); );
} }
lib/features/mailbox_creator/presentation/mailbox_creator_view.dart
+1 -1
View File
@@ -181,7 +181,7 @@ class MailboxCreatorView extends GetWidget<MailboxCreatorController> {
IconButton( IconButton(
color: AppColor.primaryColor, color: AppColor.primaryColor,
icon: SvgPicture.asset( icon: SvgPicture.asset(
_imagePaths.icCollapseFolder, DirectionUtils.isDirectionRTLByLanguage(context) ? _imagePaths.icBack : _imagePaths.icCollapseFolder,
colorFilter: AppColor.colorCollapseMailbox.asFilter(), colorFilter: AppColor.colorCollapseMailbox.asFilter(),
fit: BoxFit.fill), fit: BoxFit.fill),
onPressed: () => controller.selectMailboxLocation(context)) onPressed: () => controller.selectMailboxLocation(context))
lib/features/mailbox_dashboard/presentation/widgets/app_dashboard/app_list_dashboard_item.dart
+2 -2
View File
@@ -22,14 +22,14 @@ class AppListDashboardItem extends StatelessWidget {
final imagePaths = Get.find<ImagePaths>(); final imagePaths = Get.find<ImagePaths>();
return SloganBuilder( return SloganBuilder(
sizeLogo: 32, sizeLogo: 32,
paddingText: const EdgeInsets.only(left: 12), paddingText: const EdgeInsetsDirectional.only(start: 12),
text: app.appName, text: app.appName,
textAlign: TextAlign.center, textAlign: TextAlign.center,
textStyle: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorNameEmail), textStyle: const TextStyle(fontSize: 17, fontWeight: FontWeight.w500, color: AppColor.colorNameEmail),
logo: !app.iconName.endsWith('svg') ? imagePaths.getConfigurationImagePath(app.iconName) : null, logo: !app.iconName.endsWith('svg') ? imagePaths.getConfigurationImagePath(app.iconName) : null,
logoSVG: app.iconName.endsWith('svg') ? imagePaths.getConfigurationImagePath(app.iconName) : null, logoSVG: app.iconName.endsWith('svg') ? imagePaths.getConfigurationImagePath(app.iconName) : null,
onTapCallback: () => _openApp(context, app), onTapCallback: () => _openApp(context, app),
padding: const EdgeInsets.symmetric(vertical: 12, horizontal: 20), padding: const EdgeInsetsDirectional.symmetric(vertical: 12, horizontal: 20),
hoverColor: AppColor.colorBgMailboxSelected hoverColor: AppColor.colorBgMailboxSelected
); );
} }
lib/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_folder_tile_builder.dart
+2 -1
View File
@@ -2,6 +2,7 @@ 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/style_utils.dart'; import 'package:core/presentation/utils/style_utils.dart';
import 'package:core/presentation/views/button/icon_button_web.dart'; import 'package:core/presentation/views/button/icon_button_web.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:flutter_svg/flutter_svg.dart';
import 'package:model/mailbox/expand_mode.dart'; import 'package:model/mailbox/expand_mode.dart';
@@ -62,7 +63,7 @@ class MailBoxVisibilityFolderTileBuilder extends StatelessWidget {
icon: SvgPicture.asset( icon: SvgPicture.asset(
_mailboxNode.expandMode == ExpandMode.EXPAND _mailboxNode.expandMode == ExpandMode.EXPAND
? _imagePaths.icExpandFolder ? _imagePaths.icExpandFolder
: _imagePaths.icCollapseFolder, : DirectionUtils.isDirectionRTLByLanguage(context) ? _imagePaths.icBack : _imagePaths.icCollapseFolder,
colorFilter: _mailboxNode.item.allowedToDisplay colorFilter: _mailboxNode.item.allowedToDisplay
? AppColor.primaryColor.asFilter() ? AppColor.primaryColor.asFilter()
: AppColor.colorIconUnSubscribedMailbox.asFilter(), : AppColor.colorIconUnSubscribedMailbox.asFilter(),
lib/features/manage_account/presentation/menu/settings/settings_view.dart
+2 -1
View File
@@ -3,6 +3,7 @@ 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/icon_button_web.dart'; import 'package:core/presentation/views/button/icon_button_web.dart';
import 'package:core/utils/direction_utils.dart';
import 'package:core/utils/platform_info.dart'; import 'package:core/utils/platform_info.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart'; import 'package:flutter_svg/flutter_svg.dart';
@@ -136,7 +137,7 @@ class SettingsView extends GetWidget<SettingsController> {
padding: const EdgeInsets.symmetric(horizontal: 4), padding: const EdgeInsets.symmetric(horizontal: 4),
child: Row(mainAxisSize: MainAxisSize.min, children: [ child: Row(mainAxisSize: MainAxisSize.min, children: [
SvgPicture.asset( SvgPicture.asset(
AppUtils.isDirectionRTL(context) DirectionUtils.isDirectionRTLByLanguage(context)
? _imagePaths.icCollapseFolder ? _imagePaths.icCollapseFolder
: _imagePaths.icBack, : _imagePaths.icBack,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
lib/features/manage_account/presentation/menu/widgets/setting_first_level_tile_builder.dart
+2 -1
View File
@@ -2,6 +2,7 @@ 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/utils/direction_utils.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart'; import 'package:flutter_svg/svg.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@@ -85,7 +86,7 @@ class SettingFirstLevelTileBuilder extends StatelessWidget {
left: AppUtils.isDirectionRTL(context) ? SettingsUtils.getHorizontalPadding(context, _responsiveUtils) : 0, left: AppUtils.isDirectionRTL(context) ? SettingsUtils.getHorizontalPadding(context, _responsiveUtils) : 0,
), ),
icon: SvgPicture.asset( icon: SvgPicture.asset(
AppUtils.isDirectionRTL(context) ? _imagePath.icBack : _imagePath.icCollapseFolder, DirectionUtils.isDirectionRTLByLanguage(context) ? _imagePath.icBack : _imagePath.icCollapseFolder,
fit: BoxFit.fill, fit: BoxFit.fill,
colorFilter: AppColor.colorCollapseMailbox.asFilter()), colorFilter: AppColor.colorCollapseMailbox.asFilter()),
onPressed: clickAction onPressed: clickAction
lib/features/search/email/presentation/search_email_view.dart
+1 -2
View File
@@ -31,7 +31,6 @@ import 'package:tmail_ui_user/features/thread/domain/state/search_more_email_sta
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_builder.dart' import 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_builder.dart'
if (dart.library.html) 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_web_builder.dart'; if (dart.library.html) 'package:tmail_ui_user/features/thread/presentation/widgets/email_tile_web_builder.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
class SearchEmailView extends GetWidget<SearchEmailController> class SearchEmailView extends GetWidget<SearchEmailController>
with AppLoaderMixin { with AppLoaderMixin {
@@ -111,7 +110,7 @@ class SearchEmailView extends GetWidget<SearchEmailController>
children: [ children: [
buildIconWeb( buildIconWeb(
icon: SvgPicture.asset( icon: SvgPicture.asset(
AppUtils.isDirectionRTL(context) ? _imagePaths.icCollapseFolder : _imagePaths.icBack, DirectionUtils.isDirectionRTLByLanguage(context) ? _imagePaths.icCollapseFolder : _imagePaths.icBack,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill fit: BoxFit.fill
), ),
lib/features/sending_queue/presentation/widgets/app_bar_sending_queue_widget.dart
+2 -2
View File
@@ -4,6 +4,7 @@ import 'package:core/presentation/resources/image_paths.dart';
import 'package:core/presentation/utils/style_utils.dart'; import 'package:core/presentation/utils/style_utils.dart';
import 'package:core/presentation/views/button/icon_button_web.dart'; import 'package:core/presentation/views/button/icon_button_web.dart';
import 'package:core/utils/app_logger.dart'; import 'package:core/utils/app_logger.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:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
@@ -11,7 +12,6 @@ import 'package:model/mailbox/select_mode.dart';
import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart'; import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
import 'package:tmail_ui_user/features/sending_queue/presentation/utils/sending_queue_utils.dart'; import 'package:tmail_ui_user/features/sending_queue/presentation/utils/sending_queue_utils.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart'; import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
import 'package:tmail_ui_user/main/utils/app_utils.dart';
class AppBarSendingQueueWidget extends StatelessWidget { class AppBarSendingQueueWidget extends StatelessWidget {
@@ -65,7 +65,7 @@ class AppBarSendingQueueWidget extends StatelessWidget {
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
SvgPicture.asset( SvgPicture.asset(
AppUtils.isDirectionRTL(context) ? imagePaths.icCollapseFolder : imagePaths.icBack, DirectionUtils.isDirectionRTLByLanguage(context) ? imagePaths.icCollapseFolder : imagePaths.icBack,
colorFilter: AppColor.colorTextButton.asFilter(), colorFilter: AppColor.colorTextButton.asFilter(),
fit: BoxFit.fill fit: BoxFit.fill
), ),