mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
e502e9c8f8
Anywhere that accepted IconData now accepts either an Icon or an ImageIcon. Places that used to take an IconData in an `icon` argument, notably IconButton and DrawerItem, now take a Widget in that slot. You can wrap the value that used to be passed in in an Icon constructor to get the same result. Icon itself now takes the icon as a positional argument, for brevity. ThemeData now has an iconTheme as well as a primaryIconTheme, the same way it has had a textTheme and primaryTextTheme for a while. IconTheme.of() always returns a value now (though that value itself may have nulls in it). It defaults to the ThemeData.iconTheme. IconThemeData.fallback() is a new method that returns an icon theme data structure with all fields filled in. IconTheme.merge() is a new constructor that takes a context and creates a widget that mixes in the new values with the inherited values. Most places that introduced an IconTheme widget now use IconTheme.merge. IconThemeData.merge and IconThemeData.copyWith act in a way analogous to the similarly-named members of TextStyle. ImageIcon is introduced. It acts like Icon but takes an ImageProvider instead of an IconData. Also: Fix the analyzer to actually check the stocks app.
100 lines
2.8 KiB
Dart
100 lines
2.8 KiB
Dart
// Copyright 2016 The Chromium Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
|
|
import 'dart:async';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
enum IndicatorType { overscroll, refresh }
|
|
|
|
class OverscrollDemo extends StatefulWidget {
|
|
OverscrollDemo({ Key key }) : super(key: key);
|
|
|
|
static const String routeName = '/overscroll';
|
|
|
|
@override
|
|
OverscrollDemoState createState() => new OverscrollDemoState();
|
|
}
|
|
|
|
class OverscrollDemoState extends State<OverscrollDemo> {
|
|
static final List<String> _items = <String>[
|
|
'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'
|
|
];
|
|
|
|
IndicatorType _type = IndicatorType.refresh;
|
|
|
|
Future<Null> refresh() {
|
|
Completer<Null> completer = new Completer<Null>();
|
|
new Timer(new Duration(seconds: 3), () { completer.complete(null); });
|
|
return completer.future;
|
|
}
|
|
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
String indicatorTypeText;
|
|
switch(_type) {
|
|
case IndicatorType.overscroll:
|
|
indicatorTypeText = 'Over-scroll indicator';
|
|
break;
|
|
case IndicatorType.refresh:
|
|
indicatorTypeText = 'Refresh indicator';
|
|
break;
|
|
}
|
|
|
|
// The default ScrollConfiguration doesn't include the
|
|
// OverscrollIndicator. That's what we want, since this demo
|
|
// adds the OverscrollIndicator itself.
|
|
Widget body = new ScrollConfiguration(
|
|
child: new MaterialList(
|
|
type: MaterialListType.threeLine,
|
|
padding: const EdgeInsets.all(8.0),
|
|
children: _items.map((String item) {
|
|
return new ListItem(
|
|
isThreeLine: true,
|
|
leading: new CircleAvatar(child: new Text(item)),
|
|
title: new Text('This item represents $item.'),
|
|
subtitle: new Text('Even more additional list item information appears on line three.')
|
|
);
|
|
})
|
|
)
|
|
);
|
|
switch(_type) {
|
|
case IndicatorType.overscroll:
|
|
body = new OverscrollIndicator(child: body);
|
|
break;
|
|
case IndicatorType.refresh:
|
|
body = new RefreshIndicator(child: body, refresh: refresh);
|
|
break;
|
|
}
|
|
|
|
return new Scaffold(
|
|
appBar: new AppBar(
|
|
title: new Text('$indicatorTypeText'),
|
|
actions: <Widget>[
|
|
new IconButton(
|
|
icon: new Icon(Icons.refresh),
|
|
tooltip: 'Pull to refresh',
|
|
onPressed: () {
|
|
setState(() {
|
|
_type = IndicatorType.refresh;
|
|
});
|
|
}
|
|
),
|
|
new IconButton(
|
|
icon: new Icon(Icons.play_for_work),
|
|
tooltip: 'Over-scroll indicator',
|
|
onPressed: () {
|
|
setState(() {
|
|
_type = IndicatorType.overscroll;
|
|
});
|
|
}
|
|
)
|
|
]
|
|
),
|
|
body: body
|
|
);
|
|
}
|
|
}
|