Skip to content

feat: Reorganize deb action buttons #2047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ashuntu merged 5 commits into from
Mar 19, 2026
Merged

feat: Reorganize deb action buttons #2047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cd538e
fix: Update button not properly showing
ashuntu Mar 19, 2026
b7602d6
feat: Add more actions popup button
ashuntu Mar 19, 2026
971651e
feat: Cleanup local deb action buttons
ashuntu Mar 19, 2026
8648a81
fix(a11y): Add semantic label to more actions button
ashuntu Mar 19, 2026
b294994
fix: Remove install from secondary actions
ashuntu Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/app_center/lib/deb/deb_model.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ class DebModel extends _$DebModel {

for (final packageUpdate in updates ?? <PackageKitPackageId>[]) {
final packageName = packageUpdate.name;
final results = await packageKit.resolve([packageName]);
final results =
await packageKit.resolve([packageName], installedOnly: true);
hasUpdate = results[packageName]?.info == PackageKitInfo.installed;
break;
}
Expand Down
69 changes: 61 additions & 8 deletions packages/app_center/lib/deb/deb_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:app_center/l10n.dart';
import 'package:app_center/layout.dart';
import 'package:app_center/packagekit/packagekit.dart';
import 'package:app_center/store/store_app.dart';
import 'package:app_center/widgets/hyperlink_text.dart';
import 'package:app_center/widgets/widgets.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
Expand Down Expand Up @@ -96,14 +95,13 @@ class _DebView extends ConsumerWidget {
)
: null,
),
actionBar: Row(
actionBar: Wrap(
runSpacing: kSpacing,
spacing: kSpacing,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
_DebActionButtons(debModel: debModel),
const SizedBox(width: 32),
HyperlinkText(
text: '${l10n.debPageDocumentationLinkLabel} >',
link: debManageDocsUrl,
),
_MoreActionsButton(debData: debModel),
],
),
infoBar: DebInfoBar(debData: debModel),
Expand Down Expand Up @@ -186,12 +184,67 @@ class _DebActionButtons extends ConsumerWidget {
primaryActionButton
else
Text(l10n.debPageErrorNoPackageInfo),
if (debModel.activeTransactionId != null) cancelButton,
if (debModel.activeTransactionId != null) ...[
const SizedBox(width: kSpacing),
cancelButton,
Copy link
Copy Markdown
Member

@matthew-hagemann matthew-hagemann Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not part of your pr, but I've just noticed we aren't clearing the transaction ID when we cancel a deb install, so you get stuck in this state if you cancel an install / cancel the polkit prompt:

Image

Copy link
Copy Markdown
Member

@matthew-hagemann matthew-hagemann Mar 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this isn't a regression, so wont block your PR on it 🙂

],
].nonNulls.toList(),
);
}
}

class _MoreActionsButton extends ConsumerWidget {
const _MoreActionsButton({required this.debData});

final DebData debData;

@override
Widget build(BuildContext context, WidgetRef ref) {
final l10n = AppLocalizations.of(context);
final primaryAction = debData.hasUpdate
? DebAction.update
: debData.isInstalled
? DebAction.remove
: DebAction.install;

final secondaryActions = [
if (debData.hasUpdate) DebAction.update,
if (debData.isInstalled || debData.hasUpdate) DebAction.remove,
]..remove(primaryAction);

return secondaryActions.isNotEmpty
? YaruPopupMenuButton(
semanticLabel: l10n.appMoreActionsSemanticLabel,
childPadding: EdgeInsets.symmetric(horizontal: 2),
itemBuilder: (context) => [
...secondaryActions.map((action) {
final color = action == DebAction.remove
? Theme.of(context).colorScheme.error
: null;
return PopupMenuItem(
onTap: action.callback(
ref,
debData,
),
child: IntrinsicWidth(
child: ListTile(
mouseCursor: SystemMouseCursors.click,
title: Text(
action.label(l10n),
style: TextStyle(color: color),
),
),
),
);
}),
],
onSelected: (value) => {},
child: Icon(YaruIcons.view_more),
)
: SizedBox.shrink();
}
}

enum DebAction {
cancel,
install,
Expand Down
15 changes: 5 additions & 10 deletions packages/app_center/lib/deb/local_deb_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,12 @@ class _LocalDebPage extends StatelessWidget {
),
),
),
actionBar: Row(
actionBar: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
spacing: kSpacing,
runSpacing: kSpacing,
children: [
_LocalDebActionButtons(debData: debData),
const SizedBox(width: 32),
Html(
shrinkWrap: true,
data:
'<a href="$debManageDocsUrl">${l10n.debPageDocumentationLinkLabel} &gt;</a>',
style: {'body': Style(margin: Margins.zero)},
onLinkTap: (url, attributes, element) => launchUrlString(url!),
),
],
),
infoBar: LocalDebInfoBar(localDebData: debData),
Expand Down Expand Up @@ -174,7 +169,7 @@ class _LocalDebActionButtons extends ConsumerWidget {
children: [
primaryActionButton,
if (debData.activeTransactionId != null) ...[
const SizedBox(width: 8),
const SizedBox(width: kSpacing),
cancelButton,
],
],
Expand Down
1 change: 1 addition & 0 deletions packages/app_center/lib/snapd/snap_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ class _MoreActionsButton extends ConsumerWidget {

return secondaryActions.isNotEmpty
? YaruPopupMenuButton(
semanticLabel: l10n.appMoreActionsSemanticLabel,
childPadding: EdgeInsets.symmetric(horizontal: 2),
itemBuilder: (context) => [
...secondaryActions.map((action) {
Expand Down
1 change: 1 addition & 0 deletions packages/app_center/lib/src/l10n/app_en.arb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@
"appConfinementUnrestricted": "Unrestricted",
"appLicenseUnknown": "Unknown",
"appPublishedUnknown": "Unknown",
"appMoreActionsSemanticLabel": "More actions",
"packageFormatDebLabel": "Debian packages",
"packageFormatSnapLabel": "Snap packages",
"snapActionCancelLabel": "Cancel",
Expand Down
Loading