Skip to content

F
Front-End
Commit 3d377305 authored by Hans Muller's avatar Hans Muller
Browse files
Options

updated per review feedback

parent 179d41e6
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 46 deletions
examples/material_gallery/lib/demo/list_demo.dart
View file @ 3d377305
......@@ -21,7 +21,7 @@ class ListDemoState extends State<ListDemo> {
ScaffoldFeatureController _bottomSheet;
ListDemoItemSize _itemSize = ListDemoItemSize.threeLine;
bool _isDense = true;
bool _dense = true;
bool _showAvatar = true;
bool _showIcon = false;
bool _reverseSort = false;
......@@ -47,7 +47,7 @@ class ListDemoState extends State<ListDemo> {
alignItems: FlexAlignItems.stretch,
children: <Widget>[
new ListItem(
isDense: true,
dense: true,
primary: new Text('One-line'),
right: new Radio<ListDemoItemSize>(
value: ListDemoItemSize.oneLine,
......@@ -56,7 +56,7 @@ class ListDemoState extends State<ListDemo> {
)
),
new ListItem(
isDense: true,
dense: true,
primary: new Text('Two-line'),
right: new Radio<ListDemoItemSize>(
value: ListDemoItemSize.twoLine,
......@@ -65,7 +65,7 @@ class ListDemoState extends State<ListDemo> {
)
),
new ListItem(
isDense: true,
dense: true,
primary: new Text('Three-line'),
right: new Radio<ListDemoItemSize>(
value: ListDemoItemSize.threeLine,
......@@ -74,7 +74,7 @@ class ListDemoState extends State<ListDemo> {
)
),
new ListItem(
isDense: true,
dense: true,
primary: new Text('Show Avatar'),
right: new Checkbox(
value: _showAvatar,
......@@ -87,7 +87,7 @@ class ListDemoState extends State<ListDemo> {
)
),
new ListItem(
isDense: true,
dense: true,
primary: new Text('Show Icon'),
right: new Checkbox(
value: _showIcon,
......@@ -100,13 +100,13 @@ class ListDemoState extends State<ListDemo> {
)
),
new ListItem(
isDense: true,
dense: true,
primary: new Text('Dense Layout'),
right: new Checkbox(
value: _isDense,
value: _dense,
onChanged: (bool value) {
setState(() {
_isDense = value;
_dense = value;
});
_bottomSheet?.setState(() { });
}
......@@ -131,7 +131,7 @@ class ListDemoState extends State<ListDemo> {
}
return new ListItem(
isThreeLine: _itemSize == ListDemoItemSize.threeLine,
isDense: _isDense,
dense: _dense,
left: _showAvatar ? new CircleAvatar(child: new Text(item)) : null,
primary: new Text('This item represents $item'),
secondary: secondary,
......@@ -140,7 +140,7 @@ class ListDemoState extends State<ListDemo> {
}
Widget build(BuildContext context) {
final String layoutText = _isDense ? " \u2013 Dense" : "";
final String layoutText = _dense ? " \u2013 Dense" : "";
String itemSizeText;
switch(_itemSize) {
case ListDemoItemSize.oneLine:
......@@ -176,7 +176,7 @@ class ListDemoState extends State<ListDemo> {
]
),
body: new Block(
padding: new EdgeDims.all(_isDense ? 4.0 : 8.0),
padding: new EdgeDims.all(_dense ? 4.0 : 8.0),
children: items.map((String item) => buildListItem(context, item)).toList()
)
);
......
examples/material_gallery/lib/demo/menu_demo.dart
View file @ 3d377305
......@@ -94,7 +94,7 @@ class MenuDemoState extends State<MenuDemo> {
child: new Text('Context menu item one')
),
new PopupMenuItem(
isDisabled: true,
enabled: false,
child: new Text('A disabled menu item')
),
new PopupMenuItem(
......@@ -178,22 +178,22 @@ class MenuDemoState extends State<MenuDemo> {
items: <PopupMenuItem>[
new CheckedPopupMenuItem(
value: _checkedValue1,
isChecked: isChecked(_checkedValue1),
checked: isChecked(_checkedValue1),
child: new Text(_checkedValue1)
),
new CheckedPopupMenuItem(
isDisabled: true,
isChecked: isChecked(_checkedValue2),
enabled: false,
checked: isChecked(_checkedValue2),
child: new Text(_checkedValue2)
),
new CheckedPopupMenuItem(
value: _checkedValue3,
isChecked: isChecked(_checkedValue3),
checked: isChecked(_checkedValue3),
child: new Text(_checkedValue3)
),
new CheckedPopupMenuItem(
value: _checkedValue4,
isChecked: isChecked(_checkedValue4),
checked: isChecked(_checkedValue4),
child: new Text(_checkedValue4)
)
]
......
examples/stocks/lib/stock_home.dart
View file @ 3d377305
......@@ -221,7 +221,7 @@ class StockHomeState extends State<StockHome> {
items: <PopupMenuItem>[
new CheckedPopupMenuItem(
value: _StockMenuItem.autorefresh,
isChecked: _autorefresh,
checked: _autorefresh,
child: new Text('Autorefresh')
),
new PopupMenuItem(
......
packages/flutter/lib/src/material/list_item.dart
View file @ 3d377305
......@@ -11,7 +11,7 @@ import 'theme.dart';
/// Icons are defined with the [left] and [right] parameters. The first line of text
/// is not optional and is specified with [primary]. The value of [secondary] will
/// occupy the space allocated for an aditional line of text, or two lines if
/// isThreeLine: true is specified. If isDense: true is specified then the overall
/// isThreeLine: true is specified. If dense: true is specified then the overall
/// height of this list item and the size of the DefaultTextStyles that wrap
/// the [primary] and [secondary] widget are reduced.
class ListItem extends StatelessComponent {
......@@ -22,8 +22,8 @@ class ListItem extends StatelessComponent {
this.secondary,
this.right,
this.isThreeLine: false,
this.isDense: false,
this.isDisabled: false,
this.dense: false,
this.enabled: true,
this.onTap,
this.onLongPress
}) : super(key: key) {
......@@ -36,26 +36,26 @@ class ListItem extends StatelessComponent {
final Widget secondary;
final Widget right;
final bool isThreeLine;
final bool isDense;
final bool isDisabled;
final bool dense;
final bool enabled;
final GestureTapCallback onTap;
final GestureLongPressCallback onLongPress;
TextStyle primaryTextStyle(BuildContext context) {
final ThemeData theme = Theme.of(context);
final TextStyle style = theme.text.subhead;
if (isDisabled) {
if (!enabled) {
final Color color = theme.disabledColor;
return isDense ? style.copyWith(fontSize: 13.0, color: color) : style.copyWith(color: color);
return dense ? style.copyWith(fontSize: 13.0, color: color) : style.copyWith(color: color);
}
return isDense ? style.copyWith(fontSize: 13.0) : style;
return dense ? style.copyWith(fontSize: 13.0) : style;
}
TextStyle secondaryTextStyle(BuildContext context) {
final ThemeData theme = Theme.of(context);
final Color color = theme.text.caption.color;
final TextStyle style = theme.text.body1;
return isDense ? style.copyWith(color: color, fontSize: 12.0) : style.copyWith(color: color);
return dense ? style.copyWith(color: color, fontSize: 12.0) : style.copyWith(color: color);
}
Widget build(BuildContext context) {
......@@ -63,15 +63,15 @@ class ListItem extends StatelessComponent {
final bool isOneLine = !isThreeLine && !isTwoLine;
double itemHeight;
if (isOneLine)
itemHeight = isDense ? 48.0 : 56.0;
itemHeight = dense ? 48.0 : 56.0;
else if (isTwoLine)
itemHeight = isDense ? 60.0 : 72.0;
itemHeight = dense ? 60.0 : 72.0;
else
itemHeight = isDense ? 76.0 : 88.0;
itemHeight = dense ? 76.0 : 88.0;
double iconMarginTop = 0.0;
if (isThreeLine)
iconMarginTop = isDense ? 8.0 : 16.0;
iconMarginTop = dense ? 8.0 : 16.0;
// Overall, the list item is a Row() with these children.
final List<Widget> children = <Widget>[];
......@@ -120,8 +120,8 @@ class ListItem extends StatelessComponent {
}
return new InkWell(
onTap: isDisabled ? null : onTap,
onLongPress: isDisabled ? null : onLongPress,
onTap: enabled ? onTap : null,
onLongPress: enabled ? onLongPress : null,
child: new Container(
height: itemHeight,
padding: const EdgeDims.symmetric(horizontal: 16.0),
......
packages/flutter/lib/src/material/popup_menu.dart
View file @ 3d377305
......@@ -25,26 +25,25 @@ const double _kMenuMinWidth = 2.0 * _kMenuWidthStep;
const double _kMenuVerticalPadding = 8.0;
const double _kMenuWidthStep = 56.0;
const double _kMenuScreenPadding = 8.0;
const double _kDisabledIconOpacity = 0.38;
class PopupMenuItem<T> extends StatelessComponent {
PopupMenuItem({
Key key,
this.value,
this.isDisabled: false,
this.enabled: true,
this.hasDivider: false,
this.child
}) : super(key: key);
final T value;
final bool isDisabled;
final bool enabled;
final bool hasDivider;
final Widget child;
Widget build(BuildContext context) {
final ThemeData theme = Theme.of(context);
TextStyle style = theme.text.subhead;
if (isDisabled)
if (!enabled)
style = style.copyWith(color: theme.disabledColor);
Widget item = new DefaultTextStyle(
......@@ -54,7 +53,7 @@ class PopupMenuItem<T> extends StatelessComponent {
child: child
)
);
if (isDisabled) {
if (!enabled) {
final bool isDark = theme.brightness == ThemeBrightness.dark;
item = new IconTheme(
data: new IconThemeData(opacity: isDark ? 0.5 : 0.38),
......@@ -79,16 +78,16 @@ class CheckedPopupMenuItem<T> extends PopupMenuItem<T> {
CheckedPopupMenuItem({
Key key,
T value,
isChecked: false,
bool isDisabled: false,
checked: false,
bool enabled: true,
Widget child
}) : super(
key: key,
value: value,
isDisabled: isDisabled,
enabled: enabled,
child: new ListItem(
isDisabled: isDisabled,
left: new Icon(icon: isChecked ? 'action/done' : null),
enabled: enabled,
left: new Icon(icon: checked ? 'action/done' : null),
primary: child
)
);
......@@ -113,7 +112,7 @@ class _PopupMenu<T> extends StatelessComponent {
parent: route.animation,
curve: new Interval(start, end)
);
final bool isDisabled = route.items[i].isDisabled;
final bool enabled = route.items[i].enabled;
Widget item = route.items[i];
if (route.initialValue != null && route.initialValue == route.items[i].value) {
item = new Container(
......@@ -124,7 +123,7 @@ class _PopupMenu<T> extends StatelessComponent {
children.add(new FadeTransition(
opacity: opacity,
child: new InkWell(
onTap: isDisabled ? null : () { Navigator.pop(context, route.items[i].value); },
onTap: enabled ? () { Navigator.pop(context, route.items[i].value); } : null,
child: item
)
));
......
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