immich-app/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-12-19 09:13:14 +03:00
Code Issues Packages Projects Releases 17 Wiki Activity

refactor: action button visibility logic and kebab menu handling

Browse Source
This commit is contained in:
idubnori
2025-12-17 13:31:53 +09:00
parent 76fd68957c
commit c38ecab1a6
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
mobile/lib/utils/action_button.utils.dart
View File

@@ -90,9 +90,7 @@ enum ActionButtonType {
bool shouldShow(ActionButtonContext context) { bool shouldShow(ActionButtonContext context) {
return switch (this) { return switch (this) {
ActionButtonType.advancedInfo => context.advancedTroubleshooting, ActionButtonType.advancedInfo => context.advancedTroubleshooting,
ActionButtonType.share => ActionButtonType.share => true,
!context.isInLockedView && //
context.asset.hasRemote,
ActionButtonType.shareLink => ActionButtonType.shareLink =>
!context.isInLockedView && // !context.isInLockedView && //
context.asset.hasRemote, context.asset.hasRemote,
@@ -311,33 +309,44 @@ class ActionButtonBuilder {
return _actionTypes.where((type) => type.shouldShow(context)).map((type) => type.buildButton(context)).toList(); return _actionTypes.where((type) => type.shouldShow(context)).map((type) => type.buildButton(context)).toList();
} }
static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) { static List<ActionButtonType> getViewerKebabMenuTypes(ActionButtonContext context) {
// Get visible bottom bar buttons for exclusion final visibleBottomBarButtons = getViewerBottomBarTypes(context);
final visibleBottomBarButtons = _defaultViewerBottomBarOrder
.where((type) => type.shouldShow(context))
.take(4)
.toSet();
// Always exclude addTo from kebab menu
final excludedTypes = <ActionButtonType>{...visibleBottomBarButtons, ActionButtonType.addTo}; final excludedTypes = <ActionButtonType>{...visibleBottomBarButtons, ActionButtonType.addTo};
// If addTo is visible in bottom bar, also exclude moveToLockFolder, archive, and unarchive from kebab menu
if (visibleBottomBarButtons.contains(ActionButtonType.addTo)) { if (visibleBottomBarButtons.contains(ActionButtonType.addTo)) {
excludedTypes.addAll([ActionButtonType.moveToLockFolder, ActionButtonType.archive, ActionButtonType.unarchive]); excludedTypes.addAll([ActionButtonType.moveToLockFolder, ActionButtonType.archive, ActionButtonType.unarchive]);
} }
final visibleButtons = defaultViewerKebabMenuOrder return defaultViewerKebabMenuOrder
.where((type) => !excludedTypes.contains(type) && type.shouldShow(context)) .where((type) => !excludedTypes.contains(type) && type.shouldShow(context))
.toList(); .toList();
}
if (visibleButtons.isEmpty) { static List<ActionButtonType> getViewerBottomBarTypes(ActionButtonContext context) {
return _defaultViewerBottomBarOrder.where((type) => type.shouldShow(context)).take(4).toList();
}
static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
final visibleButtons = getViewerKebabMenuTypes(context);
return visibleButtons.toKebabMenuWidgets(context, buildContext, ref);
}
static List<Widget> buildViewerBottomBar(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
final visibleButtons = getViewerBottomBarTypes(context);
return visibleButtons.toBottomBarWidgets(context, buildContext, ref);
}
}
extension ActionButtonTypeListExtension on List<ActionButtonType> {
List<Widget> toKebabMenuWidgets(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
if (isEmpty) {
return []; return [];
} }
final List<Widget> result = []; final List<Widget> result = [];
int? lastGroup; int? lastGroup;
for (final type in visibleButtons) { for (final type in this) {
if (lastGroup != null && type.kebabMenuGroup != lastGroup) { if (lastGroup != null && type.kebabMenuGroup != lastGroup) {
result.add(const Divider(height: 1)); result.add(const Divider(height: 1));
} }
@@ -349,11 +358,8 @@ class ActionButtonBuilder {
return result; return result;
} }
static List<Widget> buildViewerBottomBar(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) { List<Widget> toBottomBarWidgets(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {
// Take only the first 4 visible buttons from the order return map((type) {
final visibleButtons = _defaultViewerBottomBarOrder.where((type) => type.shouldShow(context)).take(4).toList();
return visibleButtons.map((type) {
final widget = type.buildButton(context, buildContext, false, false); final widget = type.buildButton(context, buildContext, false, false);
return widget is ConsumerWidget ? widget.build(buildContext, ref) : widget; return widget is ConsumerWidget ? widget.build(buildContext, ref) : widget;
}).toList(); }).toList();