diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index 1a39b7bbf7..0e5f648bd1 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -11,7 +11,7 @@ dependencies: flutter_gallery_assets: git: url: https://flutter.googlesource.com/gallery-assets - ref: 3e55082f0128cb4ef95e0e8d2c14e941024d6da9 + ref: ef658435dff4e3a7ad671feed19b634d53ae98f9 dev_dependencies: flutter_test: diff --git a/dev/manual_tests/pubspec.yaml b/dev/manual_tests/pubspec.yaml index 134cef8208..d4b1a1679c 100644 --- a/dev/manual_tests/pubspec.yaml +++ b/dev/manual_tests/pubspec.yaml @@ -9,7 +9,7 @@ dependencies: flutter_gallery_assets: git: url: https://flutter.googlesource.com/gallery-assets - ref: 3e55082f0128cb4ef95e0e8d2c14e941024d6da9 + ref: ef658435dff4e3a7ad671feed19b634d53ae98f9 dev_dependencies: test: any # flutter_test provides the version constraints diff --git a/examples/flutter_gallery/android/AndroidManifest.xml b/examples/flutter_gallery/android/AndroidManifest.xml index 537f1dabe6..ea63555f0e 100644 --- a/examples/flutter_gallery/android/AndroidManifest.xml +++ b/examples/flutter_gallery/android/AndroidManifest.xml @@ -9,7 +9,7 @@ - + diff --git a/examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png index f0a55cda78..a429c28949 100644 Binary files a/examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png and b/examples/flutter_gallery/android/res/mipmap-hdpi/ic_launcher.png differ diff --git a/examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png index eb98dc451d..4758b7c043 100644 Binary files a/examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png and b/examples/flutter_gallery/android/res/mipmap-mdpi/ic_launcher.png differ diff --git a/examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png index f1783dbbf3..36fc087ad1 100644 Binary files a/examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png and b/examples/flutter_gallery/android/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png index 46828a290a..6e38b48b7d 100644 Binary files a/examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png and b/examples/flutter_gallery/android/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png b/examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png index a5276715d9..78c77b8967 100644 Binary files a/examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png and b/examples/flutter_gallery/android/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/examples/flutter_gallery/flutter.yaml b/examples/flutter_gallery/flutter.yaml index be0a79ee73..f9300f384d 100644 --- a/examples/flutter_gallery/flutter.yaml +++ b/examples/flutter_gallery/flutter.yaml @@ -3,6 +3,12 @@ uses-material-design: true assets: - lib/gallery/example_code.dart - packages/flutter_gallery_assets/appbar_background.jpg + - packages/flutter_gallery_assets/appbar/appbar_background_layer0.png + - packages/flutter_gallery_assets/appbar/appbar_background_layer1.png + - packages/flutter_gallery_assets/appbar/appbar_background_layer2.png + - packages/flutter_gallery_assets/appbar/appbar_background_layer3.png + - packages/flutter_gallery_assets/appbar/appbar_background_layer4.png + - packages/flutter_gallery_assets/appbar/appbar_background_layer5.png - packages/flutter_gallery_assets/pesto/avatar.jpg - packages/flutter_gallery_assets/pesto/image10.jpg - packages/flutter_gallery_assets/pesto/image11.jpg @@ -27,9 +33,11 @@ assets: - packages/flutter_gallery_assets/pesto/quick.png - packages/flutter_gallery_assets/pesto/spicy.png - packages/flutter_gallery_assets/pesto/veggie.png - - packages/flutter_gallery_assets/ali_connors.png - - packages/flutter_gallery_assets/kangaroo_valley_safari.png - - packages/flutter_gallery_assets/top_10_australian_beaches.png + - packages/flutter_gallery_assets/about_logo.png + - packages/flutter_gallery_assets/ali_connors.jpg + - packages/flutter_gallery_assets/drawer_logo.png + - packages/flutter_gallery_assets/kangaroo_valley_safari.jpg + - packages/flutter_gallery_assets/top_10_australian_beaches.jpg - packages/flutter_gallery_assets/landscape_0.jpg - packages/flutter_gallery_assets/landscape_1.jpg - packages/flutter_gallery_assets/landscape_2.jpg diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png index 9996f5e598..8d3843889f 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png index 7a543edbdd..2439531312 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png index 05a8268104..f36758a4f8 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png index bfbca28f5d..e184e6ec4a 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png index c924b8e497..6d0f096754 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png index 3006f1d348..f5f7a58130 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png index 5f7d22d364..494cbfd7b4 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png index 9996f5e598..8d3843889f 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small-40@3x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small.png index 3433da1196..35792390d5 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png index f7f9f16d1b..0f89e013da 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png index e9c23601cf..96fc7f3047 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128.png index dd5fccb0a9..9047a03226 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png index 1909e27511..fe051041de 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16.png index 40a701b514..020334e491 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png index 06c1a80560..6e0270bc51 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256.png index 1909e27511..fe051041de 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png index 69c96ef1e2..52fa700497 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32.png index 06c1a80560..6e0270bc51 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png index 0f94371460..f9c4d0b420 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512.png index 69c96ef1e2..52fa700497 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png index 1d6355f58c..17faecba9e 100644 Binary files a/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png and b/examples/flutter_gallery/ios/Runner/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/examples/flutter_gallery/ios/Runner/Info.plist b/examples/flutter_gallery/ios/Runner/Info.plist index f8faf47f03..bc665344b9 100644 --- a/examples/flutter_gallery/ios/Runner/Info.plist +++ b/examples/flutter_gallery/ios/Runner/Info.plist @@ -33,15 +33,11 @@ UISupportedInterfaceOrientations UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UISupportedInterfaceOrientations~ipad UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight UIViewControllerBasedStatusBarAppearance diff --git a/examples/flutter_gallery/lib/demo/cards_demo.dart b/examples/flutter_gallery/lib/demo/cards_demo.dart index 17380ffde5..0b4eb8e363 100644 --- a/examples/flutter_gallery/lib/demo/cards_demo.dart +++ b/examples/flutter_gallery/lib/demo/cards_demo.dart @@ -17,7 +17,7 @@ class TravelDestination { final List destinations = [ const TravelDestination( - assetName: 'packages/flutter_gallery_assets/top_10_australian_beaches.png', + assetName: 'packages/flutter_gallery_assets/top_10_australian_beaches.jpg', title: 'Top 10 Australian beaches', description: const [ 'Number 10', @@ -26,7 +26,7 @@ final List destinations = [ ] ), const TravelDestination( - assetName: 'packages/flutter_gallery_assets/kangaroo_valley_safari.png', + assetName: 'packages/flutter_gallery_assets/kangaroo_valley_safari.jpg', title: 'Kangaroo Valley Safari', description: const [ '2031 Moss Vale Road', diff --git a/examples/flutter_gallery/lib/demo/contacts_demo.dart b/examples/flutter_gallery/lib/demo/contacts_demo.dart index 724567877f..6928dd4978 100644 --- a/examples/flutter_gallery/lib/demo/contacts_demo.dart +++ b/examples/flutter_gallery/lib/demo/contacts_demo.dart @@ -130,7 +130,7 @@ class ContactsDemoState extends State { background: new Stack( children: [ new Image.asset( - 'packages/flutter_gallery_assets/ali_connors.png', + 'packages/flutter_gallery_assets/ali_connors.jpg', fit: ImageFit.cover, height: _appBarHeight ), diff --git a/examples/flutter_gallery/lib/gallery/app.dart b/examples/flutter_gallery/lib/gallery/app.dart index ba1b86f31b..0c6f59b024 100644 --- a/examples/flutter_gallery/lib/gallery/app.dart +++ b/examples/flutter_gallery/lib/gallery/app.dart @@ -16,12 +16,12 @@ final Map _kRoutes = new Map.fromI final ThemeData _kGalleryLightTheme = new ThemeData( brightness: Brightness.light, - primarySwatch: Colors.teal + primarySwatch: Colors.lightBlue, ); final ThemeData _kGalleryDarkTheme = new ThemeData( brightness: Brightness.dark, - primarySwatch: Colors.teal + primarySwatch: Colors.lightBlue ); class GalleryApp extends StatefulWidget { diff --git a/examples/flutter_gallery/lib/gallery/drawer.dart b/examples/flutter_gallery/lib/gallery/drawer.dart index d0e628f1aa..650db8265e 100644 --- a/examples/flutter_gallery/lib/gallery/drawer.dart +++ b/examples/flutter_gallery/lib/gallery/drawer.dart @@ -49,7 +49,15 @@ class GalleryDrawer extends StatelessWidget { child: new Block( children: [ new DrawerHeader( - child: new Center(child: new Text('Flutter gallery')) + child: new Center( + child: new Padding( + padding: const EdgeInsets.all(16.0), + child: new Image.asset( + 'packages/flutter_gallery_assets/drawer_logo.png', + fit: ImageFit.contain + ) + ) + ) ), new DrawerItem( icon: new Icon(Icons.brightness_5), @@ -112,7 +120,7 @@ class GalleryDrawer extends StatelessWidget { ), new AboutDrawerItem( applicationVersion: '2016 Q2 Preview', - applicationIcon: new AssetImage('packages/flutter_gallery_assets/appbar_background.jpg'), + applicationIcon: new AssetImage('packages/flutter_gallery_assets/about_logo.png'), applicationLegalese: '© 2016 The Chromium Authors', aboutBoxChildren: [ new Padding( diff --git a/examples/flutter_gallery/lib/gallery/home.dart b/examples/flutter_gallery/lib/gallery/home.dart index 9804c0b2e1..24a8ac15dc 100644 --- a/examples/flutter_gallery/lib/gallery/home.dart +++ b/examples/flutter_gallery/lib/gallery/home.dart @@ -18,6 +18,53 @@ final List _demoItems = _itemsWithCategory('Demos'); final List _componentItems = _itemsWithCategory('Components'); final List _styleItems = _itemsWithCategory('Style'); +class _BackgroundLayer { + _BackgroundLayer({ int level, double parallax }) + : assetName = 'packages/flutter_gallery_assets/appbar/appbar_background_layer$level.png', + parallaxTween = new Tween(begin: 0.0, end: parallax); + final String assetName; + final Tween parallaxTween; +} + +final List<_BackgroundLayer> _kBackgroundLayers = <_BackgroundLayer>[ + new _BackgroundLayer(level: 0, parallax: _kFlexibleSpaceMaxHeight), + new _BackgroundLayer(level: 1, parallax: _kFlexibleSpaceMaxHeight), + new _BackgroundLayer(level: 2, parallax: _kFlexibleSpaceMaxHeight / 2.0), + new _BackgroundLayer(level: 3, parallax: _kFlexibleSpaceMaxHeight / 4.0), + new _BackgroundLayer(level: 4, parallax: _kFlexibleSpaceMaxHeight / 2.0), + new _BackgroundLayer(level: 5, parallax: _kFlexibleSpaceMaxHeight) +]; + +class _AppBarBackground extends StatelessWidget { + _AppBarBackground({ Key key, this.animation }) : super(key: key); + + final Animation animation; + + @override + Widget build(BuildContext context) { + return new AnimatedBuilder( + animation: animation, + builder: (BuildContext context, Widget child) { + return new Stack( + children: _kBackgroundLayers.map((_BackgroundLayer layer) { + return new Positioned( + top: -layer.parallaxTween.evaluate(animation), + left: 0.0, + right: 0.0, + bottom: 0.0, + child: new Image.asset( + layer.assetName, + fit: ImageFit.cover, + height: _kFlexibleSpaceMaxHeight + ) + ); + }).toList() + ); + } + ); + } +} + class GalleryHome extends StatefulWidget { GalleryHome({ Key key, @@ -96,12 +143,14 @@ class GalleryHomeState extends State { appBar: new AppBar( expandedHeight: _kFlexibleSpaceMaxHeight, flexibleSpace: new FlexibleSpaceBar( - background: new Image.asset( - 'packages/flutter_gallery_assets/appbar_background.jpg', - fit: ImageFit.cover, - height: _kFlexibleSpaceMaxHeight - ), - title: new Text('Flutter gallery') + title: new Text('Flutter Gallery'), + background: new Builder( + builder: (BuildContext context) { + return new _AppBarBackground( + animation: Scaffold.of(context).appBarAnimation + ); + } + ) ) ), appBarBehavior: AppBarBehavior.under, diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index 72d4cb1916..394121af83 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -13,7 +13,7 @@ dependencies: flutter_gallery_assets: git: url: https://flutter.googlesource.com/gallery-assets - ref: 3e55082f0128cb4ef95e0e8d2c14e941024d6da9 + ref: ef658435dff4e3a7ad671feed19b634d53ae98f9 dev_dependencies: test: any # flutter_test provides the version constraints diff --git a/examples/flutter_gallery/test/pesto_test.dart b/examples/flutter_gallery/test/pesto_test.dart index ab0d106b1b..22f6f4b08a 100644 --- a/examples/flutter_gallery/test/pesto_test.dart +++ b/examples/flutter_gallery/test/pesto_test.dart @@ -50,6 +50,6 @@ void main() { await tapDrawerItem('Home'); await tapDrawerItem('Return to Gallery'); - expect(find.text('Flutter gallery'), findsOneWidget); + expect(find.text('Flutter Gallery'), findsOneWidget); }); }