[Gallery] Updated assets and copy (#18324)

326caa5d · Will Larche · xster · 581a343b · 326caa5d · 326caa5d
Commit 326caa5d authored Jun 09, 2018 by Will Larche Committed by xster Jun 09, 2018
18 changed files
--- a/dev/benchmarks/complex_layout/lib/main.dart
+++ b/dev/benchmarks/complex_layout/lib/main.dart
@@ -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('Artisans of Southern India', style: Theme.of(context).textTheme.body2),
-                  new Text('The sun sets over stinson beach', style: Theme.of(context).textTheme.body1),
+                  new Text('Silk Spinners', style: Theme.of(context).textTheme.body1),
-                  new Text('flutter.io/amazingsunsets', style: Theme.of(context).textTheme.caption)
+                  new Text('Sivaganga, Tamil Nadu', style: Theme.of(context).textTheme.caption)
                ]
              )
            )

--- a/dev/benchmarks/complex_layout/pubspec.yaml
+++ b/dev/benchmarks/complex_layout/pubspec.yaml
@@ -8,10 +8,7 @@ dependencies:
    sdk: flutter
  # Also examples/flutter_gallery/pubspec.yaml
-  flutter_gallery_assets:
+  flutter_gallery_assets: 0.1.3
-    git:
-      url: https://flutter.googlesource.com/gallery-assets
-      ref: 43590e625ab1b07f6a5809287ce16f7e61d9e165
  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/people/square/ali.png
-    - packages/flutter_gallery_assets/ali_connors_sml.png
+    - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
-    - packages/flutter_gallery_assets/top_10_australian_beaches.png
-# PUBSPEC CHECKSUM: 45b1
+# PUBSPEC CHECKSUM: 89f2
--- a/examples/flutter_gallery/lib/demo/animation/sections.dart
+++ b/examples/flutter_gallery/lib/demo/animation/sections.dart
@@ -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,

--- a/examples/flutter_gallery/lib/demo/contacts_demo.dart
+++ b/examples/flutter_gallery/lib/demo/contacts_demo.dart
@@ -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',
                      ],
                    ),
                  ],

--- a/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart
+++ b/examples/flutter_gallery/lib/demo/cupertino/cupertino_navigation_demo.dart
@@ -507,8 +507,8 @@ class Tab2Header extends StatelessWidget {
                            decoration: const BoxDecoration(
                              image: const DecorationImage(
                                image: const AssetImage(
-                                  'cupertino_navigation/person1.jpg',
+                                  '/people/square/trevor.png',
-                                  package: _kGalleryAssetsPackage
+                                  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',
+                                  '/people/square/sandra.png',
-                                  package: _kGalleryAssetsPackage
+                                  package: _kGalleryAssetsPackage,
                                ),
                              ),
                              shape: BoxShape.circle,

--- a/examples/flutter_gallery/lib/demo/images_demo.dart
+++ b/examples/flutter_gallery/lib/demo/images_demo.dart
@@ -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',
+            ),
          ),
        ),
      ]

--- a/examples/flutter_gallery/lib/demo/material/backdrop_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/backdrop_demo.dart
@@ -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',
+      '/products/belt.png',
-      'shrine/products/teapot.png',
+      '/products/earrings.png',
-      'shrine/products/radio.png',
+      '/products/backpack.png',
-      'shrine/products/lawn_chair.png',
+      '/products/hat.png',
-      'shrine/products/chair.png',
+      '/products/scarf.png',
+      '/products/sunnies.png',
    ],
  ),
  const Category(
-    title: 'Red',
+    title: 'Blue',
    assets: const <String>[
-      'shrine/products/popsicle.png',
+      '/products/backpack.png',
-      'shrine/products/brush.png',
+      '/products/cup.png',
-      'shrine/products/lipstick.png',
+      '/products/napkins.png',
-      'shrine/products/backpack.png',
+      '/products/top.png',
    ],
  ),
  const Category(
-    title: 'Sport',
+    title: 'Cold Weather',
    assets: const <String>[
-      'shrine/products/helmet.png',
+      '/products/jacket.png',
-      'shrine/products/beachball.png',
+      '/products/jumper.png',
-      'shrine/products/flippers.png',
+      '/products/scarf.png',
-      'shrine/products/surfboard.png',
+      '/products/sweater.png',
+      '/products/sweats.png',
    ],
  ),
  const Category(
-    title: 'Shoes',
+    title: 'Home',
    assets: const <String>[
-      'shrine/products/chucks.png',
+      '/products/cup.png',
-      'shrine/products/green-shoes.png',
+      '/products/napkins.png',
-      'shrine/products/heels.png',
+      '/products/planters.png',
-      'shrine/products/flippers.png',
+      '/products/table.png',
+      '/products/teaset.png',
    ],
  ),
  const Category(
-    title: 'Vision',
+    title: 'Tops',
    assets: const <String>[
-      'shrine/products/sunnies.png',
+      '/products/jumper.png',
-      'shrine/products/binoculars.png',
+      '/products/shirt.png',
-      'shrine/products/fish_bowl.png',
+      '/products/sweater.png',
+      '/products/top.png',
    ],
  ),
  const Category(
    title: 'Everything',
    assets: const <String>[
-      'shrine/products/radio.png',
+      '/products/backpack.png',
-      'shrine/products/sunnies.png',
+      '/products/belt.png',
-      'shrine/products/clock.png',
+      '/products/cup.png',
-      'shrine/products/popsicle.png',
+      '/products/dress.png',
-      'shrine/products/lawn_chair.png',
+      '/products/earrings.png',
-      'shrine/products/chair.png',
+      '/products/flatwear.png',
-      'shrine/products/heels.png',
+      '/products/hat.png',
-      'shrine/products/green-shoes.png',
+      '/products/jacket.png',
-      'shrine/products/teapot.png',
+      '/products/jumper.png',
-      'shrine/products/chucks.png',
+      '/products/napkins.png',
-      'shrine/products/brush.png',
+      '/products/planters.png',
-      'shrine/products/fish_bowl.png',
+      '/products/scarf.png',
-      'shrine/products/lipstick.png',
+      '/products/shirt.png',
-      'shrine/products/backpack.png',
+      '/products/sunnies.png',
-      'shrine/products/helmet.png',
+      '/products/sweater.png',
-      'shrine/products/beachball.png',
+      '/products/sweats.png',
-      'shrine/products/binoculars.png',
+      '/products/table.png',
-      'shrine/products/flippers.png',
+      '/products/teaset.png',
-      'shrine/products/surfboard.png',
+      '/products/top.png',
    ],
  ),
 ];

--- a/examples/flutter_gallery/lib/demo/material/cards_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/cards_demo.dart
@@ -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',
+      'Thanjavur',
-      'Whitsunday Island, Whitsunday Islands',
+      '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',
+      'Silk Spinners',
-      'Kangaroo Valley 2577',
+      'Chettinad',
-      'New South Wales',
+      'Sivaganga, Tamil Nadu',
    ],
  )
 ];

--- a/examples/flutter_gallery/lib/demo/material/chip_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/chip_demo.dart
@@ -45,11 +45,11 @@ const List<String> _defaultTools = const <String>[
 ];
 const Map<String, String> _avatars = const <String, String>{
-  'hammer': 'shrine/vendors/ali-connors.png',
+  'hammer': '/people/square/ali.png',
-  'chisel': 'shrine/vendors/sandra-adams.jpg',
+  'chisel': '/people/square/sandra.png',
-  'fryer': 'shrine/vendors/zach.jpg',
+  'fryer': '/people/square/trevor.png',
-  'fabricator': 'shrine/vendors/peter-carlsson.png',
+  'fabricator': '/people/square/stella.png',
-  'customer': 'shrine/vendors/16c477b.jpg',
+  'customer': '/people/square/peter.png',
 };
 final Map<String, Set<String>> _toolActions = <String, Set<String>>{

--- a/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/drawer_demo.dart
@@ -4,9 +4,9 @@
 import 'package:flutter/material.dart';
-const String _kAsset0 = 'shrine/vendors/zach.jpg';
+const String _kAsset0 = '/people/square/trevor.png';
-const String _kAsset1 = 'shrine/vendors/16c477b.jpg';
+const String _kAsset1 = '/people/square/stella.png';
-const String _kAsset2 = 'shrine/vendors/sandra-adams.jpg';
+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'),
+              accountName: const Text('Trevor Widget'),
-              accountEmail: const Text('zach.widget@example.com'),
+              accountEmail: const Text('trevor.widget@example.com'),
              currentAccountPicture: const CircleAvatar(
                backgroundImage: const AssetImage(
                  _kAsset0,

--- a/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/grid_list_demo.dart
@@ -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',
+      title: 'Chennai',
-      caption: 'Batad rice terraces',
+      caption: 'Flower Market',
    ),
    new Photo(
-      assetName: 'landscape_1.jpg',
+      assetName: '/places/india_tanjore_bronze_works.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Italy',
+      title: 'Tanjore',
-      caption: 'Ceresole Reale',
+      caption: 'Bronze Works',
    ),
    new Photo(
-      assetName: 'landscape_2.jpg',
+      assetName: '/places/india_tanjore_market_merchant.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Somewhere',
+      title: 'Tanjore',
-      caption: 'Beautiful mountains',
+      caption: 'Market',
    ),
    new Photo(
-      assetName: 'landscape_3.jpg',
+      assetName: '/places/india_tanjore_thanjavur_temple.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'A place',
+      title: 'Tanjore',
-      caption: 'Beautiful hills',
+      caption: 'Thanjavur Temple',
    ),
    new Photo(
-      assetName: 'landscape_4.jpg',
+      assetName: '/places/india_tanjore_thanjavur_temple_carvings.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'New Zealand',
+      title: 'Tanjore',
-      caption: 'View from the van',
+      caption: 'Thanjavur Temple',
    ),
    new Photo(
-      assetName: 'landscape_5.jpg',
+      assetName: '/places/india_pondicherry_salt_farm.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Autumn',
+      title: 'Pondicherry',
-      caption: 'The golden season',
+      caption: 'Salt Farm',
    ),
    new Photo(
-      assetName: 'landscape_6.jpg',
+      assetName: '/places/india_chennai_highway.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Germany',
+      title: 'Chennai',
-      caption: 'Englischer Garten',
+      caption: 'Scooters',
    ),
    new Photo(
-      assetName: 'landscape_7.jpg',
+      assetName: '/places/india_chettinad_silk_maker.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'A country',
+      title: 'Chettinad',
-      caption: 'Grass fields',
+      caption: 'Silk Maker',
    ),
    new Photo(
-      assetName: 'landscape_8.jpg',
+      assetName: '/places/india_chettinad_produce.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Mountain country',
+      title: 'Chettinad',
-      caption: 'River forest',
+      caption: 'Lunch Prep',
    ),
    new Photo(
-      assetName: 'landscape_9.jpg',
+      assetName: '/places/india_tanjore_market_technology.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Alpine place',
+      title: 'Tanjore',
-      caption: 'Green hills',
+      caption: 'Market',
    ),
    new Photo(
-      assetName: 'landscape_10.jpg',
+      assetName: '/places/india_pondicherry_beach.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Desert land',
+      title: 'Pondicherry',
-      caption: 'Blue skies',
+      caption: 'Beach',
    ),
    new Photo(
-      assetName: 'landscape_11.jpg',
+      assetName: '/places/india_pondicherry_fisherman.png',
      assetPackage: _kGalleryAssetsPackage,
-      title: 'Narnia',
+      title: 'Pondicherry',
-      caption: 'Rocks and rivers',
+      caption: 'Fisherman',
    ),
  ];

--- a/examples/flutter_gallery/lib/demo/material/search_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/search_demo.dart
@@ -100,11 +100,11 @@ class _SearchDemoState extends State<SearchDemo> {
        child: new Column(
          children: <Widget>[
            const UserAccountsDrawerHeader(
-              accountName: const Text('Zach Widget'),
+              accountName: const Text('Peter Widget'),
-              accountEmail: const Text('zach.widget@example.com'),
+              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',
                ),
              ),

--- a/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
+++ b/examples/flutter_gallery/lib/demo/material/tabs_demo.dart
@@ -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',
+      title: 'Flatwear',
-      imageAsset: 'shrine/products/radio.png',
+      imageAsset: '/products/flatwear.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Sunglasses',
+      title: 'Pine Table',
-      imageAsset: 'shrine/products/sunnies.png',
+      imageAsset: '/products/table.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Clock',
+      title: 'Blue Cup',
-      imageAsset: 'shrine/products/clock.png',
+      imageAsset: '/products/cup.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Red popsicle',
+      title: 'Tea Set',
-      imageAsset: 'shrine/products/popsicle.png',
+      imageAsset: '/products/teaset.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Folding Chair',
+      title: 'Desk Set',
-      imageAsset: 'shrine/products/lawn_chair.png',
+      imageAsset: '/products/deskset.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Green comfort chair',
+      title: 'Blue Linen Napkins',
-      imageAsset: 'shrine/products/chair.png',
+      imageAsset: '/products/napkins.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Old Binoculars',
+      title: 'Planters',
-      imageAsset: 'shrine/products/binoculars.png',
+      imageAsset: '/products/planters.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Teapot',
+      title: 'Kitchen Quattro',
-      imageAsset: 'shrine/products/teapot.png',
+      imageAsset: '/products/kitchen_quattro.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Blue suede shoes',
+      title: 'Platter',
-      imageAsset: 'shrine/products/chucks.png',
+      imageAsset: '/products/platter.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
  ],
-  new _Page(label: 'RIGHT'): <_CardData>[
+  new _Page(label: 'APPAREL'): <_CardData>[
    const _CardData(
-      title: 'Beachball',
+      title: 'Cloud-White Dress',
-      imageAsset: 'shrine/products/beachball.png',
+      imageAsset: '/products/dress.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Dipped Brush',
+      title: 'Ginger Scarf',
-      imageAsset: 'shrine/products/brush.png',
+      imageAsset: '/products/scarf.png',
      imageAssetPackage: _kGalleryAssetsPackage,
    ),
    const _CardData(
-      title: 'Perfect Goldfish Bowl',
+      title: 'Blush Sweats',
-      imageAsset: 'shrine/products/fish_bowl.png',
+      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}')),

--- a/examples/flutter_gallery/lib/demo/pesto_demo.dart
+++ b/examples/flutter_gallery/lib/demo/pesto_demo.dart
@@ -15,7 +15,7 @@ class PestoDemo extends StatelessWidget {
 }
-const String _kSmallLogoImage = 'pesto/logo_small.png';
+const String _kSmallLogoImage = '/logos/pesto/logo_small.png';
 const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
 const double _kAppBarHeight = 128.0;
 const double _kFabHalfSize = 28.0; // TODO(mpcomplete): needs to adapt to screen size
@@ -571,10 +571,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Pesto Bruschetta',
    author: 'Peter Carlsson',
-    ingredientsImagePath: 'pesto/quick.png',
+    ingredientsImagePath: '/food/icons/quick.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Bask in greens this season by trying this delightful take on traditional bruschetta. Top with a dollop of homemade pesto, and season with freshly ground sea salt and pepper.',
-    imagePath: 'pesto/image1.jpg',
+    imagePath: '/food/image1.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '6 pieces', description: 'Mozzarella cheese'),
@@ -591,10 +591,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Rustic purple mash',
    author: 'Trevor Hansen',
-    ingredientsImagePath: 'pesto/veggie.png',
+    ingredientsImagePath: '/food/icons/veggie.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Abundant in color, and healthy, delicious goodness, cooking with these South American purple potatoes is a treat. Boil, mash, bake, or roast them. For taste cook with chicken stock, and a dash of extra virgin olive oil.',
-    imagePath: 'pesto/image2.jpg',
+    imagePath: '/food/image2.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '2 lbs', description: 'Purple potatoes, skin on'),
@@ -611,10 +611,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Bacon Sprouts',
    author: 'Ali Connors',
-    ingredientsImagePath: 'pesto/main.png',
+    ingredientsImagePath: '/food/icons/main.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'This beautiful sprouts recipe is the most glorious side dish on a cold winter’s night. Construct it with bacon or fake-on, but always make sure the sprouts are deliciously seasoned and appropriately sautéed.',
-    imagePath: 'pesto/image3.jpg',
+    imagePath: '/food/image3.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '2 lbs', description: 'Brussel sprouts'),
@@ -632,10 +632,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Oven Sausage',
    author: 'Sandra Adams',
-    ingredientsImagePath: 'pesto/meat.png',
+    ingredientsImagePath: '/food/icons/meat.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Robust cuts of portuguese sausage add layers of flavour. Bake or fry until sausages are slightly browned and with a crispy skin. Serve warm and with cuts of pineapple for a delightful mix of sweet and savory flavour. This is the perfect dish after a swim in the sea.',
-    imagePath: 'pesto/image4.jpg',
+    imagePath: '/food/image4.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '1 1/2 lbs', description: 'Linguisa'),
@@ -649,10 +649,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Chicken tostadas',
    author: 'Peter Carlsson',
-    ingredientsImagePath: 'pesto/spicy.png',
+    ingredientsImagePath: '/food/icons/spicy.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Crisp flavours and a bit of spice make this roasted chicken dish an easy go to when cooking for large groups. Top with Baja sauce for an extra kick of spice.',
-    imagePath: 'pesto/image5.jpg',
+    imagePath: '/food/image5.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '4-6', description: 'Small corn tortillas'),
@@ -668,10 +668,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Coconut rice',
    author: 'Ali Connors',
-    ingredientsImagePath: 'pesto/healthy.png',
+    ingredientsImagePath: '/food/icons/healthy.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'This dish is a terrific pairing to almost any main. Bonus- it’s quick, easy to make, and turns even the simplest of dishes into a delicacy. Sweet coconut cream will leave your mouth watering, with yummy caramelized flecks of rice adding an extra bit of taste. Fluff with fork before serving for best results.',
-    imagePath: 'pesto/image6.jpg',
+    imagePath: '/food/image6.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '2 cups', description: 'Jasmine rice'),
@@ -688,10 +688,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Gin basil cocktail',
    author: 'Trevor Hansen',
-    ingredientsImagePath: 'pesto/quick.png',
+    ingredientsImagePath: '/food/icons/quick.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'This mellow and herb filled blending of simple ingredients is easy enough to mix that a novice host will feel like a seasoned bartender. Top with crushed basil, shake or stir.',
-    imagePath: 'pesto/image7.jpg',
+    imagePath: '/food/image7.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '3 parts', description: 'Gin'),
@@ -707,10 +707,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Seared sesame fish',
    author: 'Ali Connors',
-    ingredientsImagePath: 'pesto/fish.png',
+    ingredientsImagePath: '/food/icons/fish.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Cuts of fish like this are perfect for simple searing with bright flavours. Try Sesame seeds on these fillets for crusty skin filled with crunch. For added flavour try dipping in a homemade ponzu sauce - delicious.',
-    imagePath: 'pesto/image8.jpg',
+    imagePath: '/food/image8.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '1 ½ lbs', description: 'Thin fish fillets'),
@@ -728,10 +728,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Herb artichoke',
    author: 'Sandra Adams',
-    ingredientsImagePath: 'pesto/healthy.png',
+    ingredientsImagePath: '/food/icons/healthy.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'This tasty and healthy veggie is a favorite. Artichoke like this can be paired with a hearty main or works well as a small meal with some white wine on the side. Simple and fresh, all foodies love tasty artichoke.',
-    imagePath: 'pesto/image9.jpg',
+    imagePath: '/food/image9.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '1', description: 'Small garlic clove, peeled'),
@@ -749,10 +749,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Pesto bruschetta',
    author: 'Trevor Hansen',
-    ingredientsImagePath: 'pesto/veggie.png',
+    ingredientsImagePath: '/food/icons/veggie.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Life is good when you add amazingly warm bread, fresh pesto sauce, and roasted tomatoes to the table. This a classic starter to break out in a pinch. It’s easy to make and extra tasty.',
-    imagePath: 'pesto/image10.jpg',
+    imagePath: '/food/image10.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '1 loaf', description: 'Sliced French bread'),
@@ -772,10 +772,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Garlic bok choy',
    author: 'Sandra Adams',
-    ingredientsImagePath: 'pesto/spicy.png',
+    ingredientsImagePath: '/food/icons/spicy.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Great stir-fried bok choy starts at the market. For me, nothing says tasty like garlic and baby bok choy. Choose fresh, crisp greens. Once home, wash, chop, and then ready for the wok. No family style spread is complete without these greens.',
-    imagePath: 'pesto/image11.jpg',
+    imagePath: '/food/image11.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '1/2 cup', description: 'Chick broth'),
@@ -792,10 +792,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Fresh Fettuccine',
    author: 'Ali Connors',
-    ingredientsImagePath: 'pesto/main.png',
+    ingredientsImagePath: '/food/icons/main.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'Satisfy a need for rich, creamy homemade goodness with this classic. Creamy fettuccine alfredo will have you hitting the gym the next day, but it’s so good it’s worth it.',
-    imagePath: 'pesto/image12.jpg',
+    imagePath: '/food/image12.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '¾ cup', description: 'Milk'),
@@ -813,10 +813,10 @@ const List<Recipe> kPestoRecipes = const <Recipe>[
  const Recipe(
    name: 'Sicilian-Style sardines',
    author: 'Peter Carlsson',
-    ingredientsImagePath: 'pesto/quick.png',
+    ingredientsImagePath: '/food/icons/quick.png',
    ingredientsImagePackage: _kGalleryAssetsPackage,
    description: 'My go to way to eat sardines is with a splash of tangy lemon and fresh fennel drizzled on top. The best thing about this dish is the flavour it packs. Prepaid with wild caught sardines or canned.',
-    imagePath: 'pesto/image13.jpg',
+    imagePath: '/food/image13.jpg',
    imagePackage: _kGalleryAssetsPackage,
    ingredients: const<RecipeIngredient>[
      const RecipeIngredient(amount: '1/4 cup', description: 'Dry white wine'),

--- a/examples/flutter_gallery/lib/demo/shrine/shrine_data.dart
+++ b/examples/flutter_gallery/lib/demo/shrine/shrine_data.dart
@@ -8,7 +8,7 @@ const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
 const Vendor _ali = const Vendor(
  name: 'Ali’s shop',
-  avatarAsset: 'shrine/vendors/ali-connors.png',
+  avatarAsset: '/people/square/ali.png',
  avatarAssetPackage: _kGalleryAssetsPackage,
  description:
    'Ali Connor’s makes custom goods for folks of all shapes and sizes '
@@ -16,28 +16,9 @@ const Vendor _ali = const Vendor(
    'Custom orders are available upon request if you need something extra special.'
 );
-const Vendor _sandra = const Vendor(
-  name: 'Sandra’s shop',
-  avatarAsset: 'shrine/vendors/sandra-adams.jpg',
-  avatarAssetPackage: _kGalleryAssetsPackage,
-  description:
-    'Sandra specializes in furniture, beauty and travel products with a classic vibe. '
-    'Custom orders are available if you’re looking for a certain color or material.'
-);
-const Vendor _trevor = const Vendor(
-  name: 'Trevor’s shop',
-  avatarAsset: 'shrine/vendors/zach.jpg',
-  avatarAssetPackage: _kGalleryAssetsPackage,
-  description:
-    'Trevor makes great stuff for awesome people like you. Super cool and extra '
-    'awesome all of his shop’s goods are handmade with love. Custom orders are '
-    'available upon request if you need something extra special.'
-);
 const Vendor _peter = const Vendor(
  name: 'Peter’s shop',
-  avatarAsset: 'shrine/vendors/peter-carlsson.png',
+  avatarAsset: '/people/square/peter.png',
  avatarAssetPackage: _kGalleryAssetsPackage,
  description:
    'Peter makes great stuff for awesome people like you. Super cool and extra '
@@ -45,9 +26,18 @@ const Vendor _peter = const Vendor(
    'available upon request if you need something extra special.'
 );
+const Vendor _sandra = const Vendor(
+    name: 'Sandra’s shop',
+    avatarAsset: '/people/square/sandra.png',
+    avatarAssetPackage: _kGalleryAssetsPackage,
+    description:
+    'Sandra specializes in furniture, beauty and travel products with a classic vibe. '
+        'Custom orders are available if you’re looking for a certain color or material.'
+);
 const Vendor _stella = const Vendor(
  name: 'Stella’s shop',
-  avatarAsset: 'shrine/vendors/16c477b.jpg',
+  avatarAsset: '/people/square/stella.png',
  avatarAssetPackage: _kGalleryAssetsPackage,
  description:
    'Stella sells awesome stuff at lovely prices. made by hand and sometimes by '
@@ -55,22 +45,31 @@ const Vendor _stella = const Vendor(
    'if you need something extra special.'
 );
+const Vendor _trevor = const Vendor(
+    name: 'Trevor’s shop',
+    avatarAsset: '/people/square/trevor.png',
+    avatarAssetPackage: _kGalleryAssetsPackage,
+    description:
+    'Trevor makes great stuff for awesome people like you. Super cool and extra '
+        'awesome all of his shop’s goods are handmade with love. Custom orders are '
+        'available upon request if you need something extra special.'
+);
 const List<Product> _allProducts = const <Product> [
  const Product(
-    name: 'Vintage Bluetooth Radio',
+    name: 'Vintage Brown Belt',
-    imageAsset: 'shrine/products/radio.png',
+    imageAsset: '/products/belt.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>['furniture', 'latest'],
+    categories: const <String>['fashion', 'latest'],
    price: 300.00,
    vendor: _sandra,
    description:
      'Isn’t it cool when things look old, but they\'re not. Looks Old But Not makes '
-      'awesome vintage goods that are super smart. This ol’ radio just got an upgrade. '
+      'awesome vintage goods that are super smart. This ol’ belt just got an upgrade. '
-      'Connect to it with an app and jam out to some top forty.'
  ),
  const Product(
    name: 'Sunglasses',
-    imageAsset: 'shrine/products/sunnies.png',
+    imageAsset: '/products/sunnies.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['travel', 'fashion', 'beauty'],
    price: 20.00,
@@ -82,32 +81,30 @@ const List<Product> _allProducts = const <Product> [
      'look cool, wear them.'
  ),
  const Product(
-    name: 'Clock',
+    name: 'Flatwear',
-    imageAsset: 'shrine/products/clock.png',
+    imageAsset: '/products/flatwear.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['furniture'],
    price: 30.00,
    vendor: _trevor,
    description:
-      'Timekeeper Co makes clocks that tell time precisely. Clock is '
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
-      'very simple to use, set the time using your phone, hang it, and viola! '
-      'You’ll never be late again.'
  ),
  const Product(
-    name: 'Red popsicle',
+    name: 'Salmon Sweater',
-    imageAsset: 'shrine/products/popsicle.png',
+    imageAsset: '/products/sweater.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>['food', 'fashion'],
+    categories: const <String>['fashion'],
    price: 300.00,
    vendor: _stella,
    description:
-      'Looks can be deceiving. This red popsicle comes in a wide variety of '
+      'Looks can be deceiving. This sweater comes in a wide variety of '
-      'flavors, including strawberry, that burst as soon as they hit your mouth. '
+      'flavors, including salmon, that pop as soon as they hit your eyes. '
-      'Red popsicles melt slowly, so savor the flavor.'
+      'Sweaters heat quickly, so savor the warmth.'
  ),
  const Product(
-    name: 'Folding Chair',
+    name: 'Pine Table',
-    imageAsset: 'shrine/products/lawn_chair.png',
+    imageAsset: '/products/table.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['furniture'],
    price: 63.00,
@@ -116,18 +113,18 @@ const List<Product> _allProducts = const <Product> [
      'Leave the tunnel and the rain is fallin amazing things happen when you wait'
  ),
  const Product(
-    name: 'Green comfort chair',
+    name: 'Green Comfort Jacket',
-    imageAsset: 'shrine/products/chair.png',
+    imageAsset: '/products/jacket.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>['furniture'],
+    categories: const <String>['fashion'],
    price: 36.00,
    vendor: _ali,
    description:
      'Leave the tunnel and the rain is fallin amazing things happen when you wait'
  ),
  const Product(
-    name: 'Better wearing heels',
+    name: 'Chambray Top',
-    imageAsset: 'shrine/products/heels.png',
+    imageAsset: '/products/top.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['fashion'],
    price: 125.00,
@@ -136,82 +133,82 @@ const List<Product> _allProducts = const <Product> [
      'Leave the tunnel and the rain is fallin amazing things happen when you wait'
  ),
  const Product(
-    name: 'Green Slip-ons',
+    name: 'Blue Cup',
-    imageAsset: 'shrine/products/green-shoes.png',
+    imageAsset: '/products/cup.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>['travel', 'fashion'],
+    categories: const <String>['travel', 'furniture'],
    price: 75.00,
    vendor: _sandra,
    description:
-      'Feetsy has been making extraordinary slip-ons for decades. With each pair '
+      'Drinksy has been making extraordinary mugs for decades. With each '
-      'of shoes purchased Feetsy donates a pair to those in need. Buy yourself a pair, '
+      'cup purchased Drinksy donates a cup to those in need. Buy yourself a mug, '
-      'buy someone else a pair. Very Comfortable.'
+      'buy someone else a mug.'
  ),
  const Product(
-    name: 'Teapot',
+    name: 'Tea Set',
-    imageAsset: 'shrine/products/teapot.png',
+    imageAsset: '/products/teaset.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['furniture', 'fashion'],
    price: 70.00,
    vendor: _trevor,
-    featureTitle: 'Beautiful little teapot',
+    featureTitle: 'Beautiful glass teapot',
    featureDescription:
-      'Leave the tunnel and the rain is fallin amazing things happen when you wait',
+      'Teapot holds extremely hot liquids and pours them from the spout.',
    description:
-      'Impress your guests with Teapot by Kitchen Stuff. Teapot holds extremely '
+      'Impress your guests with Tea Set by Kitchen Stuff. Teapot holds extremely '
-      'hot liquids and pours them from the spout. Use the handle, shown on the left, '
+      'hot liquids and pours them from the spout. Use the handle, shown on the right, '
      'so your fingers don’t get burnt while pouring.'
  ),
  const Product(
-    name: 'Blue suede shoes',
+    name: 'Blue linen napkins',
-    imageAsset: 'shrine/products/chucks.png',
+    imageAsset: '/products/napkins.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>['travel', 'fashion'],
+    categories: const <String>['furniture', 'fashion'],
    price: 89.00,
    vendor: _trevor,
    description:
-      'Who needs pants when you have shoes! Blue suede shoes were meant to go '
+      'Blue linen napkins were meant to go with friends, so you may want to pick '
-      'dancing in, so you may want to pick up a few of these. These things are stylish.'
+      'up a bunch of these. These things are absorbant.'
  ),
  const Product(
-    name: 'Dipped Brush',
+    name: 'Dipped Earrings',
-    imageAsset: 'shrine/products/brush.png',
+    imageAsset: '/products/earrings.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['fashion', 'beauty'],
    price: 25.00,
    vendor: _stella,
    description:
-      'WeDipIt does it again. This handle dipped 4 inch brush is a perfect for '
+      'WeDipIt does it again. These hand-dipped 4 inch earrings are perfect for '
-      'painting 4 inch lines, or coloring in big areas with paint. Just be sure you '
+      'the office or the beach. Just be sure you don’t drop it in a bucket of '
-      'don’t drop it in a bucket of red paint, then it won’t look dipped anymore.'
+      'red paint, then they won’t look dipped anymore.'
  ),
  const Product(
-    name: 'Perfect Goldfish Bowl',
+    name: 'Perfect Planters',
-    imageAsset: 'shrine/products/fish_bowl.png',
+    imageAsset: '/products/planters.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['latest', 'furniture'],
    price: 30.00,
    vendor: _ali,
    description:
-      'The Perfect Bowl Co makes the best bowls for just about anything you can '
+      'The Perfect Planter Co makes the best vessels for just about anything you '
-      'think of. This Perfect Goldfish Bowl holds water and fish perfectly. Looks '
+      'can pot. This set of Perfect Planters holds succulents and cuttings perfectly. '
-      'great in living rooms. Keep out of reach from cats.'
+      'Looks great in any room. Keep out of reach from cats.'
  ),
  const Product(
-    name: 'Red Lipstick Set',
+    name: 'Cloud-White Dress',
-    imageAsset: 'shrine/products/lipstick.png',
+    imageAsset: '/products/dress.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>['fashion', 'beauty'],
+    categories: const <String>['fashion'],
    price: 54.00,
    vendor: _sandra,
    description:
-      'Trying to find the perfect shade to match your mood? Try no longer. Red '
+      'Trying to find the perfect outift to match your mood? Try no longer. '
-      'Lipstick Set by StickLips has you covered for those nights when you need '
+      'This Cloud-White Dress has you covered for those nights when you need '
      'to get out, or even if you’re just headed to work.'
  ),
  const Product(
    name: 'Backpack',
-    imageAsset: 'shrine/products/backpack.png',
+    imageAsset: '/products/backpack.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['travel', 'fashion'],
    price: 25.00,
@@ -222,65 +219,56 @@ const List<Product> _allProducts = const <Product> [
      'sunglasses, gym clothes, shoes, gloves, two kittens, and even lunch!'
  ),
  const Product(
-    name: 'Half Shield Helmet',
+    name: 'Charcoal Straw Hat',
-    imageAsset: 'shrine/products/helmet.png',
+    imageAsset: '/products/hat.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['travel', 'fashion', 'latest'],
    price: 25.00,
    vendor: _ali,
    description:
-      'Half Shield is the right helmet for those warm summer days on the road. '
+      'This is the  helmet for those warm summer days on the road. '
-      'Dot approved, these helmets have been rigorously tested. Keep that noggin '
+      'Jetset approved, these hats have been rigorously tested. Keep that face '
-      'protected.'
+      'protected from the sun.'
  ),
  const Product(
-    name: 'Beachball',
+    name: 'Ginger Scarf',
-    imageAsset: 'shrine/products/beachball.png',
+    imageAsset: '/products/scarf.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>['latest'],
+    categories: const <String>['latest', 'fashion'],
    price: 17.00,
    vendor: _peter,
    description:
-      'Are you at a baseball game and feeling bored? At a pool party and looking '
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
-      'for a laugh? Do you need something to take your anger out on? Beachball, '
-      'by inflatable fun, is the perfect outlet.'
  ),
  const Product(
-    name: 'Old Binoculars',
+    name: 'Blush Sweats',
-    imageAsset: 'shrine/products/binoculars.png',
+    imageAsset: '/products/sweats.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['travel', 'fashion', 'latest'],
    price: 25.00,
    vendor: _stella,
    description:
-      'These Binoculars by See Through are amazing and can make things that are '
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
-      'really far away seem like they’re right in front of you. Bring them to the '
-      'beach. Now you can buy the cheap seats at the big game and feel like you’re '
-      'right in the action.'
  ),
  const Product(
-    name: 'Lime Flippers',
+    name: 'Mint Jumper',
-    imageAsset: 'shrine/products/flippers.png',
+    imageAsset: '/products/jumper.png',
    imageAssetPackage: _kGalleryAssetsPackage,
    categories: const <String>['travel', 'fashion', 'beauty'],
    price: 25.00,
    vendor: _peter,
    description:
-      'Flippers are a nice tool to have when you’re being chased by an oversized '
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
-      'sea turtle. Never get caught again with these fast water shoes. You’re like '
-      'a fish, but more graceful.'
  ),
  const Product(
-    name: 'Surfboard',
+    name: 'Ochre Shirt',
-    imageAsset: 'shrine/products/surfboard.png',
+    imageAsset: '/products/shirt.png',
    imageAssetPackage: _kGalleryAssetsPackage,
-    categories: const <String>[ 'travel', 'latest'],
+    categories: const <String>[ 'fashion', 'latest'],
    price: 120.00,
    vendor: _stella,
    description:
-      'Who says you can’t walk on water? With Surfboard, by Surfboard Supply, '
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
-      'you can fly on water. This beast is fast and handles like a Porsche. '
-      'Hang Ten Bro!'
  )
 ];

--- a/examples/flutter_gallery/lib/demo/video_demo.dart
+++ b/examples/flutter_gallery/lib/demo/video_demo.dart
@@ -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(

--- a/examples/flutter_gallery/lib/gallery/home.dart
+++ b/examples/flutter_gallery/lib/gallery/home.dart
@@ -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,
            ),
          ),

--- a/examples/flutter_gallery/pubspec.yaml
+++ b/examples/flutter_gallery/pubspec.yaml
@@ -12,10 +12,7 @@ dependencies:
  video_player: 0.5.1
  # Also update dev/benchmarks/complex_layout/pubspec.yaml
-  flutter_gallery_assets:
+  flutter_gallery_assets: 0.1.3
-    git:
-      url: https://flutter.googlesource.com/gallery-assets
-      ref: 43590e625ab1b07f6a5809287ce16f7e61d9e165
  charcode: 1.1.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
  meta: 1.1.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -83,130 +80,121 @@ flutter:
  uses-material-design: true
  assets:
    - lib/gallery/example_code.dart
-    - packages/flutter_gallery_assets/white_logo/logo.png
+    - packages/flutter_gallery_assets/people/ali_landscape.png
+    - packages/flutter_gallery_assets/logos/flutter_white/logo.png
+    - packages/flutter_gallery_assets/videos/bee.mp4
    - packages/flutter_gallery_assets/videos/butterfly.mp4
-    - packages/flutter_gallery_assets/animated_flutter_lgtm.gif
+    - packages/flutter_gallery_assets/animated_images/animated_flutter_lgtm.gif
-    - packages/flutter_gallery_assets/animated_flutter_stickers.webp
+    - packages/flutter_gallery_assets/animated_images/animated_flutter_stickers.webp
-    - packages/flutter_gallery_assets/appbar_background.jpg
+    - packages/flutter_gallery_assets/food/image10.jpg
-    - packages/flutter_gallery_assets/appbar/appbar_background_layer0.png
+    - packages/flutter_gallery_assets/food/image11.jpg
-    - packages/flutter_gallery_assets/appbar/appbar_background_layer1.png
+    - packages/flutter_gallery_assets/food/image12.jpg
-    - packages/flutter_gallery_assets/appbar/appbar_background_layer2.png
+    - packages/flutter_gallery_assets/food/image13.jpg
-    - packages/flutter_gallery_assets/appbar/appbar_background_layer3.png
+    - packages/flutter_gallery_assets/food/image1.jpg
-    - packages/flutter_gallery_assets/appbar/appbar_background_layer4.png
+    - packages/flutter_gallery_assets/food/image2.jpg
-    - packages/flutter_gallery_assets/appbar/appbar_background_layer5.png
+    - packages/flutter_gallery_assets/food/image3.jpg
-    - packages/flutter_gallery_assets/pesto/avatar.jpg
+    - packages/flutter_gallery_assets/food/image4.jpg
-    - packages/flutter_gallery_assets/pesto/image10.jpg
+    - packages/flutter_gallery_assets/food/image5.jpg
-    - packages/flutter_gallery_assets/pesto/image11.jpg
+    - packages/flutter_gallery_assets/food/image6.jpg
-    - packages/flutter_gallery_assets/pesto/image12.jpg
+    - packages/flutter_gallery_assets/food/image7.jpg
-    - packages/flutter_gallery_assets/pesto/image13.jpg
+    - packages/flutter_gallery_assets/food/image8.jpg
-    - packages/flutter_gallery_assets/pesto/image1.jpg
+    - packages/flutter_gallery_assets/food/image9.jpg
-    - packages/flutter_gallery_assets/pesto/image2.jpg
+    - packages/flutter_gallery_assets/food/icons/fish.png
-    - packages/flutter_gallery_assets/pesto/image3.jpg
+    - packages/flutter_gallery_assets/food/icons/healthy.png
-    - packages/flutter_gallery_assets/pesto/image4.jpg
+    - packages/flutter_gallery_assets/food/icons/main.png
-    - packages/flutter_gallery_assets/pesto/image5.jpg
+    - packages/flutter_gallery_assets/food/icons/meat.png
-    - packages/flutter_gallery_assets/pesto/image6.jpg
+    - packages/flutter_gallery_assets/food/icons/quick.png
-    - packages/flutter_gallery_assets/pesto/image7.jpg
+    - packages/flutter_gallery_assets/food/icons/spicy.png
-    - packages/flutter_gallery_assets/pesto/image8.jpg
+    - packages/flutter_gallery_assets/food/icons/veggie.png
-    - packages/flutter_gallery_assets/pesto/image9.jpg
+    - packages/flutter_gallery_assets/logos/pesto/logo_small.png
-    - packages/flutter_gallery_assets/pesto/logo_small.png
+    - packages/flutter_gallery_assets/places/india_chennai_flower_market.png
-    - packages/flutter_gallery_assets/pesto/logo_medium.png
+    - packages/flutter_gallery_assets/places/india_thanjavur_market.png
-    - packages/flutter_gallery_assets/pesto/fish.png
+    - packages/flutter_gallery_assets/places/india_tanjore_bronze_works.png
-    - packages/flutter_gallery_assets/pesto/healthy.png
+    - packages/flutter_gallery_assets/places/india_tanjore_market_merchant.png
-    - packages/flutter_gallery_assets/pesto/main.png
+    - packages/flutter_gallery_assets/places/india_tanjore_thanjavur_temple.png
-    - packages/flutter_gallery_assets/pesto/meat.png
+    - packages/flutter_gallery_assets/places/india_pondicherry_salt_farm.png
-    - packages/flutter_gallery_assets/pesto/quick.png
+    - packages/flutter_gallery_assets/places/india_chennai_highway.png
-    - packages/flutter_gallery_assets/pesto/spicy.png
+    - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
-    - packages/flutter_gallery_assets/pesto/veggie.png
+    - packages/flutter_gallery_assets/places/india_tanjore_thanjavur_temple_carvings.png
-    - packages/flutter_gallery_assets/about_logo.png
+    - packages/flutter_gallery_assets/places/india_chettinad_produce.png
-    - packages/flutter_gallery_assets/ali_connors.jpg
+    - packages/flutter_gallery_assets/places/india_tanjore_market_technology.png
-    - packages/flutter_gallery_assets/drawer_logo.png
+    - packages/flutter_gallery_assets/places/india_pondicherry_beach.png
-    - packages/flutter_gallery_assets/kangaroo_valley_safari.jpg
+    - packages/flutter_gallery_assets/places/india_pondicherry_fisherman.png
-    - packages/flutter_gallery_assets/top_10_australian_beaches.jpg
+    - packages/flutter_gallery_assets/products/backpack.png
-    - packages/flutter_gallery_assets/landscape_0.jpg
+    - packages/flutter_gallery_assets/products/belt.png
-    - packages/flutter_gallery_assets/landscape_1.jpg
+    - packages/flutter_gallery_assets/products/cup.png
-    - packages/flutter_gallery_assets/landscape_2.jpg
+    - packages/flutter_gallery_assets/products/deskset.png
-    - packages/flutter_gallery_assets/landscape_3.jpg
+    - packages/flutter_gallery_assets/products/dress.png
-    - packages/flutter_gallery_assets/landscape_4.jpg
+    - packages/flutter_gallery_assets/products/earrings.png
-    - packages/flutter_gallery_assets/landscape_5.jpg
+    - packages/flutter_gallery_assets/products/flatwear.png
-    - packages/flutter_gallery_assets/landscape_6.jpg
+    - packages/flutter_gallery_assets/products/hat.png
-    - packages/flutter_gallery_assets/landscape_7.jpg
+    - packages/flutter_gallery_assets/products/jacket.png
-    - packages/flutter_gallery_assets/landscape_8.jpg
+    - packages/flutter_gallery_assets/products/jumper.png
-    - packages/flutter_gallery_assets/landscape_9.jpg
+    - packages/flutter_gallery_assets/products/kitchen_quattro.png
-    - packages/flutter_gallery_assets/landscape_10.jpg
+    - packages/flutter_gallery_assets/products/napkins.png
-    - packages/flutter_gallery_assets/landscape_11.jpg
+    - packages/flutter_gallery_assets/products/planters.png
-    - packages/flutter_gallery_assets/shrine/products/backpack.png
+    - packages/flutter_gallery_assets/products/platter.png
-    - packages/flutter_gallery_assets/shrine/products/beachball.png
+    - packages/flutter_gallery_assets/products/scarf.png
-    - packages/flutter_gallery_assets/shrine/products/binoculars.png
+    - packages/flutter_gallery_assets/products/shirt.png
-    - packages/flutter_gallery_assets/shrine/products/brush.png
+    - packages/flutter_gallery_assets/products/sunnies.png
-    - packages/flutter_gallery_assets/shrine/products/chair.png
+    - packages/flutter_gallery_assets/products/sweater.png
-    - packages/flutter_gallery_assets/shrine/products/chucks.png
+    - packages/flutter_gallery_assets/products/sweats.png
-    - packages/flutter_gallery_assets/shrine/products/clock.png
+    - packages/flutter_gallery_assets/products/table.png
-    - packages/flutter_gallery_assets/shrine/products/fish_bowl.png
+    - packages/flutter_gallery_assets/products/teaset.png
-    - packages/flutter_gallery_assets/shrine/products/flippers.png
+    - packages/flutter_gallery_assets/products/top.png
-    - packages/flutter_gallery_assets/shrine/products/green-shoes.png
+    - packages/flutter_gallery_assets/people/ali.png
-    - packages/flutter_gallery_assets/shrine/products/heels.png
+    - packages/flutter_gallery_assets/people/square/ali.png
-    - packages/flutter_gallery_assets/shrine/products/helmet.png
+    - packages/flutter_gallery_assets/people/square/peter.png
-    - packages/flutter_gallery_assets/shrine/products/lawn_chair.png
+    - packages/flutter_gallery_assets/people/square/sandra.png
-    - packages/flutter_gallery_assets/shrine/products/lipstick.png
+    - packages/flutter_gallery_assets/people/square/stella.png
-    - packages/flutter_gallery_assets/shrine/products/popsicle.png
+    - packages/flutter_gallery_assets/people/square/trevor.png
-    - packages/flutter_gallery_assets/shrine/products/radio.png
-    - packages/flutter_gallery_assets/shrine/products/sunnies.png
-    - packages/flutter_gallery_assets/shrine/products/surfboard.png
-    - packages/flutter_gallery_assets/shrine/products/teapot.png
-    - packages/flutter_gallery_assets/shrine/vendors/16c477b.jpg
-    - packages/flutter_gallery_assets/shrine/vendors/ali-connors.png
-    - packages/flutter_gallery_assets/shrine/vendors/peter-carlsson.png
-    - packages/flutter_gallery_assets/shrine/vendors/sandra-adams.jpg
-    - packages/flutter_gallery_assets/shrine/vendors/zach.jpg
-    - packages/flutter_gallery_assets/cupertino_navigation/person1.jpg
-    - packages/flutter_gallery_assets/cupertino_navigation/person2.jpg
  fonts:
    - family: Raleway
      fonts:
-        - asset: packages/flutter_gallery_assets/pesto/fonts/Raleway-Regular.ttf
+        - asset: packages/flutter_gallery_assets/fonts/raleway/Raleway-Regular.ttf
-        - asset: packages/flutter_gallery_assets/pesto/fonts/Raleway-Medium.ttf
+        - asset: packages/flutter_gallery_assets/fonts/raleway/Raleway-Medium.ttf
          weight: 500
-        - asset: packages/flutter_gallery_assets/pesto/fonts/Raleway-SemiBold.ttf
+        - asset: packages/flutter_gallery_assets/fonts/raleway/Raleway-SemiBold.ttf
          weight: 600
    - family: AbrilFatface
      fonts:
-        - asset: packages/flutter_gallery_assets/shrine/fonts/abrilfatface/AbrilFatface-Regular.ttf
+        - asset: packages/flutter_gallery_assets/fonts/abrilfatface/AbrilFatface-Regular.ttf
    - family: GalleryIcons
      fonts:
-        - asset: packages/flutter_gallery_assets/fonts/GalleryIcons.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/gallery_icons/GalleryIcons.ttf
    - family: GoogleSans
      fonts:
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSans-BoldItalic.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSans-BoldItalic.ttf
          weight: 700
          style: italic
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSans-Bold.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSans-Bold.ttf
          weight: 700
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSans-Italic.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSans-Italic.ttf
          weight: 400
          style: italic
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSans-MediumItalic.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSans-MediumItalic.ttf
          weight: 500
          style: italic
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSans-Medium.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSans-Medium.ttf
          weight: 500
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSans-Regular.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSans-Regular.ttf
          weight: 400
    - family: GoogleSansDisplay
      fonts:
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSansDisplay-BoldItalic.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-BoldItalic.ttf
          weight: 700
          style: italic
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSansDisplay-Bold.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Bold.ttf
          weight: 700
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSansDisplay-Italic.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Italic.ttf
          weight: 400
          style: italic
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSansDisplay-MediumItalic.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-MediumItalic.ttf
          style: italic
          weight: 500
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSansDisplay-Medium.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Medium.ttf
          weight: 500
-        - asset: packages/flutter_gallery_assets/fonts/GoogleSansDisplay-Regular.ttf
+        - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Regular.ttf
          weight: 400
-# PUBSPEC CHECKSUM: b217
+# PUBSPEC CHECKSUM: e358