-
-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Improve mobile settings UX (#541)
- Loading branch information
Showing
13 changed files
with
241 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| import 'package:flutter/material.dart'; | ||
| import 'package:flutter_bloc/flutter_bloc.dart'; | ||
| import 'package:go_router/go_router.dart'; | ||
| import 'package:collection/collection.dart'; | ||
| import 'package:kitchenowl/app.dart'; | ||
| import 'package:kitchenowl/cubits/auth_cubit.dart'; | ||
| import 'package:kitchenowl/cubits/household_cubit.dart'; | ||
| import 'package:kitchenowl/enums/update_enum.dart'; | ||
| import 'package:kitchenowl/enums/views_enum.dart'; | ||
| import 'package:kitchenowl/kitchenowl.dart'; | ||
| import 'package:kitchenowl/pages/household_update_page.dart'; | ||
| import 'package:kitchenowl/widgets/household_image.dart'; | ||
|
|
||
| class MorePage extends StatelessWidget { | ||
| const MorePage({super.key}); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final householdCubit = BlocProvider.of<HouseholdCubit>(context); | ||
|
|
||
| return SafeArea( | ||
| child: ListView( | ||
| shrinkWrap: true, | ||
| padding: const EdgeInsets.symmetric(horizontal: 8), | ||
| children: [ | ||
| BlocBuilder<HouseholdCubit, HouseholdState>( | ||
| bloc: householdCubit, | ||
| builder: (context, state) => Column( | ||
| crossAxisAlignment: CrossAxisAlignment.stretch, | ||
| children: [ | ||
| if (state.household.image != null) | ||
| Padding( | ||
| padding: EdgeInsets.only( | ||
| bottom: !App.isOffline && | ||
| context.read<AuthCubit>().getUser() != null && | ||
| state.household.hasAdminRights( | ||
| context.read<AuthCubit>().getUser()!) | ||
| ? 6 | ||
| : 16), | ||
| child: HouseholdImage(household: state.household), | ||
| ), | ||
| Row( | ||
| crossAxisAlignment: CrossAxisAlignment.baseline, | ||
| textBaseline: TextBaseline.alphabetic, | ||
| children: [ | ||
| Text( | ||
| state.household.name, | ||
| style: Theme.of(context).textTheme.titleSmall, | ||
| maxLines: 1, | ||
| overflow: TextOverflow.ellipsis, | ||
| ), | ||
| const Spacer(), | ||
| if (!App.isOffline && | ||
| context.read<AuthCubit>().getUser() != null && | ||
| state.household.hasAdminRights( | ||
| context.read<AuthCubit>().getUser()!)) | ||
| IconButton( | ||
| icon: Icon(Icons.edit_rounded), | ||
| onPressed: () { | ||
| context.pop(); | ||
| Navigator.of(context).push<UpdateEnum>( | ||
| MaterialPageRoute( | ||
| builder: (ctx) => HouseholdUpdatePage( | ||
| household: state.household, | ||
| ), | ||
| ), | ||
| ); | ||
| }, | ||
| ), | ||
| ], | ||
| ), | ||
| ], | ||
| ), | ||
| ), | ||
| const Divider(), | ||
| BlocBuilder<HouseholdCubit, HouseholdState>( | ||
| bloc: householdCubit, | ||
| buildWhen: (previous, current) => | ||
| previous.household.viewOrdering | ||
| ?.equals(current.household.viewOrdering ?? const []) ?? | ||
| true, | ||
| builder: (context, state) { | ||
| List<ViewsEnum> pages = | ||
| (state.household.viewOrdering ?? ViewsEnum.values) | ||
| .where((e) => e.isViewActive(state.household)) | ||
| .skip(5) | ||
| .toList(); | ||
| if (pages.isEmpty) return const SizedBox(); | ||
| return Column( | ||
| children: pages | ||
| .map((e) => Card( | ||
| child: ListTile( | ||
| title: Text( | ||
| e.toLocalizedString(context), | ||
| ), | ||
| leading: e.toIconWidget(context) ?? | ||
| Icon(e.toIcon(context)), | ||
| minLeadingWidth: 16, | ||
| onTap: () => context.go("/household"), | ||
| ), | ||
| ) as Widget) | ||
| .toList() + | ||
| [ | ||
| const Divider(), | ||
| ], | ||
| ); | ||
| }, | ||
| ), | ||
| Card( | ||
| child: ListTile( | ||
| title: Text( | ||
| AppLocalizations.of(context)!.householdSwitch, | ||
| ), | ||
| leading: const Icon(Icons.swap_horiz_rounded), | ||
| minLeadingWidth: 16, | ||
| onTap: () => context.go("/household"), | ||
| ), | ||
| ), | ||
| Card( | ||
| child: ListTile( | ||
| title: Text( | ||
| AppLocalizations.of(context)!.profile, | ||
| ), | ||
| leading: const Icon(Icons.person_rounded), | ||
| minLeadingWidth: 16, | ||
| onTap: () { | ||
| context.pop(); | ||
| context.push("/settings/account").then((res) { | ||
| if (res == UpdateEnum.updated) { | ||
| context.read<AuthCubit>().refreshUser(); | ||
| } | ||
| }); | ||
| }, | ||
| ), | ||
| ), | ||
| Card( | ||
| child: ListTile( | ||
| title: Text( | ||
| AppLocalizations.of(context)!.settings, | ||
| ), | ||
| leading: const Icon(Icons.settings), | ||
| minLeadingWidth: 16, | ||
| onTap: () { | ||
| context.pop(); | ||
| context.push( | ||
| "/settings", | ||
| extra: householdCubit.state.household, | ||
| ); | ||
| }, | ||
| ), | ||
| ), | ||
| const SizedBox(height: 16), | ||
| ], | ||
| ), | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.