Skip to content

F
Front-End
Commit 534097ff authored by Adam Barth's avatar Adam Barth Committed by GitHub
Browse files
Options

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
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 42 deletions
dev/manual_tests/card_collection.dart
View file @ 534097ff
......@@ -429,7 +429,7 @@ class CardCollectionState extends State<CardCollection> {
if (_sunshine) {
cardCollection = new Stack(
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)
]
);
......
dev/manual_tests/weather_demo.dart
View file @ 534097ff
......@@ -157,8 +157,8 @@ class WeatherButton extends StatelessWidget {
child: new InkWell(
onTap: onPressed,
child: new Center(
child: new Image(
image: new AssetImage(icon),
child: new Image.fromAssetBundle(
name: icon,
width: _kWeatherIconSize,
height: _kWeatherIconSize
)
......
examples/flutter_gallery/lib/demo/cards_demo.dart
View file @ 534097ff
......@@ -66,8 +66,8 @@ class TravelDestinationItem extends StatelessWidget {
top: 0.0,
bottom: 0.0,
right: 0.0,
child: new Image(
image: new AssetImage(destination.assetName),
child: new Image.fromAssetBundle(
name: destination.assetName,
fit: ImageFit.cover
)
),
......
examples/flutter_gallery/lib/demo/contacts_demo.dart
View file @ 534097ff
......@@ -129,8 +129,8 @@ class ContactsDemoState extends State<ContactsDemo> {
title : new Text('Ali Connors'),
background: new Stack(
children: <Widget>[
new Image(
image: new AssetImage('packages/flutter_gallery_assets/ali_connors.png'),
new Image.fromAssetBundle(
name: 'packages/flutter_gallery_assets/ali_connors.png',
fit: ImageFit.cover,
height: _appBarHeight
),
......
examples/flutter_gallery/lib/demo/grid_list_demo.dart
View file @ 534097ff
......@@ -62,8 +62,8 @@ class GridDemoPhotoItem extends StatelessWidget {
body: new Material(
child: new Hero(
tag: photoHeroTag,
child: new Image(
image: new AssetImage(photo.assetName),
child: new Image.fromAssetBundle(
name: photo.assetName,
fit: ImageFit.cover
)
)
......@@ -80,8 +80,8 @@ class GridDemoPhotoItem extends StatelessWidget {
child: new Hero(
key: new Key(photo.assetName),
tag: photoHeroTag,
child: new Image(
image: new AssetImage(photo.assetName),
child: new Image.fromAssetBundle(
name: photo.assetName,
fit: ImageFit.cover
)
)
......
examples/flutter_gallery/lib/demo/pesto_demo.dart
View file @ 534097ff
......@@ -105,8 +105,8 @@ class _PestoDemoState extends State<PestoDemo> {
bottom: extraPadding
),
child: new Center(
child: new Image(
image: new AssetImage(_kLogoImages[bestHeight]),
child: new Image.fromAssetBundle(
name: _kLogoImages[bestHeight],
fit: ImageFit.scaleDown
)
)
......@@ -134,8 +134,8 @@ class _PestoDemoState extends State<PestoDemo> {
padding: const EdgeInsets.all(2.0),
margin: const EdgeInsets.only(bottom: 16.0),
child: new ClipOval(
child: new Image(
image: new AssetImage(_kUserImage),
child: new Image.fromAssetBundle(
name: _kUserImage,
fit: ImageFit.contain
)
)
......@@ -237,8 +237,8 @@ class _RecipeCard extends StatelessWidget {
child: new Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
new Image(
image: new AssetImage(recipe.imagePath),
new Image.fromAssetBundle(
name: recipe.imagePath,
fit: ImageFit.contain
),
new Flexible(
......@@ -246,8 +246,8 @@ class _RecipeCard extends StatelessWidget {
children: <Widget>[
new Padding(
padding: const EdgeInsets.all(16.0),
child: new Image(
image: new AssetImage(recipe.ingredientsImagePath),
child: new Image.fromAssetBundle(
name: recipe.ingredientsImagePath,
width: 48.0,
height: 48.0
)
......@@ -422,8 +422,8 @@ class _RecipeSheet extends StatelessWidget {
children: <Widget>[
new TableCell(
verticalAlignment: TableCellVerticalAlignment.middle,
child: new Image(
image: new AssetImage(recipe.ingredientsImagePath),
child: new Image.fromAssetBundle(
name: recipe.ingredientsImagePath,
width: 32.0,
height: 32.0,
alignment: FractionalOffset.centerLeft,
......
examples/flutter_gallery/lib/demo/shrine/shrine_home.dart
View file @ 534097ff
......@@ -78,8 +78,8 @@ class VendorItem extends StatelessWidget {
child: new ClipRRect(
xRadius: 12.0,
yRadius: 12.0,
child: new Image(
image: new AssetImage(vendor.avatarAsset),
child: new Image.fromAssetBundle(
name: vendor.avatarAsset,
fit: ImageFit.cover
)
)
......@@ -209,8 +209,8 @@ class FeatureItem extends StatelessWidget {
minHeight: 340.0,
maxHeight: 340.0,
alignment: FractionalOffset.topRight,
child: new Image(
image: new AssetImage(product.imageAsset),
child: new Image.fromAssetBundle(
name: product.imageAsset,
fit: ImageFit.cover
)
)
......@@ -273,8 +273,8 @@ class ProductItem extends StatelessWidget {
child: new Hero(
tag: productHeroTag,
key: new ObjectKey(product),
child: new Image(
image: new AssetImage(product.imageAsset),
child: new Image.fromAssetBundle(
name: product.imageAsset,
fit: ImageFit.contain
)
)
......
examples/flutter_gallery/lib/demo/shrine/shrine_order.dart
View file @ 534097ff
......@@ -41,8 +41,8 @@ class OrderItem extends StatelessWidget {
height: 248.0,
child: new Hero(
tag: productHeroTag,
child: new Image(
image: new AssetImage(product.imageAsset),
child: new Image.fromAssetBundle(
name: product.imageAsset,
fit: ImageFit.contain
)
)
......@@ -201,8 +201,8 @@ class _OrderPageState extends State<OrderPage> {
.map((Product product) {
return new Card(
elevation: 0,
child: new Image(
image: new AssetImage(product.imageAsset),
child: new Image.fromAssetBundle(
name: product.imageAsset,
fit: ImageFit.contain
)
);
......
examples/flutter_gallery/lib/demo/tabs_demo.dart
View file @ 534097ff
......@@ -99,8 +99,8 @@ class _CardDataItem extends StatelessWidget {
new SizedBox(
width: 144.0,
height: 144.0,
child: new Image(
image: new AssetImage(data.imageAsset),
child: new Image.fromAssetBundle(
name: data.imageAsset,
fit: ImageFit.contain
)
),
......
examples/flutter_gallery/lib/gallery/example_code.dart
View file @ 534097ff
......@@ -222,8 +222,8 @@ new ScrollableGrid(
footer: new GridTileBar(
title: new Text(url)
),
child: new Image(
image: new NetworkImage(url),
child: new Image.fromNetwork(
src: url,
fit: ImageFit.cover
)
);
......
examples/flutter_gallery/lib/gallery/home.dart
View file @ 534097ff
......@@ -98,8 +98,8 @@ class GalleryHomeState extends State<GalleryHome> {
appBar: new AppBar(
expandedHeight: _kFlexibleSpaceMaxHeight,
flexibleSpace: new FlexibleSpaceBar(
background: new Image(
image: new AssetImage('packages/flutter_gallery_assets/appbar_background.jpg'),
background: new Image.fromAssetBundle(
name: 'packages/flutter_gallery_assets/appbar_background.jpg',
fit: ImageFit.cover,
height: _kFlexibleSpaceMaxHeight
),
......
examples/layers/widgets/spinning_mixed.dart
View file @ 534097ff
......@@ -51,9 +51,7 @@ void attachWidgetTreeToRenderTree(RenderProxyBox container) {
new RaisedButton(
child: new Row(
children: <Widget>[
new Image(
image: new NetworkImage('http://flutter.io/favicon.ico')
),
new Image.fromNetwork(src: 'http://flutter.io/favicon.ico'),
new Text('PRESS ME'),
]
),
......
packages/flutter_markdown/lib/src/markdown_raw.dart
View file @ 534097ff
......@@ -485,8 +485,8 @@ class _Block {
}
}
return new Image(
image: new NetworkImage(path),
return new Image.fromNetwork(
src: path,
width: width,
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

HIAST - GitLab