Upgrade dependencies after upgrade Flutter 3.22.2
This commit is contained in:
@@ -39,7 +39,7 @@ mixin PopupContextMenuActionMixin {
|
||||
|
||||
Widget buildCancelButton(BuildContext context) {
|
||||
return MouseRegion(
|
||||
cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
|
||||
cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
child: Text(
|
||||
AppLocalizations.of(context).cancel,
|
||||
|
||||
@@ -156,15 +156,15 @@ class DropDownButtonWidget<T> extends StatelessWidget {
|
||||
offset: const Offset(0.0, -8.0),
|
||||
scrollbarTheme: ScrollbarThemeData(
|
||||
radius: const Radius.circular(40),
|
||||
thickness: MaterialStateProperty.all<double>(6),
|
||||
thumbVisibility: MaterialStateProperty.all<bool>(true),
|
||||
thickness: WidgetStateProperty.all<double>(6),
|
||||
thumbVisibility: WidgetStateProperty.all<bool>(true),
|
||||
),
|
||||
),
|
||||
iconStyleData: IconStyleData(icon: iconArrowDown ?? SvgPicture.asset(imagePaths.icDropDown)),
|
||||
menuItemStyleData: MenuItemStyleData(
|
||||
height: heightItem,
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
overlayColor: MaterialStateProperty.resolveWith<Color>((Set<MaterialState> states) => supportSelectionIcon ? Colors.white : Colors.black12)
|
||||
overlayColor: WidgetStateProperty.resolveWith<Color>((Set<WidgetState> states) => supportSelectionIcon ? Colors.white : Colors.black12)
|
||||
),
|
||||
onMenuStateChange: onMenuStateChange,
|
||||
),
|
||||
|
||||
@@ -364,6 +364,12 @@ class ComposerController extends BaseController with DragDropFileMixin implement
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
if (richTextWebController != null) {
|
||||
ever(richTextWebController!.formattingOptionsState, (_) {
|
||||
richTextWebController!.editorController.setFocus();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
void _listenBrowserTabRefresh() {
|
||||
@@ -462,7 +468,7 @@ class ComposerController extends BaseController with DragDropFileMixin implement
|
||||
bccAddressFocusNodeKeyboard = FocusNode();
|
||||
|
||||
subjectEmailInputFocusNode = FocusNode(
|
||||
onKey: PlatformInfo.isWeb ? _subjectEmailInputOnKeyListener : null
|
||||
onKeyEvent: PlatformInfo.isWeb ? _subjectEmailInputOnKeyListener : null,
|
||||
);
|
||||
subjectEmailInputFocusNode?.addListener(_subjectEmailInputFocusListener);
|
||||
}
|
||||
@@ -479,8 +485,8 @@ class ComposerController extends BaseController with DragDropFileMixin implement
|
||||
}
|
||||
}
|
||||
|
||||
KeyEventResult _subjectEmailInputOnKeyListener(FocusNode node, RawKeyEvent event) {
|
||||
if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
KeyEventResult _subjectEmailInputOnKeyListener(FocusNode node, KeyEvent event) {
|
||||
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
richTextWebController?.editorController.setFocus();
|
||||
return KeyEventResult.handled;
|
||||
}
|
||||
|
||||
+3
-3
@@ -51,14 +51,14 @@ class FromComposerDropDownWidgetStyle {
|
||||
offset: const Offset(0.0, -8.0),
|
||||
scrollbarTheme: ScrollbarThemeData(
|
||||
radius: const Radius.circular(40.0),
|
||||
thickness: MaterialStateProperty.all<double>(6.0),
|
||||
thumbVisibility: MaterialStateProperty.all<bool>(true),
|
||||
thickness: WidgetStateProperty.all<double>(6.0),
|
||||
thumbVisibility: WidgetStateProperty.all<bool>(true),
|
||||
)
|
||||
);
|
||||
static MenuItemStyleData menuIemStyleData = MenuItemStyleData(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 12),
|
||||
height: 72,
|
||||
overlayColor: MaterialStateProperty.resolveWith<Color>((Set<MaterialState> states) => Colors.white)
|
||||
overlayColor: WidgetStateProperty.resolveWith<Color>((Set<WidgetState> states) => Colors.white)
|
||||
);
|
||||
|
||||
static const TextStyle prefixTextStyle = TextStyle(
|
||||
|
||||
@@ -58,8 +58,8 @@ class DropDownMenuHeaderStyleWidget extends StatelessWidget {
|
||||
offset: const Offset(0.0, -8.0),
|
||||
scrollbarTheme: ScrollbarThemeData(
|
||||
radius: const Radius.circular(40),
|
||||
thickness: MaterialStateProperty.all<double>(6),
|
||||
thumbVisibility: MaterialStateProperty.all<bool>(true),
|
||||
thickness: WidgetStateProperty.all<double>(6),
|
||||
thumbVisibility: WidgetStateProperty.all<bool>(true),
|
||||
)
|
||||
),
|
||||
menuItemStyleData: MenuItemStyleData(
|
||||
|
||||
@@ -149,7 +149,7 @@ class _RecipientComposerWidgetState extends State<RecipientComposerWidget> {
|
||||
child: FocusScope(
|
||||
child: Focus(
|
||||
onFocusChange: (focus) => widget.onFocusEmailAddressChangeAction?.call(widget.prefix, focus),
|
||||
onKey: PlatformInfo.isWeb ? _recipientInputOnKeyListener : null,
|
||||
onKeyEvent: PlatformInfo.isWeb ? _recipientInputOnKeyListener : null,
|
||||
child: StatefulBuilder(
|
||||
builder: (context, stateSetter) {
|
||||
if (PlatformInfo.isWeb || widget.isTestingForWeb) {
|
||||
@@ -230,7 +230,7 @@ class _RecipientComposerWidgetState extends State<RecipientComposerWidget> {
|
||||
},
|
||||
);
|
||||
},
|
||||
onAccept: (draggableEmailAddress) => _handleAcceptDraggableEmailAddressAction(draggableEmailAddress, stateSetter),
|
||||
onAcceptWithDetails: (draggableEmailAddress) => _handleAcceptDraggableEmailAddressAction(draggableEmailAddress.data, stateSetter),
|
||||
onLeave: (draggableEmailAddress) {
|
||||
if (_isDragging) {
|
||||
stateSetter(() => _isDragging = false);
|
||||
@@ -382,8 +382,8 @@ class _RecipientComposerWidgetState extends State<RecipientComposerWidget> {
|
||||
);
|
||||
}
|
||||
|
||||
KeyEventResult _recipientInputOnKeyListener(FocusNode node, RawKeyEvent event) {
|
||||
if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
KeyEventResult _recipientInputOnKeyListener(FocusNode node, KeyEvent event) {
|
||||
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
widget.nextFocusNode?.requestFocus();
|
||||
widget.onFocusNextAddressAction?.call();
|
||||
return KeyEventResult.handled;
|
||||
|
||||
@@ -65,7 +65,7 @@ class AttachmentDropZoneWidget extends StatelessWidget {
|
||||
),
|
||||
);
|
||||
},
|
||||
onAccept: onAttachmentDropZoneListener
|
||||
onAcceptWithDetails: (details) => onAttachmentDropZoneListener?.call(details.data),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ class EmailActionCupertinoActionSheetActionBuilder extends CupertinoActionSheetA
|
||||
return Container(
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
|
||||
cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
|
||||
|
||||
@@ -157,11 +157,11 @@ class EmailAddressBottomSheetBuilder {
|
||||
height: 44,
|
||||
child: TextButton(
|
||||
style: ButtonStyle(
|
||||
foregroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => AppColor.colorTextButton),
|
||||
backgroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => AppColor.colorItemEmailSelectedDesktop),
|
||||
shape: MaterialStateProperty.all(RoundedRectangleBorder(
|
||||
foregroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => AppColor.colorTextButton),
|
||||
backgroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => AppColor.colorItemEmailSelectedDesktop),
|
||||
shape: WidgetStateProperty.all(RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
side: const BorderSide(
|
||||
width: 0,
|
||||
@@ -183,11 +183,11 @@ class EmailAddressBottomSheetBuilder {
|
||||
height: 44,
|
||||
child: TextButton(
|
||||
style: ButtonStyle(
|
||||
foregroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => Colors.white),
|
||||
backgroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => AppColor.colorTextButton),
|
||||
shape: MaterialStateProperty.all(RoundedRectangleBorder(
|
||||
foregroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => Colors.white),
|
||||
backgroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => AppColor.colorTextButton),
|
||||
shape: WidgetStateProperty.all(RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
side: const BorderSide(
|
||||
width: 0,
|
||||
|
||||
@@ -135,11 +135,11 @@ class EmailAddressDialogBuilder extends StatelessWidget {
|
||||
height: 44,
|
||||
child: TextButton(
|
||||
style: ButtonStyle(
|
||||
foregroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => AppColor.colorTextButton),
|
||||
backgroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => AppColor.colorItemEmailSelectedDesktop),
|
||||
shape: MaterialStateProperty.all(RoundedRectangleBorder(
|
||||
foregroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => AppColor.colorTextButton),
|
||||
backgroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => AppColor.colorItemEmailSelectedDesktop),
|
||||
shape: WidgetStateProperty.all(RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
side: const BorderSide(
|
||||
width: 0,
|
||||
@@ -161,11 +161,11 @@ class EmailAddressDialogBuilder extends StatelessWidget {
|
||||
height: 44,
|
||||
child: TextButton(
|
||||
style: ButtonStyle(
|
||||
foregroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => Colors.white),
|
||||
backgroundColor: MaterialStateProperty.resolveWith<Color>(
|
||||
(Set<MaterialState> states) => AppColor.colorTextButton),
|
||||
shape: MaterialStateProperty.all(RoundedRectangleBorder(
|
||||
foregroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => Colors.white),
|
||||
backgroundColor: WidgetStateProperty.resolveWith<Color>(
|
||||
(Set<WidgetState> states) => AppColor.colorTextButton),
|
||||
shape: WidgetStateProperty.all(RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(8),
|
||||
side: const BorderSide(
|
||||
width: 0,
|
||||
|
||||
@@ -123,10 +123,10 @@ class _PDFViewerState extends State<PDFViewer> {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return RawKeyboardListener(
|
||||
return KeyboardListener(
|
||||
focusNode: _keyboardFocusNode,
|
||||
autofocus: true,
|
||||
onKey: _handleKeyboardEventListener,
|
||||
onKeyEvent: _handleKeyboardEventListener,
|
||||
child: Center(
|
||||
child: Stack(
|
||||
children: [
|
||||
@@ -287,8 +287,8 @@ class _PDFViewerState extends State<PDFViewer> {
|
||||
Navigator.maybeOf(context)?.pop();
|
||||
}
|
||||
|
||||
void _handleKeyboardEventListener(RawKeyEvent event) {
|
||||
if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.escape) {
|
||||
void _handleKeyboardEventListener(KeyEvent event) {
|
||||
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.escape) {
|
||||
_closeView();
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -22,9 +22,9 @@ class CheckBoxHasAttachmentWidget extends StatelessWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return RawKeyboardListener(
|
||||
return KeyboardListener(
|
||||
focusNode: FocusNode(),
|
||||
onKey: (event) {
|
||||
onKeyEvent: (event) {
|
||||
if (event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
nextFocusNode?.requestFocus();
|
||||
}
|
||||
|
||||
+2
-2
@@ -89,8 +89,8 @@ class DateSelectionDropDownButton extends StatelessWidget {
|
||||
offset: DateSelectionDropdownButtonStyles.dropdownOffset,
|
||||
scrollbarTheme: ScrollbarThemeData(
|
||||
radius: DateSelectionDropdownButtonStyles.scrollbarRadius,
|
||||
thickness: MaterialStateProperty.all<double>(DateSelectionDropdownButtonStyles.scrollbarThickness),
|
||||
thumbVisibility: MaterialStateProperty.all<bool>(true),
|
||||
thickness: WidgetStateProperty.all<double>(DateSelectionDropdownButtonStyles.scrollbarThickness),
|
||||
thumbVisibility: WidgetStateProperty.all<bool>(true),
|
||||
),
|
||||
),
|
||||
iconStyleData: IconStyleData(
|
||||
|
||||
+1
-1
@@ -174,7 +174,7 @@ class _TextInputFieldSuggestionWidgetState extends State<TextInputFieldSuggestio
|
||||
);
|
||||
},
|
||||
onHandleKeyEventAction: (event) {
|
||||
if (event is RawKeyDownEvent) {
|
||||
if (event is KeyDownEvent) {
|
||||
switch (event.logicalKey) {
|
||||
case LogicalKeyboardKey.tab:
|
||||
widget.nextFocusNode?.requestFocus();
|
||||
|
||||
+3
-3
@@ -64,10 +64,10 @@ class TextInputFieldWidget extends StatelessWidget {
|
||||
),
|
||||
);
|
||||
|
||||
return RawKeyboardListener(
|
||||
return KeyboardListener(
|
||||
focusNode: currentFocusNode ?? FocusNode(),
|
||||
onKey: (event) {
|
||||
if (event is RawKeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
onKeyEvent: (event) {
|
||||
if (event is KeyDownEvent && event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
nextFocusNode?.requestFocus();
|
||||
}
|
||||
},
|
||||
|
||||
+2
-2
@@ -79,8 +79,8 @@ class IdentityDropListFieldBuilder extends StatelessWidget {
|
||||
elevation: 4,
|
||||
scrollbarTheme: ScrollbarThemeData(
|
||||
radius: const Radius.circular(40),
|
||||
thickness: MaterialStateProperty.all<double>(6),
|
||||
thumbVisibility: MaterialStateProperty.all<bool>(true),
|
||||
thickness: WidgetStateProperty.all<double>(6),
|
||||
thumbVisibility: WidgetStateProperty.all<bool>(true),
|
||||
),
|
||||
),
|
||||
iconStyleData: IconStyleData(
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ class MailboxBottomSheetActionTileBuilder extends CupertinoActionSheetActionBuil
|
||||
child: Container(
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
|
||||
cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
|
||||
|
||||
@@ -103,7 +103,7 @@ class _MailboxItemWidgetState extends State<MailboxItemWidget> {
|
||||
),
|
||||
);
|
||||
},
|
||||
onAccept: (emails) => widget.onDragItemAccepted?.call(emails, widget.mailboxNode.item),
|
||||
onAcceptWithDetails: (emails) => widget.onDragItemAccepted?.call(emails.data, widget.mailboxNode.item),
|
||||
);
|
||||
} else {
|
||||
if (widget.mailboxDisplayed == MailboxDisplayed.mailbox) {
|
||||
|
||||
+6
-6
@@ -114,10 +114,10 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
|
||||
}
|
||||
) {
|
||||
return Obx(
|
||||
() => RawKeyboardListener(
|
||||
() => KeyboardListener(
|
||||
focusNode: FocusNode(),
|
||||
onKey: (event) {
|
||||
if (event is RawKeyDownEvent &&
|
||||
onKeyEvent: (event) {
|
||||
if (event is KeyDownEvent &&
|
||||
event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
nextFocusNode?.requestFocus();
|
||||
}
|
||||
@@ -145,10 +145,10 @@ class AdvancedSearchFilterFormBottomView extends GetWidget<AdvancedFilterControl
|
||||
FocusNode? nextFocusNode,
|
||||
double? minWidth,
|
||||
}) {
|
||||
return RawKeyboardListener(
|
||||
return KeyboardListener(
|
||||
focusNode: FocusNode(),
|
||||
onKey: (event) {
|
||||
if (event is RawKeyDownEvent &&
|
||||
onKeyEvent: (event) {
|
||||
if (event is KeyDownEvent &&
|
||||
event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
nextFocusNode?.requestFocus();
|
||||
}
|
||||
|
||||
+3
-3
@@ -267,10 +267,10 @@ class AdvancedSearchInputForm extends GetWidget<AdvancedFilterController>
|
||||
FocusNode? currentFocusNode,
|
||||
FocusNode? nextFocusNode,
|
||||
}) {
|
||||
return RawKeyboardListener(
|
||||
return KeyboardListener(
|
||||
focusNode: currentFocusNode ?? FocusNode(),
|
||||
onKey: (event) {
|
||||
if (event is RawKeyDownEvent &&
|
||||
onKeyEvent: (event) {
|
||||
if (event is KeyDownEvent &&
|
||||
event.logicalKey == LogicalKeyboardKey.tab) {
|
||||
nextFocusNode?.requestFocus();
|
||||
}
|
||||
|
||||
+2
-2
@@ -84,8 +84,8 @@ class DateDropDownButton extends StatelessWidget {
|
||||
offset: const Offset(0.0, -8.0),
|
||||
scrollbarTheme: ScrollbarThemeData(
|
||||
radius: const Radius.circular(40),
|
||||
thickness: MaterialStateProperty.all<double>(6),
|
||||
thumbVisibility: MaterialStateProperty.all<bool>(true),
|
||||
thickness: WidgetStateProperty.all<double>(6),
|
||||
thumbVisibility: WidgetStateProperty.all<bool>(true),
|
||||
),
|
||||
),
|
||||
iconStyleData: IconStyleData(
|
||||
|
||||
+2
-2
@@ -106,8 +106,8 @@ class SortByDropDownButton extends StatelessWidget {
|
||||
offset: SortByDropdownStyle.dropdownOffset,
|
||||
scrollbarTheme: ScrollbarThemeData(
|
||||
radius: SortByDropdownStyle.dropdownScrollbarRadius,
|
||||
thickness: MaterialStateProperty.all<double>(SortByDropdownStyle.scrollbarThickness),
|
||||
thumbVisibility: MaterialStateProperty.all<bool>(true),
|
||||
thickness: WidgetStateProperty.all<double>(SortByDropdownStyle.scrollbarThickness),
|
||||
thumbVisibility: WidgetStateProperty.all<bool>(true),
|
||||
)
|
||||
),
|
||||
iconStyleData: IconStyleData(
|
||||
|
||||
+1
-1
@@ -178,7 +178,7 @@ class _TextFieldAutocompleteEmailAddressWebState extends State<TextFieldAutocomp
|
||||
);
|
||||
},
|
||||
onHandleKeyEventAction: (event) {
|
||||
if (event is RawKeyDownEvent) {
|
||||
if (event is KeyDownEvent) {
|
||||
switch (event.logicalKey) {
|
||||
case LogicalKeyboardKey.tab:
|
||||
widget.nextFocusNode?.requestFocus();
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ class EmailRuleBottomSheetActionTileBuilder
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb
|
||||
? MaterialStateMouseCursor.clickable
|
||||
? WidgetStateMouseCursor.clickable
|
||||
: MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
|
||||
@@ -56,4 +56,7 @@ class NotificationController extends FullLifeCycleController with FullLifeCycleM
|
||||
|
||||
@override
|
||||
Future<void> onResumed() => _getNotificationSetting();
|
||||
|
||||
@override
|
||||
void onHidden() {}
|
||||
}
|
||||
-1
@@ -93,7 +93,6 @@ class IdentitiesRadioListBuilder extends StatelessWidget {
|
||||
child: Obx(() => FadingEdgeScrollView.fromScrollView(
|
||||
gradientFractionOnStart: 0.3,
|
||||
gradientFractionOnEnd: 0.3,
|
||||
shouldDisposeScrollController: true,
|
||||
child: ListView.builder(
|
||||
controller: ScrollController(),
|
||||
padding: const EdgeInsets.only(right: 12.0),
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ class RuleActionSheetActionTileBuilder
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb
|
||||
? MaterialStateMouseCursor.clickable
|
||||
? WidgetStateMouseCursor.clickable
|
||||
: MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
|
||||
+1
-2
@@ -1,6 +1,5 @@
|
||||
import 'package:core/core.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/svg.dart';
|
||||
import 'package:rule_filter/rule_filter/rule_condition_group.dart';
|
||||
import 'package:tmail_ui_user/features/rules_filter_creator/presentation/styles/rule_condition_combiner_bottom_sheet_styles.dart';
|
||||
@@ -34,7 +33,7 @@ class RuleConditionCombinerSheetActionTileBuilder
|
||||
color: bgColor ?? RuleConditionCombinerBottomSheetStyles.defaultBgColor,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb
|
||||
? MaterialStateMouseCursor.clickable
|
||||
? WidgetStateMouseCursor.clickable
|
||||
: MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ class RuleConditionComparatorSheetActionTileBuilder
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb
|
||||
? MaterialStateMouseCursor.clickable
|
||||
? WidgetStateMouseCursor.clickable
|
||||
: MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ class RuleConditionFieldSheetActionTileBuilder
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb
|
||||
? MaterialStateMouseCursor.clickable
|
||||
? WidgetStateMouseCursor.clickable
|
||||
: MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
|
||||
+1
-1
@@ -32,7 +32,7 @@ class EmailReceiveTimeCupertinoActionSheetActionBuilder
|
||||
return Container(
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
|
||||
cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
|
||||
|
||||
+1
-2
@@ -1,7 +1,6 @@
|
||||
import 'package:core/presentation/views/bottom_popup/cupertino_action_sheet_no_icon_builder.dart';
|
||||
import 'package:core/utils/platform_info.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_svg/flutter_svg.dart';
|
||||
import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/model/search/email_sort_order_type.dart';
|
||||
import 'package:tmail_ui_user/features/search/email/presentation/styles/email_sort_by_cupertino_action_sheet_action_builder_style.dart';
|
||||
@@ -32,7 +31,7 @@ class EmailSortByCupertinoActionSheetActionBuilder extends CupertinoActionSheetN
|
||||
return Container(
|
||||
color: bgColor ?? EmailSortByCupertinoActionSheetActionBuilderStyle.backgroundColor,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
|
||||
cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
child: Row(
|
||||
|
||||
@@ -54,8 +54,8 @@ class _MailboxSearchedItemBuilderState extends State<MailboxSearchedItemBuilder>
|
||||
if (PlatformInfo.isWeb) {
|
||||
return DragTarget<List<PresentationEmail>>(
|
||||
builder: (_, __, ___) => _buildMailboxItem(context),
|
||||
onAccept: (emails) {
|
||||
widget.onDragEmailToMailboxAccepted?.call(emails, widget._presentationMailbox);
|
||||
onAcceptWithDetails: (emails) {
|
||||
widget.onDragEmailToMailboxAccepted?.call(emails.data, widget._presentationMailbox);
|
||||
}
|
||||
);
|
||||
} else {
|
||||
|
||||
@@ -1064,13 +1064,13 @@ class ThreadController extends BaseController with EmailActionController {
|
||||
}
|
||||
}
|
||||
|
||||
KeyEventResult handleKeyEvent(FocusNode node, RawKeyEvent event) {
|
||||
KeyEventResult handleKeyEvent(FocusNode node, KeyEvent event) {
|
||||
final shiftEvent = event.logicalKey == LogicalKeyboardKey.shiftLeft || event.logicalKey == LogicalKeyboardKey.shiftRight;
|
||||
if (event is RawKeyDownEvent && shiftEvent) {
|
||||
if (event is KeyDownEvent && shiftEvent) {
|
||||
_rangeSelectionMode = true;
|
||||
}
|
||||
|
||||
if (event is RawKeyUpEvent && shiftEvent) {
|
||||
if (event is KeyUpEvent && shiftEvent) {
|
||||
_rangeSelectionMode = false;
|
||||
}
|
||||
return shiftEvent
|
||||
|
||||
@@ -379,7 +379,7 @@ class ThreadView extends GetWidget<ThreadController>
|
||||
: Focus(
|
||||
focusNode: controller.focusNodeKeyBoard,
|
||||
autofocus: true,
|
||||
onKey: controller.handleKeyEvent,
|
||||
onKeyEvent: controller.handleKeyEvent,
|
||||
child: ListView.separated(
|
||||
key: const PageStorageKey('list_presentation_email_in_threads'),
|
||||
controller: controller.listEmailController,
|
||||
|
||||
@@ -24,7 +24,7 @@ class AppActionSheetActionBuilder extends CupertinoActionSheetActionBuilder {
|
||||
return Container(
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
|
||||
cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@ class FilterMessageCupertinoActionSheetActionBuilder
|
||||
return Container(
|
||||
color: bgColor ?? Colors.white,
|
||||
child: MouseRegion(
|
||||
cursor: PlatformInfo.isWeb ? MaterialStateMouseCursor.clickable : MouseCursor.defer,
|
||||
cursor: PlatformInfo.isWeb ? WidgetStateMouseCursor.clickable : MouseCursor.defer,
|
||||
child: CupertinoActionSheetAction(
|
||||
key: key,
|
||||
child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [
|
||||
|
||||
Reference in New Issue
Block a user