TF-359 Open a web address and mailto link from EmailView

This commit is contained in:
dab246
2022-04-05 18:49:30 +07:00
committed by Dat H. Pham
parent 8cdb2c6fa4
commit c456cde7a8
11 changed files with 69 additions and 55 deletions
-1
View File
@@ -41,7 +41,6 @@ export 'presentation/views/context_menu/context_menu_action_builder.dart';
export 'presentation/views/context_menu/context_menu_builder.dart';
export 'presentation/views/context_menu/context_menu_header_builder.dart';
export 'presentation/views/context_menu/simple_context_menu_action_builder.dart';
export 'presentation/views/dialog/loading_dialog_builder.dart';
export 'presentation/views/dialog/downloading_file_dialog_builder.dart';
export 'presentation/views/dialog/confirmation_dialog_builder.dart';
export 'presentation/views/dialog/edit_text_dialog_builder.dart';
@@ -1,6 +1,7 @@
import 'package:core/core.dart';
import 'package:flutter/cupertino.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
class CupertinoActionSheetBuilder {
@@ -33,12 +34,12 @@ class CupertinoActionSheetBuilder {
showCupertinoModalPopup(
context: _context,
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
builder: (context) => CupertinoActionSheet(
builder: (context) => PointerInterceptor(child: CupertinoActionSheet(
title: _titleWidget,
message: _messageWidget,
actions: _actionTiles,
cancelButton: _cancelWidget,
)
))
);
}
}
@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
typedef OnCloseContextMenuAction = void Function();
@@ -54,7 +55,7 @@ class ContextMenuBuilder {
void build() {
Get.bottomSheet(
GestureDetector(
PointerInterceptor(child: GestureDetector(
onTap: () {
if (_onCloseContextMenuAction != null) {
_onCloseContextMenuAction!();
@@ -88,7 +89,7 @@ class ContextMenuBuilder {
),
),
),
),
)),
useRootNavigator: true,
shape: _shape(),
isScrollControlled: true,
@@ -1,31 +0,0 @@
import 'package:core/core.dart';
import 'package:flutter/cupertino.dart';
class LoadingDialogBuilder {
final Key _key;
final String _title;
LoadingDialogBuilder(this._key, this._title);
Widget build() {
return CupertinoAlertDialog(
key: _key,
title: Text(_title, style: TextStyle(fontSize: 17.0, color: AppColor.appColor)),
content: Padding(
padding: EdgeInsets.only(top: 16.0, left: 16.0, right: 16.0),
child: Center(
child: Column(
children: [
SizedBox(
width: 20.0,
height: 20.0,
child: CupertinoActivityIndicator()),
SizedBox(height: 16),
],
),
),
),
);
}
}
@@ -16,12 +16,16 @@ class HtmlContentViewerOnWeb extends StatefulWidget {
final double heightContent;
final HtmlViewerControllerForWeb controller;
/// Handler for mailto: links
final Function(Uri?)? mailtoDelegate;
const HtmlContentViewerOnWeb({
Key? key,
required this.contentHtml,
required this.widthContent,
required this.heightContent,
required this.controller,
this.mailtoDelegate,
}) : super(key: key);
@override
@@ -106,7 +110,7 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
return false;
}
return url.protocol === "http:" || url.protocol === "https:";
return url.protocol === "http:" || url.protocol === "https:" || url.protocol === "mailto:";
}
</script>
''';
@@ -217,7 +221,12 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
final link = data['url'];
if (link != null && mounted) {
log('_HtmlContentViewerOnWebState::_setUpWeb(): OpenLink: $link');
html.window.open('$link', '_blank');
final urlString = link as String;
if (urlString.startsWith('mailto:')) {
widget.mailtoDelegate?.call(Uri.parse(urlString));
} else {
html.window.open('$urlString', '_blank');
}
}
}
});
@@ -23,7 +23,7 @@ class HtmlContentViewer extends StatefulWidget {
/// Handler for any non-media URLs that the user taps on the website.
///
/// Returns `true` when the given `url` was handled.
final Future<bool> Function(String url)? urlLauncherDelegate;
final Future<bool> Function(Uri url)? urlLauncherDelegate;
const HtmlContentViewer({
Key? key,
@@ -180,12 +180,12 @@ class _HtmlContentViewState extends State<HtmlContentViewer> {
final url = navigation.url;
final urlDelegate = widget.urlLauncherDelegate;
if (urlDelegate != null) {
final handled = await urlDelegate(url);
if (handled) {
return NavigationDecision.prevent;
}
await urlDelegate(Uri.parse(url));
return NavigationDecision.prevent;
}
if (await launcher.canLaunch(url)) {
await launcher.launch(url);
}
await launcher.launch(url);
return NavigationDecision.prevent;
}
}
+5
View File
@@ -2,6 +2,11 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>https</string>
<string>http</string>
</array>
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
@@ -260,18 +260,22 @@ class ComposerController extends BaseController {
if (listToEmailAddress.isNotEmpty || listCcEmailAddress.isNotEmpty || listBccEmailAddress.isNotEmpty) {
isInitialRecipient.value = true;
toAddressExpandMode.value = ExpandMode.COLLAPSE;
}
if (listCcEmailAddress.isNotEmpty) {
listEmailAddressType.add(PrefixEmailAddress.cc);
ccAddressExpandMode.value = ExpandMode.COLLAPSE;
}
if (listBccEmailAddress.isNotEmpty) {
listEmailAddressType.add(PrefixEmailAddress.bcc);
bccAddressExpandMode.value = ExpandMode.COLLAPSE;
}
} else if (arguments.emailAddress != null) {
listToEmailAddress.add(arguments.emailAddress!);
isInitialRecipient.value = true;
toAddressExpandMode.value = ExpandMode.COLLAPSE;
}
_updateStatusEmailSendButton();
}
@@ -484,11 +484,11 @@ class EmailController extends BaseController {
showDialog(
context: context,
barrierColor: AppColor.colorDefaultCupertinoActionSheet,
builder: (BuildContext context) => (EmailAddressDialogBuilder(context, imagePaths, emailAddress)
builder: (BuildContext context) => PointerInterceptor(child: (EmailAddressDialogBuilder(context, imagePaths, emailAddress)
..addOnCloseContextMenuAction(() => popBack())
..addOnCopyEmailAddressAction((emailAddress) => copyEmailAddress(context, emailAddress))
..addOnComposeEmailAction((emailAddress) => composeEmailFromEmailAddress(emailAddress)))
.build());
.build()));
}
}
@@ -518,6 +518,29 @@ class EmailController extends BaseController {
}
}
void openMailToLink(Uri? uri) {
log('EmailController::openMailToLink(): ${uri.toString()}');
String address = uri?.path ?? '';
log('EmailController::openMailToLink(): address: $address');
if (address.isNotEmpty) {
final emailAddress = EmailAddress(null, address);
final arguments = ComposerArguments(
emailActionType: EmailActionType.composeFromEmailAddress,
emailAddress: emailAddress,
mailboxRole: mailboxDashBoardController.selectedMailbox.value?.role);
if (kIsWeb) {
if (mailboxDashBoardController.dashBoardAction != DashBoardAction.compose) {
mailboxDashBoardController.dispatchDashBoardAction(DashBoardAction.compose, arguments: arguments);
}
if (Get.currentRoute == AppRoutes.EMAIL) {
popBack();
}
} else {
push(AppRoutes.COMPOSER, arguments: arguments);
}
}
}
void deleteEmailPermanently(BuildContext context, PresentationEmail email) {
if (responsiveUtils.isMobile(context)) {
(ConfirmationDialogActionSheetBuilder(context)
@@ -536,12 +536,14 @@ class EmailView extends GetView with UserSettingPopupMenuMixin, NetworkConnectio
widthContent: constraints.maxWidth,
heightContent: MediaQuery.of(context).size.height,
contentHtml: allEmailContents,
controller: HtmlViewerControllerForWeb());
controller: HtmlViewerControllerForWeb(),
mailtoDelegate: (uri) => emailController.openMailToLink(uri));
} else {
return HtmlContentViewer(
widthContent: MediaQuery.of(context).size.width,
contentHtml: allEmailContents,
loadingWidget: EmailContentPlaceHolderLoading(responsiveUtils: responsiveUtils));
loadingWidget: EmailContentPlaceHolderLoading(responsiveUtils: responsiveUtils),
mailtoDelegate: (uri) async => emailController.openMailToLink(uri));
}
} else {
return SizedBox.shrink();
@@ -5,6 +5,7 @@ import 'package:flutter_svg/flutter_svg.dart';
import 'package:get/get.dart';
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
import 'package:model/model.dart';
import 'package:pointer_interceptor/pointer_interceptor.dart';
import 'package:tmail_ui_user/main/localizations/app_localizations.dart';
typedef OnCloseBottomSheetAction = void Function();
@@ -56,7 +57,7 @@ class EmailAddressBottomSheetBuilder {
void show() {
Get.bottomSheet(
GestureDetector(
PointerInterceptor(child: GestureDetector(
onTap: () => _onCloseBottomSheetAction?.call(),
child: SingleChildScrollView(
child: Container(
@@ -73,11 +74,11 @@ class EmailAddressBottomSheetBuilder {
onPressed: () => _onCloseBottomSheetAction?.call(),
icon: SvgPicture.asset(_imagePaths.icCloseMailbox, width: 24, height: 24, fit: BoxFit.fill))),
(AvatarBuilder()
..text('${_emailAddress.asString().characters.first.toUpperCase()}')
..size(64)
..addTextStyle(TextStyle(fontWeight: FontWeight.w600, fontSize: 23, color: Colors.white))
..avatarColor(_emailAddress.avatarColors))
.build(),
..text('${_emailAddress.asString().characters.first.toUpperCase()}')
..size(64)
..addTextStyle(TextStyle(fontWeight: FontWeight.w600, fontSize: 23, color: Colors.white))
..avatarColor(_emailAddress.avatarColors))
.build(),
if (_emailAddress.displayName.isNotEmpty)
Padding(
padding: EdgeInsets.only(left: 16, right: 16, top: 16),
@@ -125,7 +126,7 @@ class EmailAddressBottomSheetBuilder {
)),
),
),
),
)),
useRootNavigator: true,
shape: _shape(),
isScrollControlled: true,