Update Flutter Gallery to use new asset api for package assets (flutter#12254)

Author: szakarias

examples/flutter_gallery/lib/demo/animation/sections.dart

@@ -12,17 +12,33 @@ const Color _tomato = const Color(0xFFF95B57);
 const Color _mySin = const Color(0xFFF3A646);
 const Color _deepCerise = const Color(0xFFD93F9B);
 
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
+
 class SectionDetail {
-  const SectionDetail({ this.title, this.subtitle, this.imageAsset });
+  const SectionDetail({
+    this.title,
+    this.subtitle,
+    this.imageAsset,
+    this.imageAssetPackage,
+  });
   final String title;
   final String subtitle;
   final String imageAsset;
+  final String imageAssetPackage;
 }
 
 class Section {
-  const Section({ this.title, this.backgroundAsset, this.leftColor, this.rightColor, this.details });
+  const Section({
+    this.title,
+    this.backgroundAsset,
+    this.backgroundAssetPackage,
+    this.leftColor,
+    this.rightColor,
+    this.details,
+  });
   final String title;
   final String backgroundAsset;
+  final String backgroundAssetPackage;
   final Color leftColor;
   final Color rightColor;
   final List<SectionDetail> details;
@@ -44,51 +60,60 @@ class Section {
 // image SectionDetails in the allSections list.
 
 const SectionDetail _eyeglassesDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/sunnies.png',
+  imageAsset: 'shrine/products/sunnies.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
   title: 'Flutter enables interactive animation',
   subtitle: '3K views - 5 days',
 );
 
 const SectionDetail _eyeglassesImageDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/sunnies.png',
+  imageAsset: 'shrine/products/sunnies.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
 );
 
 const SectionDetail _seatingDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/lawn_chair.png',
+  imageAsset: 'shrine/products/lawn_chair.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
   title: 'Flutter enables interactive animation',
   subtitle: '3K views - 5 days',
 );
 
 const SectionDetail _seatingImageDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/lawn_chair.png',
+  imageAsset: 'shrine/products/lawn_chair.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
 );
 
 const SectionDetail _decorationDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/lipstick.png',
+  imageAsset: 'shrine/products/lipstick.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
   title: 'Flutter enables interactive animation',
   subtitle: '3K views - 5 days',
 );
 
 const SectionDetail _decorationImageDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/lipstick.png',
+  imageAsset: 'shrine/products/lipstick.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
 );
 
 const SectionDetail _protectionDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/helmet.png',
+  imageAsset: 'shrine/products/helmet.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
   title: 'Flutter enables interactive animation',
   subtitle: '3K views - 5 days',
 );
 
 const SectionDetail _protectionImageDetail = const SectionDetail(
-  imageAsset: 'packages/flutter_gallery_assets/shrine/products/helmet.png',
+  imageAsset: 'shrine/products/helmet.png',
+  imageAssetPackage: _kGalleryAssetsPackage,
 );
 
 final List<Section> allSections = <Section>[
   const Section(
     title: 'EYEGLASSES',
     leftColor: _mediumPurple,
     rightColor: _mariner,
-    backgroundAsset: 'packages/flutter_gallery_assets/shrine/products/sunnies.png',
+    backgroundAsset: 'shrine/products/sunnies.png',
+    backgroundAssetPackage: _kGalleryAssetsPackage,
     details: const <SectionDetail>[
       _eyeglassesDetail,
       _eyeglassesImageDetail,
@@ -102,7 +127,8 @@ final List<Section> allSections = <Section>[
     title: 'SEATING',
     leftColor: _tomato,
     rightColor: _mediumPurple,
-    backgroundAsset: 'packages/flutter_gallery_assets/shrine/products/lawn_chair.png',
+    backgroundAsset: 'shrine/products/lawn_chair.png',
+    backgroundAssetPackage: _kGalleryAssetsPackage,
     details: const <SectionDetail>[
       _seatingDetail,
       _seatingImageDetail,
@@ -116,7 +142,8 @@ final List<Section> allSections = <Section>[
     title: 'DECORATION',
     leftColor: _mySin,
     rightColor: _tomato,
-    backgroundAsset: 'packages/flutter_gallery_assets/shrine/products/lipstick.png',
+    backgroundAsset: 'shrine/products/lipstick.png',
+    backgroundAssetPackage: _kGalleryAssetsPackage,
     details: const <SectionDetail>[
       _decorationDetail,
       _decorationImageDetail,
@@ -130,7 +157,8 @@ final List<Section> allSections = <Section>[
     title: 'PROTECTION',
     leftColor: Colors.white,
     rightColor: _tomato,
-    backgroundAsset: 'packages/flutter_gallery_assets/shrine/products/helmet.png',
+    backgroundAsset: 'shrine/products/helmet.png',
+    backgroundAssetPackage: _kGalleryAssetsPackage,
     details: const <SectionDetail>[
       _protectionDetail,
       _protectionImageDetail,

examples/flutter_gallery/lib/demo/animation/widgets.dart

@@ -35,6 +35,7 @@ class SectionCard extends StatelessWidget {
         ),
         child: new Image.asset(
           section.backgroundAsset,
+          package: section.backgroundAssetPackage,
           color: const Color.fromRGBO(255, 255, 255, 0.075),
           colorBlendMode: BlendMode.modulate,
           fit: BoxFit.cover,
@@ -130,7 +131,10 @@ class SectionDetailView extends StatelessWidget {
       decoration: new BoxDecoration(
         borderRadius: new BorderRadius.circular(6.0),
         image: new DecorationImage(
-          image: new AssetImage(detail.imageAsset),
+          image: new AssetImage(
+            detail.imageAsset,
+            package: detail.imageAssetPackage,
+          ),
           fit: BoxFit.cover,
           alignment: FractionalOffset.center,
         ),

examples/flutter_gallery/lib/demo/contacts_demo.dart

@@ -156,7 +156,8 @@ class ContactsDemoState extends State<ContactsDemo> {
                   fit: StackFit.expand,
                   children: <Widget>[
                     new Image.asset(
-                      'packages/flutter_gallery_assets/ali_connors.jpg',
+                      'ali_connors.jpg',
+                      package: 'flutter_gallery_assets',
                       fit: BoxFit.cover,
                       height: _appBarHeight,
                     ),

examples/flutter_gallery/lib/demo/material/cards_demo.dart

@@ -5,10 +5,18 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
+
 class TravelDestination {
-  const TravelDestination({ this.assetName, this.title, this.description });
+  const TravelDestination({
+    this.assetName,
+    this.assetPackage,
+    this.title,
+    this.description,
+  });
 
   final String assetName;
+  final String assetPackage;
   final String title;
   final List<String> description;
 
@@ -17,7 +25,8 @@ class TravelDestination {
 
 final List<TravelDestination> destinations = <TravelDestination>[
   const TravelDestination(
-    assetName: 'packages/flutter_gallery_assets/top_10_australian_beaches.jpg',
+    assetName: 'top_10_australian_beaches.jpg',
+    assetPackage: _kGalleryAssetsPackage,
     title: 'Top 10 Australian beaches',
     description: const <String>[
       'Number 10',
@@ -26,7 +35,8 @@ final List<TravelDestination> destinations = <TravelDestination>[
     ],
   ),
   const TravelDestination(
-    assetName: 'packages/flutter_gallery_assets/kangaroo_valley_safari.jpg',
+    assetName: 'kangaroo_valley_safari.jpg',
+    assetPackage: _kGalleryAssetsPackage,
     title: 'Kangaroo Valley Safari',
     description: const <String>[
       '2031 Moss Vale Road',
@@ -65,6 +75,7 @@ class TravelDestinationItem extends StatelessWidget {
                   new Positioned.fill(
                     child: new Image.asset(
                       destination.assetName,
+                      package: destination.assetPackage,
                       fit: BoxFit.cover,
                     ),
                   ),

examples/flutter_gallery/lib/demo/material/drawer_demo.dart

@@ -4,9 +4,10 @@
 
 import 'package:flutter/material.dart';
 
-const String _kAsset0 = 'packages/flutter_gallery_assets/shrine/vendors/zach.jpg';
-const String _kAsset1 = 'packages/flutter_gallery_assets/shrine/vendors/16c477b.jpg';
-const String _kAsset2 = 'packages/flutter_gallery_assets/shrine/vendors/sandra-adams.jpg';
+const String _kAsset0 = 'shrine/vendors/zach.jpg';
+const String _kAsset1 = 'shrine/vendors/16c477b.jpg';
+const String _kAsset2 = 'shrine/vendors/sandra-adams.jpg';
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
 
 class DrawerDemo extends StatefulWidget {
   static const String routeName = '/material/drawer';
@@ -93,10 +94,25 @@ class _DrawerDemoState extends State<DrawerDemo> with TickerProviderStateMixin {
             new UserAccountsDrawerHeader(
               accountName: const Text('Zach Widget'),
               accountEmail: const Text('zach.widget@example.com'),
-              currentAccountPicture: const CircleAvatar(backgroundImage: const AssetImage(_kAsset0)),
+              currentAccountPicture: const CircleAvatar(
+                backgroundImage: const AssetImage(
+                  _kAsset0,
+                  package: _kGalleryAssetsPackage,
+                ),
+              ),
               otherAccountsPictures: const <Widget>[
-                const CircleAvatar(backgroundImage: const AssetImage(_kAsset1)),
-                const CircleAvatar(backgroundImage: const AssetImage(_kAsset2)),
+                const CircleAvatar(
+                  backgroundImage: const AssetImage(
+                    _kAsset1,
+                    package: _kGalleryAssetsPackage,
+                  ),
+                ),
+                const CircleAvatar(
+                  backgroundImage: const AssetImage(
+                    _kAsset2,
+                    package: _kGalleryAssetsPackage,
+                  ),
+                ),
               ],
               onDetailsPressed: () {
                 _showDrawerContents = !_showDrawerContents;
@@ -167,7 +183,10 @@ class _DrawerDemoState extends State<DrawerDemo> with TickerProviderStateMixin {
                 decoration: const BoxDecoration(
                   shape: BoxShape.circle,
                   image: const DecorationImage(
-                    image: const AssetImage(_kAsset0),
+                    image: const AssetImage(
+                      _kAsset0,
+                      package: _kGalleryAssetsPackage,
+                    ),
                   ),
                 ),
               ),