TF-3408 Auto load more when user uses arrow down of keyboard
This commit is contained in:
@@ -8,7 +8,6 @@ class RichTextBuilder extends StatefulWidget {
|
||||
final TextStyle styleWord;
|
||||
final String? preMarkedText;
|
||||
final bool ensureHighlightVisible;
|
||||
final bool? softWrap;
|
||||
|
||||
const RichTextBuilder({
|
||||
super.key,
|
||||
@@ -18,7 +17,6 @@ class RichTextBuilder extends StatefulWidget {
|
||||
required this.styleWord,
|
||||
this.preMarkedText,
|
||||
this.ensureHighlightVisible = false,
|
||||
this.softWrap,
|
||||
});
|
||||
|
||||
@override
|
||||
@@ -65,7 +63,6 @@ class _RichTextBuilderState extends State<RichTextBuilder> with AutomaticKeepAli
|
||||
),
|
||||
style: widget.styleOrigin,
|
||||
maxLines: 1,
|
||||
softWrap: widget.softWrap,
|
||||
overflow: TextOverflow.ellipsis
|
||||
);
|
||||
|
||||
|
||||
@@ -8,6 +8,7 @@ class ComposerStyle {
|
||||
static const double radius = 28;
|
||||
static const double keyboardToolBarHeight = 200;
|
||||
static const double popupMenuRadius = 8;
|
||||
static const double suggestionItemHeight = 60;
|
||||
|
||||
static const Color borderColor = AppColor.colorLineComposer;
|
||||
static const Color backgroundEditorColor = Colors.white;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
|
||||
|
||||
class RecipientComposerWidgetStyle {
|
||||
static const double deleteRecipientFieldIconSize = 20;
|
||||
@@ -10,6 +11,7 @@ class RecipientComposerWidgetStyle {
|
||||
static const double suggestionsBoxRadius = 20;
|
||||
static const double suggestionsBoxMaxHeight = 300;
|
||||
static const double suggestionBoxWidth = 300;
|
||||
static const double suggestionBoxItemHeight = ComposerStyle.suggestionItemHeight;
|
||||
static const double minTextFieldWidth = 20;
|
||||
static const double tagSpacing = 8;
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ class RecipientSuggestionItemWidgetStyle {
|
||||
static const double selectedIconSize = 24;
|
||||
|
||||
static const EdgeInsetsGeometry suggestionDuplicatedMargin = EdgeInsets.all(8.0);
|
||||
static const EdgeInsetsGeometry labelDuplicatedPadding = EdgeInsets.symmetric(horizontal: 8.0);
|
||||
static const EdgeInsetsGeometry labelPadding = EdgeInsets.symmetric(horizontal: 16.0);
|
||||
|
||||
static const TextStyle labelTextStyle = TextStyle(
|
||||
|
||||
@@ -180,6 +180,7 @@ class _RecipientComposerWidgetState extends State<RecipientComposerWidget> {
|
||||
suggestionsBoxBackgroundColor: RecipientComposerWidgetStyle.suggestionsBoxBackgroundColor,
|
||||
suggestionsBoxRadius: RecipientComposerWidgetStyle.suggestionsBoxRadius,
|
||||
suggestionsBoxMaxHeight: RecipientComposerWidgetStyle.suggestionsBoxMaxHeight,
|
||||
suggestionItemHeight: RecipientComposerWidgetStyle.suggestionBoxItemHeight,
|
||||
suggestionBoxWidth: _getSuggestionBoxWidth(widget.maxWidth),
|
||||
textStyle: RecipientComposerWidgetStyle.inputTextStyle,
|
||||
onFocusTagAction: (focused) => _handleFocusTagAction.call(focused, stateSetter),
|
||||
@@ -270,6 +271,7 @@ class _RecipientComposerWidgetState extends State<RecipientComposerWidget> {
|
||||
suggestionsBoxBackgroundColor: RecipientComposerWidgetStyle.suggestionsBoxBackgroundColor,
|
||||
suggestionsBoxRadius: RecipientComposerWidgetStyle.suggestionsBoxRadius,
|
||||
suggestionsBoxMaxHeight: RecipientComposerWidgetStyle.suggestionsBoxMaxHeight,
|
||||
suggestionItemHeight: RecipientComposerWidgetStyle.suggestionBoxItemHeight,
|
||||
suggestionBoxWidth: _getSuggestionBoxWidth(widget.maxWidth),
|
||||
textStyle: RecipientComposerWidgetStyle.inputTextStyle,
|
||||
onFocusTagAction: (focused) => _handleFocusTagAction.call(focused, stateSetter),
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:core/presentation/views/text/rich_text_builder.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/extensions/email_address_extension.dart';
|
||||
import 'package:super_tag_editor/widgets/rich_text_widget.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/suggestion_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/recipient_suggestion_item_widget_style.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/avatar_suggestion_item_widget.dart';
|
||||
|
||||
@@ -38,59 +40,91 @@ class RecipientSuggestionItemWidget extends StatelessWidget {
|
||||
margin: RecipientSuggestionItemWidgetStyle.suggestionDuplicatedMargin,
|
||||
decoration: const BoxDecoration(
|
||||
color: AppColor.colorBgMenuItemDropDownSelected,
|
||||
borderRadius: BorderRadius.all(Radius.circular(RecipientSuggestionItemWidgetStyle.radius))
|
||||
borderRadius: BorderRadius.all(Radius.circular(RecipientSuggestionItemWidgetStyle.radius)),
|
||||
),
|
||||
height: ComposerStyle.suggestionItemHeight,
|
||||
child: Material(
|
||||
type: MaterialType.transparency,
|
||||
child: ListTile(
|
||||
contentPadding: RecipientSuggestionItemWidgetStyle.labelDuplicatedPadding,
|
||||
leading: AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
title: RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: emailAddress.displayName.isNotEmpty
|
||||
? RichTextWidget(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
styleTextOrigin: RecipientSuggestionItemWidgetStyle.labelTextStyle,
|
||||
styleWordSearched: RecipientSuggestionItemWidgetStyle.labelHighlightTextStyle
|
||||
)
|
||||
: null,
|
||||
trailing: SvgPicture.asset(
|
||||
imagePaths.icFilterSelected,
|
||||
width: RecipientSuggestionItemWidgetStyle.selectedIconSize,
|
||||
height: RecipientSuggestionItemWidgetStyle.selectedIconSize,
|
||||
fit: BoxFit.fill
|
||||
child: InkWell(
|
||||
onTap: () {},
|
||||
child: Padding(
|
||||
padding: RecipientSuggestionItemWidgetStyle.labelPadding,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (emailAddress.displayName.isNotEmpty)
|
||||
RichTextBuilder(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordToStyle: suggestionValid ?? '',
|
||||
styleOrigin: RecipientSuggestionItemWidgetStyle.labelTextStyle,
|
||||
styleWord: RecipientSuggestionItemWidgetStyle.labelHighlightTextStyle,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 8),
|
||||
SvgPicture.asset(
|
||||
imagePaths.icFilterSelected,
|
||||
width: RecipientSuggestionItemWidgetStyle.selectedIconSize,
|
||||
height: RecipientSuggestionItemWidgetStyle.selectedIconSize,
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
)
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return Container(
|
||||
color: highlight ? AppColor.colorItemSelected : Colors.white,
|
||||
height: ComposerStyle.suggestionItemHeight,
|
||||
child: Material(
|
||||
type: MaterialType.transparency,
|
||||
child: ListTile(
|
||||
contentPadding: RecipientSuggestionItemWidgetStyle.labelPadding,
|
||||
leading: AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
title: RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: emailAddress.displayName.isNotEmpty
|
||||
? RichTextWidget(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
styleTextOrigin: RecipientSuggestionItemWidgetStyle.labelTextStyle,
|
||||
styleWordSearched: RecipientSuggestionItemWidgetStyle.labelHighlightTextStyle
|
||||
)
|
||||
: null,
|
||||
child: InkWell(
|
||||
onTap: () => onSelectedAction?.call(emailAddress),
|
||||
child: Padding(
|
||||
padding: RecipientSuggestionItemWidgetStyle.labelPadding,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
const SizedBox(width: 8),
|
||||
Expanded(
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
if (emailAddress.displayName.isNotEmpty)
|
||||
RichTextBuilder(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordToStyle: suggestionValid ?? '',
|
||||
styleOrigin: RecipientSuggestionItemWidgetStyle.labelTextStyle,
|
||||
styleWord: RecipientSuggestionItemWidgetStyle.labelHighlightTextStyle,
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
|
||||
@@ -5,31 +5,32 @@ import 'package:core/presentation/utils/style_utils.dart';
|
||||
import 'package:core/presentation/views/avatar/gradient_circle_avatar_icon.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/extensions/email_address_extension.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/suggestion_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
|
||||
|
||||
typedef SelectedContactCallbackAction = Function(EmailAddress contactSelected);
|
||||
|
||||
class ContactSuggestionBoxItem extends StatelessWidget {
|
||||
|
||||
final ImagePaths imagePaths;
|
||||
final SuggestionEmailAddress suggestionEmailAddress;
|
||||
final SelectedContactCallbackAction? selectedContactCallbackAction;
|
||||
final EdgeInsets? padding;
|
||||
final ShapeBorder? shapeBorder;
|
||||
|
||||
const ContactSuggestionBoxItem(this.suggestionEmailAddress, {
|
||||
Key? key,
|
||||
this.padding,
|
||||
this.shapeBorder,
|
||||
this.selectedContactCallbackAction
|
||||
}) : super(key: key);
|
||||
const ContactSuggestionBoxItem(
|
||||
this.suggestionEmailAddress,
|
||||
this.imagePaths,
|
||||
{
|
||||
Key? key,
|
||||
this.shapeBorder,
|
||||
this.selectedContactCallbackAction,
|
||||
}
|
||||
) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final imagePaths = Get.find<ImagePaths>();
|
||||
|
||||
final itemChild = Row(children: [
|
||||
GradientCircleAvatarIcon(
|
||||
colors: suggestionEmailAddress.emailAddress.avatarColors,
|
||||
@@ -82,8 +83,9 @@ class ContactSuggestionBoxItem extends StatelessWidget {
|
||||
child: InkWell(
|
||||
onTap: () => selectedContactCallbackAction?.call(suggestionEmailAddress.emailAddress),
|
||||
customBorder: shapeBorder,
|
||||
child: Padding(
|
||||
padding: padding ?? const EdgeInsets.all(12),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
height: ComposerStyle.suggestionItemHeight,
|
||||
child: itemChild,
|
||||
),
|
||||
),
|
||||
@@ -91,8 +93,9 @@ class ContactSuggestionBoxItem extends StatelessWidget {
|
||||
} else {
|
||||
return Material(
|
||||
color: Colors.transparent,
|
||||
child: Padding(
|
||||
padding: padding ?? const EdgeInsets.all(12),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
height: ComposerStyle.suggestionItemHeight,
|
||||
child: itemChild,
|
||||
),
|
||||
);
|
||||
|
||||
+2
@@ -1,8 +1,10 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
|
||||
|
||||
class SuggestionItemWidgetStyles {
|
||||
static const double iconSelectedSize = 24.0;
|
||||
static const double suggestionItemHeight = ComposerStyle.suggestionItemHeight;
|
||||
|
||||
static const EdgeInsetsGeometry margin = EdgeInsets.all(8.0);
|
||||
static const EdgeInsetsGeometry contentPaddingDuplicated = EdgeInsets.symmetric(
|
||||
|
||||
+2
@@ -1,4 +1,5 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
|
||||
|
||||
class TextInputSuggestionFieldWidgetStyles {
|
||||
static const double titleWidth = 112.0;
|
||||
@@ -8,6 +9,7 @@ class TextInputSuggestionFieldWidgetStyles {
|
||||
static const double suggestionsBoxElevation = 20.0;
|
||||
static const double suggestionsBoxRadius = 20.0;
|
||||
static const double suggestionsBoxMaxHeight = 350.0;
|
||||
static const double suggestionBoxItemHeight = ComposerStyle.suggestionItemHeight;
|
||||
static const double space = 12.0;
|
||||
static const double spaceMobile = 8.0;
|
||||
|
||||
|
||||
-95
@@ -1,95 +0,0 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/model.dart';
|
||||
import 'package:super_tag_editor/widgets/rich_text_widget.dart';
|
||||
import 'package:tmail_ui_user/features/email_recovery/presentation/styles/text_input_field/suggestion_item_widget_styles.dart';
|
||||
import 'package:tmail_ui_user/features/email_recovery/presentation/widgets/text_input_field/avatar_suggestion_item_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/suggesstion_email_address.dart';
|
||||
|
||||
typedef OnSelectedRecipientSuggestionAction = void Function(EmailAddress emailAddress);
|
||||
|
||||
class SuggestionItemWidget extends StatelessWidget {
|
||||
final SuggestionEmailState suggestionState;
|
||||
final EmailAddress emailAddress;
|
||||
final String? suggestionValid;
|
||||
final bool highlight;
|
||||
final OnSelectedRecipientSuggestionAction? onSelectedAction;
|
||||
|
||||
final _imagePaths = Get.find<ImagePaths>();
|
||||
|
||||
SuggestionItemWidget({
|
||||
super.key,
|
||||
required this.suggestionState,
|
||||
required this.emailAddress,
|
||||
this.highlight = false,
|
||||
this.suggestionValid,
|
||||
this.onSelectedAction,
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (suggestionState == SuggestionEmailState.duplicated) {
|
||||
return Container(
|
||||
margin: SuggestionItemWidgetStyles.margin,
|
||||
decoration: SuggestionItemWidgetStyles.decoration,
|
||||
child: Material(
|
||||
type: MaterialType.transparency,
|
||||
child: ListTile(
|
||||
contentPadding: SuggestionItemWidgetStyles.contentPaddingDuplicated,
|
||||
leading: AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
title: RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: emailAddress.displayName.isNotEmpty
|
||||
? RichTextWidget(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordSearched: suggestionValid ?? '',
|
||||
styleTextOrigin: SuggestionItemWidgetStyles.subTitleTextOriginStyle,
|
||||
styleWordSearched: SuggestionItemWidgetStyles.subTitleWordSearchedStyle,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
)
|
||||
: null,
|
||||
trailing: SvgPicture.asset(
|
||||
_imagePaths.icFilterSelected,
|
||||
width: SuggestionItemWidgetStyles.iconSelectedSize,
|
||||
height: SuggestionItemWidgetStyles.iconSelectedSize,
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return Container(
|
||||
color: highlight ? AppColor.colorItemSelected : Colors.white,
|
||||
child: Material(
|
||||
type: MaterialType.transparency,
|
||||
child: ListTile(
|
||||
contentPadding: SuggestionItemWidgetStyles.contentPaddingValid,
|
||||
leading: AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
title: RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: emailAddress.displayName.isNotEmpty
|
||||
? RichTextWidget(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordSearched: suggestionValid ?? '',
|
||||
styleTextOrigin: SuggestionItemWidgetStyles.subTitleTextOriginStyle,
|
||||
styleWordSearched: SuggestionItemWidgetStyles.subTitleWordSearchedStyle,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
)
|
||||
: null,
|
||||
onTap: () => onSelectedAction?.call(emailAddress),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
+9
-3
@@ -1,20 +1,22 @@
|
||||
import 'dart:async';
|
||||
import 'dart:math';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:core/utils/app_logger.dart';
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/utils/responsive_utils.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/mailbox/expand_mode.dart';
|
||||
import 'package:model/extensions/email_address_extension.dart';
|
||||
import 'package:super_tag_editor/tag_editor.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/suggestion_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/widgets/recipient_suggestion_item_widget.dart';
|
||||
import 'package:tmail_ui_user/features/email_recovery/presentation/model/email_recovery_field.dart';
|
||||
import 'package:tmail_ui_user/features/email_recovery/presentation/styles/text_input_field/text_input_suggestion_field_widget_styles.dart';
|
||||
import 'package:tmail_ui_user/features/email_recovery/presentation/widgets/text_input_field/suggestion_item_widget.dart';
|
||||
import 'package:tmail_ui_user/features/email_recovery/presentation/widgets/text_input_field/suggestion_tag_item_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/suggesstion_email_address.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
||||
|
||||
typedef OnSuggestionEmailAddress = Future<List<EmailAddress>> Function(String word, {int? limit});
|
||||
@@ -68,6 +70,8 @@ class TextInputFieldSuggestionWidget extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _TextInputFieldSuggestionWidgetState extends State<TextInputFieldSuggestionWidget> {
|
||||
final _imagePaths = Get.find<ImagePaths>();
|
||||
|
||||
bool _lastTagFocused = false;
|
||||
late List<EmailAddress> _currentListEmailAddress;
|
||||
Timer? _gapBetweenTagChangedAndFindSuggestion;
|
||||
@@ -138,6 +142,7 @@ class _TextInputFieldSuggestionWidgetState extends State<TextInputFieldSuggestio
|
||||
suggestionsBoxBackgroundColor: Colors.white,
|
||||
suggestionsBoxRadius: TextInputSuggestionFieldWidgetStyles.suggestionsBoxRadius,
|
||||
suggestionsBoxMaxHeight: TextInputSuggestionFieldWidgetStyles.suggestionsBoxMaxHeight,
|
||||
suggestionItemHeight: TextInputSuggestionFieldWidgetStyles.suggestionBoxItemHeight,
|
||||
suggestionBoxWidth: _getSuggestionBoxWidth(constraints.maxWidth),
|
||||
textStyle: TextInputSuggestionFieldWidgetStyles.inputFieldTextStyle,
|
||||
onFocusTagAction: (focused) => _handleFocusTagAction.call(focused, setState),
|
||||
@@ -168,7 +173,8 @@ class _TextInputFieldSuggestionWidgetState extends State<TextInputFieldSuggestio
|
||||
isLoadMoreReplaceAllOld: false,
|
||||
loadMoreSuggestions: _findSuggestions,
|
||||
suggestionBuilder: (context, tagEditorState, suggestionEmailAddress, index, length, highlight, suggestionValid) {
|
||||
return SuggestionItemWidget(
|
||||
return RecipientSuggestionItemWidget(
|
||||
imagePaths: _imagePaths,
|
||||
suggestionState: suggestionEmailAddress.state,
|
||||
emailAddress: suggestionEmailAddress.emailAddress,
|
||||
suggestionValid: suggestionValid,
|
||||
|
||||
-17
@@ -1,17 +0,0 @@
|
||||
import 'package:equatable/equatable.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
|
||||
class SuggestionEmailAddress with EquatableMixin {
|
||||
final EmailAddress emailAddress;
|
||||
final SuggestionEmailState state;
|
||||
|
||||
SuggestionEmailAddress(this.emailAddress, {this.state = SuggestionEmailState.valid});
|
||||
|
||||
@override
|
||||
List<Object?> get props => [emailAddress, state];
|
||||
}
|
||||
|
||||
enum SuggestionEmailState {
|
||||
valid,
|
||||
duplicated,
|
||||
}
|
||||
-27
@@ -1,27 +0,0 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
class AutoCompleteSuggestionItemWebStyle {
|
||||
static const double iconSize = 24.0;
|
||||
|
||||
static const EdgeInsetsGeometry margin = EdgeInsets.all(8.0);
|
||||
|
||||
static const EdgeInsetsGeometry contentPaddingDuplicated = EdgeInsets.symmetric(horizontal: 8.0);
|
||||
static const EdgeInsetsGeometry contentPaddingValid = EdgeInsets.symmetric(horizontal: 16.0);
|
||||
|
||||
static const Decoration decoration = BoxDecoration(
|
||||
color: AppColor.colorBgMenuItemDropDownSelected,
|
||||
borderRadius: BorderRadius.all(Radius.circular(20))
|
||||
);
|
||||
|
||||
static const TextStyle subTitleTextOriginStyle = TextStyle(
|
||||
color: AppColor.colorHintSearchBar,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.normal
|
||||
);
|
||||
static const TextStyle subTitleWordSearchStyle = TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 13,
|
||||
fontWeight: FontWeight.bold
|
||||
);
|
||||
}
|
||||
+2
@@ -1,5 +1,6 @@
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
|
||||
|
||||
class TextFieldAutoCompleteEmailAddressWebStyles {
|
||||
static const EdgeInsetsGeometry padding = EdgeInsets.symmetric(vertical: 8);
|
||||
@@ -15,6 +16,7 @@ class TextFieldAutoCompleteEmailAddressWebStyles {
|
||||
|
||||
static const double suggestionBoxElevation = 20.0;
|
||||
static const double suggestionBoxMaxHeight = 350.0;
|
||||
static const double suggestionBoxItemHeight = ComposerStyle.suggestionItemHeight;
|
||||
|
||||
static const double fieldTitleWidth = 112.0;
|
||||
static const double space = 8.0;
|
||||
|
||||
-95
@@ -1,95 +0,0 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/extensions/email_address_extension.dart';
|
||||
import 'package:super_tag_editor/widgets/rich_text_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/suggesstion_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/autocomplete_suggestion_item_web_style.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/avatar_suggestion_item_widget.dart';
|
||||
|
||||
typedef OnSelectedRecipientSuggestionAction = Function(EmailAddress emailAddress);
|
||||
|
||||
class AutoCompleteSuggestionItemWidgetWeb extends StatelessWidget {
|
||||
|
||||
final SuggestionEmailState suggestionState;
|
||||
final EmailAddress emailAddress;
|
||||
final String? suggestionValid;
|
||||
final bool highlight;
|
||||
final OnSelectedRecipientSuggestionAction? onSelectedAction;
|
||||
|
||||
final _imagePaths = Get.find<ImagePaths>();
|
||||
|
||||
AutoCompleteSuggestionItemWidgetWeb({
|
||||
Key? key,
|
||||
required this.suggestionState,
|
||||
required this.emailAddress,
|
||||
this.highlight = false,
|
||||
this.suggestionValid,
|
||||
this.onSelectedAction,
|
||||
}) : super(key: key);
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
if (suggestionState == SuggestionEmailState.duplicated) {
|
||||
return Container(
|
||||
margin: AutoCompleteSuggestionItemWebStyle.margin,
|
||||
decoration: AutoCompleteSuggestionItemWebStyle.decoration,
|
||||
child: Material(
|
||||
type: MaterialType.transparency,
|
||||
child: ListTile(
|
||||
contentPadding: AutoCompleteSuggestionItemWebStyle.contentPaddingDuplicated,
|
||||
leading: AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
title: RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: emailAddress.displayName.isNotEmpty
|
||||
? RichTextWidget(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordSearched: suggestionValid ?? '',
|
||||
styleTextOrigin: AutoCompleteSuggestionItemWebStyle.subTitleTextOriginStyle,
|
||||
styleWordSearched: AutoCompleteSuggestionItemWebStyle.subTitleWordSearchStyle,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
)
|
||||
: null,
|
||||
trailing: SvgPicture.asset(
|
||||
_imagePaths.icFilterSelected,
|
||||
width: AutoCompleteSuggestionItemWebStyle.iconSize,
|
||||
height: AutoCompleteSuggestionItemWebStyle.iconSize,
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
} else {
|
||||
return Container(
|
||||
color: highlight ? AppColor.colorItemSelected : Colors.white,
|
||||
child: Material(
|
||||
type: MaterialType.transparency,
|
||||
child: ListTile(
|
||||
contentPadding: AutoCompleteSuggestionItemWebStyle.contentPaddingValid,
|
||||
leading: AvatarSuggestionItemWidget(emailAddress: emailAddress),
|
||||
title: RichTextWidget(
|
||||
textOrigin: emailAddress.asString(),
|
||||
wordSearched: suggestionValid ?? '',
|
||||
overflow: TextOverflow.ellipsis,
|
||||
),
|
||||
subtitle: emailAddress.displayName.isNotEmpty
|
||||
? RichTextWidget(
|
||||
textOrigin: emailAddress.emailAddress,
|
||||
wordSearched: suggestionValid ?? '',
|
||||
styleTextOrigin: AutoCompleteSuggestionItemWebStyle.subTitleTextOriginStyle,
|
||||
styleWordSearched: AutoCompleteSuggestionItemWebStyle.subTitleWordSearchStyle,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
)
|
||||
: null,
|
||||
onTap: () => onSelectedAction?.call(emailAddress),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
+9
-3
@@ -3,21 +3,23 @@ import 'dart:math';
|
||||
|
||||
import 'package:collection/collection.dart';
|
||||
import 'package:core/presentation/extensions/color_extension.dart';
|
||||
import 'package:core/presentation/resources/image_paths.dart';
|
||||
import 'package:core/presentation/utils/responsive_utils.dart';
|
||||
import 'package:core/utils/app_logger.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:get/get.dart';
|
||||
import 'package:jmap_dart_client/jmap/mail/email/email_address.dart';
|
||||
import 'package:model/extensions/email_address_extension.dart';
|
||||
import 'package:model/mailbox/expand_mode.dart';
|
||||
import 'package:super_tag_editor/tag_editor.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/draggable_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/suggestion_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/widgets/recipient_composer_widget.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/widgets/recipient_suggestion_item_widget.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/advanced_search_filter.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/suggesstion_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/advanced_search_input_form_style.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/styles/text_field_autocomplete_email_address_web_style.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/autocomplete_suggestion_item_widget_web.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/widgets/advanced_search/autocomplete_tag_item_widget_web.dart';
|
||||
import 'package:tmail_ui_user/main/utils/app_config.dart';
|
||||
|
||||
@@ -73,6 +75,8 @@ class TextFieldAutocompleteEmailAddressWeb extends StatefulWidget {
|
||||
}
|
||||
|
||||
class _TextFieldAutocompleteEmailAddressWebState extends State<TextFieldAutocompleteEmailAddressWeb> {
|
||||
final _imagePaths = Get.find<ImagePaths>();
|
||||
|
||||
bool _lastTagFocused = false;
|
||||
bool _isDragging = false;
|
||||
late List<EmailAddress> _currentListEmailAddress;
|
||||
@@ -166,6 +170,7 @@ class _TextFieldAutocompleteEmailAddressWebState extends State<TextFieldAutocomp
|
||||
suggestionsBoxBackgroundColor: TextFieldAutoCompleteEmailAddressWebStyles.suggestionBoxBackgroundColor,
|
||||
suggestionsBoxRadius: TextFieldAutoCompleteEmailAddressWebStyles.suggestionBoxRadius,
|
||||
suggestionsBoxMaxHeight: TextFieldAutoCompleteEmailAddressWebStyles.suggestionBoxMaxHeight,
|
||||
suggestionItemHeight: TextFieldAutoCompleteEmailAddressWebStyles.suggestionBoxItemHeight,
|
||||
suggestionBoxWidth: _getSuggestionBoxWidth(constraints.maxWidth),
|
||||
textStyle: AdvancedSearchInputFormStyle.inputTextStyle,
|
||||
onFocusTagAction: (focused) => _handleFocusTagAction.call(focused, setState),
|
||||
@@ -196,7 +201,8 @@ class _TextFieldAutocompleteEmailAddressWebState extends State<TextFieldAutocomp
|
||||
isLoadMoreReplaceAllOld: false,
|
||||
loadMoreSuggestions: _findSuggestions,
|
||||
suggestionBuilder: (context, tagEditorState, suggestionEmailAddress, index, length, highlight, suggestionValid) {
|
||||
return AutoCompleteSuggestionItemWidgetWeb(
|
||||
return RecipientSuggestionItemWidget(
|
||||
imagePaths: _imagePaths,
|
||||
suggestionState: suggestionEmailAddress.state,
|
||||
emailAddress: suggestionEmailAddress.emailAddress,
|
||||
suggestionValid: suggestionValid,
|
||||
|
||||
+12
-1
@@ -17,6 +17,7 @@ import 'package:super_tag_editor/tag_editor.dart';
|
||||
import 'package:tmail_ui_user/features/base/mixin/message_dialog_action_mixin.dart';
|
||||
import 'package:tmail_ui_user/features/base/widget/material_text_icon_button.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/model/suggestion_email_address.dart';
|
||||
import 'package:tmail_ui_user/features/composer/presentation/styles/composer_style.dart';
|
||||
import 'package:tmail_ui_user/features/contact/presentation/widgets/contact_input_tag_item.dart';
|
||||
import 'package:tmail_ui_user/features/contact/presentation/widgets/contact_suggestion_box_item.dart';
|
||||
import 'package:tmail_ui_user/features/email/presentation/utils/email_utils.dart';
|
||||
@@ -62,6 +63,7 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
|
||||
final _responsiveUtils = Get.find<ResponsiveUtils>();
|
||||
final _imagePaths = Get.find<ImagePaths>();
|
||||
final GlobalKey<TagsEditorState> keyToEmailTagEditor = GlobalKey<TagsEditorState>();
|
||||
final FocusNode _focusNodeKeyboard = FocusNode();
|
||||
|
||||
late List<EmailAddress> listEmailAddress;
|
||||
|
||||
@@ -73,12 +75,19 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
|
||||
listEmailAddress = widget.listEmailAddress;
|
||||
}
|
||||
|
||||
@override
|
||||
void dispose() {
|
||||
_focusNodeKeyboard.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final itemTagEditor = TagEditor<SuggestionEmailAddress>(
|
||||
key: keyToEmailTagEditor,
|
||||
length: listEmailAddress.length,
|
||||
controller: widget.controller,
|
||||
focusNodeKeyboard: _focusNodeKeyboard,
|
||||
borderRadius: 12,
|
||||
backgroundColor: AppColor.colorInputBackgroundCreateMailbox,
|
||||
focusedBorderColor: AppColor.colorTextButton,
|
||||
@@ -144,14 +153,16 @@ class _AutocompleteContactTextFieldWithTagsState extends State<AutocompleteConta
|
||||
queryString,
|
||||
limit: AppConfig.defaultLimitAutocomplete,
|
||||
),
|
||||
suggestionItemHeight: ComposerStyle.suggestionItemHeight,
|
||||
isLoadMoreOnlyOnce: true,
|
||||
isLoadMoreReplaceAllOld: false,
|
||||
loadMoreSuggestions: _findSuggestions,
|
||||
suggestionBuilder: (context, tagEditorState, suggestionEmailAddress, index, length, highlight, suggestionValid) {
|
||||
return Container(
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
child: ContactSuggestionBoxItem(
|
||||
suggestionEmailAddress,
|
||||
_imagePaths,
|
||||
shapeBorder: const RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.all(Radius.circular(12))),
|
||||
selectedContactCallbackAction: (contact) {
|
||||
|
||||
+1
-1
@@ -1956,7 +1956,7 @@ packages:
|
||||
description:
|
||||
path: "."
|
||||
ref: fix-some-issue-with-suggestion-box
|
||||
resolved-ref: "2d6bc8b1481f555e4aa29f744d1a7168641aed8b"
|
||||
resolved-ref: "3ac885e6416f61f5888e5b9c5e8e07c182b57e71"
|
||||
url: "https://github.com/dab246/super_tag_editor.git"
|
||||
source: git
|
||||
version: "0.3.0"
|
||||
|
||||
Reference in New Issue
Block a user