Commit 326caa5d authored by Will Larche's avatar Will Larche Committed by xster

[Gallery] Updated assets and copy (#18324)

parent 581a343b
......@@ -352,7 +352,7 @@ class UserHeader extends StatelessWidget {
const Padding(
padding: const EdgeInsets.only(right: 8.0),
child: const Image(
image: const AssetImage('packages/flutter_gallery_assets/ali_connors_sml.png'),
image: const AssetImage('packages/flutter_gallery_assets/people/square/ali.png'),
width: 32.0,
height: 32.0
)
......@@ -410,7 +410,7 @@ class ItemImageBox extends StatelessWidget {
const SizedBox(
height: 230.0,
child: const Image(
image: const AssetImage('packages/flutter_gallery_assets/top_10_australian_beaches.png')
image: const AssetImage('packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png')
)
),
new Theme(
......@@ -447,7 +447,7 @@ class ItemImageBox extends StatelessWidget {
),
const TextSpan(
style: const TextStyle(fontWeight: FontWeight.bold),
text: 'Magic Mike'
text: 'Chris Godley'
)
]
)
......@@ -462,9 +462,9 @@ class ItemImageBox extends StatelessWidget {
child: new Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: <Widget>[
new Text('Where can you find that amazing sunset?', style: Theme.of(context).textTheme.body2),
new Text('The sun sets over stinson beach', style: Theme.of(context).textTheme.body1),
new Text('flutter.io/amazingsunsets', style: Theme.of(context).textTheme.caption)
new Text('Artisans of Southern India', style: Theme.of(context).textTheme.body2),
new Text('Silk Spinners', style: Theme.of(context).textTheme.body1),
new Text('Sivaganga, Tamil Nadu', style: Theme.of(context).textTheme.caption)
]
)
)
......
......@@ -8,10 +8,7 @@ dependencies:
sdk: flutter
# Also examples/flutter_gallery/pubspec.yaml
flutter_gallery_assets:
git:
url: https://flutter.googlesource.com/gallery-assets
ref: 43590e625ab1b07f6a5809287ce16f7e61d9e165
flutter_gallery_assets: 0.1.3
async: 2.0.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
charcode: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
......@@ -75,8 +72,7 @@ dev_dependencies:
flutter:
uses-material-design: true
assets:
- packages/flutter_gallery_assets/ali_connors.png
- packages/flutter_gallery_assets/ali_connors_sml.png
- packages/flutter_gallery_assets/top_10_australian_beaches.png
- packages/flutter_gallery_assets/people/square/ali.png
- packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
# PUBSPEC CHECKSUM: 45b1
# PUBSPEC CHECKSUM: 89f2
......@@ -59,59 +59,59 @@ class Section {
// image SectionDetails in the allSections list.
const SectionDetail _eyeglassesDetail = const SectionDetail(
imageAsset: 'shrine/products/sunnies.png',
imageAsset: '/products/sunnies.png',
imageAssetPackage: _kGalleryAssetsPackage,
title: 'Flutter enables interactive animation',
subtitle: '3K views - 5 days',
);
const SectionDetail _eyeglassesImageDetail = const SectionDetail(
imageAsset: 'shrine/products/sunnies.png',
imageAsset: '/products/sunnies.png',
imageAssetPackage: _kGalleryAssetsPackage,
);
const SectionDetail _seatingDetail = const SectionDetail(
imageAsset: 'shrine/products/lawn_chair.png',
imageAsset: '/products/table.png',
imageAssetPackage: _kGalleryAssetsPackage,
title: 'Flutter enables interactive animation',
subtitle: '3K views - 5 days',
);
const SectionDetail _seatingImageDetail = const SectionDetail(
imageAsset: 'shrine/products/lawn_chair.png',
imageAsset: '/products/table.png',
imageAssetPackage: _kGalleryAssetsPackage,
);
const SectionDetail _decorationDetail = const SectionDetail(
imageAsset: 'shrine/products/lipstick.png',
imageAsset: '/products/earrings.png',
imageAssetPackage: _kGalleryAssetsPackage,
title: 'Flutter enables interactive animation',
subtitle: '3K views - 5 days',
);
const SectionDetail _decorationImageDetail = const SectionDetail(
imageAsset: 'shrine/products/lipstick.png',
imageAsset: '/products/earrings.png',
imageAssetPackage: _kGalleryAssetsPackage,
);
const SectionDetail _protectionDetail = const SectionDetail(
imageAsset: 'shrine/products/helmet.png',
imageAsset: '/products/hat.png',
imageAssetPackage: _kGalleryAssetsPackage,
title: 'Flutter enables interactive animation',
subtitle: '3K views - 5 days',
);
const SectionDetail _protectionImageDetail = const SectionDetail(
imageAsset: 'shrine/products/helmet.png',
imageAsset: '/products/hat.png',
imageAssetPackage: _kGalleryAssetsPackage,
);
final List<Section> allSections = <Section>[
const Section(
title: 'EYEGLASSES',
title: 'SUNGLASSES',
leftColor: _mediumPurple,
rightColor: _mariner,
backgroundAsset: 'shrine/products/sunnies.png',
backgroundAsset: '/products/sunnies.png',
backgroundAssetPackage: _kGalleryAssetsPackage,
details: const <SectionDetail>[
_eyeglassesDetail,
......@@ -123,10 +123,10 @@ final List<Section> allSections = <Section>[
],
),
const Section(
title: 'SEATING',
title: 'FURNITURE',
leftColor: _tomato,
rightColor: _mediumPurple,
backgroundAsset: 'shrine/products/lawn_chair.png',
backgroundAsset: '/products/table.png',
backgroundAssetPackage: _kGalleryAssetsPackage,
details: const <SectionDetail>[
_seatingDetail,
......@@ -138,10 +138,10 @@ final List<Section> allSections = <Section>[
],
),
const Section(
title: 'DECORATION',
title: 'JEWELRY',
leftColor: _mySin,
rightColor: _tomato,
backgroundAsset: 'shrine/products/lipstick.png',
backgroundAsset: '/products/earrings.png',
backgroundAssetPackage: _kGalleryAssetsPackage,
details: const <SectionDetail>[
_decorationDetail,
......@@ -153,10 +153,10 @@ final List<Section> allSections = <Section>[
],
),
const Section(
title: 'PROTECTION',
title: 'HEADWEAR',
leftColor: Colors.white,
rightColor: _tomato,
backgroundAsset: 'shrine/products/helmet.png',
backgroundAsset: '/products/hat.png',
backgroundAssetPackage: _kGalleryAssetsPackage,
details: const <SectionDetail>[
_protectionDetail,
......
......@@ -160,7 +160,7 @@ class ContactsDemoState extends State<ContactsDemo> {
fit: StackFit.expand,
children: <Widget>[
new Image.asset(
'ali_connors.jpg',
'/people/ali_landscape.png',
package: 'flutter_gallery_assets',
fit: BoxFit.cover,
height: _appBarHeight,
......@@ -328,7 +328,7 @@ class ContactsDemoState extends State<ContactsDemo> {
new _ContactItem(
lines: const <String>[
'Last day in office',
'August 9th, 2015',
'August 9th, 2018',
],
),
],
......
......@@ -507,8 +507,8 @@ class Tab2Header extends StatelessWidget {
decoration: const BoxDecoration(
image: const DecorationImage(
image: const AssetImage(
'cupertino_navigation/person1.jpg',
package: _kGalleryAssetsPackage
'/people/square/trevor.png',
package: _kGalleryAssetsPackage,
),
),
shape: BoxShape.circle,
......@@ -521,8 +521,8 @@ class Tab2Header extends StatelessWidget {
decoration: const BoxDecoration(
image: const DecorationImage(
image: const AssetImage(
'cupertino_navigation/person2.jpg',
package: _kGalleryAssetsPackage
'/people/square/sandra.png',
package: _kGalleryAssetsPackage,
),
),
shape: BoxShape.circle,
......
......@@ -11,21 +11,27 @@ class ImagesDemo extends StatelessWidget {
title: 'Animated images',
demos: <ComponentDemoTabData>[
new ComponentDemoTabData(
tabName: 'ANIMATED WEBP',
tabName: 'WEBP',
description: '',
exampleCodeTag: 'animated_image',
demoWidget: new Semantics(
label: 'Example of animated WEBP',
child: new Image.asset('packages/flutter_gallery_assets/animated_flutter_stickers.webp'),
child: new Image.asset(
'/animated_images/animated_flutter_stickers.webp',
package: 'flutter_gallery_assets',
),
),
),
new ComponentDemoTabData(
tabName: 'ANIMATED GIF',
tabName: 'GIF',
description: '',
exampleCodeTag: 'animated_image',
demoWidget: new Semantics(
label: 'Example of animated GIF',
child:new Image.asset('packages/flutter_gallery_assets/animated_flutter_lgtm.gif'),
child:new Image.asset(
'/animated_images/animated_flutter_lgtm.gif',
package: 'flutter_gallery_assets',
),
),
),
]
......
......@@ -20,72 +20,76 @@ class Category {
const List<Category> allCategories = const <Category>[
const Category(
title: 'Home',
title: 'Accessories',
assets: const <String>[
'shrine/products/clock.png',
'shrine/products/teapot.png',
'shrine/products/radio.png',
'shrine/products/lawn_chair.png',
'shrine/products/chair.png',
'/products/belt.png',
'/products/earrings.png',
'/products/backpack.png',
'/products/hat.png',
'/products/scarf.png',
'/products/sunnies.png',
],
),
const Category(
title: 'Red',
title: 'Blue',
assets: const <String>[
'shrine/products/popsicle.png',
'shrine/products/brush.png',
'shrine/products/lipstick.png',
'shrine/products/backpack.png',
'/products/backpack.png',
'/products/cup.png',
'/products/napkins.png',
'/products/top.png',
],
),
const Category(
title: 'Sport',
title: 'Cold Weather',
assets: const <String>[
'shrine/products/helmet.png',
'shrine/products/beachball.png',
'shrine/products/flippers.png',
'shrine/products/surfboard.png',
'/products/jacket.png',
'/products/jumper.png',
'/products/scarf.png',
'/products/sweater.png',
'/products/sweats.png',
],
),
const Category(
title: 'Shoes',
title: 'Home',
assets: const <String>[
'shrine/products/chucks.png',
'shrine/products/green-shoes.png',
'shrine/products/heels.png',
'shrine/products/flippers.png',
'/products/cup.png',
'/products/napkins.png',
'/products/planters.png',
'/products/table.png',
'/products/teaset.png',
],
),
const Category(
title: 'Vision',
title: 'Tops',
assets: const <String>[
'shrine/products/sunnies.png',
'shrine/products/binoculars.png',
'shrine/products/fish_bowl.png',
'/products/jumper.png',
'/products/shirt.png',
'/products/sweater.png',
'/products/top.png',
],
),
const Category(
title: 'Everything',
assets: const <String>[
'shrine/products/radio.png',
'shrine/products/sunnies.png',
'shrine/products/clock.png',
'shrine/products/popsicle.png',
'shrine/products/lawn_chair.png',
'shrine/products/chair.png',
'shrine/products/heels.png',
'shrine/products/green-shoes.png',
'shrine/products/teapot.png',
'shrine/products/chucks.png',
'shrine/products/brush.png',
'shrine/products/fish_bowl.png',
'shrine/products/lipstick.png',
'shrine/products/backpack.png',
'shrine/products/helmet.png',
'shrine/products/beachball.png',
'shrine/products/binoculars.png',
'shrine/products/flippers.png',
'shrine/products/surfboard.png',
'/products/backpack.png',
'/products/belt.png',
'/products/cup.png',
'/products/dress.png',
'/products/earrings.png',
'/products/flatwear.png',
'/products/hat.png',
'/products/jacket.png',
'/products/jumper.png',
'/products/napkins.png',
'/products/planters.png',
'/products/scarf.png',
'/products/shirt.png',
'/products/sunnies.png',
'/products/sweater.png',
'/products/sweats.png',
'/products/table.png',
'/products/teaset.png',
'/products/top.png',
],
),
];
......
......@@ -25,23 +25,23 @@ class TravelDestination {
final List<TravelDestination> destinations = <TravelDestination>[
const TravelDestination(
assetName: 'top_10_australian_beaches.jpg',
assetName: '/places/india_thanjavur_market.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Top 10 Australian beaches',
title: 'Top 10 Cities to Visit in Tamil Nadu',
description: const <String>[
'Number 10',
'Whitehaven Beach',
'Whitsunday Island, Whitsunday Islands',
'Thanjavur',
'Thanjavur, Tamil Nadu',
],
),
const TravelDestination(
assetName: 'kangaroo_valley_safari.jpg',
assetName: '/places/india_chettinad_silk_maker.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Kangaroo Valley Safari',
title: 'Artisans of Southern India',
description: const <String>[
'2031 Moss Vale Road',
'Kangaroo Valley 2577',
'New South Wales',
'Silk Spinners',
'Chettinad',
'Sivaganga, Tamil Nadu',
],
)
];
......
......@@ -45,11 +45,11 @@ const List<String> _defaultTools = const <String>[
];
const Map<String, String> _avatars = const <String, String>{
'hammer': 'shrine/vendors/ali-connors.png',
'chisel': 'shrine/vendors/sandra-adams.jpg',
'fryer': 'shrine/vendors/zach.jpg',
'fabricator': 'shrine/vendors/peter-carlsson.png',
'customer': 'shrine/vendors/16c477b.jpg',
'hammer': '/people/square/ali.png',
'chisel': '/people/square/sandra.png',
'fryer': '/people/square/trevor.png',
'fabricator': '/people/square/stella.png',
'customer': '/people/square/peter.png',
};
final Map<String, Set<String>> _toolActions = <String, Set<String>>{
......
......@@ -4,9 +4,9 @@
import 'package:flutter/material.dart';
const String _kAsset0 = 'shrine/vendors/zach.jpg';
const String _kAsset1 = 'shrine/vendors/16c477b.jpg';
const String _kAsset2 = 'shrine/vendors/sandra-adams.jpg';
const String _kAsset0 = '/people/square/trevor.png';
const String _kAsset1 = '/people/square/stella.png';
const String _kAsset2 = '/people/square/sandra.png';
const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
class DrawerDemo extends StatefulWidget {
......@@ -92,8 +92,8 @@ class _DrawerDemoState extends State<DrawerDemo> with TickerProviderStateMixin {
child: new Column(
children: <Widget>[
new UserAccountsDrawerHeader(
accountName: const Text('Zach Widget'),
accountEmail: const Text('zach.widget@example.com'),
accountName: const Text('Trevor Widget'),
accountEmail: const Text('trevor.widget@example.com'),
currentAccountPicture: const CircleAvatar(
backgroundImage: const AssetImage(
_kAsset0,
......
......@@ -254,76 +254,76 @@ class GridListDemoState extends State<GridListDemo> {
List<Photo> photos = <Photo>[
new Photo(
assetName: 'landscape_0.jpg',
assetName: '/places/india_chennai_flower_market.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Philippines',
caption: 'Batad rice terraces',
title: 'Chennai',
caption: 'Flower Market',
),
new Photo(
assetName: 'landscape_1.jpg',
assetName: '/places/india_tanjore_bronze_works.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Italy',
caption: 'Ceresole Reale',
title: 'Tanjore',
caption: 'Bronze Works',
),
new Photo(
assetName: 'landscape_2.jpg',
assetName: '/places/india_tanjore_market_merchant.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Somewhere',
caption: 'Beautiful mountains',
title: 'Tanjore',
caption: 'Market',
),
new Photo(
assetName: 'landscape_3.jpg',
assetName: '/places/india_tanjore_thanjavur_temple.png',
assetPackage: _kGalleryAssetsPackage,
title: 'A place',
caption: 'Beautiful hills',
title: 'Tanjore',
caption: 'Thanjavur Temple',
),
new Photo(
assetName: 'landscape_4.jpg',
assetName: '/places/india_tanjore_thanjavur_temple_carvings.png',
assetPackage: _kGalleryAssetsPackage,
title: 'New Zealand',
caption: 'View from the van',
title: 'Tanjore',
caption: 'Thanjavur Temple',
),
new Photo(
assetName: 'landscape_5.jpg',
assetName: '/places/india_pondicherry_salt_farm.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Autumn',
caption: 'The golden season',
title: 'Pondicherry',
caption: 'Salt Farm',
),
new Photo(
assetName: 'landscape_6.jpg',
assetName: '/places/india_chennai_highway.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Germany',
caption: 'Englischer Garten',
title: 'Chennai',
caption: 'Scooters',
),
new Photo(
assetName: 'landscape_7.jpg',
assetName: '/places/india_chettinad_silk_maker.png',
assetPackage: _kGalleryAssetsPackage,
title: 'A country',
caption: 'Grass fields',
title: 'Chettinad',
caption: 'Silk Maker',
),
new Photo(
assetName: 'landscape_8.jpg',
assetName: '/places/india_chettinad_produce.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Mountain country',
caption: 'River forest',
title: 'Chettinad',
caption: 'Lunch Prep',
),
new Photo(
assetName: 'landscape_9.jpg',
assetName: '/places/india_tanjore_market_technology.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Alpine place',
caption: 'Green hills',
title: 'Tanjore',
caption: 'Market',
),
new Photo(
assetName: 'landscape_10.jpg',
assetName: '/places/india_pondicherry_beach.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Desert land',
caption: 'Blue skies',
title: 'Pondicherry',
caption: 'Beach',
),
new Photo(
assetName: 'landscape_11.jpg',
assetName: '/places/india_pondicherry_fisherman.png',
assetPackage: _kGalleryAssetsPackage,
title: 'Narnia',
caption: 'Rocks and rivers',
title: 'Pondicherry',
caption: 'Fisherman',
),
];
......
......@@ -100,11 +100,11 @@ class _SearchDemoState extends State<SearchDemo> {
child: new Column(
children: <Widget>[
const UserAccountsDrawerHeader(
accountName: const Text('Zach Widget'),
accountEmail: const Text('zach.widget@example.com'),
accountName: const Text('Peter Widget'),
accountEmail: const Text('peter.widget@example.com'),
currentAccountPicture: const CircleAvatar(
backgroundImage: const AssetImage(
'shrine/vendors/zach.jpg',
'/people/square/peter.png',
package: 'flutter_gallery_assets',
),
),
......
......@@ -25,67 +25,67 @@ class _CardData {
}
final Map<_Page, List<_CardData>> _allPages = <_Page, List<_CardData>>{
new _Page(label: 'LEFT'): <_CardData>[
new _Page(label: 'HOME'): <_CardData>[
const _CardData(
title: 'Vintage Bluetooth Radio',
imageAsset: 'shrine/products/radio.png',
title: 'Flatwear',
imageAsset: '/products/flatwear.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Sunglasses',
imageAsset: 'shrine/products/sunnies.png',
title: 'Pine Table',
imageAsset: '/products/table.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Clock',
imageAsset: 'shrine/products/clock.png',
title: 'Blue Cup',
imageAsset: '/products/cup.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Red popsicle',
imageAsset: 'shrine/products/popsicle.png',
title: 'Tea Set',
imageAsset: '/products/teaset.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Folding Chair',
imageAsset: 'shrine/products/lawn_chair.png',
title: 'Desk Set',
imageAsset: '/products/deskset.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Green comfort chair',
imageAsset: 'shrine/products/chair.png',
title: 'Blue Linen Napkins',
imageAsset: '/products/napkins.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Old Binoculars',
imageAsset: 'shrine/products/binoculars.png',
title: 'Planters',
imageAsset: '/products/planters.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Teapot',
imageAsset: 'shrine/products/teapot.png',
title: 'Kitchen Quattro',
imageAsset: '/products/kitchen_quattro.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Blue suede shoes',
imageAsset: 'shrine/products/chucks.png',
title: 'Platter',
imageAsset: '/products/platter.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
],
new _Page(label: 'RIGHT'): <_CardData>[
new _Page(label: 'APPAREL'): <_CardData>[
const _CardData(
title: 'Beachball',
imageAsset: 'shrine/products/beachball.png',
title: 'Cloud-White Dress',
imageAsset: '/products/dress.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Dipped Brush',
imageAsset: 'shrine/products/brush.png',
title: 'Ginger Scarf',
imageAsset: '/products/scarf.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
const _CardData(
title: 'Perfect Goldfish Bowl',
imageAsset: 'shrine/products/fish_bowl.png',
title: 'Blush Sweats',
imageAsset: '/products/sweats.png',
imageAssetPackage: _kGalleryAssetsPackage,
),
],
......@@ -108,7 +108,7 @@ class _CardDataItem extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.start,
children: <Widget>[
new Align(
alignment: page.id == 'L'
alignment: page.id == 'H'
? Alignment.centerLeft
: Alignment.centerRight,
child: new CircleAvatar(child: new Text('${page.id}')),
......
......@@ -353,7 +353,7 @@ class _VideoDemoState extends State<VideoDemo>
with SingleTickerProviderStateMixin {
final VideoPlayerController butterflyController =
new VideoPlayerController.asset(
'videos/butterfly.mp4',
'/videos/butterfly.mp4',
package: 'flutter_gallery_assets',
);
final VideoPlayerController beeController = new VideoPlayerController.network(
......
......@@ -28,7 +28,7 @@ class _FlutterLogo extends StatelessWidget {
decoration: const BoxDecoration(
image: const DecorationImage(
image: const AssetImage(
'white_logo/logo.png',
'/logos/flutter_white/logo.png',
package: _kGalleryAssetsPackage,
),
),
......
This diff is collapsed.
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