Open new tab when contact support has mail address at setting view
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -1,35 +1,34 @@
|
|||||||
|
|
||||||
import 'package:core/utils/app_logger.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/extensions/contact_support_capability_extension.dart';
|
import 'package:model/extensions/contact_support_capability_extension.dart';
|
||||||
import 'package:model/support/contact_support_capability.dart';
|
import 'package:model/support/contact_support_capability.dart';
|
||||||
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
||||||
|
import 'package:tmail_ui_user/main/routes/route_navigation.dart';
|
||||||
|
import 'package:tmail_ui_user/main/routes/route_utils.dart';
|
||||||
import 'package:tmail_ui_user/main/utils/app_utils.dart';
|
import 'package:tmail_ui_user/main/utils/app_utils.dart';
|
||||||
|
|
||||||
typedef OnTapContactSupportAction = Function(ContactSupportCapability contactSupport);
|
typedef OnTapContactSupportAction = Function(ContactSupportCapability contactSupport);
|
||||||
|
|
||||||
mixin ContactSupportMixin {
|
mixin ContactSupportMixin {
|
||||||
|
|
||||||
void onGetHelpOrReportBug(
|
void onGetHelpOrReportBug(ContactSupportCapability contactSupport) {
|
||||||
ContactSupportCapability contactSupport,
|
|
||||||
MailboxDashBoardController mailboxDashBoardController,
|
|
||||||
) {
|
|
||||||
log('ContactSupportMixin::onGetHelpOrReportBug:contactSupport = $contactSupport');
|
|
||||||
if (contactSupport.isMailAddressSupported) {
|
if (contactSupport.isMailAddressSupported) {
|
||||||
_handleMailAddress(contactSupport.supportMailAddress!, mailboxDashBoardController);
|
_handleMailAddress(contactSupport.supportMailAddress!);
|
||||||
} else if (contactSupport.isHttpLinkSupported) {
|
} else if (contactSupport.isHttpLinkSupported) {
|
||||||
_handleHttpLink(contactSupport.httpLink!);
|
_handleHttpLink(contactSupport.httpLink!);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _handleMailAddress(
|
void _handleMailAddress(String mailAddress) {
|
||||||
String mailAddress,
|
final mailboxDashBoardController = getBinding<MailboxDashBoardController>();
|
||||||
MailboxDashBoardController mailboxDashBoardController,
|
if (mailboxDashBoardController != null) {
|
||||||
) {
|
mailboxDashBoardController.goToComposer(
|
||||||
mailboxDashBoardController.goToComposer(
|
ComposerArguments.fromEmailAddress(EmailAddress(null, mailAddress)),
|
||||||
ComposerArguments.fromEmailAddress(EmailAddress(null, mailAddress)),
|
);
|
||||||
);
|
} else {
|
||||||
|
AppUtils.launchLink('${RouteUtils.mailtoPrefix}:$mailAddress');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void _handleHttpLink(String httpLink) {
|
void _handleHttpLink(String httpLink) {
|
||||||
|
|||||||
@@ -121,7 +121,6 @@ class MailboxView extends BaseMailboxView {
|
|||||||
onTapActionCallback: () =>
|
onTapActionCallback: () =>
|
||||||
controller.onGetHelpOrReportBug(
|
controller.onGetHelpOrReportBug(
|
||||||
controller.contactSupportCapability!,
|
controller.contactSupportCapability!,
|
||||||
controller.mailboxDashBoardController,
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -104,7 +104,6 @@ class MailboxView extends BaseMailboxView {
|
|||||||
onTapActionCallback: () =>
|
onTapActionCallback: () =>
|
||||||
controller.onGetHelpOrReportBug(
|
controller.onGetHelpOrReportBug(
|
||||||
controller.contactSupportCapability!,
|
controller.contactSupportCapability!,
|
||||||
controller.mailboxDashBoardController,
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -76,10 +76,7 @@ class MailboxDashBoardView extends BaseMailboxDashBoardView {
|
|||||||
onTapApplicationLogoAction: controller.redirectToInboxAction,
|
onTapApplicationLogoAction: controller.redirectToInboxAction,
|
||||||
onTapAvatarAction: (position) => controller.handleClickAvatarAction(context, position),
|
onTapAvatarAction: (position) => controller.handleClickAvatarAction(context, position),
|
||||||
onTapContactSupportAction: (contactSupport) =>
|
onTapContactSupportAction: (contactSupport) =>
|
||||||
controller.onGetHelpOrReportBug(
|
controller.onGetHelpOrReportBug(contactSupport),
|
||||||
contactSupport,
|
|
||||||
controller,
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -15,7 +15,6 @@ import 'package:server_settings/server_settings/capability_server_settings.dart'
|
|||||||
import 'package:tmail_ui_user/features/base/action/ui_action.dart';
|
import 'package:tmail_ui_user/features/base/action/ui_action.dart';
|
||||||
import 'package:tmail_ui_user/features/base/reloadable/reloadable_controller.dart';
|
import 'package:tmail_ui_user/features/base/reloadable/reloadable_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/base/state/banner_state.dart';
|
import 'package:tmail_ui_user/features/base/state/banner_state.dart';
|
||||||
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
|
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart';
|
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/mixin/user_setting_popup_menu_mixin.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/domain/state/get_all_vacation_state.dart';
|
import 'package:tmail_ui_user/features/manage_account/domain/state/get_all_vacation_state.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/domain/state/update_vacation_state.dart';
|
import 'package:tmail_ui_user/features/manage_account/domain/state/update_vacation_state.dart';
|
||||||
@@ -256,23 +255,6 @@ class ManageAccountDashBoardController extends ReloadableController with UserSet
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool get isContactSupportCapabilitySupported {
|
|
||||||
if (accountId.value != null && sessionCurrent != null) {
|
|
||||||
final isSupported = [SessionExtensions.linagoraContactSupportCapability].isSupported(sessionCurrent!, accountId.value!);
|
|
||||||
return isSupported && contactSupportCapability != null;
|
|
||||||
} else {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ContactSupportCapability? get contactSupportCapability {
|
|
||||||
if (accountId.value != null && sessionCurrent != null) {
|
|
||||||
return sessionCurrent!.getContactSupportCapability(accountId.value!);
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void disableVacationResponder() {
|
void disableVacationResponder() {
|
||||||
if (accountId.value != null && _updateVacationInteractor != null) {
|
if (accountId.value != null && _updateVacationInteractor != null) {
|
||||||
final vacationDisabled = vacationResponse.value != null
|
final vacationDisabled = vacationResponse.value != null
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import 'package:flutter_svg/flutter_svg.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:tmail_ui_user/features/base/widget/application_version_widget.dart';
|
import 'package:tmail_ui_user/features/base/widget/application_version_widget.dart';
|
||||||
import 'package:tmail_ui_user/features/base/widget/application_logo_with_text_widget.dart';
|
import 'package:tmail_ui_user/features/base/widget/application_logo_with_text_widget.dart';
|
||||||
|
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/menu/manage_account_menu_controller.dart';
|
import 'package:tmail_ui_user/features/manage_account/presentation/menu/manage_account_menu_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/menu/widgets/account_menu_item_tile_builder.dart';
|
import 'package:tmail_ui_user/features/manage_account/presentation/menu/widgets/account_menu_item_tile_builder.dart';
|
||||||
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
|
||||||
@@ -96,37 +97,57 @@ class ManageAccountMenuView extends GetWidget<ManageAccountMenuController> {
|
|||||||
const Padding(
|
const Padding(
|
||||||
padding: EdgeInsets.symmetric(vertical: 16),
|
padding: EdgeInsets.symmetric(vertical: 16),
|
||||||
child: Divider()),
|
child: Divider()),
|
||||||
if (controller.dashBoardController.isContactSupportCapabilitySupported)
|
Obx(() {
|
||||||
Padding(
|
final accountId = controller
|
||||||
padding: const EdgeInsetsDirectional.only(start: 20, end: 10),
|
.dashBoardController
|
||||||
child: Material(
|
.accountId
|
||||||
color: Colors.transparent,
|
.value;
|
||||||
child: InkWell(
|
|
||||||
onTap: () {
|
if (accountId == null) return const SizedBox.shrink();
|
||||||
controller.onGetHelpOrReportBug(
|
|
||||||
controller.dashBoardController.contactSupportCapability!,
|
final contactSupportCapability = controller
|
||||||
controller.mailboxDashBoardController
|
.dashBoardController
|
||||||
);
|
.sessionCurrent
|
||||||
},
|
?.getContactSupportCapability(accountId);
|
||||||
borderRadius: BorderRadius.circular(10),
|
|
||||||
child: Padding(
|
if (contactSupportCapability == null) return const SizedBox.shrink();
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
|
|
||||||
child: Row(children: [
|
return Padding(
|
||||||
SvgPicture.asset(controller.imagePaths.icHelp, width: 20, height: 20, fit: BoxFit.fill),
|
padding: const EdgeInsetsDirectional.only(start: 20, end: 10),
|
||||||
const SizedBox(width: 12),
|
child: Material(
|
||||||
Expanded(child: Text(
|
color: Colors.transparent,
|
||||||
AppLocalizations.of(context).contactSupport,
|
child: InkWell(
|
||||||
style: const TextStyle(
|
onTap: () => controller.onGetHelpOrReportBug(contactSupportCapability),
|
||||||
fontWeight: FontWeight.normal,
|
borderRadius: const BorderRadius.all(Radius.circular(10)),
|
||||||
fontSize: 15,
|
child: Padding(
|
||||||
color: Colors.black
|
padding: const EdgeInsets.symmetric(
|
||||||
)
|
horizontal: 12,
|
||||||
))
|
vertical: 6,
|
||||||
]),
|
),
|
||||||
|
child: Row(children: [
|
||||||
|
SvgPicture.asset(
|
||||||
|
controller.imagePaths.icHelp,
|
||||||
|
width: 20,
|
||||||
|
height: 20,
|
||||||
|
fit: BoxFit.fill,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
AppLocalizations.of(context).contactSupport,
|
||||||
|
style: const TextStyle(
|
||||||
|
fontWeight: FontWeight.normal,
|
||||||
|
fontSize: 15,
|
||||||
|
color: Colors.black,
|
||||||
|
),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
),
|
]),
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}),
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsetsDirectional.only(start: 20, end: 10),
|
padding: const EdgeInsetsDirectional.only(start: 20, end: 10),
|
||||||
child: Material(
|
child: Material(
|
||||||
|
|||||||
@@ -2,13 +2,11 @@ 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:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:tmail_ui_user/features/base/mixin/contact_support_mixin.dart';
|
import 'package:tmail_ui_user/features/base/mixin/contact_support_mixin.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
|
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
|
import 'package:tmail_ui_user/features/manage_account/presentation/manage_account_dashboard_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/model/account_menu_item.dart';
|
import 'package:tmail_ui_user/features/manage_account/presentation/model/account_menu_item.dart';
|
||||||
|
|
||||||
class SettingsController extends GetxController with ContactSupportMixin {
|
class SettingsController extends GetxController with ContactSupportMixin {
|
||||||
final manageAccountDashboardController = Get.find<ManageAccountDashBoardController>();
|
final manageAccountDashboardController = Get.find<ManageAccountDashBoardController>();
|
||||||
final mailboxDashBoardController = Get.find<MailboxDashBoardController>();
|
|
||||||
final responsiveUtils = Get.find<ResponsiveUtils>();
|
final responsiveUtils = Get.find<ResponsiveUtils>();
|
||||||
final imagePaths = Get.find<ImagePaths>();
|
final imagePaths = Get.find<ImagePaths>();
|
||||||
|
|
||||||
|
|||||||
+33
-17
@@ -2,6 +2,7 @@ import 'package:core/presentation/extensions/color_extension.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:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
|
||||||
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget.dart';
|
import 'package:tmail_ui_user/features/mailbox/presentation/widgets/user_information_widget.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/menu/settings/settings_controller.dart';
|
import 'package:tmail_ui_user/features/manage_account/presentation/menu/settings/settings_controller.dart';
|
||||||
import 'package:tmail_ui_user/features/manage_account/presentation/menu/settings_utils.dart';
|
import 'package:tmail_ui_user/features/manage_account/presentation/menu/settings_utils.dart';
|
||||||
@@ -154,24 +155,39 @@ class SettingsFirstLevelView extends GetWidget<SettingsController> {
|
|||||||
)
|
)
|
||||||
],
|
],
|
||||||
Obx(() {
|
Obx(() {
|
||||||
if (controller.manageAccountDashboardController.isContactSupportCapabilitySupported) {
|
final accountId = controller
|
||||||
return Column(children: [
|
.manageAccountDashboardController
|
||||||
Divider(
|
.accountId
|
||||||
color: AppColor.colorDividerHorizontal,
|
.value;
|
||||||
height: 1,
|
|
||||||
indent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils),
|
if (accountId == null) return const SizedBox.shrink();
|
||||||
endIndent: SettingsUtils.getHorizontalPadding(context, controller.responsiveUtils)
|
|
||||||
|
final contactSupportCapability = controller
|
||||||
|
.manageAccountDashboardController
|
||||||
|
.sessionCurrent
|
||||||
|
?.getContactSupportCapability(accountId);
|
||||||
|
|
||||||
|
if (contactSupportCapability == null) return const SizedBox.shrink();
|
||||||
|
|
||||||
|
return Column(children: [
|
||||||
|
Divider(
|
||||||
|
color: AppColor.colorDividerHorizontal,
|
||||||
|
height: 1,
|
||||||
|
indent: SettingsUtils.getHorizontalPadding(
|
||||||
|
context,
|
||||||
|
controller.responsiveUtils,
|
||||||
),
|
),
|
||||||
SettingFirstLevelTileBuilder(
|
endIndent: SettingsUtils.getHorizontalPadding(
|
||||||
AccountMenuItem.contactSupport.getName(context),
|
context,
|
||||||
AccountMenuItem.contactSupport.getIcon(controller.imagePaths),
|
controller.responsiveUtils,
|
||||||
() => controller.onGetHelpOrReportBug(
|
),
|
||||||
controller.manageAccountDashboardController.contactSupportCapability!,
|
),
|
||||||
controller.mailboxDashBoardController)),
|
SettingFirstLevelTileBuilder(
|
||||||
]);
|
AccountMenuItem.contactSupport.getName(context),
|
||||||
} else {
|
AccountMenuItem.contactSupport.getIcon(controller.imagePaths),
|
||||||
return const SizedBox.shrink();
|
() => controller.onGetHelpOrReportBug(contactSupportCapability),
|
||||||
}
|
),
|
||||||
|
]);
|
||||||
}),
|
}),
|
||||||
Divider(
|
Divider(
|
||||||
color: AppColor.colorDividerHorizontal,
|
color: AppColor.colorDividerHorizontal,
|
||||||
|
|||||||
Reference in New Issue
Block a user