Skip to content
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.

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

refactor(neon): Make account selection reusable #698

Merged
merged 1 commit into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 64 additions & 0 deletions packages/neon/neon/lib/src/widgets/account_selection_dialog.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import 'package:flutter/material.dart';
import 'package:meta/meta.dart';
import 'package:neon/src/blocs/accounts.dart';
import 'package:neon/src/theme/dialog.dart';
import 'package:neon/src/widgets/account_tile.dart';
import 'package:provider/provider.dart';

@internal
class NeonAccountSelectionDialog extends StatelessWidget {
const NeonAccountSelectionDialog({
this.highlightActiveAccount = false,
this.children,
super.key,
});

final bool highlightActiveAccount;
final List<Widget>? children;

@override
Widget build(final BuildContext context) {
final accountsBloc = Provider.of<AccountsBloc>(context, listen: false);
final accounts = accountsBloc.accounts.value;
final activeAccount = accountsBloc.activeAccount.value!;

final sortedAccounts = List.of(accounts)
..removeWhere((final account) => account.id == activeAccount.id)
..insert(0, activeAccount);

final tiles = sortedAccounts
.map<Widget>(
(final account) => NeonAccountTile(
account: account,
trailing: highlightActiveAccount && account.id == activeAccount.id ? const Icon(Icons.check_circle) : null,
onTap: () {
Navigator.of(context).pop(account);
},
),
)
.toList();
if (highlightActiveAccount && accounts.length > 1) {
tiles.insert(1, const Divider());
}

final body = SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
...tiles,
...?children,
],
),
);

return Dialog(
child: IntrinsicHeight(
child: Container(
padding: const EdgeInsets.all(24),
constraints: NeonDialogTheme.of(context).constraints,
child: body,
),
),
);
}
}
92 changes: 0 additions & 92 deletions packages/neon/neon/lib/src/widgets/account_switcher.dart

This file was deleted.

56 changes: 56 additions & 0 deletions packages/neon/neon/lib/src/widgets/account_switcher_button.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:meta/meta.dart';
import 'package:neon/l10n/localizations.dart';
import 'package:neon/src/blocs/accounts.dart';
import 'package:neon/src/models/account.dart';
import 'package:neon/src/pages/settings.dart';
import 'package:neon/src/router.dart';
import 'package:neon/src/widgets/account_selection_dialog.dart';
import 'package:neon/src/widgets/user_avatar.dart';
import 'package:provider/provider.dart';

@internal
class AccountSwitcherButton extends StatelessWidget {
const AccountSwitcherButton({
super.key,
});

Future<void> _onPressed(final BuildContext context) async {
final accountsBloc = Provider.of<AccountsBloc>(context, listen: false);

final account = await showDialog<Account>(
context: context,
builder: (final context) => NeonAccountSelectionDialog(
highlightActiveAccount: true,
children: [
ListTile(
leading: const Icon(Icons.settings),
title: Text(AppLocalizations.of(context).settingsAccountManage),
onTap: () {
Navigator.of(context).pop();
const SettingsRoute(initialCategory: SettingsCageories.accounts).push(context);
},
),
],
),
);

if (account != null) {
accountsBloc.setActiveAccount(account);
}
}

@override
Widget build(final BuildContext context) {
final accountsBloc = Provider.of<AccountsBloc>(context, listen: false);
final account = accountsBloc.activeAccount.value!;

return IconButton(
onPressed: () async => _onPressed(context),
tooltip: AppLocalizations.of(context).settingsAccount,
icon: NeonUserAvatar(
account: account,
),
);
}
}
2 changes: 1 addition & 1 deletion packages/neon/neon/lib/src/widgets/app_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:neon/src/blocs/apps.dart';
import 'package:neon/src/models/account.dart';
import 'package:neon/src/models/app_implementation.dart';
import 'package:neon/src/models/notifications_interface.dart';
import 'package:neon/src/widgets/account_switcher.dart';
import 'package:neon/src/widgets/account_switcher_button.dart';
import 'package:neon/src/widgets/app_implementation_icon.dart';
import 'package:neon/src/widgets/exception.dart';
import 'package:neon/src/widgets/linear_progress_indicator.dart';
Expand Down