Commit 534097ff authored by Adam Barth's avatar Adam Barth Committed by GitHub

Use named Image constructors (#5129)

Some folks didn't realize these existed and asked us to add them. By
using them in examples, hopefully folks will discover them more easily.
parent 408e4240
...@@ -429,7 +429,7 @@ class CardCollectionState extends State<CardCollection> { ...@@ -429,7 +429,7 @@ class CardCollectionState extends State<CardCollection> {
if (_sunshine) { if (_sunshine) {
cardCollection = new Stack( cardCollection = new Stack(
children: <Widget>[ children: <Widget>[
new Column(children: <Widget>[new Image(image: new NetworkImage(_sunshineURL))]), new Column(children: <Widget>[new Image.fromNetwork(src: _sunshineURL)]),
new ShaderMask(child: cardCollection, shaderCallback: _createShader) new ShaderMask(child: cardCollection, shaderCallback: _createShader)
] ]
); );
......
...@@ -157,8 +157,8 @@ class WeatherButton extends StatelessWidget { ...@@ -157,8 +157,8 @@ class WeatherButton extends StatelessWidget {
child: new InkWell( child: new InkWell(
onTap: onPressed, onTap: onPressed,
child: new Center( child: new Center(
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(icon), name: icon,
width: _kWeatherIconSize, width: _kWeatherIconSize,
height: _kWeatherIconSize height: _kWeatherIconSize
) )
......
...@@ -66,8 +66,8 @@ class TravelDestinationItem extends StatelessWidget { ...@@ -66,8 +66,8 @@ class TravelDestinationItem extends StatelessWidget {
top: 0.0, top: 0.0,
bottom: 0.0, bottom: 0.0,
right: 0.0, right: 0.0,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(destination.assetName), name: destination.assetName,
fit: ImageFit.cover fit: ImageFit.cover
) )
), ),
......
...@@ -129,8 +129,8 @@ class ContactsDemoState extends State<ContactsDemo> { ...@@ -129,8 +129,8 @@ class ContactsDemoState extends State<ContactsDemo> {
title : new Text('Ali Connors'), title : new Text('Ali Connors'),
background: new Stack( background: new Stack(
children: <Widget>[ children: <Widget>[
new Image( new Image.fromAssetBundle(
image: new AssetImage('packages/flutter_gallery_assets/ali_connors.png'), name: 'packages/flutter_gallery_assets/ali_connors.png',
fit: ImageFit.cover, fit: ImageFit.cover,
height: _appBarHeight height: _appBarHeight
), ),
......
...@@ -62,8 +62,8 @@ class GridDemoPhotoItem extends StatelessWidget { ...@@ -62,8 +62,8 @@ class GridDemoPhotoItem extends StatelessWidget {
body: new Material( body: new Material(
child: new Hero( child: new Hero(
tag: photoHeroTag, tag: photoHeroTag,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(photo.assetName), name: photo.assetName,
fit: ImageFit.cover fit: ImageFit.cover
) )
) )
...@@ -80,8 +80,8 @@ class GridDemoPhotoItem extends StatelessWidget { ...@@ -80,8 +80,8 @@ class GridDemoPhotoItem extends StatelessWidget {
child: new Hero( child: new Hero(
key: new Key(photo.assetName), key: new Key(photo.assetName),
tag: photoHeroTag, tag: photoHeroTag,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(photo.assetName), name: photo.assetName,
fit: ImageFit.cover fit: ImageFit.cover
) )
) )
......
...@@ -105,8 +105,8 @@ class _PestoDemoState extends State<PestoDemo> { ...@@ -105,8 +105,8 @@ class _PestoDemoState extends State<PestoDemo> {
bottom: extraPadding bottom: extraPadding
), ),
child: new Center( child: new Center(
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(_kLogoImages[bestHeight]), name: _kLogoImages[bestHeight],
fit: ImageFit.scaleDown fit: ImageFit.scaleDown
) )
) )
...@@ -134,8 +134,8 @@ class _PestoDemoState extends State<PestoDemo> { ...@@ -134,8 +134,8 @@ class _PestoDemoState extends State<PestoDemo> {
padding: const EdgeInsets.all(2.0), padding: const EdgeInsets.all(2.0),
margin: const EdgeInsets.only(bottom: 16.0), margin: const EdgeInsets.only(bottom: 16.0),
child: new ClipOval( child: new ClipOval(
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(_kUserImage), name: _kUserImage,
fit: ImageFit.contain fit: ImageFit.contain
) )
) )
...@@ -237,8 +237,8 @@ class _RecipeCard extends StatelessWidget { ...@@ -237,8 +237,8 @@ class _RecipeCard extends StatelessWidget {
child: new Column( child: new Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
new Image( new Image.fromAssetBundle(
image: new AssetImage(recipe.imagePath), name: recipe.imagePath,
fit: ImageFit.contain fit: ImageFit.contain
), ),
new Flexible( new Flexible(
...@@ -246,8 +246,8 @@ class _RecipeCard extends StatelessWidget { ...@@ -246,8 +246,8 @@ class _RecipeCard extends StatelessWidget {
children: <Widget>[ children: <Widget>[
new Padding( new Padding(
padding: const EdgeInsets.all(16.0), padding: const EdgeInsets.all(16.0),
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(recipe.ingredientsImagePath), name: recipe.ingredientsImagePath,
width: 48.0, width: 48.0,
height: 48.0 height: 48.0
) )
...@@ -422,8 +422,8 @@ class _RecipeSheet extends StatelessWidget { ...@@ -422,8 +422,8 @@ class _RecipeSheet extends StatelessWidget {
children: <Widget>[ children: <Widget>[
new TableCell( new TableCell(
verticalAlignment: TableCellVerticalAlignment.middle, verticalAlignment: TableCellVerticalAlignment.middle,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(recipe.ingredientsImagePath), name: recipe.ingredientsImagePath,
width: 32.0, width: 32.0,
height: 32.0, height: 32.0,
alignment: FractionalOffset.centerLeft, alignment: FractionalOffset.centerLeft,
......
...@@ -78,8 +78,8 @@ class VendorItem extends StatelessWidget { ...@@ -78,8 +78,8 @@ class VendorItem extends StatelessWidget {
child: new ClipRRect( child: new ClipRRect(
xRadius: 12.0, xRadius: 12.0,
yRadius: 12.0, yRadius: 12.0,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(vendor.avatarAsset), name: vendor.avatarAsset,
fit: ImageFit.cover fit: ImageFit.cover
) )
) )
...@@ -209,8 +209,8 @@ class FeatureItem extends StatelessWidget { ...@@ -209,8 +209,8 @@ class FeatureItem extends StatelessWidget {
minHeight: 340.0, minHeight: 340.0,
maxHeight: 340.0, maxHeight: 340.0,
alignment: FractionalOffset.topRight, alignment: FractionalOffset.topRight,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(product.imageAsset), name: product.imageAsset,
fit: ImageFit.cover fit: ImageFit.cover
) )
) )
...@@ -273,8 +273,8 @@ class ProductItem extends StatelessWidget { ...@@ -273,8 +273,8 @@ class ProductItem extends StatelessWidget {
child: new Hero( child: new Hero(
tag: productHeroTag, tag: productHeroTag,
key: new ObjectKey(product), key: new ObjectKey(product),
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(product.imageAsset), name: product.imageAsset,
fit: ImageFit.contain fit: ImageFit.contain
) )
) )
......
...@@ -41,8 +41,8 @@ class OrderItem extends StatelessWidget { ...@@ -41,8 +41,8 @@ class OrderItem extends StatelessWidget {
height: 248.0, height: 248.0,
child: new Hero( child: new Hero(
tag: productHeroTag, tag: productHeroTag,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(product.imageAsset), name: product.imageAsset,
fit: ImageFit.contain fit: ImageFit.contain
) )
) )
...@@ -201,8 +201,8 @@ class _OrderPageState extends State<OrderPage> { ...@@ -201,8 +201,8 @@ class _OrderPageState extends State<OrderPage> {
.map((Product product) { .map((Product product) {
return new Card( return new Card(
elevation: 0, elevation: 0,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(product.imageAsset), name: product.imageAsset,
fit: ImageFit.contain fit: ImageFit.contain
) )
); );
......
...@@ -99,8 +99,8 @@ class _CardDataItem extends StatelessWidget { ...@@ -99,8 +99,8 @@ class _CardDataItem extends StatelessWidget {
new SizedBox( new SizedBox(
width: 144.0, width: 144.0,
height: 144.0, height: 144.0,
child: new Image( child: new Image.fromAssetBundle(
image: new AssetImage(data.imageAsset), name: data.imageAsset,
fit: ImageFit.contain fit: ImageFit.contain
) )
), ),
......
...@@ -222,8 +222,8 @@ new ScrollableGrid( ...@@ -222,8 +222,8 @@ new ScrollableGrid(
footer: new GridTileBar( footer: new GridTileBar(
title: new Text(url) title: new Text(url)
), ),
child: new Image( child: new Image.fromNetwork(
image: new NetworkImage(url), src: url,
fit: ImageFit.cover fit: ImageFit.cover
) )
); );
......
...@@ -98,8 +98,8 @@ class GalleryHomeState extends State<GalleryHome> { ...@@ -98,8 +98,8 @@ class GalleryHomeState extends State<GalleryHome> {
appBar: new AppBar( appBar: new AppBar(
expandedHeight: _kFlexibleSpaceMaxHeight, expandedHeight: _kFlexibleSpaceMaxHeight,
flexibleSpace: new FlexibleSpaceBar( flexibleSpace: new FlexibleSpaceBar(
background: new Image( background: new Image.fromAssetBundle(
image: new AssetImage('packages/flutter_gallery_assets/appbar_background.jpg'), name: 'packages/flutter_gallery_assets/appbar_background.jpg',
fit: ImageFit.cover, fit: ImageFit.cover,
height: _kFlexibleSpaceMaxHeight height: _kFlexibleSpaceMaxHeight
), ),
......
...@@ -51,9 +51,7 @@ void attachWidgetTreeToRenderTree(RenderProxyBox container) { ...@@ -51,9 +51,7 @@ void attachWidgetTreeToRenderTree(RenderProxyBox container) {
new RaisedButton( new RaisedButton(
child: new Row( child: new Row(
children: <Widget>[ children: <Widget>[
new Image( new Image.fromNetwork(src: 'http://flutter.io/favicon.ico'),
image: new NetworkImage('http://flutter.io/favicon.ico')
),
new Text('PRESS ME'), new Text('PRESS ME'),
] ]
), ),
......
...@@ -485,8 +485,8 @@ class _Block { ...@@ -485,8 +485,8 @@ class _Block {
} }
} }
return new Image( return new Image.fromNetwork(
image: new NetworkImage(path), src: path,
width: width, width: width,
height: height height: height
); );
......
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