High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix: kebab menu icon colors and actions (#28433)
Alex43687cd8b4bf
diff --git a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dartindex 1ca875e483..6599ff0ffd 100644--- a/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart+++ b/mobile/lib/presentation/widgets/action_buttons/base_action_button.widget.dart@@ -35,10 +35,11 @@ class BaseActionButton extends ConsumerWidget {final miniWidth = minWidth ?? (context.isMobile ? context.width / 4.5 : 75.0);final iconTheme = IconTheme.of(context);final iconSize = iconTheme.size ?? 24.0;- final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;final textColor = context.themeData.textTheme.labelLarge?.color;if (iconOnly) {+ final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;+return IconButton(onPressed: onPressed,icon: Icon(iconData, size: iconSize, color: iconColor),@@ -46,17 +47,18 @@ class BaseActionButton extends ConsumerWidget {}if (menuItem) {- final theme = context.themeData;- final effectiveIconColor = iconColor ?? theme.iconTheme.color ?? theme.colorScheme.onSurfaceVariant;+ final iconColor = this.iconColor;return MenuItemButton(style: MenuItemButton.styleFrom(alignment: Alignment.centerLeft, padding: const EdgeInsets.all(16)),- leadingIcon: Icon(iconData, color: effectiveIconColor),+ leadingIcon: Icon(iconData, color: iconColor),onPressed: onPressed,- child: Text(label, style: theme.textTheme.labelLarge?.copyWith(fontSize: 16, color: iconColor)),+ child: Text(label, style: TextStyle(fontSize: 16, color: iconColor)),);}+ final iconColor = this.iconColor ?? iconTheme.color ?? context.themeData.iconTheme.color;+return ConstrainedBox(constraints: BoxConstraints(maxWidth: maxWidth),child: MaterialButton(diff --git a/mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dartindex 308f6a72a3..5a79485daf 100644--- a/mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/viewer_kebab_menu.widget.dart@@ -50,7 +50,7 @@ class ViewerKebabMenu extends ConsumerWidget {timelineOrigin: timelineOrigin,);- final menuChildren = ActionButtonBuilder.buildViewerKebabMenu(actionContext, context);+ final menuChildren = ActionButtonBuilder.buildViewerKebabMenu(actionContext, context, ref);return MenuAnchor(consumeOutsideTap: true,diff --git a/mobile/lib/utils/action_button.utils.dart b/mobile/lib/utils/action_button.utils.dartindex 87588efe65..a048e245cb 100644--- a/mobile/lib/utils/action_button.utils.dart+++ b/mobile/lib/utils/action_button.utils.dart@@ -330,7 +330,7 @@ class ActionButtonBuilder {return _actionTypes.where((type) => type.shouldShow(context)).map((type) => type.buildButton(context)).toList();}- static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext) {+ static List<Widget> buildViewerKebabMenu(ActionButtonContext context, BuildContext buildContext, WidgetRef ref) {final visibleButtons = defaultViewerKebabMenuOrder.where((type) => !defaultViewerBottomBarButtons.contains(type) && type.shouldShow(context)).toList();@@ -346,7 +346,7 @@ class ActionButtonBuilder {if (lastGroup != null && type.kebabMenuGroup != lastGroup) {result.add(const Divider(height: 1));}- result.add(type.buildButton(context, buildContext, false, true));+ result.add(type.buildButton(context, buildContext, false, true).build(buildContext, ref));lastGroup = type.kebabMenuGroup;}