From e2f3b3d6f2c164975c0ec0d81345c9f603cd2d44 Mon Sep 17 00:00:00 2001 From: TL Lee Date: Fri, 17 Aug 2018 17:58:25 -0400 Subject: [PATCH] Feature pesto new recipes (#19415) pesto_before pesto_after --- dev/benchmarks/complex_layout/pubspec.yaml | 4 +- .../flutter_gallery/lib/demo/pesto_demo.dart | 318 ++++++------------ examples/flutter_gallery/pubspec.yaml | 29 +- examples/flutter_gallery/test/pesto_test.dart | 8 +- .../lib/src/commands/update_packages.dart | 2 +- 5 files changed, 117 insertions(+), 244 deletions(-) diff --git a/dev/benchmarks/complex_layout/pubspec.yaml b/dev/benchmarks/complex_layout/pubspec.yaml index 08ec970dbd..a5357e07c8 100644 --- a/dev/benchmarks/complex_layout/pubspec.yaml +++ b/dev/benchmarks/complex_layout/pubspec.yaml @@ -15,7 +15,7 @@ dependencies: # //packages/flutter_tools/lib/src/commands/update_packages.dart # and run # flutter update-packages --force-upgrade - flutter_gallery_assets: 0.1.4 + flutter_gallery_assets: 0.1.6 async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -82,4 +82,4 @@ flutter: - packages/flutter_gallery_assets/people/square/ali.png - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png -# PUBSPEC CHECKSUM: cbc9 +# PUBSPEC CHECKSUM: 75cb diff --git a/examples/flutter_gallery/lib/demo/pesto_demo.dart b/examples/flutter_gallery/lib/demo/pesto_demo.dart index 31203b55bb..bc16884887 100644 --- a/examples/flutter_gallery/lib/demo/pesto_demo.dart +++ b/examples/flutter_gallery/lib/demo/pesto_demo.dart @@ -268,11 +268,14 @@ class RecipeCard extends StatelessWidget { children: [ new Hero( tag: 'packages/$_kGalleryAssetsPackage/${recipe.imagePath}', - child: new Image.asset( - recipe.imagePath, - package: recipe.imagePackage, - fit: BoxFit.contain, - semanticLabel: recipe.name, + child: AspectRatio( + aspectRatio: 4.0 / 3.0, + child: Image.asset( + recipe.imagePath, + package: recipe.imagePackage, + fit: BoxFit.cover, + semanticLabel: recipe.name, + ), ), ), new Expanded( @@ -570,266 +573,145 @@ class RecipeStep { const List kPestoRecipes = [ Recipe( - name: 'Pesto Bruschetta', + name: 'Roasted Chicken', author: 'Peter Carlsson', - ingredientsImagePath: 'food/icons/quick.png', + ingredientsImagePath: 'food/icons/main.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: 'food/image1.jpg', + description: 'The perfect dish to welcome your family and friends with on a crisp autumn night. Pair with roasted veggies to truly impress them.', + imagePath: 'food/roasted_chicken.png', imagePackage: _kGalleryAssetsPackage, ingredients: [ - RecipeIngredient(amount: '6 pieces', description: 'Mozzarella cheese'), - RecipeIngredient(amount: '6 pieces', description: 'Toasts'), - RecipeIngredient(amount: '⅔ cup', description: 'Homemade pesto'), - RecipeIngredient(amount: '1tbsp', description: 'Freshly ground pepper'), + RecipeIngredient(amount: '1 whole', description: 'Chicken'), + RecipeIngredient(amount: '1/2 cup', description: 'Butter'), + RecipeIngredient(amount: '1 tbsp', description: 'Onion powder'), + RecipeIngredient(amount: '1 tbsp', description: 'Freshly ground pepper'), RecipeIngredient(amount: '1 tsp', description: 'Salt'), ], steps: [ - RecipeStep(description: 'Put in oven'), - RecipeStep(duration: '45 min', description: 'Cook'), + RecipeStep(duration: '1 min', description: 'Put in oven'), + RecipeStep(duration: '1hr 45 min', description: 'Cook'), ], ), Recipe( - name: 'Rustic purple mash', + name: 'Chopped Beet Leaves', author: 'Trevor Hansen', 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: 'food/image2.jpg', + description: 'This vegetable has more to offer than just its root. Beet greens can be tossed into a salad to add some variety or sauteed on its own with some oil and garlic.', + imagePath: 'food/chopped_beet_leaves.png', imagePackage: _kGalleryAssetsPackage, ingredients: [ - RecipeIngredient(amount: '2 lbs', description: 'Purple potatoes, skin on'), - RecipeIngredient(amount: '1 tsp', description: 'Salt'), - RecipeIngredient(amount: '2 tsp', description: 'Lemon'), - RecipeIngredient(amount: '4 cups', description: 'Chicken stock'), - RecipeIngredient(amount: '1tbsp', description: 'Extra virgin olive oil') + RecipeIngredient(amount: '3 cups', description: 'Beet greens'), ], steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), + RecipeStep(duration: '5 min', description: 'Chop'), ], ), Recipe( - name: 'Bacon Sprouts', + name: 'Pesto Pasta', author: 'Ali Connors', 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: 'food/image3.jpg', + description: 'With this pesto recipe, you can quickly whip up a meal to satisfy your savory needs. And if you\'re feeling festive, you can add bacon to taste.', + imagePath: 'food/pesto_pasta.png', imagePackage: _kGalleryAssetsPackage, ingredients: [ - RecipeIngredient(amount: '2 lbs', description: 'Brussel sprouts'), + RecipeIngredient(amount: '1/4 cup ', description: 'Pasta'), + RecipeIngredient(amount: '2 cups', description: 'Fresh basil leaves'), + RecipeIngredient(amount: '1/2 cup', description: 'Parmesan cheese'), + RecipeIngredient(amount: '1/2 cup', description: 'Extra virgin olive oil'), + RecipeIngredient(amount: '1/3 cup', description: 'Pine nuts'), + RecipeIngredient(amount: '1/4 cup', description: 'Lemon juice'), + RecipeIngredient(amount: '3 cloves', description: 'Garlic'), + RecipeIngredient(amount: '1/4 tsp', description: 'Salt'), + RecipeIngredient(amount: '1/8 tsp', description: 'Pepper'), RecipeIngredient(amount: '3 lbs', description: 'Bacon'), - RecipeIngredient(amount: '⅔ cup', description: 'Shaved parmesan cheese'), - RecipeIngredient(amount: '1tbsp', description: 'Extra virgin olive oil'), - RecipeIngredient(amount: '1 tsp', description: 'Lemon juice'), - RecipeIngredient(amount: '1/2 cup', description: 'Sun dried tomatoes'), ], steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), + RecipeStep(duration: '15 min', description: 'Blend'), ], ), Recipe( - name: 'Oven Sausage', + name: 'Cherry Pie', author: 'Sandra Adams', - 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: 'food/image4.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '1 1/2 lbs', description: 'Linguisa'), - RecipeIngredient(amount: '1 lbs', description: 'Pineapple or other fresh citrus fruit'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), - ], - ), - Recipe( - name: 'Chicken tostadas', - author: 'Peter Carlsson', - 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: 'food/image5.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '4-6', description: 'Small corn tortillas'), - RecipeIngredient(amount: '½ cup', description: 'Chopped onion'), - RecipeIngredient(amount: '⅔', description: 'Cream'), - RecipeIngredient(amount: '3-4oz', description: 'Roasted, shredded chicken breast'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), - ], - ), - Recipe( - name: 'Coconut rice', - author: 'Ali Connors', - 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: 'food/image6.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '2 cups', description: 'Jasmine rice'), - RecipeIngredient(amount: '1 1/2 cups', description: 'Water'), - RecipeIngredient(amount: '1 cup', description: 'Coconut milk'), - RecipeIngredient(amount: '1 1/2 tbsp', description: 'Sugar'), - RecipeIngredient(amount: '1tsp', description: 'Salt'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook') - ], - ), - Recipe( - name: 'Gin basil cocktail', - author: 'Trevor Hansen', - 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: 'food/image7.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '3 parts', description: 'Gin'), - RecipeIngredient(amount: '1 part', description: 'Fresh lemon juice'), - RecipeIngredient(amount: '½ part', description: 'Simple syrup'), - RecipeIngredient(amount: '5', description: 'Basil leaves, crushed'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), - ], - ), - Recipe( - name: 'Seared sesame fish', - author: 'Ali Connors', - 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: 'food/image8.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '1 ½ lbs', description: 'Thin fish fillets'), - RecipeIngredient(amount: '1 lb', description: 'Salt and black pepper to taste'), - RecipeIngredient(amount: '3/4 cup', description: 'Sesame seeds'), - RecipeIngredient(amount: '2tbsp', description: 'Sesame oil'), - RecipeIngredient(amount: '1tbsp', description: 'Lime juice'), - RecipeIngredient(amount: '2 tbsp', description: 'Soy sauce'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), - ], - ), - Recipe( - name: 'Herb artichoke', - author: 'Sandra Adams', - 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: 'food/image9.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '1', description: 'Small garlic clove, peeled'), - RecipeIngredient(amount: '2', description: 'Whole artichokes'), - RecipeIngredient(amount: '4 tbsp', description: 'Fresh lemon juice'), - RecipeIngredient(amount: '4 tbsp', description: 'Unsalted butter'), - RecipeIngredient(amount: '2 tbsp', description: 'Extra-virgin olive oil'), - RecipeIngredient(amount: '1⁄4 tsp', description: 'Freshly ground black pepper'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), - ], - ), - Recipe( - name: 'Pesto bruschetta', - author: 'Trevor Hansen', - 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: 'food/image10.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '1 loaf', description: 'Sliced French bread'), - RecipeIngredient(amount: '½ cup', description: 'Cheese'), - RecipeIngredient(amount: '1 cup', description: 'Heirloom tomatoes'), - RecipeIngredient(amount: '1 cup', description: 'Fresh basil'), - RecipeIngredient(amount: '1 clove', description: 'Garlic '), - RecipeIngredient(amount: '½ tbsp', description: 'Olive oil'), - RecipeIngredient(amount: '3tsp', description: 'White wine vinegar'), - RecipeIngredient(amount: '¼ tsp', description: 'Sea salt'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), - ], - ), - Recipe( - name: 'Garlic bok choy', - author: 'Sandra Adams', - 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: 'food/image11.jpg', - imagePackage: _kGalleryAssetsPackage, - ingredients: [ - RecipeIngredient(amount: '1/2 cup', description: 'Chick broth'), - RecipeIngredient(amount: '1 tbsp', description: 'Soy sauce'), - RecipeIngredient(amount: '¼ cup', description: 'Sliced garlic'), - RecipeIngredient(amount: '2-3 lbs', description: 'Bok choy'), - RecipeIngredient(amount: '2 tsp', description: 'Sesame oil'), - ], - steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), - ], - ), - Recipe( - name: 'Fresh Fettuccine', - author: 'Ali Connors', 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: 'food/image12.jpg', + description: 'Sometimes when you\'re craving some cheer in your life you can jumpstart your day with some cherry pie. Dessert for breakfast is perfectly acceptable.', + imagePath: 'food/cherry_pie.png', imagePackage: _kGalleryAssetsPackage, ingredients: [ - RecipeIngredient(amount: '¾ cup', description: 'Milk'), - RecipeIngredient(amount: '1 ½ tsp', description: 'Salt'), - RecipeIngredient(amount: '1 tbsp', description: 'Olive oil'), - RecipeIngredient(amount: '8oz', description: 'Fettuccine'), - RecipeIngredient(amount: '½ cup', description: 'Fresh basil'), - RecipeIngredient(amount: '½ cup', description: 'Fresh ground pepper'), + RecipeIngredient(amount: '1', description: 'Pie crust'), + RecipeIngredient(amount: '4 cups', description: 'Fresh or frozen cherries'), + RecipeIngredient(amount: '1 cup', description: 'Granulated sugar'), + RecipeIngredient(amount: '4 tbsp', description: 'Cornstarch'), + RecipeIngredient(amount: '1½ tbsp', description: 'Butter'), ], steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), + RecipeStep(duration: '15 min', description: 'Mix'), + RecipeStep(duration: '1hr 30 min', description: 'Bake'), ], ), Recipe( - name: 'Sicilian-Style sardines', + name: 'Spinach Salad', author: 'Peter Carlsson', - ingredientsImagePath: 'food/icons/quick.png', + ingredientsImagePath: 'food/icons/spicy.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: 'food/image13.jpg', + description: 'Everyone\'s favorite leafy green is back. Paired with fresh sliced onion, it\'s ready to tackle any dish, whether it be a salad or an egg scramble.', + imagePath: 'food/spinach_onion_salad.png', imagePackage: _kGalleryAssetsPackage, ingredients: [ - RecipeIngredient(amount: '1/4 cup', description: 'Dry white wine'), - RecipeIngredient(amount: '1', description: 'Finely chopped shallot'), - RecipeIngredient(amount: '2 tbsp', description: 'Fresh lemon juice'), - RecipeIngredient(amount: '1 tbsp', description: 'Fennel seeds, crushed'), - RecipeIngredient(amount: '4 tbsp', description: 'Extra virgin olive oil, to taste'), - RecipeIngredient(amount: '2 cans', description: 'Sardines in oil, drained'), + RecipeIngredient(amount: '4 cups', description: 'Spinach'), + RecipeIngredient(amount: '1 cup', description: 'Sliced onion'), ], steps: [ - RecipeStep(duration: '3 min', description: 'Stir'), - RecipeStep(duration: '45 min', description: 'Cook'), + RecipeStep(duration: '5 min', description: 'Mix'), + ], + ), + Recipe( + name: 'Butternut Squash Soup', + author: 'Ali Connors', + ingredientsImagePath: 'food/icons/healthy.png', + ingredientsImagePackage: _kGalleryAssetsPackage, + description: 'This creamy butternut squash soup will warm you on the chilliest of winter nights and bring a delightful pop of orange to the dinner table.', + imagePath: 'food/butternut_squash_soup.png', + imagePackage: _kGalleryAssetsPackage, + ingredients: [ + RecipeIngredient(amount: '1', description: 'Butternut squash'), + RecipeIngredient(amount: '4 cups', description: 'Chicken stock'), + RecipeIngredient(amount: '2', description: 'Potatoes'), + RecipeIngredient(amount: '1', description: 'Onion'), + RecipeIngredient(amount: '1', description: 'Carrot'), + RecipeIngredient(amount: '1', description: 'Celery'), + RecipeIngredient(amount: '1 tsp', description: 'Salt'), + RecipeIngredient(amount: '1 tsp', description: 'Pepper'), + ], + steps: [ + RecipeStep(duration: '10 min', description: 'Prep vegetables'), + RecipeStep(duration: '5 min', description: 'Stir'), + RecipeStep(duration: '1 hr 10 min', description: 'Cook') + ], + ), + Recipe( + name: 'Spanakopita', + author: 'Trevor Hansen', + ingredientsImagePath: 'food/icons/quick.png', + ingredientsImagePackage: _kGalleryAssetsPackage, + description: 'You \'feta\' believe this is a crowd-pleaser! Flaky phyllo pastry surrounds a delicious mixture of spinach and cheeses to create the perfect appetizer.', + imagePath: 'food/spanakopita.png', + imagePackage: _kGalleryAssetsPackage, + ingredients: [ + RecipeIngredient(amount: '1 lb', description: 'Spinach'), + RecipeIngredient(amount: '½ cup', description: 'Feta cheese'), + RecipeIngredient(amount: '½ cup', description: 'Cottage cheese'), + RecipeIngredient(amount: '2', description: 'Eggs'), + RecipeIngredient(amount: '1', description: 'Onion'), + RecipeIngredient(amount: '½ lb', description: 'Phyllo dough'), + ], + steps: [ + RecipeStep(duration: '5 min', description: 'Sauté vegetables'), + RecipeStep(duration: '3 min', description: 'Stir vegetables and other filling ingredients'), + RecipeStep(duration: '10 min', description: 'Fill phyllo squares half-full with filling and fold.'), + RecipeStep(duration: '40 min', description: 'Bake') ], ), ]; diff --git a/examples/flutter_gallery/pubspec.yaml b/examples/flutter_gallery/pubspec.yaml index 1beb6a0b1b..675bdbcac6 100644 --- a/examples/flutter_gallery/pubspec.yaml +++ b/examples/flutter_gallery/pubspec.yaml @@ -16,11 +16,8 @@ dependencies: cupertino_icons: 0.1.2 video_player: 0.6.4 - # To change the version of the gallery assets, edit - # //packages/flutter_tools/lib/src/commands/update_packages.dart - # and run - # flutter update-packages --force-upgrade - flutter_gallery_assets: 0.1.4 + # Also update dev/benchmarks/complex_layout/pubspec.yaml + flutter_gallery_assets: 0.1.6 charcode: 1.1.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" meta: 1.1.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade" @@ -94,19 +91,13 @@ flutter: - packages/flutter_gallery_assets/videos/butterfly.mp4 - packages/flutter_gallery_assets/animated_images/animated_flutter_lgtm.gif - packages/flutter_gallery_assets/animated_images/animated_flutter_stickers.webp - - packages/flutter_gallery_assets/food/image10.jpg - - packages/flutter_gallery_assets/food/image11.jpg - - packages/flutter_gallery_assets/food/image12.jpg - - packages/flutter_gallery_assets/food/image13.jpg - - packages/flutter_gallery_assets/food/image1.jpg - - packages/flutter_gallery_assets/food/image2.jpg - - packages/flutter_gallery_assets/food/image3.jpg - - packages/flutter_gallery_assets/food/image4.jpg - - packages/flutter_gallery_assets/food/image5.jpg - - packages/flutter_gallery_assets/food/image6.jpg - - packages/flutter_gallery_assets/food/image7.jpg - - packages/flutter_gallery_assets/food/image8.jpg - - packages/flutter_gallery_assets/food/image9.jpg + - packages/flutter_gallery_assets/food/butternut_squash_soup.png + - packages/flutter_gallery_assets/food/cherry_pie.png + - packages/flutter_gallery_assets/food/chopped_beet_leaves.png + - packages/flutter_gallery_assets/food/pesto_pasta.png + - packages/flutter_gallery_assets/food/roasted_chicken.png + - packages/flutter_gallery_assets/food/spanakopita.png + - packages/flutter_gallery_assets/food/spinach_onion_salad.png - packages/flutter_gallery_assets/food/icons/fish.png - packages/flutter_gallery_assets/food/icons/healthy.png - packages/flutter_gallery_assets/food/icons/main.png @@ -205,4 +196,4 @@ flutter: - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Regular.ttf weight: 400 -# PUBSPEC CHECKSUM: 2c5c +# PUBSPEC CHECKSUM: e25e diff --git a/examples/flutter_gallery/test/pesto_test.dart b/examples/flutter_gallery/test/pesto_test.dart index 52690ca64c..86ce9d9801 100644 --- a/examples/flutter_gallery/test/pesto_test.dart +++ b/examples/flutter_gallery/test/pesto_test.dart @@ -32,10 +32,10 @@ void main() { await tester.tap(find.text('Pesto')); await tester.pumpAndSettle(); - await tester.tap(find.text('Pesto Bruschetta')); + await tester.tap(find.text('Roasted Chicken')); await tester.pumpAndSettle(); - await tester.drag(find.text('Pesto Bruschetta'), const Offset(0.0, -300.0)); + await tester.drag(find.text('Roasted Chicken'), const Offset(0.0, -300.0)); await tester.pumpAndSettle(); Navigator.pop(find.byType(Scaffold).evaluate().single); @@ -53,8 +53,8 @@ void main() { await tester.tap(find.text('Pesto')); await tester.pumpAndSettle(); - await tester.fling(find.text('Pesto Bruschetta'), const Offset(0.0, -200.0), 10000.0); + await tester.fling(find.text('Roasted Chicken'), const Offset(0.0, -200.0), 10000.0); await tester.pumpAndSettle(); // start and finish fling - expect(find.text('Sicilian-Style sardines'), findsOneWidget); + expect(find.text('Spanakopita'), findsOneWidget); }); } diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 78e6a8c6b9..fcbe5df922 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -27,7 +27,7 @@ import '../runner/flutter_command.dart'; /// ``` const Map _kManuallyPinnedDependencies = { // Add pinned packages here. - 'flutter_gallery_assets': '0.1.4', // See //examples/flutter_gallery/pubspec.yaml + 'flutter_gallery_assets': '0.1.6', // See //examples/flutter_gallery/pubspec.yaml }; class UpdatePackagesCommand extends FlutterCommand {