Skip to content

concealable frontlayer when that's active by pressing back button on phone #135

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

concealable frontlayer when that's active by pressing back button on phone #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 9 additions & 12 deletions lib/src/scaffold.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ class BackdropScaffold extends StatefulWidget {
/// Specifiy whether to conceal [backLayer] when back button pressed.
///
/// Default to `true`.
final bool concealBacklayerOnBackButton;

// ------------- PROPERTIES TAKEN OVER FROM SCAFFOLD ------------- //

Expand Down Expand Up @@ -336,7 +335,6 @@ class BackdropScaffold extends StatefulWidget {
this.onBackLayerConcealed,
this.onBackLayerRevealed,
this.maintainBackLayerState = true,
this.concealBacklayerOnBackButton = true,
this.scaffoldKey,
this.appBar,
this.floatingActionButton,
Expand Down Expand Up @@ -612,17 +610,16 @@ class BackdropScaffoldState extends State<BackdropScaffold>
);

Widget _wrapWillPopScope(BuildContext context, {required Widget child}) {
if (!widget.concealBacklayerOnBackButton) return child;
return WillPopScope(
onWillPop: () async {
if (isBackLayerRevealed) {
concealBackLayer();
if (!isBackLayerRevealed) {
return WillPopScope(
onWillPop: () async {
revealBackLayer();
return false;
}
return true;
},
child: child,
);
},
child: child,
);
}
return child;
}

Widget _buildBody(BuildContext context) => _wrapWillPopScope(
Expand Down