Unverified Commit 0bd275fe authored by Michael Goderbauer's avatar Michael Goderbauer Committed by GitHub

Remove unused (and untested) parameters from private _MasterDetailFlow (#126935)

Follow-up to https://github.com/flutter/flutter/pull/126926.
parent 9d882983
......@@ -1024,9 +1024,6 @@ enum _ActionLevel {
/// Describes which layout will be used by [_MasterDetailFlow].
enum _LayoutMode {
/// Use a nested or lateral layout depending on available screen width.
auto,
/// Always use a lateral layout.
lateral,
......@@ -1052,9 +1049,7 @@ class _MasterDetailFlow extends StatefulWidget {
const _MasterDetailFlow({
required this.detailPageBuilder,
required this.masterViewBuilder,
this.automaticallyImplyLeading = true, // ignore: unused_element
this.detailPageFABlessGutterWidth,
this.displayMode = _LayoutMode.auto, // ignore: unused_element
this.title,
});
......@@ -1080,14 +1075,6 @@ class _MasterDetailFlow extends StatefulWidget {
/// See [AppBar.title].
final Widget? title;
/// Override the framework from determining whether to show a leading widget or not.
///
/// See [AppBar.automaticallyImplyLeading].
final bool automaticallyImplyLeading;
/// Forces display mode and style.
final _LayoutMode displayMode;
@override
_MasterDetailFlowState createState() => _MasterDetailFlowState();
......@@ -1173,21 +1160,13 @@ class _MasterDetailFlowState extends State<_MasterDetailFlow> implements _PageOp
@override
Widget build(BuildContext context) {
switch (widget.displayMode) {
case _LayoutMode.nested:
return _nestedUI(context);
case _LayoutMode.lateral:
return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
final double availableWidth = constraints.maxWidth;
if (availableWidth >= _materialWideDisplayThreshold) {
return _lateralUI(context);
case _LayoutMode.auto:
return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
final double availableWidth = constraints.maxWidth;
if (availableWidth >= _materialWideDisplayThreshold) {
return _lateralUI(context);
} else {
return _nestedUI(context);
}
});
}
}
return _nestedUI(context);
});
}
Widget _nestedUI(BuildContext context) {
......@@ -1236,11 +1215,10 @@ class _MasterDetailFlowState extends State<_MasterDetailFlow> implements _PageOp
builder: (BuildContext c) {
return BlockSemantics(
child: _MasterPage(
leading: widget.automaticallyImplyLeading && Navigator.of(context).canPop()
leading: Navigator.of(context).canPop()
? BackButton(onPressed: () { Navigator.of(context).pop(); })
: null,
title: widget.title,
automaticallyImplyLeading: widget.automaticallyImplyLeading,
masterViewBuilder: widget.masterViewBuilder,
),
);
......@@ -1266,7 +1244,6 @@ class _MasterDetailFlowState extends State<_MasterDetailFlow> implements _PageOp
_builtLayout = _LayoutMode.lateral;
return _MasterDetailScaffold(
actionBuilder: (_, __) => const<Widget>[],
automaticallyImplyLeading: widget.automaticallyImplyLeading,
detailPageBuilder: (BuildContext context, Object? args, ScrollController? scrollController) =>
widget.detailPageBuilder(context, args ?? _cachedDetailArguments, scrollController),
detailPageFABlessGutterWidth: widget.detailPageFABlessGutterWidth,
......@@ -1282,13 +1259,11 @@ class _MasterPage extends StatelessWidget {
this.leading,
this.title,
this.masterViewBuilder,
required this.automaticallyImplyLeading,
});
final _MasterViewBuilder? masterViewBuilder;
final Widget? title;
final Widget? leading;
final bool automaticallyImplyLeading;
@override
Widget build(BuildContext context) {
......@@ -1297,7 +1272,6 @@ class _MasterPage extends StatelessWidget {
title: title,
leading: leading,
actions: const <Widget>[],
automaticallyImplyLeading: automaticallyImplyLeading,
),
body: masterViewBuilder!(context, false),
);
......@@ -1317,7 +1291,6 @@ class _MasterDetailScaffold extends StatefulWidget {
this.actionBuilder,
this.initialArguments,
this.title,
required this.automaticallyImplyLeading,
this.detailPageFABlessGutterWidth,
});
......@@ -1332,7 +1305,6 @@ class _MasterDetailScaffold extends StatefulWidget {
final _ActionBuilder? actionBuilder;
final Object? initialArguments;
final Widget? title;
final bool automaticallyImplyLeading;
final double? detailPageFABlessGutterWidth;
@override
......@@ -1384,7 +1356,6 @@ class _MasterDetailScaffoldState extends State<_MasterDetailScaffold>
appBar: AppBar(
title: widget.title,
actions: widget.actionBuilder!(context, _ActionLevel.top),
automaticallyImplyLeading: widget.automaticallyImplyLeading,
bottom: PreferredSize(
preferredSize: const Size.fromHeight(kToolbarHeight),
child: Row(
......@@ -1458,7 +1429,6 @@ class _MasterDetailScaffoldState extends State<_MasterDetailScaffold>
appBar: AppBar(
title: widget.title,
actions: widget.actionBuilder!(context, _ActionLevel.top),
automaticallyImplyLeading: widget.automaticallyImplyLeading,
),
body: widget.masterViewBuilder(context, true),
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment