-
-
Notifications
You must be signed in to change notification settings - Fork 831
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[auth] replace slidable with bottom sheet (#3275)
## Description Show options in bottom sheet in a horizontal manner to better utilize space and remove slidable. ## Tests
- Loading branch information
Showing
7 changed files
with
520 additions
and
120 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import 'package:ente_auth/l10n/l10n.dart'; | ||
| import 'package:ente_auth/models/code.dart'; | ||
| import 'package:ente_auth/theme/ente_theme.dart'; | ||
| import 'package:flutter/material.dart'; | ||
|
|
||
| class ActionBarWidget extends StatefulWidget { | ||
| final VoidCallback? onCancel; | ||
| final Code code; | ||
|
|
||
| const ActionBarWidget({ | ||
| required this.onCancel, | ||
| required this.code, | ||
| super.key, | ||
| }); | ||
|
|
||
| @override | ||
| State<ActionBarWidget> createState() => _ActionBarWidgetState(); | ||
| } | ||
|
|
||
| class _ActionBarWidgetState extends State<ActionBarWidget> { | ||
| @override | ||
| Widget build(BuildContext context) { | ||
| final textTheme = getEnteTextTheme(context); | ||
| return SizedBox( | ||
| child: Padding( | ||
| padding: const EdgeInsets.fromLTRB(20, 8, 20, 8), | ||
| child: Row( | ||
| mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||
| children: [ | ||
| Flexible( | ||
| flex: 1, | ||
| child: Text( | ||
| widget.code.issuer, | ||
| style: textTheme.miniMuted, | ||
| ), | ||
| ), | ||
| Flexible( | ||
| flex: 1, | ||
| child: Padding( | ||
| padding: const EdgeInsets.symmetric(vertical: 12), | ||
| child: GestureDetector( | ||
| behavior: HitTestBehavior.opaque, | ||
| onTap: () { | ||
| widget.onCancel?.call(); | ||
| }, | ||
| child: Align( | ||
| alignment: Alignment.centerRight, | ||
| child: Text( | ||
| context.l10n.cancel, | ||
| style: textTheme.mini, | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ), | ||
| ], | ||
| ), | ||
| ), | ||
| ); | ||
| } | ||
| } |
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,81 @@ | ||
| import 'package:ente_auth/models/code.dart'; | ||
| import 'package:ente_auth/theme/ente_theme.dart'; | ||
| import 'package:ente_auth/ui/components/actions_bar_widget.dart'; | ||
| import 'package:ente_auth/ui/components/code_selection_actions_widget.dart'; | ||
| import 'package:ente_auth/ui/components/components_constants.dart'; | ||
| import "package:ente_auth/ui/components/divider_widget.dart"; | ||
| import 'package:flutter/material.dart'; | ||
|
|
||
| class BottomActionBarWidget extends StatelessWidget { | ||
| final Code code; | ||
| final VoidCallback? onCancel; | ||
| final Color? backgroundColor; | ||
| final VoidCallback? onShare; | ||
| final VoidCallback? onPin; | ||
| final VoidCallback? onShowQR; | ||
| final VoidCallback? onEdit; | ||
| final VoidCallback? onRestore; | ||
| final VoidCallback? onDelete; | ||
| final VoidCallback? onTrashed; | ||
|
|
||
| const BottomActionBarWidget({ | ||
| required this.code, | ||
| this.onCancel, | ||
| this.backgroundColor, | ||
| super.key, | ||
| this.onShare, | ||
| this.onPin, | ||
| this.onShowQR, | ||
| this.onEdit, | ||
| this.onRestore, | ||
| this.onDelete, | ||
| this.onTrashed, | ||
| }); | ||
|
|
||
| @override | ||
| Widget build(BuildContext context) { | ||
| final bottomPadding = MediaQuery.of(context).padding.bottom; | ||
| final widthOfScreen = MediaQuery.of(context).size.width; | ||
| final colorScheme = getEnteColorScheme(context); | ||
| final double leftRightPadding = widthOfScreen > restrictedMaxWidth | ||
| ? (widthOfScreen - restrictedMaxWidth) / 2 | ||
| : 0; | ||
| return Container( | ||
| decoration: BoxDecoration( | ||
| color: backgroundColor ?? colorScheme.backgroundElevated2, | ||
| borderRadius: const BorderRadius.only( | ||
| topLeft: Radius.circular(8), | ||
| topRight: Radius.circular(8), | ||
| ), | ||
| ), | ||
| padding: EdgeInsets.only( | ||
| top: 4, | ||
| bottom: bottomPadding, | ||
| right: leftRightPadding, | ||
| left: leftRightPadding, | ||
| ), | ||
| child: Column( | ||
| mainAxisSize: MainAxisSize.min, | ||
| children: [ | ||
| const SizedBox(height: 8), | ||
| CodeSelectionActionsWidget( | ||
| code: code, | ||
| onShare: onShare, | ||
| onPin: onPin, | ||
| onShowQR: onShowQR, | ||
| onEdit: onEdit, | ||
| onRestore: onRestore, | ||
| onDelete: onDelete, | ||
| onTrashed: onTrashed, | ||
| ), | ||
| const DividerWidget(dividerType: DividerType.bottomBar), | ||
| ActionBarWidget( | ||
| code: code, | ||
| onCancel: onCancel, | ||
| ), | ||
| // const SizedBox(height: 2) | ||
| ], | ||
| ), | ||
| ); | ||
| } | ||
| } |
Oops, something went wrong.