Skip to content

F
Front-End
Unverified Commit d8bfb3a9 authored by Chris Bracken's avatar Chris Bracken Committed by GitHub
Browse files
Options

Apply media padding to Gallery Material Design demos (#13593) 

Applies media padding (e.g. iPhone X safe area insets) to the Material Design demos in the Gallery.

Covers the following demos:
* Buttons (via the TabbedComponentDemoScaffold change)
* Cards
* Expansion panels
* Grid list
* Icons
* Images (via the TabbedComponentDemoScaffold change)
* Page Selector
* Progress Indicator
* Scrollable tabs
* Selection controls (via the TabbedComponentDemoScaffold change)
* Snack bar
* Tabs
* Text fields
* Tooltips

Fixes #13594
parent d9edab84
Show whitespace changes
Inline Side-by-side
Showing with 454 additions and 402 deletions
examples/flutter_gallery/lib/demo/material/cards_demo.dart
View file @ d8bfb3a9
......@@ -60,7 +60,10 @@ class TravelDestinationItem extends StatelessWidget {
final TextStyle titleStyle = theme.textTheme.headline.copyWith(color: Colors.white);
final TextStyle descriptionStyle = theme.textTheme.subhead;
return new Container(
return new SafeArea(
top: false,
bottom: false,
child: new Container(
padding: const EdgeInsets.all(8.0),
height: height,
child: new Card(
......@@ -141,6 +144,7 @@ class TravelDestinationItem extends StatelessWidget {
],
),
),
),
);
}
}
......
examples/flutter_gallery/lib/demo/material/date_and_time_picker_demo.dart
View file @ d8bfb3a9
......@@ -131,6 +131,9 @@ class _DateAndTimePickerDemoState extends State<DateAndTimePickerDemo> {
return new Scaffold(
appBar: new AppBar(title: const Text('Date and time pickers')),
body: new DropdownButtonHideUnderline(
child: new SafeArea(
top: false,
bottom: false,
child: new ListView(
padding: const EdgeInsets.all(16.0),
children: <Widget>[
......@@ -201,6 +204,7 @@ class _DateAndTimePickerDemoState extends State<DateAndTimePickerDemo> {
],
),
),
),
);
}
}
examples/flutter_gallery/lib/demo/material/expansion_panels_demo.dart
View file @ d8bfb3a9
......@@ -336,6 +336,9 @@ class _ExpansionPanelsDemoState extends State<ExpasionPanelsDemo> {
return new Scaffold(
appBar: new AppBar(title: const Text('Expansion panels')),
body: new SingleChildScrollView(
child: new SafeArea(
top: false,
bottom: false,
child: new Container(
margin: const EdgeInsets.all(24.0),
child: new ExpansionPanelList(
......@@ -351,9 +354,10 @@ class _ExpansionPanelsDemoState extends State<ExpasionPanelsDemo> {
body: item.builder(item)
);
}).toList()
)
)
)
),
),
),
),
);
}
}
examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
View file @ d8bfb3a9
......@@ -363,6 +363,9 @@ class GridListDemoState extends State<GridListDemo> {
body: new Column(
children: <Widget>[
new Expanded(
child: new SafeArea(
top: false,
bottom: false,
child: new GridView.count(
crossAxisCount: (orientation == Orientation.portrait) ? 2 : 3,
mainAxisSpacing: 4.0,
......@@ -380,10 +383,11 @@ class GridListDemoState extends State<GridListDemo> {
}
);
}).toList(),
)
)
]
)
),
),
),
],
),
);
}
}
examples/flutter_gallery/lib/demo/material/icons_demo.dart
View file @ d8bfb3a9
......@@ -54,6 +54,9 @@ class IconsDemoState extends State<IconsDemo> {
data: new IconThemeData(color: iconColor),
child: new Padding(
padding: const EdgeInsets.all(24.0),
child: new SafeArea(
top: false,
bottom: false,
child: new Column(
children: <Widget>[
new _IconsDemoCard(handleIconButtonPress),
......@@ -61,6 +64,7 @@ class IconsDemoState extends State<IconsDemo> {
),
),
),
),
);
}
}
......
examples/flutter_gallery/lib/demo/material/page_selector_demo.dart
View file @ d8bfb3a9
......@@ -19,7 +19,10 @@ class _PageSelector extends StatelessWidget {
Widget build(BuildContext context) {
final TabController controller = DefaultTabController.of(context);
final Color color = Theme.of(context).accentColor;
return new Column(
return new SafeArea(
top: false,
bottom: false,
child: new Column(
children: <Widget>[
new Container(
margin: const EdgeInsets.only(top: 16.0),
......@@ -58,6 +61,7 @@ class _PageSelector extends StatelessWidget {
),
),
],
),
);
}
}
......
examples/flutter_gallery/lib/demo/material/progress_indicator_demo.dart
View file @ d8bfb3a9
......@@ -107,17 +107,21 @@ class _ProgressIndicatorDemoState extends State<ProgressIndicatorDemo> with Sing
child: new GestureDetector(
onTap: _handleTap,
behavior: HitTestBehavior.opaque,
child: new SafeArea(
top: false,
bottom: false,
child: new Container(
padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 8.0),
child: new AnimatedBuilder(
animation: _animation,
builder: _buildIndicators
)
)
)
)
)
)
),
),
),
),
),
),
),
);
}
}
examples/flutter_gallery/lib/demo/material/scrollable_tabs_demo.dart
View file @ d8bfb3a9
......@@ -105,7 +105,10 @@ class ScrollableTabsDemoState extends State<ScrollableTabsDemo> with SingleTicke
body: new TabBarView(
controller: _controller,
children: _allPages.map((_Page page) {
return new Container(
return new SafeArea(
top: false,
bottom: false,
child: new Container(
key: new ObjectKey(page.icon),
padding: const EdgeInsets.all(12.0),
child:new Card(
......@@ -117,6 +120,7 @@ class ScrollableTabsDemoState extends State<ScrollableTabsDemo> with SingleTicke
),
),
),
),
);
}).toList()
),
......
examples/flutter_gallery/lib/demo/material/snack_bar_demo.dart
View file @ d8bfb3a9
......@@ -29,7 +29,10 @@ class _SnackBarDemoState extends State<SnackBarDemo> {
int _snackBarIndex = 1;
Widget buildBody(BuildContext context) {
return new ListView(
return new SafeArea(
top: false,
bottom: false,
child: new ListView(
padding: const EdgeInsets.all(24.0),
children: <Widget>[
const Text(_text1),
......@@ -48,10 +51,10 @@ class _SnackBarDemoState extends State<SnackBarDemo> {
content: new Text('You pressed snackbar $thisSnackBarIndex\'s action.')
));
}
)
),
));
}
)
),
),
const Text(_text3),
]
......@@ -62,6 +65,7 @@ class _SnackBarDemoState extends State<SnackBarDemo> {
);
})
.toList()
),
);
}
......
examples/flutter_gallery/lib/demo/material/tabs_demo.dart
View file @ d8bfb3a9
......@@ -154,7 +154,10 @@ class TabsDemo extends StatelessWidget {
},
body: new TabBarView(
children: _allPages.keys.map((_Page page) {
return new ListView(
return new SafeArea(
top: false,
bottom: false,
child: new ListView(
padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 16.0),
itemExtent: _CardDataItem.height,
children: _allPages[page].map((_CardData data) {
......@@ -163,6 +166,7 @@ class TabsDemo extends StatelessWidget {
child: new _CardDataItem(page: page, data: data),
);
}).toList(),
),
);
}).toList(),
),
......
examples/flutter_gallery/lib/demo/material/text_form_field_demo.dart
View file @ d8bfb3a9
......@@ -108,7 +108,10 @@ class TextFormFieldDemoState extends State<TextFormFieldDemo> {
appBar: new AppBar(
title: const Text('Text fields'),
),
body: new Form(
body: new SafeArea(
top: false,
bottom: false,
child: new Form(
key: _formKey,
autovalidate: _autovalidate,
onWillPop: _warnUserAboutInvalidData,
......@@ -199,7 +202,8 @@ class TextFormFieldDemoState extends State<TextFormFieldDemo> {
child: new Text('* indicates required field', style: Theme.of(context).textTheme.caption),
),
],
)
),
),
),
);
}
......
examples/flutter_gallery/lib/demo/material/tooltip_demo.dart
View file @ d8bfb3a9
......@@ -22,7 +22,10 @@ class TooltipDemo extends StatelessWidget {
),
body: new Builder(
builder: (BuildContext context) {
return new ListView(
return new SafeArea(
top: false,
bottom: false,
child: new ListView(
children: <Widget>[
new Text(_introText, style: theme.textTheme.subhead),
new Row(
......@@ -60,6 +63,7 @@ class TooltipDemo extends StatelessWidget {
);
})
.toList()
),
);
}
)
......
examples/flutter_gallery/lib/gallery/demo.dart
View file @ d8bfb3a9
......@@ -77,7 +77,10 @@ class TabbedComponentDemoScaffold extends StatelessWidget {
),
body: new TabBarView(
children: demos.map((ComponentDemoTabData demo) {
return new Column(
return new SafeArea(
top: false,
bottom: false,
child: new Column(
children: <Widget>[
new Padding(
padding: const EdgeInsets.all(16.0),
......@@ -87,6 +90,7 @@ class TabbedComponentDemoScaffold extends StatelessWidget {
),
new Expanded(child: demo.demoWidget)
],
),
);
}).toList(),
),
......
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

HIAST - GitLab