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

fix(mobile): buttons inside AddActionButton color is the same as background color (#24460)

Browse Source 
* fix: icon & text color in AddActionButton

* fix: use Divider
This commit is contained in:
idubnori
2025-12-09 05:29:31 +09:00
committed by GitHub
parent fe9125a3d1
commit 287f6d5c94
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mobile/lib/presentation/widgets/action_buttons/add_action_button.widget.dart
View File

@@ -22,7 +22,9 @@ import 'package:immich_mobile/presentation/widgets/bottom_sheet/base_bottom_shee
enum AddToMenuItem { album, archive, unarchive, lockedFolder } enum AddToMenuItem { album, archive, unarchive, lockedFolder }
class AddActionButton extends ConsumerStatefulWidget { class AddActionButton extends ConsumerStatefulWidget {
const AddActionButton({super.key}); const AddActionButton({super.key, this.originalTheme});
final ThemeData? originalTheme;
@override @override
ConsumerState<AddActionButton> createState() => _AddActionButtonState(); ConsumerState<AddActionButton> createState() => _AddActionButtonState();
@@ -71,7 +73,7 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
), ),
if (isOwner) ...[ if (isOwner) ...[
const PopupMenuDivider(), const Divider(),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: Text("move_to".tr(), style: context.textTheme.labelMedium), child: Text("move_to".tr(), style: context.textTheme.labelMedium),
@@ -166,16 +168,25 @@ class _AddActionButtonState extends ConsumerState<AddActionButton> {
return const SizedBox.shrink(); return const SizedBox.shrink();
} }
final themeData = widget.originalTheme ?? context.themeData;
return MenuAnchor( return MenuAnchor(
consumeOutsideTap: true, consumeOutsideTap: true,
style: MenuStyle( style: MenuStyle(
backgroundColor: WidgetStatePropertyAll(context.themeData.scaffoldBackgroundColor), backgroundColor: WidgetStatePropertyAll(themeData.scaffoldBackgroundColor),
elevation: const WidgetStatePropertyAll(4), elevation: const WidgetStatePropertyAll(4),
shape: const WidgetStatePropertyAll( shape: const WidgetStatePropertyAll(
RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))), RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(12))),
), ),
), ),
menuChildren: _buildMenuChildren(), menuChildren: widget.originalTheme != null
? [
Theme(
data: widget.originalTheme!,
child: Column(crossAxisAlignment: CrossAxisAlignment.start, children: _buildMenuChildren()),
),
]
: _buildMenuChildren(),
builder: (context, controller, child) { builder: (context, controller, child) {
return BaseActionButton( return BaseActionButton(
iconData: Icons.add, iconData: Icons.add,

4
mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart
View File

@@ -38,11 +38,13 @@ class ViewerBottomBar extends ConsumerWidget {
opacity = 0; opacity = 0;
} }
final originalTheme = context.themeData;
final actions = <Widget>[ final actions = <Widget>[
const ShareActionButton(source: ActionSource.viewer), const ShareActionButton(source: ActionSource.viewer),
if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer), if (asset.isLocalOnly) const UploadActionButton(source: ActionSource.viewer),
if (asset.type == AssetType.image) const EditImageActionButton(), if (asset.type == AssetType.image) const EditImageActionButton(),
if (asset.hasRemote) const AddActionButton(), if (asset.hasRemote) AddActionButton(originalTheme: originalTheme),
if (isOwner) ...[ if (isOwner) ...[
asset.isLocalOnly asset.isLocalOnly