TF-3766 Fix Mark as important, Request read receipt not selected after touch in composer
Signed-off-by: dab246 <tdvu@linagora.com>
This commit is contained in:
@@ -56,3 +56,14 @@ abstract class PopupMenuItemActionRequiredFull<T> extends PopupMenuItemAction<T>
|
||||
|
||||
PopupMenuItemActionRequiredFull(super.action, this.selectedAction);
|
||||
}
|
||||
|
||||
abstract class PopupMenuItemActionRequiredIconWithMultipleSelected<T>
|
||||
extends PopupMenuItemAction<T>
|
||||
with OptionalPopupIcon, OptionalPopupSelectedIcon<T> {
|
||||
final List<T> selectedActions;
|
||||
|
||||
PopupMenuItemActionRequiredIconWithMultipleSelected(
|
||||
super.action,
|
||||
this.selectedActions,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -34,7 +34,8 @@ class PopupMenuItemActionWidget extends StatelessWidget {
|
||||
),
|
||||
);
|
||||
} else if (menuAction is PopupMenuItemActionRequiredSelectedIcon) {
|
||||
final specificMenuAction = menuAction as PopupMenuItemActionRequiredSelectedIcon;
|
||||
final specificMenuAction =
|
||||
menuAction as PopupMenuItemActionRequiredSelectedIcon;
|
||||
selectedIconWidget = Padding(
|
||||
padding: const EdgeInsetsDirectional.only(start: 16),
|
||||
child: SvgPicture.asset(
|
||||
@@ -69,6 +70,32 @@ class PopupMenuItemActionWidget extends StatelessWidget {
|
||||
),
|
||||
);
|
||||
isSelected = specificMenuAction.selectedAction == menuAction.action;
|
||||
} else if (menuAction
|
||||
is PopupMenuItemActionRequiredIconWithMultipleSelected) {
|
||||
final specificMenuAction =
|
||||
menuAction as PopupMenuItemActionRequiredIconWithMultipleSelected;
|
||||
iconWidget = Padding(
|
||||
padding: const EdgeInsetsDirectional.only(end: 16),
|
||||
child: SvgPicture.asset(
|
||||
specificMenuAction.actionIcon,
|
||||
width: specificMenuAction.actionIconSize,
|
||||
height: specificMenuAction.actionIconSize,
|
||||
colorFilter: specificMenuAction.actionIconColor.asFilter(),
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
);
|
||||
selectedIconWidget = Padding(
|
||||
padding: const EdgeInsetsDirectional.only(start: 16),
|
||||
child: SvgPicture.asset(
|
||||
specificMenuAction.selectedIcon,
|
||||
width: specificMenuAction.selectedIconSize,
|
||||
height: specificMenuAction.selectedIconSize,
|
||||
colorFilter: specificMenuAction.selectedIconColor.asFilter(),
|
||||
fit: BoxFit.fill,
|
||||
),
|
||||
);
|
||||
isSelected =
|
||||
specificMenuAction.selectedActions.contains(menuAction.action);
|
||||
}
|
||||
|
||||
return PointerInterceptor(
|
||||
|
||||
Reference in New Issue
Block a user