linagora · dab246 · Jun 15, 2023 · Jun 12, 2023 · Jun 13, 2023 · Jun 14, 2023
diff --git a/core/lib/core.dart b/core/lib/core.dart
@@ -46,8 +46,8 @@ export 'utils/platform_info.dart';
 // Views
 export 'presentation/views/text/slogan_builder.dart';
 export 'presentation/views/text/text_field_builder.dart';
+export 'presentation/views/text/text_form_field_builder.dart';
 export 'presentation/views/text/input_decoration_builder.dart';
-export 'presentation/views/text/text_builder.dart';
 export 'presentation/views/text/rich_text_builder.dart';
 export 'presentation/views/responsive/responsive_widget.dart';
 export 'presentation/views/list/tree_view.dart';

diff --git a/core/lib/data/network/download/download_client.dart b/core/lib/data/network/download/download_client.dart
@@ -6,7 +6,7 @@ import 'package:core/data/network/dio_client.dart';
 import 'package:core/data/utils/compress_file_utils.dart';
 import 'package:core/presentation/extensions/html_extension.dart';
 import 'package:core/utils/app_logger.dart';
-import 'package:core/utils/build_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 
@@ -55,7 +55,7 @@ class DownloadClient {
         return null;
       }
 
-      if (BuildUtils.isWeb) {
+      if (PlatformInfo.isWeb) {
         final base64Uri = encodeToBase64Uri({
           'bytesData': bytesData,
           'mimeType': 'image/$fileExtension',

diff --git a/core/lib/presentation/utils/html_transformer/dom/image_transformers.dart b/core/lib/presentation/utils/html_transformer/dom/image_transformers.dart
@@ -1,8 +1,12 @@
 
 import 'dart:convert';
 
-import 'package:core/core.dart';
+import 'package:core/data/network/dio_client.dart';
+import 'package:core/data/utils/compress_file_utils.dart';
+import 'package:core/presentation/extensions/html_extension.dart';
 import 'package:core/presentation/utils/html_transformer/base/dom_transformer.dart';
+import 'package:core/utils/app_logger.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:html/dom.dart';
@@ -59,7 +63,7 @@ class ImageTransformer extends DomTransformer {
           options: Options(responseType: ResponseType.bytes));
 
       if (responseData != null) {
-        if (BuildUtils.isWeb) {
+        if (PlatformInfo.isWeb) {
           return encodeToBase64Uri(responseData);
         } else {
           final bytesCompressed = await compressFileUtils.compressBytesDataImage(responseData);

diff --git a/core/lib/presentation/utils/html_transformer/html_template.dart b/core/lib/presentation/utils/html_transformer/html_template.dart
@@ -1,4 +1,6 @@
 
+import 'package:flutter/material.dart';
+
 const nameClassToolTip = 'tmail-tooltip';
 
 const tooltipLinkCss = '''
@@ -27,6 +29,7 @@ String generateHtml(String content, {
   String? styleCSS,
   String? javaScripts,
   bool hideScrollBar = true,
+  TextDirection? direction
 }) {
   return '''
     <!DOCTYPE html>
@@ -53,35 +56,9 @@ String generateHtml(String content, {
     </style>
     ${javaScripts ?? ''}
     </head>
-    <body style = "overflow-x: hidden">
+    <body ${direction == TextDirection.rtl ? 'dir="rtl"' : ''} style = "overflow-x: hidden">
     <div class="tmail-content">$content</div>
     </body>
     </html> 
   ''';
-}
-
-const bodyCssStyleForEditor = '''
-  <style>
-      blockquote {
-        margin-left: 8px;
-        margin-right: 8px;
-        padding-left: 12px;
-        padding-right: 12px;
-        border-left: 5px solid #eee;
-      }
-      pre {
-        display: block;
-        padding: 10px;
-        margin: 0 0 10px;
-        font-size: 13px;
-        line-height: 1.5;
-        color: #333;
-        word-break: break-all;
-        word-wrap: break-word;
-        background-color: #f5f5f5;
-        border: 1px solid #ccc;
-        border-radius: 4px;
-        overflow: auto;
-      }
-  </style>
-''';
+}
diff --git a/core/lib/presentation/utils/html_transformer/html_utils.dart b/core/lib/presentation/utils/html_transformer/html_utils.dart
@@ -1,5 +1,7 @@
 
 import 'package:core/presentation/utils/html_transformer/html_event_action.dart';
+import 'package:core/utils/platform_info.dart';
+import 'package:flutter/material.dart';
 
 class HtmlUtils {
 
@@ -65,4 +67,47 @@ class HtmlUtils {
       yDown = null;                                             
     }
   ''';
+
+  static String customCssStyleHtmlEditor({TextDirection direction = TextDirection.ltr}) {
+    if (PlatformInfo.isWeb) {
+      return '''
+        <style>
+          .note-editable {
+            direction: ${direction.name};
+          }
+
+          blockquote {
+            margin-left: 8px;
+            margin-right: 8px;
+            padding-left: 12px;
+            padding-right: 12px;
+            border-left: 5px solid #eee;
+          }
+
+          pre {
+            display: block;
+            padding: 10px;
+            margin: 0 0 10px;
+            font-size: 13px;
+            line-height: 1.5;
+            color: #333;
+            word-break: break-all;
+            word-wrap: break-word;
+            background-color: #f5f5f5;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+            overflow: auto;
+          }
+        </style>
+      ''';
+    } else if (PlatformInfo.isMobile) {
+      return '''
+        #editor {
+          direction: ${direction.name};
+        }
+      ''';
+    } else {
+      return '';
+    }
+  }
 }
diff --git a/core/lib/presentation/utils/icon_utils.dart b/core/lib/presentation/utils/icon_utils.dart
@@ -1,6 +1,6 @@
 
-import 'package:core/utils/build_utils.dart';
+import 'package:core/utils/platform_info.dart';
 
 class IconUtils {
-  static const double defaultIconSize = BuildUtils.isWeb ? 20.0 : 24.0;
+  static const double defaultIconSize = PlatformInfo.isWeb ? 20.0 : 24.0;
 }
diff --git a/core/lib/presentation/utils/responsive_utils.dart b/core/lib/presentation/utils/responsive_utils.dart
@@ -1,4 +1,4 @@
-import 'package:core/utils/build_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/widgets.dart';
 import 'package:get/get.dart';
 
@@ -82,7 +82,7 @@ class ResponsiveUtils {
   }
 
   bool hasLeftMenuDrawerActive(BuildContext context) {
-    if (BuildUtils.isWeb) {
+    if (PlatformInfo.isWeb) {
       return isMobile(context) ||
           isTablet(context) ||
           isTabletLarge(context);
@@ -92,13 +92,13 @@ class ResponsiveUtils {
   }
 
   bool isWebDesktop(BuildContext context) =>
-      BuildUtils.isWeb && isDesktop(context);
+      PlatformInfo.isWeb && isDesktop(context);
 
   bool isWebNotDesktop(BuildContext context) =>
-      BuildUtils.isWeb && !isDesktop(context);
+      PlatformInfo.isWeb && !isDesktop(context);
 
   bool mailboxDashboardOnlyHasEmailView(BuildContext context) {
-    if (BuildUtils.isWeb) {
+    if (PlatformInfo.isWeb) {
       return isMobile(context) || isTablet(context);
     } else {
       return isPortraitMobile(context) ||
@@ -108,7 +108,7 @@ class ResponsiveUtils {
   }
 
   bool landscapeTabletSupported(BuildContext context) {
-    if (BuildUtils.isWeb) {
+    if (PlatformInfo.isWeb) {
       return isTabletLarge(context);
     } else {
       return !isLandscapeMobile(context) && (isLandscapeTablet(context) ||

diff --git a/core/lib/presentation/utils/style_utils.dart b/core/lib/presentation/utils/style_utils.dart
@@ -1,4 +1,5 @@
-import 'package:core/core.dart';
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/material.dart';
 
 class CommonTextStyle {
@@ -9,9 +10,9 @@ class CommonTextStyle {
     fontWeight: FontWeight.normal,
   );
 
-  static const defaultTextOverFlow = BuildUtils.isWeb
+  static const defaultTextOverFlow = PlatformInfo.isWeb
       ? TextOverflow.fade
       : TextOverflow.ellipsis;
 
-  static const defaultSoftWrap = BuildUtils.isWeb ? false : true;
+  static const defaultSoftWrap = PlatformInfo.isWeb ? false : true;
 }
diff --git a/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart b/core/lib/presentation/views/bottom_popup/confirmation_dialog_action_sheet_builder.dart
@@ -1,5 +1,6 @@
 
-import 'package:core/core.dart';
+import 'package:core/presentation/extensions/color_extension.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:pointer_interceptor/pointer_interceptor.dart';
@@ -60,7 +61,7 @@ class ConfirmationDialogActionSheetBuilder {
                 padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10),
                 color: Colors.white,
                 child: MouseRegion(
-                  cursor: BuildUtils.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
+                  cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
                   child: CupertinoActionSheetAction(
                     child: Text(
                         _messageText ?? '',
@@ -75,7 +76,7 @@ class ConfirmationDialogActionSheetBuilder {
               padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 10),
               color: Colors.white,
               child: MouseRegion(
-                cursor: BuildUtils.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
+                cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
                 child: CupertinoActionSheetAction(
                   child: RichText(text: TextSpan(
                     style: _styleMessage ?? const TextStyle(fontSize: 14, color: AppColor.colorMessageConfirmDialog),
@@ -88,7 +89,7 @@ class ConfirmationDialogActionSheetBuilder {
           Container(
               color: Colors.white,
               child: MouseRegion(
-                cursor: BuildUtils.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
+                cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
                 child: CupertinoActionSheetAction(
                   child: Text(
                       _confirmText ?? '',
@@ -99,7 +100,7 @@ class ConfirmationDialogActionSheetBuilder {
           ),
         ],
         cancelButton: MouseRegion(
-          cursor: BuildUtils.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
+          cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
           child: CupertinoActionSheetAction(
             child: Text(
                 _cancelText ?? '',

diff --git a/core/lib/presentation/views/dialog/edit_text_dialog_builder.dart b/core/lib/presentation/views/dialog/edit_text_dialog_builder.dart
@@ -102,10 +102,10 @@ class EditTextDialogBuilder {
                       textAlign: TextAlign.center),
                   Padding(
                       padding: const EdgeInsets.only(top: 20),
-                      child: TextFormField(
+                      child: TextFormFieldBuilder(
                         keyboardType: TextInputType.visiblePassword,
-                        onChanged: (value) => _onTextChanged(value, setState),
-                        autofocus: true,
+                        onTextChange: (value) => _onTextChanged(value, setState),
+                        autoFocus: true,
                         controller: _textController,
                         decoration: InputDecoration(
                             errorText: _error,

diff --git a/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart b/core/lib/presentation/views/html_viewer/html_content_viewer_on_web_widget.dart
@@ -16,6 +16,7 @@ class HtmlContentViewerOnWeb extends StatefulWidget {
   final double widthContent;
   final double heightContent;
   final HtmlViewerControllerForWeb controller;
+  final TextDirection? direction;
 
   /// Handler for mailto: links
   final Function(Uri?)? mailtoDelegate;
@@ -31,6 +32,7 @@ class HtmlContentViewerOnWeb extends StatefulWidget {
     required this.controller,
     this.allowResizeToDocumentSize = true,
     this.mailtoDelegate,
+    this.direction,
   }) : super(key: key);
 
   @override
@@ -65,7 +67,9 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
   @override
   void didUpdateWidget(covariant HtmlContentViewerOnWeb oldWidget) {
     super.didUpdateWidget(oldWidget);
-    if (widget.contentHtml != oldWidget.contentHtml) {
+    log('_HtmlContentViewerOnWebState::didUpdateWidget():Old-Direction: ${oldWidget.direction} | Current-Direction: ${widget.direction}');
+    if (widget.contentHtml != oldWidget.contentHtml ||
+        widget.direction != oldWidget.direction) {
       createdViewId = _getRandString(10);
       widget.controller.viewId = createdViewId;
       _setUpWeb();
@@ -167,7 +171,8 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
       minHeight: minHeight,
       minWidth: minWidth,
       styleCSS: tooltipLinkCss,
-      javaScripts: webViewActionScripts + scriptsDisableZoom);
+      javaScripts: webViewActionScripts + scriptsDisableZoom,
+      direction: widget.direction);
 
     return htmlTemplate;
   }
@@ -276,21 +281,18 @@ class _HtmlContentViewerOnWebState extends State<HtmlContentViewerOnWeb> {
       return Container();
     }
 
-    return Directionality(
-      textDirection: TextDirection.ltr,
-      child: FutureBuilder<bool>(
-        future: webInit,
-        builder: (context, snapshot) {
-          if (snapshot.hasData) {
-            return HtmlElementView(
-              key: ValueKey(htmlData),
-              viewType: createdViewId,
-            );
-          } else {
-            return Container();
-          }
+    return FutureBuilder<bool>(
+      future: webInit,
+      builder: (context, snapshot) {
+        if (snapshot.hasData) {
+          return HtmlElementView(
+            key: ValueKey(htmlData),
+            viewType: createdViewId,
+          );
+        } else {
+          return Container();
         }
-      )
+      }
     );
   }
 }