Fix bug subject email deleted when compose email
This commit is contained in:
@@ -3,7 +3,6 @@ import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:html_editor_enhanced/html_editor.dart';
|
||||
import 'package:model/email/email_action_type.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/composer_controller.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/widgets/email_address_composer_widget_builder.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/widgets/top_bar_composer_widget_builder.dart';
|
||||
@@ -13,35 +12,36 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
|
||||
final responsiveUtils = Get.find<ResponsiveUtils>();
|
||||
final imagePaths = Get.find<ImagePaths>();
|
||||
final htmlMessagePurifier = Get.find<HtmlMessagePurifier>();
|
||||
final keyboardUtils = Get.find<KeyboardUtils>();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Scaffold(
|
||||
resizeToAvoidBottomInset: false,
|
||||
backgroundColor: AppColor.primaryLightColor,
|
||||
body: SafeArea(
|
||||
right: false,
|
||||
left: false,
|
||||
child: Container(
|
||||
margin: EdgeInsets.zero,
|
||||
alignment: Alignment.topCenter,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
children: [
|
||||
_buildTopBar(context),
|
||||
Expanded(
|
||||
child: Container(
|
||||
return GestureDetector(
|
||||
onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
|
||||
child: Scaffold(
|
||||
resizeToAvoidBottomInset: false,
|
||||
backgroundColor: AppColor.primaryLightColor,
|
||||
body: SafeArea(
|
||||
right: false,
|
||||
left: false,
|
||||
child: Container(
|
||||
margin: EdgeInsets.zero,
|
||||
alignment: Alignment.topCenter,
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisSize: MainAxisSize.max,
|
||||
children: [
|
||||
_buildTopBar(context),
|
||||
Expanded(child: Container(
|
||||
color: AppColor.bgComposer,
|
||||
margin: EdgeInsets.zero,
|
||||
alignment: Alignment.topCenter,
|
||||
child: _buildEmailBody(context)))
|
||||
child: _buildBodyComposer(context)))
|
||||
])
|
||||
)
|
||||
),
|
||||
)
|
||||
),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
@@ -55,7 +55,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildEmailHeaderField(BuildContext context) {
|
||||
Widget _buildEmailHeader(BuildContext context) {
|
||||
return Container(
|
||||
margin: EdgeInsets.zero,
|
||||
padding: EdgeInsets.only(top: 20),
|
||||
@@ -67,12 +67,7 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
padding: EdgeInsets.symmetric(horizontal: 24),
|
||||
child: _buildEmailAddress(context)),
|
||||
_buildSubjectEmail(context),
|
||||
Container(
|
||||
margin: EdgeInsets.zero,
|
||||
padding: EdgeInsets.zero,
|
||||
height: 1,
|
||||
color: AppColor.dividerColor,
|
||||
)
|
||||
Divider(color: AppColor.dividerColor, height: 1)
|
||||
],
|
||||
),
|
||||
);
|
||||
@@ -97,55 +92,55 @@ class ComposerView extends GetWidget<ComposerController> {
|
||||
Widget _buildSubjectEmail(BuildContext context) {
|
||||
return Padding(
|
||||
padding: EdgeInsets.only(left: 24, right: 24, bottom: 10, top: 8),
|
||||
child: Obx(() => TextFieldBuilder()
|
||||
.key(Key('subject_email_input'))
|
||||
.textInputAction(TextInputAction.newline)
|
||||
.maxLines(null)
|
||||
.onChange((value) => controller.setSubjectEmail(value))
|
||||
.textStyle(TextStyle(color: AppColor.nameUserColor, fontSize: 14, fontWeight: FontWeight.w500))
|
||||
.textDecoration(InputDecoration(
|
||||
hintText: AppLocalizations.of(context).subject_email,
|
||||
hintStyle: TextStyle(color: AppColor.baseTextColor, fontSize: 14, fontWeight: FontWeight.w500),
|
||||
contentPadding: EdgeInsets.zero,
|
||||
filled: true,
|
||||
border: InputBorder.none,
|
||||
fillColor: AppColor.bgComposer))
|
||||
.setText(controller.getEmailSubject(context))
|
||||
.build()),
|
||||
child: (TextFieldBuilder()
|
||||
..key(Key('subject_email_input'))
|
||||
..textInputAction(TextInputAction.newline)
|
||||
..maxLines(null)
|
||||
..onChange((value) => controller.setSubjectEmail(value))
|
||||
..textStyle(TextStyle(color: AppColor.nameUserColor, fontSize: 14, fontWeight: FontWeight.w500))
|
||||
..textDecoration(InputDecoration(
|
||||
hintText: AppLocalizations.of(context).subject_email,
|
||||
hintStyle: TextStyle(color: AppColor.baseTextColor, fontSize: 14, fontWeight: FontWeight.w500),
|
||||
contentPadding: EdgeInsets.zero,
|
||||
filled: true,
|
||||
border: InputBorder.none,
|
||||
fillColor: AppColor.bgComposer))
|
||||
..addController(controller.subjectEmailInputController))
|
||||
.build()
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildEmailBody(BuildContext context) {
|
||||
Widget _buildBodyComposer(BuildContext context) {
|
||||
return SingleChildScrollView(
|
||||
physics: ClampingScrollPhysics(),
|
||||
child: Column(
|
||||
children: [
|
||||
_buildEmailHeaderField(context),
|
||||
_buildEmailHeader(context),
|
||||
Padding(
|
||||
padding: EdgeInsets.only(bottom: 30, top: 16, left: 16, right: 16),
|
||||
child: _buildEmailBodyEditorQuoted(context),
|
||||
child: _buildComposerEditer(context),
|
||||
)
|
||||
]
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildEmailBodyEditorQuoted(BuildContext context) {
|
||||
return Obx(() => HtmlEditor(
|
||||
Widget _buildComposerEditer(BuildContext context) {
|
||||
return HtmlEditor(
|
||||
key: Key('email_body_editor_quoted'),
|
||||
controller: controller.htmlEditorController,
|
||||
controller: controller.composerEditorController,
|
||||
htmlEditorOptions: HtmlEditorOptions(
|
||||
hint: AppLocalizations.of(context).hint_content_email_composer,
|
||||
initialText: controller.getEmailActionType() != EmailActionType.compose
|
||||
? controller.getBodyEmailQuotedAsHtml(context, htmlMessagePurifier)
|
||||
: null,
|
||||
shouldEnsureVisible: true),
|
||||
otherOptions: OtherOptions(decoration: BoxDecoration()),
|
||||
callbacks: Callbacks(
|
||||
onFocus: () {
|
||||
FocusScope.of(context).unfocus();
|
||||
FocusManager.instance.primaryFocus?.unfocus();
|
||||
},
|
||||
onInit: () {
|
||||
controller.initContentEmail();
|
||||
}
|
||||
),
|
||||
));
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user