Migrate v0.11.3-patch4-dev to master branch

contact/pubspec.lock

@@ -304,6 +304,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.0"
+  fk_user_agent:
+    dependency: transitive
+    description:
+      name: fk_user_agent
+      sha256: fd6c94e120786985a292d12f61422a581f4e851148d5940af38b819357b8ad0d
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   flex_color_picker:
     dependency: transitive
     description:
@@ -563,8 +571,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: master
-      resolved-ref: "21d15bc1a6a75e048ee1e3cd751dd0815492ce20"
+      ref: migrate_cnb_to_master_5Jun
+      resolved-ref: "49305a382ca77211a0668fd9fe196a3c057cdc8e"
       url: "https://github.com/linagora/jmap-dart-client.git"
     source: git
     version: "0.0.1"
@@ -671,6 +679,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  package_info_plus:
+    dependency: transitive
+    description:
+      name: package_info_plus
+      sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  package_info_plus_platform_interface:
+    dependency: transitive
+    description:
+      name: package_info_plus_platform_interface
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   path:
     dependency: transitive
     description:

contact/pubspec.yaml

@@ -15,10 +15,12 @@ dependencies:
     path: ../model
 
   ### Dependencies from git ###
+  # TODO: We will change it when the PR in upstream repository will be merged
+  # https://github.com/linagora/jmap-dart-client/pull/87
   jmap_dart_client:
     git:
       url: https://github.com/linagora/jmap-dart-client.git
-      ref: master
+      ref: migrate_cnb_to_master_5Jun
 
   ### Dependencies from pub.dev ###
   equatable: 2.0.5

core/lib/core.dart

@@ -45,6 +45,9 @@ export 'utils/file_utils.dart';
 export 'utils/option_param_mixin.dart';
 export 'utils/print_utils.dart';
 export 'utils/broadcast_channel/broadcast_channel.dart';
+export 'utils/list_utils.dart';
+export 'utils/mail/domain.dart';
+export 'utils/mail/mail_address.dart';
 
 // Views
 export 'presentation/views/text/slogan_builder.dart';

core/lib/data/constants/constant.dart

@@ -2,6 +2,7 @@ class Constant {
   static const acceptHeaderDefault = 'application/json';
   static const contentTypeHeaderDefault = 'application/json';
   static const pdfMimeType = 'application/pdf';
+  static const base64Charset = 'base64';
   static const textHtmlMimeType = 'text/html';
   static const octetStreamMimeType = 'application/octet-stream';
   static const pdfExtension = '.pdf';

core/lib/data/network/download/download_client.dart

@@ -63,7 +63,8 @@ class DownloadClient {
           'bytesData': bytesData,
           'mimeType': 'image/$fileExtension',
           'cid': cid,
-          'fileName': fileName
+          'fileName': fileName,
+          'maxWidth': maxWidth
         });
 
         return base64Uri;
@@ -77,7 +78,8 @@ class DownloadClient {
             'bytesData': bytesDataCompressed,
             'mimeType': 'image/$fileExtension',
             'cid': cid,
-            'fileName': fileName
+            'fileName': fileName,
+            'maxWidth': maxWidth
           });
 
           return base64Uri;
@@ -86,7 +88,8 @@ class DownloadClient {
             'bytesData': bytesData,
             'mimeType': 'image/$fileExtension',
             'cid': cid,
-            'fileName': fileName
+            'fileName': fileName,
+            'maxWidth': maxWidth
           });
 
           return base64Uri;
@@ -103,11 +106,14 @@ class DownloadClient {
     var mimeType = entryParam['mimeType'];
     final cid = entryParam['cid'];
     var fileName = entryParam['fileName'];
+    var maxWidth = entryParam['maxWidth'] != null
+      ? '${entryParam['maxWidth']}px'
+      : '100%';
     final base64Data = base64Encode(bytesData);
     if (fileName.contains('.')) {
       fileName = fileName.split('.').first;
     }
-    final base64Uri = '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: mimeType)}" alt="$fileName" id="cid:$cid" style="max-width: 100%;" />';
+    final base64Uri = '<img src="${HtmlUtils.convertBase64ToImageResourceData(base64Data: base64Data, mimeType: mimeType)}" alt="$fileName" id="cid:$cid" style="max-width: $maxWidth;" />';
     return base64Uri;
   }
 }

core/lib/domain/exceptions/address_exception.dart

@@ -0,0 +1,13 @@
+import 'package:equatable/equatable.dart';
+
+class AddressException with EquatableMixin implements Exception {
+  final String message;
+
+  AddressException(this.message);
+
+  @override
+  String toString() => message;
+
+  @override
+  List<Object> get props => [message];
+}

core/lib/presentation/action/action_callback_define.dart

@@ -2,4 +2,5 @@
 import 'package:flutter/material.dart';
 
 typedef OnTapActionCallback = void Function();
-typedef OnTapActionAtPositionCallback = void Function(RelativeRect position);
+typedef OnTapActionAtPositionCallback = void Function(RelativeRect position);
+typedef OnLongPressActionCallback = void Function();

core/lib/presentation/extensions/color_extension.dart

@@ -160,7 +160,6 @@ extension AppColor on Color {
   static const colorBackgroundQuotasWarning = Color(0xFFFFC107);
   static const colorQuotaWarning = Color(0xFFF05C44);
   static const colorQuotaError = Color(0xffE64646);
-  static const colorThumbScrollBar = Color(0xFFAEB7C2);
   static const colorCreateNewIdentityButton = Color(0xFFEBEDF0);
   static const colorSpamReportBannerBackground = Color(0xFFBFDEFF);
   static const colorSpamReportBannerStrokeBorder = Color(0x1F000000);

core/lib/presentation/extensions/string_extension.dart

@@ -1,5 +1,4 @@
 import 'package:core/utils/app_logger.dart';
-import 'package:flutter/material.dart';
 
 extension StringExtension on String {
 
@@ -39,11 +38,4 @@ extension StringExtension on String {
       return '';
     }
   }
-
-  String get overflow {
-    return characters
-      .replaceAll(Characters(''), Characters('\u{200B}'))
-      .replaceAll(Characters('-'), Characters('\u{2011}'))
-      .toString();
-  }
 }

core/lib/presentation/utils/html_transformer/transform_configuration.dart

@@ -43,7 +43,6 @@ class TransformConfiguration {
     if (PlatformInfo.isWeb)
       const RemoveTooltipLinkTransformer(),
     const SignatureTransformer(),
-    const RemoveLazyLoadingForBackgroundImageTransformer(),
     const RemoveCollapsedSignatureButtonTransformer(),
   ]);
 

core/lib/presentation/utils/responsive_utils.dart

@@ -19,15 +19,15 @@ class ResponsiveUtils {
   static const double desktopVerticalMargin = 120.0;
   static const double desktopHorizontalMargin = 200.0;
 
-  bool isScreenWithShortestSide(BuildContext context) => context.mediaQueryShortestSide < minTabletWidth;
+  bool isScreenWithShortestSide(BuildContext context) => getSizeScreenShortestSide(context) < minTabletWidth;
 
-  double getSizeScreenWidth(BuildContext context) => context.width;
+  double getSizeScreenWidth(BuildContext context) => MediaQuery.sizeOf(context).width;
 
-  double getSizeScreenHeight(BuildContext context) => context.height;
+  double getSizeScreenHeight(BuildContext context) => MediaQuery.sizeOf(context).height;
 
-  double getSizeScreenShortestSide(BuildContext context) => context.mediaQueryShortestSide;
+  double getSizeScreenShortestSide(BuildContext context) => MediaQuery.sizeOf(context).shortestSide;
 
-  double getDeviceWidth(BuildContext context) => context.width;
+  double getDeviceWidth(BuildContext context) => MediaQuery.sizeOf(context).width;
 
   bool isMobile(BuildContext context) => getDeviceWidth(context) < minTabletWidth;
 
@@ -46,21 +46,21 @@ class ResponsiveUtils {
   bool isLandscapeMobile(BuildContext context) => isScreenWithShortestSide(context) && isLandscape(context);
 
   bool isLandscapeTablet(BuildContext context) {
-    return context.mediaQueryShortestSide >= minTabletWidth &&
-        context.mediaQueryShortestSide < minDesktopWidth &&
+    return getSizeScreenShortestSide(context) >= minTabletWidth &&
+        getSizeScreenShortestSide(context) < minDesktopWidth &&
         isLandscape(context);
   }
 
   bool isPortraitMobile(BuildContext context) => isScreenWithShortestSide(context) && isPortrait(context);
 
   bool isPortraitTablet(BuildContext context) {
-    return context.mediaQueryShortestSide >= minTabletWidth &&
-        context.mediaQueryShortestSide < minDesktopWidth &&
+    return getSizeScreenShortestSide(context) >= minTabletWidth &&
+        getSizeScreenShortestSide(context) < minDesktopWidth &&
         isPortrait(context);
   }
 
   bool isHeightShortest(BuildContext context) {
-    return MediaQuery.of(context).size.shortestSide < heightShortest;
+    return getSizeScreenShortestSide(context) < heightShortest;
   }
 
   double getMaxWidthToast(BuildContext context) {

core/lib/presentation/utils/theme_utils.dart

@@ -14,9 +14,9 @@ class ThemeUtils {
       dividerTheme: _dividerTheme,
       visualDensity: VisualDensity.adaptivePlatformDensity,
       scrollbarTheme: ScrollbarThemeData(
-        thickness: MaterialStateProperty.all(2.0), 
-        radius: const  Radius.circular(5.0), 
-        thumbColor: MaterialStateProperty.all(AppColor.colorThumbScrollBar)),
+        thickness: MaterialStateProperty.all(8.0),
+        radius: const Radius.circular(8.0),
+        thumbColor: MaterialStateProperty.all(AppColor.thumbScrollbarColor)),
     );
   }
 

core/lib/presentation/views/button/tmail_button_widget.dart

@@ -10,6 +10,7 @@ class TMailButtonWidget extends StatelessWidget {
 
   final OnTapActionCallback? onTapActionCallback;
   final OnTapActionAtPositionCallback? onTapActionAtPositionCallback;
+  final OnLongPressActionCallback? onLongPressActionCallback;
 
   final double borderRadius;
   final double? width;
@@ -44,6 +45,7 @@ class TMailButtonWidget extends StatelessWidget {
     required this.text,
     this.onTapActionCallback,
     this.onTapActionAtPositionCallback,
+    this.onLongPressActionCallback,
     this.borderRadius = 20,
     this.width,
     this.maxWidth = double.infinity,
@@ -77,6 +79,7 @@ class TMailButtonWidget extends StatelessWidget {
     final Key? key,
     OnTapActionCallback? onTapActionCallback,
     OnTapActionAtPositionCallback? onTapActionAtPositionCallback,
+    OnLongPressActionCallback? onLongPressActionCallback,
     double borderRadius = 20,
     double? width,
     double maxWidth = double.infinity,
@@ -99,6 +102,7 @@ class TMailButtonWidget extends StatelessWidget {
       text: '',
       onTapActionCallback: onTapActionCallback,
       onTapActionAtPositionCallback: onTapActionAtPositionCallback,
+      onLongPressActionCallback: onLongPressActionCallback,
       borderRadius: borderRadius,
       width: width,
       maxWidth : maxWidth,
@@ -124,6 +128,7 @@ class TMailButtonWidget extends StatelessWidget {
     final Key? key,
     OnTapActionCallback? onTapActionCallback,
     OnTapActionAtPositionCallback? onTapActionAtPositionCallback,
+    OnLongPressActionCallback? onLongPressActionCallback,
     double borderRadius = 20,
     double? width,
     double maxWidth = double.infinity,
@@ -145,6 +150,7 @@ class TMailButtonWidget extends StatelessWidget {
       text: text,
       onTapActionCallback: onTapActionCallback,
       onTapActionAtPositionCallback: onTapActionAtPositionCallback,
+      onLongPressActionCallback: onLongPressActionCallback,
       borderRadius: borderRadius,
       width: width,
       maxWidth : maxWidth,
@@ -335,6 +341,7 @@ class TMailButtonWidget extends StatelessWidget {
     return TMailContainerWidget(
       onTapActionCallback: onTapActionCallback,
       onTapActionAtPositionCallback: onTapActionAtPositionCallback,
+      onLongPressActionCallback: onLongPressActionCallback,
       borderRadius: borderRadius,
       width: width,
       maxWidth: maxWidth,

core/lib/presentation/views/container/tmail_container_widget.dart

@@ -7,6 +7,7 @@ class TMailContainerWidget extends StatelessWidget {
 
   final OnTapActionCallback? onTapActionCallback;
   final OnTapActionAtPositionCallback? onTapActionAtPositionCallback;
+  final OnLongPressActionCallback? onLongPressActionCallback;
 
   final Widget child;
   final double borderRadius;
@@ -26,6 +27,7 @@ class TMailContainerWidget extends StatelessWidget {
     required this.child,
     this.onTapActionCallback,
     this.onTapActionAtPositionCallback,
+    this.onLongPressActionCallback,
     this.borderRadius = 20,
     this.width,
     this.maxWidth = double.infinity,
@@ -58,6 +60,7 @@ class TMailContainerWidget extends StatelessWidget {
             onTapActionAtPositionCallback!.call(position);
           }
         },
+        onLongPress: onLongPressActionCallback,
         borderRadius: BorderRadius.all(Radius.circular(borderRadius)),
         child: tooltipMessage != null
           ? Tooltip(