diff --git a/lib/features/manage_account/presentation/vacation/vacation_controller.dart b/lib/features/manage_account/presentation/vacation/vacation_controller.dart index 492a579f6..4a1e6c3e2 100644 --- a/lib/features/manage_account/presentation/vacation/vacation_controller.dart +++ b/lib/features/manage_account/presentation/vacation/vacation_controller.dart @@ -2,6 +2,7 @@ import 'package:core/core.dart'; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:jmap_dart_client/jmap/mail/vacation/vacation_response.dart'; +import 'package:rich_text_composer/richtext_controller.dart'; import 'package:tmail_ui_user/features/base/base_controller.dart'; import 'package:tmail_ui_user/features/composer/presentation/controller/rich_text_web_controller.dart'; import 'package:tmail_ui_user/features/mailbox_creator/domain/model/verification/empty_name_validator.dart'; @@ -42,6 +43,7 @@ class VacationController extends BaseController { final messageTextController = TextEditingController(); final subjectTextController = TextEditingController(); + final richTextControllerForMobile = RichTextController(); VacationResponse? currentVacation; String? _vacationMessageHtmlText; @@ -121,7 +123,11 @@ class VacationController extends BaseController { messageTextController.text = newVacation.messagePlainText ?? ''; subjectTextController.text = newVacation.subject ?? ''; updateMessageHtmlText(newVacation.messageHtmlText ?? ''); - _richTextControllerForWeb.editorController.setText(newVacation.messageHtmlText ?? ''); + if (BuildUtils.isWeb) { + _richTextControllerForWeb.editorController.setText(newVacation.messageHtmlText ?? ''); + } else { + richTextControllerForMobile.htmlEditorApi?.setText(newVacation.messageHtmlText ?? ''); + } } bool get isVacationDeactivated => !vacationPresentation.value.isEnabled; @@ -235,7 +241,7 @@ class VacationController extends BaseController { errorMessageBody.value = _getErrorStringByInputValue(context, value); } - void saveVacation(BuildContext context) { + void saveVacation(BuildContext context) async { FocusScope.of(context).unfocus(); if (vacationPresentation.value.isEnabled) { @@ -261,7 +267,7 @@ class VacationController extends BaseController { } final messagePlainText = messageTextController.text; - final messageHtmlText = _vacationMessageHtmlText ?? ''; + final messageHtmlText = (BuildUtils.isWeb ? _vacationMessageHtmlText : await _getMessageHtmlText()) ?? ''; if (messagePlainText.isEmpty && messageHtmlText.isEmpty) { _appToast.showToastWithIcon( context, @@ -319,24 +325,36 @@ class VacationController extends BaseController { void updateMessageHtmlText(String? text) => _vacationMessageHtmlText = text; - Future _getMessageHtmlText() { - return _richTextControllerForWeb.editorController.getText(); + Future? _getMessageHtmlText() { + if (BuildUtils.isWeb) { + return _richTextControllerForWeb.editorController.getText(); + } else { + return richTextControllerForMobile.htmlEditorApi?.getText(); + } } - void selectVacationMessageType(BuildContext context, VacationMessageType newMessageType) async { + void selectVacationMessageType(BuildContext context, VacationMessageType newMessageType) { if (newMessageType == VacationMessageType.plainText && !BuildUtils.isWeb) { - final messageHtml = await _getMessageHtmlText(); - updateMessageHtmlText(messageHtml); + _storeMessageHtmlTextOnMobile(); } clearFocusEditor(context); vacationMessageType.value = newMessageType; } + void _storeMessageHtmlTextOnMobile() async { + final messageHtml = await _getMessageHtmlText(); + updateMessageHtmlText(messageHtml); + } + void clearFocusEditor(BuildContext context) { + if (!BuildUtils.isWeb) { + richTextControllerForMobile.htmlEditorApi?.unfocus(); + } FocusScope.of(context).unfocus(); } - void backToUniversalSettings() { + void backToUniversalSettings(BuildContext context) { + clearFocusEditor(context); _settingController.backToUniversalSettings(); } @@ -344,6 +362,7 @@ class VacationController extends BaseController { void onClose() { messageTextController.dispose(); subjectTextController.dispose(); + richTextControllerForMobile.dispose(); vacationWorker.dispose(); VacationControllerBindings().dispose(); super.onClose(); diff --git a/lib/features/manage_account/presentation/vacation/vacation_view.dart b/lib/features/manage_account/presentation/vacation/vacation_view.dart index 2c95df430..c4663e211 100644 --- a/lib/features/manage_account/presentation/vacation/vacation_view.dart +++ b/lib/features/manage_account/presentation/vacation/vacation_view.dart @@ -1,9 +1,12 @@ import 'package:core/core.dart'; +import 'package:enough_html_editor/enough_html_editor.dart' as html_editor_mobile; import 'package:flutter/material.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:pointer_interceptor/pointer_interceptor.dart'; +import 'package:rich_text_composer/rich_text_composer.dart'; +import 'package:rich_text_composer/views/widgets/rich_text_keyboard_toolbar.dart'; import 'package:tmail_ui_user/features/base/widget/border_button_field.dart'; import 'package:tmail_ui_user/features/base/widget/text_input_decoration_builder.dart'; import 'package:tmail_ui_user/features/base/widget/text_input_field_builder.dart'; @@ -32,77 +35,112 @@ class VacationView extends GetWidget with RichTextButtonMixi : Colors.white, body: GestureDetector( onTap: () => FocusScope.of(context).unfocus(), - child: Container( - width: double.infinity, - height: double.infinity, - margin: _responsiveUtils.isWebDesktop(context) - ? const EdgeInsets.all(24) - : EdgeInsets.zero, - decoration: _responsiveUtils.isWebDesktop(context) - ? BoxDecoration( - borderRadius: BorderRadius.circular(20), - border: Border.all(color: AppColor.colorBorderBodyThread, width: 1), - color: Colors.white) - : null, - padding: SettingsUtils.getMarginViewForSettingDetails(context, _responsiveUtils), - child: SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (_responsiveUtils.isWebDesktop(context)) - ...[ - Text(AppLocalizations.of(context).vacation, - style: const TextStyle( - fontSize: 20, - fontWeight: FontWeight.w500, - color: Colors.black)), - const SizedBox(height: 8) - ], - Text(AppLocalizations.of(context).vacationSettingExplanation, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.normal, - color: AppColor.colorVacationSettingExplanation)), - const SizedBox(height: 24), - Row(children: [ - Obx(() { - return InkWell( - onTap: () { - final newStatus = controller.isVacationDeactivated - ? VacationResponderStatus.activated - : VacationResponderStatus.deactivated; - controller.updateVacationPresentation(newStatus: newStatus); - }, - child: SvgPicture.asset( - controller.isVacationDeactivated - ? _imagePaths.icSwitchOff - : _imagePaths.icSwitchOn, - fit: BoxFit.fill, - width: 24, - height: 24) - ); - }), - const SizedBox(width: 16), - Expanded( - child: Text(AppLocalizations.of(context).vacationSettingToggleButtonAutoReply, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.normal, - color: Colors.black) - ), - ) - ]), - const SizedBox(height: 28), - Padding( - padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14), - child: Column(children: [ - Obx(() => AbsorbPointer( - absorbing: controller.isVacationDeactivated, - child: Opacity( - opacity: controller.isVacationDeactivated ? 0.3 : 1.0, - child: _responsiveUtils.isPortraitMobile(context) - ? Column(children: [ - BorderButtonField( + child: KeyboardRichText( + richTextController: controller.richTextControllerForMobile, + backgroundKeyboardToolBarColor: Colors.grey, + keyBroadToolbar: RichTextKeyboardToolBar( + titleFormatBottomSheet: AppLocalizations.of(context).format, + richTextController: controller.richTextControllerForMobile, + insertImage: () {}, + insertAttachment: () {}, + titleQuickStyleBottomSheet: AppLocalizations.of(context).quickStyles, + titleBackgroundBottomSheet: AppLocalizations.of(context).background, + titleForegroundBottomSheet: AppLocalizations.of(context).foreground, + ), + child: Container( + width: double.infinity, + height: double.infinity, + margin: _responsiveUtils.isWebDesktop(context) + ? const EdgeInsets.all(24) + : EdgeInsets.zero, + decoration: _responsiveUtils.isWebDesktop(context) + ? BoxDecoration( + borderRadius: BorderRadius.circular(20), + border: Border.all(color: AppColor.colorBorderBodyThread, width: 1), + color: Colors.white) + : null, + padding: SettingsUtils.getMarginViewForSettingDetails(context, _responsiveUtils), + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (_responsiveUtils.isWebDesktop(context)) + ...[ + Text(AppLocalizations.of(context).vacation, + style: const TextStyle( + fontSize: 20, + fontWeight: FontWeight.w500, + color: Colors.black)), + const SizedBox(height: 8) + ], + Text(AppLocalizations.of(context).vacationSettingExplanation, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.normal, + color: AppColor.colorVacationSettingExplanation)), + const SizedBox(height: 24), + Row(children: [ + Obx(() { + return InkWell( + onTap: () { + final newStatus = controller.isVacationDeactivated + ? VacationResponderStatus.activated + : VacationResponderStatus.deactivated; + controller.updateVacationPresentation(newStatus: newStatus); + }, + child: SvgPicture.asset( + controller.isVacationDeactivated + ? _imagePaths.icSwitchOff + : _imagePaths.icSwitchOn, + fit: BoxFit.fill, + width: 24, + height: 24) + ); + }), + const SizedBox(width: 16), + Expanded( + child: Text(AppLocalizations.of(context).vacationSettingToggleButtonAutoReply, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.normal, + color: Colors.black) + ), + ) + ]), + const SizedBox(height: 28), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 14), + child: Column(children: [ + Obx(() => AbsorbPointer( + absorbing: controller.isVacationDeactivated, + child: Opacity( + opacity: controller.isVacationDeactivated ? 0.3 : 1.0, + child: _responsiveUtils.isPortraitMobile(context) + ? Column(children: [ + BorderButtonField( + label: AppLocalizations.of(context).startDate, + value: controller.vacationPresentation.value.startDate, + mouseCursor: SystemMouseCursors.text, + backgroundColor: AppColor.colorBackgroundVacationSettingField, + isEmpty: !controller.isVacationDeactivated && + controller.vacationPresentation.value.startDateIsNull, + hintText: AppLocalizations.of(context).startDate, + tapActionCallback: (value) => + controller.selectDate(context, DateType.start, value)), + const SizedBox(height: 18), + BorderButtonField( + label: AppLocalizations.of(context).startTime, + value: controller.vacationPresentation.value.startTime, + mouseCursor: SystemMouseCursors.text, + backgroundColor: AppColor.colorBackgroundVacationSettingField, + isEmpty: !controller.isVacationDeactivated && + controller.vacationPresentation.value.starTimeIsNull, + hintText: AppLocalizations.of(context).noStartTime, + tapActionCallback: (value) => + controller.selectTime(context, DateType.start, value)), + ]) + : Row(children: [ + Expanded(child: BorderButtonField( label: AppLocalizations.of(context).startDate, value: controller.vacationPresentation.value.startDate, mouseCursor: SystemMouseCursors.text, @@ -111,9 +149,9 @@ class VacationView extends GetWidget with RichTextButtonMixi controller.vacationPresentation.value.startDateIsNull, hintText: AppLocalizations.of(context).startDate, tapActionCallback: (value) => - controller.selectDate(context, DateType.start, value)), - const SizedBox(height: 18), - BorderButtonField( + controller.selectDate(context, DateType.start, value))), + const SizedBox(width: 24), + Expanded(child: BorderButtonField( label: AppLocalizations.of(context).startTime, value: controller.vacationPresentation.value.startTime, mouseCursor: SystemMouseCursors.text, @@ -122,155 +160,133 @@ class VacationView extends GetWidget with RichTextButtonMixi controller.vacationPresentation.value.starTimeIsNull, hintText: AppLocalizations.of(context).noStartTime, tapActionCallback: (value) => - controller.selectTime(context, DateType.start, value)), - ]) - : Row(children: [ - Expanded(child: BorderButtonField( - label: AppLocalizations.of(context).startDate, - value: controller.vacationPresentation.value.startDate, - mouseCursor: SystemMouseCursors.text, - backgroundColor: AppColor.colorBackgroundVacationSettingField, - isEmpty: !controller.isVacationDeactivated && - controller.vacationPresentation.value.startDateIsNull, - hintText: AppLocalizations.of(context).startDate, - tapActionCallback: (value) => - controller.selectDate(context, DateType.start, value))), - const SizedBox(width: 24), - Expanded(child: BorderButtonField( - label: AppLocalizations.of(context).startTime, - value: controller.vacationPresentation.value.startTime, - mouseCursor: SystemMouseCursors.text, - backgroundColor: AppColor.colorBackgroundVacationSettingField, - isEmpty: !controller.isVacationDeactivated && - controller.vacationPresentation.value.starTimeIsNull, - hintText: AppLocalizations.of(context).noStartTime, - tapActionCallback: (value) => - controller.selectTime(context, DateType.start, value))), - ]), - ), - )), - const SizedBox(height: 24), - Obx(() => AbsorbPointer( + controller.selectTime(context, DateType.start, value))), + ]), + ), + )), + const SizedBox(height: 24), + Obx(() => AbsorbPointer( + absorbing: controller.isVacationDeactivated, + child: Opacity( + opacity: controller.isVacationDeactivated ? 0.3 : 1.0, + child: Row(children: [ + Obx(() => InkWell( + onTap: () { + final value = !controller.vacationPresentation.value.vacationStopEnabled; + controller.updateVacationPresentation(vacationStopEnabled: value); + }, + child: SvgPicture.asset( + controller.vacationPresentation.value.vacationStopEnabled + ? _imagePaths.icSwitchOn + : _imagePaths.icSwitchOff, + fit: BoxFit.fill, + width: 24, + height: 24) + ) + ), + const SizedBox(width: 16), + Expanded( + child: Text(AppLocalizations.of(context).vacationStopsAt, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.normal, + color: Colors.black) + ), + ) + ]), + ) + )), + const SizedBox(height: 24), + Obx(() => AbsorbPointer( + absorbing: !controller.canChangeEndDate, + child: Opacity( + opacity: !controller.canChangeEndDate ? 0.3 : 1.0, + child: _responsiveUtils.isPortraitMobile(context) + ? Column(children: [ + BorderButtonField( + label: AppLocalizations.of(context).endDate, + value: controller.vacationPresentation.value.endDate, + mouseCursor: SystemMouseCursors.text, + backgroundColor: AppColor.colorBackgroundVacationSettingField, + isEmpty: controller.canChangeEndDate && + controller.vacationPresentation.value.endDateIsNull, + hintText: AppLocalizations.of(context).noEndDate, + tapActionCallback: (value) => + controller.selectDate(context, DateType.end, value)), + const SizedBox(height: 18), + BorderButtonField( + label: AppLocalizations.of(context).endTime, + value: controller.vacationPresentation.value.endTime, + mouseCursor: SystemMouseCursors.text, + backgroundColor: AppColor.colorBackgroundVacationSettingField, + isEmpty: controller.canChangeEndDate && + controller.vacationPresentation.value.endTimeIsNull, + hintText: AppLocalizations.of(context).noEndTime, + tapActionCallback: (value) => + controller.selectTime(context, DateType.end, value)), + ]) + : Row(children: [ + Expanded(child: BorderButtonField( + label: AppLocalizations.of(context).endDate, + value: controller.vacationPresentation.value.endDate, + mouseCursor: SystemMouseCursors.text, + backgroundColor: AppColor.colorBackgroundVacationSettingField, + isEmpty: controller.canChangeEndDate && + controller.vacationPresentation.value.endDateIsNull, + hintText: AppLocalizations.of(context).noEndDate, + tapActionCallback: (value) => + controller.selectDate(context, DateType.end, value))), + const SizedBox(width: 24), + Expanded(child: BorderButtonField( + label: AppLocalizations.of(context).endTime, + value: controller.vacationPresentation.value.endTime, + mouseCursor: SystemMouseCursors.text, + backgroundColor: AppColor.colorBackgroundVacationSettingField, + isEmpty: controller.canChangeEndDate && + controller.vacationPresentation.value.endTimeIsNull, + hintText: AppLocalizations.of(context).noEndTime, + tapActionCallback: (value) => + controller.selectTime(context, DateType.end, value))), + ]), + ) + )), + const SizedBox(height: 24), + Obx(() => AbsorbPointer( + absorbing: controller.isVacationDeactivated, + child: _responsiveUtils.isPortraitMobile(context) + ? Opacity( + opacity: controller.isVacationDeactivated ? 0.3 : 1.0, + child: TextInputFieldBuilder( + label: AppLocalizations.of(context).subject, + hint: AppLocalizations.of(context).hintSubjectInputVacationSetting, + editingController: controller.subjectTextController), + ) + : Row(children: [ + Expanded(child: Opacity( + opacity: controller.isVacationDeactivated ? 0.3 : 1.0, + child: TextInputFieldBuilder( + label: AppLocalizations.of(context).subject, + hint: AppLocalizations.of(context).hintSubjectInputVacationSetting, + editingController: controller.subjectTextController), + )), + const SizedBox(width: 24), + const Expanded(child: SizedBox.shrink()) + ]) + )), + const SizedBox(height: 24), + Obx(() => AbsorbPointer( absorbing: controller.isVacationDeactivated, child: Opacity( opacity: controller.isVacationDeactivated ? 0.3 : 1.0, - child: Row(children: [ - Obx(() => InkWell( - onTap: () { - final value = !controller.vacationPresentation.value.vacationStopEnabled; - controller.updateVacationPresentation(vacationStopEnabled: value); - }, - child: SvgPicture.asset( - controller.vacationPresentation.value.vacationStopEnabled - ? _imagePaths.icSwitchOn - : _imagePaths.icSwitchOff, - fit: BoxFit.fill, - width: 24, - height: 24) - ) - ), - const SizedBox(width: 16), - Expanded( - child: Text(AppLocalizations.of(context).vacationStopsAt, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.normal, - color: Colors.black) - ), - ) - ]), - ) - )), - const SizedBox(height: 24), - Obx(() => AbsorbPointer( - absorbing: !controller.canChangeEndDate, - child: Opacity( - opacity: !controller.canChangeEndDate ? 0.3 : 1.0, - child: _responsiveUtils.isPortraitMobile(context) - ? Column(children: [ - BorderButtonField( - label: AppLocalizations.of(context).endDate, - value: controller.vacationPresentation.value.endDate, - mouseCursor: SystemMouseCursors.text, - backgroundColor: AppColor.colorBackgroundVacationSettingField, - isEmpty: controller.canChangeEndDate && - controller.vacationPresentation.value.endDateIsNull, - hintText: AppLocalizations.of(context).noEndDate, - tapActionCallback: (value) => - controller.selectDate(context, DateType.end, value)), - const SizedBox(height: 18), - BorderButtonField( - label: AppLocalizations.of(context).endTime, - value: controller.vacationPresentation.value.endTime, - mouseCursor: SystemMouseCursors.text, - backgroundColor: AppColor.colorBackgroundVacationSettingField, - isEmpty: controller.canChangeEndDate && - controller.vacationPresentation.value.endTimeIsNull, - hintText: AppLocalizations.of(context).noEndTime, - tapActionCallback: (value) => - controller.selectTime(context, DateType.end, value)), - ]) - : Row(children: [ - Expanded(child: BorderButtonField( - label: AppLocalizations.of(context).endDate, - value: controller.vacationPresentation.value.endDate, - mouseCursor: SystemMouseCursors.text, - backgroundColor: AppColor.colorBackgroundVacationSettingField, - isEmpty: controller.canChangeEndDate && - controller.vacationPresentation.value.endDateIsNull, - hintText: AppLocalizations.of(context).noEndDate, - tapActionCallback: (value) => - controller.selectDate(context, DateType.end, value))), - const SizedBox(width: 24), - Expanded(child: BorderButtonField( - label: AppLocalizations.of(context).endTime, - value: controller.vacationPresentation.value.endTime, - mouseCursor: SystemMouseCursors.text, - backgroundColor: AppColor.colorBackgroundVacationSettingField, - isEmpty: controller.canChangeEndDate && - controller.vacationPresentation.value.endTimeIsNull, - hintText: AppLocalizations.of(context).noEndTime, - tapActionCallback: (value) => - controller.selectTime(context, DateType.end, value))), - ]), - ) - )), - const SizedBox(height: 24), - Obx(() => AbsorbPointer( - absorbing: controller.isVacationDeactivated, - child: _responsiveUtils.isPortraitMobile(context) - ? Opacity( - opacity: controller.isVacationDeactivated ? 0.3 : 1.0, - child: TextInputFieldBuilder( - label: AppLocalizations.of(context).subject, - hint: AppLocalizations.of(context).hintSubjectInputVacationSetting, - editingController: controller.subjectTextController), - ) - : Row(children: [ - Expanded(child: Opacity( - opacity: controller.isVacationDeactivated ? 0.3 : 1.0, - child: TextInputFieldBuilder( - label: AppLocalizations.of(context).subject, - hint: AppLocalizations.of(context).hintSubjectInputVacationSetting, - editingController: controller.subjectTextController), - )), - const SizedBox(width: 24), - const Expanded(child: SizedBox.shrink()) - ]) - )), - const SizedBox(height: 24), - Obx(() => AbsorbPointer( - absorbing: controller.isVacationDeactivated, - child: Opacity( - opacity: controller.isVacationDeactivated ? 0.3 : 1.0, - child: _buildVacationMessage(context), - ), - )), - const SizedBox(height: 24), - _buildListButtonAction(context) - ]), - ) - ] + child: _buildVacationMessage(context), + ), + )), + const SizedBox(height: 24), + _buildListButtonAction(context) + ]), + ) + ] + ), ), ), ), @@ -308,7 +324,7 @@ class VacationView extends GetWidget with RichTextButtonMixi width: 156, height: 44, radius: 10, - onTap: () => controller.backToUniversalSettings()), + onTap: () => controller.backToUniversalSettings(context)), ), const SizedBox(width: 12), Expanded( @@ -338,7 +354,7 @@ class VacationView extends GetWidget with RichTextButtonMixi width: 156, height: 44, radius: 10, - onTap: () => controller.backToUniversalSettings()), + onTap: () => controller.backToUniversalSettings(context)), const SizedBox(width: 12), buildTextButton( AppLocalizations.of(context).saveChanges, @@ -385,14 +401,15 @@ class VacationView extends GetWidget with RichTextButtonMixi padding: const EdgeInsets.only(left: 12, right: 12, top: 12), child: Column(children: [ _buildMessageHtmlTextEditor(context), - Center(child: Obx(() { - return PointerInterceptor( - child: buildToolbarRichTextForWeb( - context, - controller.richTextControllerForWeb, - layoutType: ButtonLayoutType.scrollHorizontal), - ); - })) + if (BuildUtils.isWeb) + Center(child: Obx(() { + return PointerInterceptor( + child: buildToolbarRichTextForWeb( + context, + controller.richTextControllerForWeb, + layoutType: ButtonLayoutType.scrollHorizontal), + ); + })) ]), ); } @@ -450,7 +467,13 @@ class VacationView extends GetWidget with RichTextButtonMixi ), ); } else { - return const SizedBox.shrink(); + return html_editor_mobile.HtmlEditor( + key: const Key('vacation_message_html_text_editor_mobile'), + minHeight: 150, + addDefaultSelectionMenuItems: false, + initialContent: controller.vacationMessageHtmlText ?? '', + onCreated: controller.richTextControllerForMobile.onCreateHTMLEditor + ); } } diff --git a/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart b/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart index 9a78bca46..03d6be0a7 100644 --- a/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart +++ b/lib/features/manage_account/presentation/vacation/widgets/vacation_notification_message_widget.dart @@ -106,7 +106,7 @@ class VacationNotificationMessageWidget extends StatelessWidget { if (leadingIcon != null) leadingIcon!, Expanded( child: Padding( - padding: const EdgeInsets.only(top: 8, right: 12), + padding: const EdgeInsets.only(right: 12), child: Center( child: Text( vacationResponse.getNotificationMessage(context), diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb index cad239eaa..671dff626 100644 --- a/lib/l10n/intl_messages.arb +++ b/lib/l10n/intl_messages.arb @@ -1,5 +1,5 @@ { - "@@last_modified": "2022-09-20T13:44:48.613115", + "@@last_modified": "2022-09-30T16:41:42.005040", "initializing_data": "Initializing data...", "@initializing_data": { "type": "text", @@ -2197,5 +2197,29 @@ "type": "text", "placeholders_order": [], "placeholders": {} + }, + "quickStyles": "Quick styles", + "@quickStyles": { + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "format": "Format", + "@format": { + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "background": "Background", + "@background": { + "type": "text", + "placeholders_order": [], + "placeholders": {} + }, + "foreground": "Foreground", + "@foreground": { + "type": "text", + "placeholders_order": [], + "placeholders": {} } } \ No newline at end of file diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart index 5a065142a..3d450cc56 100644 --- a/lib/main/localizations/app_localizations.dart +++ b/lib/main/localizations/app_localizations.dart @@ -2271,4 +2271,32 @@ class AppLocalizations { name: 'hintSearchInputContact' ); } + + String get quickStyles { + return Intl.message( + 'Quick styles', + name: 'quickStyles' + ); + } + + String get format { + return Intl.message( + 'Format', + name: 'format' + ); + } + + String get background { + return Intl.message( + 'Background', + name: 'background' + ); + } + + String get foreground { + return Intl.message( + 'Foreground', + name: 'foreground' + ); + } } \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 1f7f423b7..5256f397b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1083,6 +1083,15 @@ packages: url: "https://github.com/KasemJaffer/receive_sharing_intent.git" source: git version: "1.4.5" + rich_text_composer: + dependency: "direct main" + description: + path: "." + ref: master + resolved-ref: "85fe10cd4d3b29bbf803ac796ebe722710fa1d36" + url: "https://github.com/linagora/rich-text-composer.git" + source: git + version: "0.0.1" rule_filter: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index 7ee0bfe4f..c31c4bc31 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -139,6 +139,11 @@ dependencies: url: https://github.com/linagora/html-editor-enhanced.git ref: email_supported + rich_text_composer: + git: + url: https://github.com/linagora/rich-text-composer.git + ref: master + # fk_user_agent fk_user_agent: 2.1.0