From 5f0b27e742675e447cca0a85c3256af4c43b2a4e Mon Sep 17 00:00:00 2001 From: dab246 Date: Wed, 30 Aug 2023 18:59:40 +0700 Subject: [PATCH] TF-2026 Add `SaveToDraftAndClose` method (cherry picked from commit f319001c5e30ea33175476aefb9942464b540c8f) --- lib/features/composer/presentation/base_composer_view.dart | 4 ++-- lib/features/composer/presentation/composer_controller.dart | 4 +++- lib/features/composer/presentation/composer_view.dart | 4 ++-- lib/features/composer/presentation/composer_view_web.dart | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/features/composer/presentation/base_composer_view.dart b/lib/features/composer/presentation/base_composer_view.dart index 25d25148a..f5e0ab666 100644 --- a/lib/features/composer/presentation/base_composer_view.dart +++ b/lib/features/composer/presentation/base_composer_view.dart @@ -433,7 +433,7 @@ abstract class BaseComposerView extends GetWidget ), iconPadding: EdgeInsets.zero, tooltip: AppLocalizations.of(context).saveAndClose, - onTap: () => controller.saveEmailAsDrafts(context) + onTap: () => controller.saveToDraftAndClose(context) ), Expanded(child: buildTitleComposer(context)), if (responsiveUtils.isScreenWithShortestSide(context)) @@ -513,7 +513,7 @@ abstract class BaseComposerView extends GetWidget width: 150, height: 44, radius: 10, - onTap: () => controller.saveEmailAsDrafts(context) + onTap: () => controller.saveToDraft(context) ), const SizedBox(width: 12), buildTextButton( diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart index 2a4816f33..81f454739 100644 --- a/lib/features/composer/presentation/composer_controller.dart +++ b/lib/features/composer/presentation/composer_controller.dart @@ -1016,7 +1016,7 @@ class ComposerController extends BaseController { return false; } - void saveEmailAsDrafts(BuildContext context, {bool canPop = true}) async { + void saveToDraftAndClose(BuildContext context, {bool canPop = true}) async { clearFocusEditor(context); final arguments = composerArguments.value; @@ -1083,6 +1083,8 @@ class ComposerController extends BaseController { } } + void saveToDraft(BuildContext context) {} + File _covertSharedMediaFileToFile(SharedMediaFile sharedMediaFile) { return File( Platform.isIOS diff --git a/lib/features/composer/presentation/composer_view.dart b/lib/features/composer/presentation/composer_view.dart index 3413fde7c..1f0d4838a 100644 --- a/lib/features/composer/presentation/composer_view.dart +++ b/lib/features/composer/presentation/composer_view.dart @@ -39,7 +39,7 @@ class ComposerView extends BaseComposerView { Widget _buildComposerViewForMobile(BuildContext context) { return WillPopScope( onWillPop: () async { - controller.saveEmailAsDrafts(context, canPop: false); + controller.saveToDraftAndClose(context, canPop: false); return true; }, child: GestureDetector( @@ -91,7 +91,7 @@ class ComposerView extends BaseComposerView { Widget _buildComposerViewForTablet(BuildContext context) { return WillPopScope( onWillPop: () async { - controller.saveEmailAsDrafts(context, canPop: false); + controller.saveToDraftAndClose(context, canPop: false); return true; }, child: GestureDetector( diff --git a/lib/features/composer/presentation/composer_view_web.dart b/lib/features/composer/presentation/composer_view_web.dart index a252fb9c8..eaa74e1d8 100644 --- a/lib/features/composer/presentation/composer_view_web.dart +++ b/lib/features/composer/presentation/composer_view_web.dart @@ -98,7 +98,7 @@ class ComposerView extends BaseComposerView { child: buildIconWeb( icon: SvgPicture.asset(imagePaths.icCloseMailbox, fit: BoxFit.fill), tooltip: AppLocalizations.of(context).saveAndClose, - onTap: () => controller.saveEmailAsDrafts(context) + onTap: () => controller.saveToDraftAndClose(context) )), buildIconWeb( icon: SvgPicture.asset(imagePaths.icFullScreenComposer, fit: BoxFit.fill), @@ -176,7 +176,7 @@ class ComposerView extends BaseComposerView { iconPadding: EdgeInsets.zero, icon: SvgPicture.asset(imagePaths.icCloseMailbox, fit: BoxFit.fill), tooltip: AppLocalizations.of(context).saveAndClose, - onTap: () => controller.saveEmailAsDrafts(context) + onTap: () => controller.saveToDraftAndClose(context) ), if (responsiveUtils.isDesktop(context)) ...[