Revert "Restore Flutter Gallery Shrine Demo, again (round 3) (#24531)" (#24538)

This reverts commit 4ec8883b.

dev/automated_tests/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -20,7 +20,7 @@ dependencies:
   convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -29,7 +29,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # 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"
@@ -67,4 +67,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 42f2
+# PUBSPEC CHECKSUM: 4a91

dev/benchmarks/complex_layout/pubspec.yaml

@@ -41,11 +41,11 @@ dev_dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -53,7 +53,7 @@ dev_dependencies:
   http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -84,4 +84,4 @@ flutter:
     - packages/flutter_gallery_assets/people/square/ali.png
     - packages/flutter_gallery_assets/places/india_chettinad_silk_maker.png
 
-# PUBSPEC CHECKSUM: 6ac2
+# PUBSPEC CHECKSUM: 5461

dev/benchmarks/microbenchmarks/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
     path: ../../../examples/stocks
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -25,7 +25,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   dart_style: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -37,7 +37,7 @@ dependencies:
   isolate: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -75,4 +75,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: c249
+# PUBSPEC CHECKSUM: 71e7

dev/bots/pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   http_parser: 3.1.3
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # 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"
@@ -24,7 +24,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_multi_server: 2.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -32,7 +32,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -66,4 +66,4 @@ dev_dependencies:
   mockito: 4.0.0
   test_api: 0.2.1
 
-# PUBSPEC CHECKSUM: ba96
+# PUBSPEC CHECKSUM: aa35

dev/devicelab/pubspec.yaml

@@ -38,10 +38,10 @@ dev_dependencies:
   # See packages/flutter_test/pubspec.yaml for why we're pinning this version.
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -49,7 +49,7 @@ dev_dependencies:
   http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -73,4 +73,4 @@ dev_dependencies:
   watcher: 0.9.7+10 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   yaml: 2.1.15 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: df7b
+# PUBSPEC CHECKSUM: 021a

dev/integration_tests/android_semantics_testing/pubspec.yaml

@@ -8,7 +8,7 @@ dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -18,7 +18,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -28,7 +28,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # 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"
@@ -65,4 +65,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: cf3b
+# PUBSPEC CHECKSUM: c4d9

dev/integration_tests/android_views/pubspec.yaml

@@ -37,11 +37,11 @@ dev_dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -49,7 +49,7 @@ dev_dependencies:
   http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -79,4 +79,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: f2f5
+# PUBSPEC CHECKSUM: bc94

dev/integration_tests/channels/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -22,7 +22,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -32,7 +32,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # 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"
@@ -69,4 +69,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: cf3b
+# PUBSPEC CHECKSUM: c4d9

dev/integration_tests/external_ui/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -22,7 +22,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -32,7 +32,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # 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"
@@ -69,4 +69,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: cf3b
+# PUBSPEC CHECKSUM: c4d9

dev/integration_tests/flavors/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -22,7 +22,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -32,7 +32,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # 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"
@@ -69,4 +69,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: cf3b
+# PUBSPEC CHECKSUM: c4d9

dev/integration_tests/platform_interaction/pubspec.yaml

@@ -12,7 +12,7 @@ dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -22,7 +22,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -32,7 +32,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # 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"
@@ -69,4 +69,4 @@ dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: cf3b
+# PUBSPEC CHECKSUM: c4d9

dev/integration_tests/ui/pubspec.yaml

@@ -13,7 +13,7 @@ dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   archive: 2.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -24,7 +24,7 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -34,7 +34,7 @@ dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # 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"
@@ -79,4 +79,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 9e4d
+# PUBSPEC CHECKSUM: 3beb

dev/snippets/pubspec.yaml

@@ -18,17 +18,17 @@ dependencies:
   meta: 1.1.6
   platform: 2.2.0
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   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"
   collection: 1.14.11 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   path: 1.6.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -100,4 +100,4 @@ executables:
   vm_service_client: 0.2.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   web_socket_channel: 1.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
 
-# PUBSPEC CHECKSUM: d555
+# PUBSPEC CHECKSUM: a3f3

examples/catalog/pubspec.yaml

@@ -22,7 +22,7 @@ dev_dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -31,7 +31,7 @@ dev_dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -41,7 +41,7 @@ dev_dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -75,4 +75,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: c324
+# PUBSPEC CHECKSUM: d4c2

examples/flutter_gallery/lib/demo/shrine/app.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-
-import 'package:flutter_gallery/demo/shrine/backdrop.dart';
-import 'package:flutter_gallery/demo/shrine/category_menu_page.dart';
-import 'package:flutter_gallery/demo/shrine/colors.dart';
-import 'package:flutter_gallery/demo/shrine/expanding_bottom_sheet.dart';
-import 'package:flutter_gallery/demo/shrine/home.dart';
-import 'package:flutter_gallery/demo/shrine/login.dart';
-import 'package:flutter_gallery/demo/shrine/supplemental/cut_corners_border.dart';
-
-class ShrineApp extends StatefulWidget {
-  @override
-  _ShrineAppState createState() => _ShrineAppState();
-}
-
-class _ShrineAppState extends State<ShrineApp> with SingleTickerProviderStateMixin {
-  // Controller to coordinate both the opening/closing of backdrop and sliding
-  // of expanding bottom sheet
-  AnimationController _controller;
-
-  @override
-  void initState() {
-    super.initState();
-    _controller = AnimationController(
-      vsync: this,
-      duration: const Duration(milliseconds: 450),
-      value: 1.0,
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      title: 'Shrine',
-      home: HomePage(
-        backdrop: Backdrop(
-          frontLayer: const ProductPage(),
-          backLayer: CategoryMenuPage(onCategoryTap: () => _controller.forward()),
-          frontTitle: const Text('SHRINE'),
-          backTitle: const Text('MENU'),
-          controller: _controller,
-        ),
-        expandingBottomSheet: ExpandingBottomSheet(hideController: _controller),
-      ),
-      initialRoute: '/login',
-      onGenerateRoute: _getRoute,
-      theme: _kShrineTheme,
-    );
-  }
-}
-
-Route<dynamic> _getRoute(RouteSettings settings) {
-  if (settings.name != '/login') {
-    return null;
-  }
-
-  return MaterialPageRoute<void>(
-    settings: settings,
-    builder: (BuildContext context) => LoginPage(),
-    fullscreenDialog: true,
-  );
-}
-
-final ThemeData _kShrineTheme = _buildShrineTheme();
-
-IconThemeData _customIconTheme(IconThemeData original) {
-  return original.copyWith(color: kShrineBrown900);
-}
-
-ThemeData _buildShrineTheme() {
-  final ThemeData base = ThemeData.light();
-  return base.copyWith(
-    colorScheme: kShrineColorScheme,
-    accentColor: kShrineBrown900,
-    primaryColor: kShrinePink100,
-    buttonColor: kShrinePink100,
-    scaffoldBackgroundColor: kShrineBackgroundWhite,
-    cardColor: kShrineBackgroundWhite,
-    textSelectionColor: kShrinePink100,
-    errorColor: kShrineErrorRed,
-    buttonTheme: const ButtonThemeData(
-      colorScheme: kShrineColorScheme,
-      textTheme: ButtonTextTheme.normal,
-    ),
-    primaryIconTheme: _customIconTheme(base.iconTheme),
-    inputDecorationTheme: const InputDecorationTheme(border: CutCornersBorder()),
-    textTheme: _buildShrineTextTheme(base.textTheme),
-    primaryTextTheme: _buildShrineTextTheme(base.primaryTextTheme),
-    accentTextTheme: _buildShrineTextTheme(base.accentTextTheme),
-    iconTheme: _customIconTheme(base.iconTheme),
-  );
-}
-
-TextTheme _buildShrineTextTheme(TextTheme base) {
-  return base.copyWith(
-    headline: base.headline.copyWith(fontWeight: FontWeight.w500),
-    title: base.title.copyWith(fontSize: 18.0),
-    caption: base.caption.copyWith(fontWeight: FontWeight.w400, fontSize: 14.0),
-    body2: base.body2.copyWith(fontWeight: FontWeight.w500, fontSize: 16.0),
-    button: base.button.copyWith(fontWeight: FontWeight.w500, fontSize: 14.0),
-  ).apply(
-    fontFamily: 'Raleway',
-    displayColor: kShrineBrown900,
-    bodyColor: kShrineBrown900,
-  );
-}
-
-const ColorScheme kShrineColorScheme = ColorScheme(
-  primary: kShrinePink100,
-  primaryVariant: kShrineBrown900,
-  secondary: kShrinePink50,
-  secondaryVariant: kShrineBrown900,
-  surface: kShrineSurfaceWhite,
-  background: kShrineBackgroundWhite,
-  error: kShrineErrorRed,
-  onPrimary: kShrineBrown900,
-  onSecondary: kShrineBrown900,
-  onSurface: kShrineBrown900,
-  onBackground: kShrineBrown900,
-  onError: kShrineSurfaceWhite,
-  brightness: Brightness.light,
-);

examples/flutter_gallery/lib/demo/shrine/category_menu_page.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-import 'package:scoped_model/scoped_model.dart';
-
-import 'package:flutter_gallery/demo/shrine/colors.dart';
-import 'package:flutter_gallery/demo/shrine/model/app_state_model.dart';
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-
-class CategoryMenuPage extends StatelessWidget {
-  const CategoryMenuPage({
-    Key key,
-    this.onCategoryTap,
-  }) : super(key: key);
-
-  final VoidCallback onCategoryTap;
-
-  Widget _buildCategory(Category category, BuildContext context) {
-    final String categoryString = category.toString().replaceAll('Category.', '').toUpperCase();
-    final ThemeData theme = Theme.of(context);
-    return ScopedModelDescendant<AppStateModel>(
-      builder: (BuildContext context, Widget child, AppStateModel model) =>
-          GestureDetector(
-            onTap: () {
-              model.setCategory(category);
-              if (onCategoryTap != null) {
-                onCategoryTap();
-              }
-            },
-            child: model.selectedCategory == category
-              ? Column(
-                  children: <Widget>[
-                    const SizedBox(height: 16.0),
-                    Text(
-                      categoryString,
-                      style: theme.textTheme.body2,
-                      textAlign: TextAlign.center,
-                    ),
-                    const SizedBox(height: 14.0),
-                    Container(
-                      width: 70.0,
-                      height: 2.0,
-                      color: kShrinePink400,
-                    ),
-                  ],
-                )
-              : Padding(
-                  padding: const EdgeInsets.symmetric(vertical: 16.0),
-                  child: Text(
-                    categoryString,
-                    style: theme.textTheme.body2.copyWith(
-                      color: kShrineBrown900.withAlpha(153)
-                    ),
-                    textAlign: TextAlign.center,
-                  ),
-                ),
-          ),
-    );
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Center(
-      child: Container(
-        padding: const EdgeInsets.only(top: 40.0),
-        color: kShrinePink100,
-        child: ListView(
-          children: Category.values.map((Category c) => _buildCategory(c, context)).toList(),
-        ),
-      ),
-    );
-  }
-}

examples/flutter_gallery/lib/demo/shrine/colors.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-
-const Color kShrinePink50 = Color(0xFFFEEAE6);
-const Color kShrinePink100 = Color(0xFFFEDBD0);
-const Color kShrinePink300 = Color(0xFFFBB8AC);
-const Color kShrinePink400 = Color(0xFFEAA4A4);
-
-const Color kShrineBrown900 = Color(0xFF442B2D);
-const Color kShrineBrown600 = Color(0xFF7D4F52);
-
-const Color kShrineErrorRed = Color(0xFFC5032B);
-
-const Color kShrineSurfaceWhite = Color(0xFFFFFBFA);
-const Color kShrineBackgroundWhite = Colors.white;

examples/flutter_gallery/lib/demo/shrine/home.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-import 'package:scoped_model/scoped_model.dart';
-
-import 'package:flutter_gallery/demo/shrine/backdrop.dart';
-import 'package:flutter_gallery/demo/shrine/expanding_bottom_sheet.dart';
-import 'package:flutter_gallery/demo/shrine/model/app_state_model.dart';
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-import 'package:flutter_gallery/demo/shrine/supplemental/asymmetric_view.dart';
-
-class ProductPage extends StatelessWidget {
-  const ProductPage({this.category = Category.all});
-
-  final Category category;
-
-  @override
-  Widget build(BuildContext context) {
-    return ScopedModelDescendant<AppStateModel>(
-      builder: (BuildContext context, Widget child, AppStateModel model) {
-        return AsymmetricView(products: model.getProducts());
-    });
-  }
-}
-
-class HomePage extends StatelessWidget {
-  const HomePage({
-    this.expandingBottomSheet,
-    this.backdrop,
-    Key key,
-  }) : super(key: key);
-
-  final ExpandingBottomSheet expandingBottomSheet;
-  final Backdrop backdrop;
-
-  @override
-  Widget build(BuildContext context) {
-    return Stack(
-      children: <Widget>[
-        backdrop,
-        Align(child: expandingBottomSheet, alignment: Alignment.bottomRight)
-      ],
-    );
-  }
-}

examples/flutter_gallery/lib/demo/shrine/login.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-
-import 'package:flutter_gallery/demo/shrine/colors.dart';
-
-class LoginPage extends StatefulWidget {
-  @override
-  _LoginPageState createState() => _LoginPageState();
-}
-
-class _LoginPageState extends State<LoginPage> {
-  final TextEditingController _usernameController = TextEditingController();
-  final TextEditingController _passwordController = TextEditingController();
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      body: SafeArea(
-        child: ListView(
-          padding: const EdgeInsets.symmetric(horizontal: 24.0),
-          children: <Widget>[
-            const SizedBox(height: 80.0),
-            Column(
-              children: <Widget>[
-                Image.asset('packages/shrine_images/diamond.png'),
-                const SizedBox(height: 16.0),
-                Text(
-                  'SHRINE',
-                  style: Theme.of(context).textTheme.headline,
-                ),
-              ],
-            ),
-            const SizedBox(height: 120.0),
-            PrimaryColorOverride(
-              color: kShrineBrown900,
-              child: TextField(
-                controller: _usernameController,
-                decoration: const InputDecoration(
-                  labelText: 'Username',
-                ),
-              ),
-            ),
-            const SizedBox(height: 12.0),
-            PrimaryColorOverride(
-              color: kShrineBrown900,
-              child: TextField(
-                controller: _passwordController,
-                decoration: const InputDecoration(
-                  labelText: 'Password',
-                ),
-              ),
-            ),
-            Wrap(
-              children: <Widget>[
-                ButtonBar(
-                  children: <Widget>[
-                    FlatButton(
-                      child: const Text('CANCEL'),
-                      shape: const BeveledRectangleBorder(
-                        borderRadius: BorderRadius.all(Radius.circular(7.0)),
-                      ),
-                      onPressed: () {
-                        _usernameController.clear();
-                        _passwordController.clear();
-                      },
-                    ),
-                    RaisedButton(
-                      child: const Text('NEXT'),
-                      elevation: 8.0,
-                      shape: const BeveledRectangleBorder(
-                        borderRadius: BorderRadius.all(Radius.circular(7.0)),
-                      ),
-                      onPressed: () {
-                        Navigator.pop(context);
-                      },
-                    ),
-                  ],
-                ),
-                Tooltip(
-                  message: 'Back',
-                  child: FlatButton(
-                    child: const Text('EXIT'),
-                    shape: const BeveledRectangleBorder(
-                      borderRadius: BorderRadius.all(Radius.circular(7.0)),
-                    ),
-                    onPressed: () {
-                      Navigator.of(context, rootNavigator: true).pop();
-                    },
-                  ),
-                ),
-              ],
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}
-
-class PrimaryColorOverride extends StatelessWidget {
-  const PrimaryColorOverride({Key key, this.color, this.child}) : super(key: key);
-
-  final Color color;
-  final Widget child;
-
-  @override
-  Widget build(BuildContext context) {
-    return Theme(
-      child: child,
-      data: Theme.of(context).copyWith(primaryColor: color),
-    );
-  }
-}

examples/flutter_gallery/lib/demo/shrine/model/app_state_model.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:scoped_model/scoped_model.dart';
-
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-import 'package:flutter_gallery/demo/shrine/model/products_repository.dart';
-
-double _salesTaxRate = 0.06;
-double _shippingCostPerItem = 7.0;
-
-class AppStateModel extends Model {
-  // All the available products.
-  List<Product> _availableProducts;
-
-  // The currently selected category of products.
-  Category _selectedCategory = Category.all;
-
-  // The IDs and quantities of products currently in the cart.
-  final Map<int, int> _productsInCart = <int, int>{};
-
-  Map<int, int> get productsInCart => Map<int, int>.from(_productsInCart);
-
-  // Total number of items in the cart.
-  int get totalCartQuantity => _productsInCart.values.fold(0, (int v, int e) => v + e);
-
-  Category get selectedCategory => _selectedCategory;
-
-  // Totaled prices of the items in the cart.
-  double get subtotalCost {
-    return _productsInCart.keys
-      .map((int id) => _availableProducts[id].price * _productsInCart[id])
-      .fold(0.0, (double sum, int e) => sum + e);
-  }
-
-  // Total shipping cost for the items in the cart.
-  double get shippingCost {
-    return _shippingCostPerItem * _productsInCart.values.fold(0.0, (num sum, int e) => sum + e);
-  }
-
-  // Sales tax for the items in the cart
-  double get tax => subtotalCost * _salesTaxRate;
-
-  // Total cost to order everything in the cart.
-  double get totalCost => subtotalCost + shippingCost + tax;
-
-  // Returns a copy of the list of available products, filtered by category.
-  List<Product> getProducts() {
-    if (_availableProducts == null) {
-      return <Product>[];
-    }
-
-    if (_selectedCategory == Category.all) {
-      return List<Product>.from(_availableProducts);
-    } else {
-      return _availableProducts
-        .where((Product p) => p.category == _selectedCategory)
-        .toList();
-    }
-  }
-
-  // Adds a product to the cart.
-  void addProductToCart(int productId) {
-    if (!_productsInCart.containsKey(productId)) {
-      _productsInCart[productId] = 1;
-    } else {
-      _productsInCart[productId]++;
-    }
-
-    notifyListeners();
-  }
-
-  // Removes an item from the cart.
-  void removeItemFromCart(int productId) {
-    if (_productsInCart.containsKey(productId)) {
-      if (_productsInCart[productId] == 1) {
-        _productsInCart.remove(productId);
-      } else {
-        _productsInCart[productId]--;
-      }
-    }
-
-    notifyListeners();
-  }
-
-  // Returns the Product instance matching the provided id.
-  Product getProductById(int id) {
-    return _availableProducts.firstWhere((Product p) => p.id == id);
-  }
-
-  // Removes everything from the cart.
-  void clearCart() {
-    _productsInCart.clear();
-    notifyListeners();
-  }
-
-  // Loads the list of available products from the repo.
-  void loadProducts() {
-    _availableProducts = ProductsRepository.loadProducts(Category.all);
-    notifyListeners();
-  }
-
-  void setCategory(Category newCategory) {
-    _selectedCategory = newCategory;
-    notifyListeners();
-  }
-}

examples/flutter_gallery/lib/demo/shrine/model/product.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/foundation.dart';
-
-enum Category {
-  all,
-  accessories,
-  clothing,
-  home,
-}
-
-class Product {
-  const Product({
-    @required this.category,
-    @required this.id,
-    @required this.isFeatured,
-    @required this.name,
-    @required this.price,
-  })  : assert(category != null),
-        assert(id != null),
-        assert(isFeatured != null),
-        assert(name != null),
-        assert(price != null);
-
-  final Category category;
-  final int id;
-  final bool isFeatured;
-  final String name;
-  final int price;
-
-  String get assetName => '$id-0.jpg';
-  String get assetPackage => 'shrine_images';
-
-  @override
-  String toString() => '$name (id=$id)';
-}

examples/flutter_gallery/lib/demo/shrine/model/products_repository.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-
-class ProductsRepository {
-  static List<Product> loadProducts(Category category) {
-    const List<Product> allProducts = <Product>[
-      Product(
-        category: Category.accessories,
-        id: 0,
-        isFeatured: true,
-        name: 'Vagabond sack',
-        price: 120,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 1,
-        isFeatured: true,
-        name: 'Stella sunglasses',
-        price: 58,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 2,
-        isFeatured: false,
-        name: 'Whitney belt',
-        price: 35,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 3,
-        isFeatured: true,
-        name: 'Garden strand',
-        price: 98,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 4,
-        isFeatured: false,
-        name: 'Strut earrings',
-        price: 34,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 5,
-        isFeatured: false,
-        name: 'Varsity socks',
-        price: 12,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 6,
-        isFeatured: false,
-        name: 'Weave keyring',
-        price: 16,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 7,
-        isFeatured: true,
-        name: 'Gatsby hat',
-        price: 40,
-      ),
-      Product(
-        category: Category.accessories,
-        id: 8,
-        isFeatured: true,
-        name: 'Shrug bag',
-        price: 198,
-      ),
-      Product(
-        category: Category.home,
-        id: 9,
-        isFeatured: true,
-        name: 'Gilt desk trio',
-        price: 58,
-      ),
-      Product(
-        category: Category.home,
-        id: 10,
-        isFeatured: false,
-        name: 'Copper wire rack',
-        price: 18,
-      ),
-      Product(
-        category: Category.home,
-        id: 11,
-        isFeatured: false,
-        name: 'Soothe ceramic set',
-        price: 28,
-      ),
-      Product(
-        category: Category.home,
-        id: 12,
-        isFeatured: false,
-        name: 'Hurrahs tea set',
-        price: 34,
-      ),
-      Product(
-        category: Category.home,
-        id: 13,
-        isFeatured: true,
-        name: 'Blue stone mug',
-        price: 18,
-      ),
-      Product(
-        category: Category.home,
-        id: 14,
-        isFeatured: true,
-        name: 'Rainwater tray',
-        price: 27,
-      ),
-      Product(
-        category: Category.home,
-        id: 15,
-        isFeatured: true,
-        name: 'Chambray napkins',
-        price: 16,
-      ),
-      Product(
-        category: Category.home,
-        id: 16,
-        isFeatured: true,
-        name: 'Succulent planters',
-        price: 16,
-      ),
-      Product(
-        category: Category.home,
-        id: 17,
-        isFeatured: false,
-        name: 'Quartet table',
-        price: 175,
-      ),
-      Product(
-        category: Category.home,
-        id: 18,
-        isFeatured: true,
-        name: 'Kitchen quattro',
-        price: 129,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 19,
-        isFeatured: false,
-        name: 'Clay sweater',
-        price: 48,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 20,
-        isFeatured: false,
-        name: 'Sea tunic',
-        price: 45,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 21,
-        isFeatured: false,
-        name: 'Plaster tunic',
-        price: 38,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 22,
-        isFeatured: false,
-        name: 'White pinstripe shirt',
-        price: 70,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 23,
-        isFeatured: false,
-        name: 'Chambray shirt',
-        price: 70,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 24,
-        isFeatured: true,
-        name: 'Seabreeze sweater',
-        price: 60,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 25,
-        isFeatured: false,
-        name: 'Gentry jacket',
-        price: 178,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 26,
-        isFeatured: false,
-        name: 'Navy trousers',
-        price: 74,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 27,
-        isFeatured: true,
-        name: 'Walter henley (white)',
-        price: 38,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 28,
-        isFeatured: true,
-        name: 'Surf and perf shirt',
-        price: 48,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 29,
-        isFeatured: true,
-        name: 'Ginger scarf',
-        price: 98,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 30,
-        isFeatured: true,
-        name: 'Ramona crossover',
-        price: 68,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 31,
-        isFeatured: false,
-        name: 'Chambray shirt',
-        price: 38,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 32,
-        isFeatured: false,
-        name: 'Classic white collar',
-        price: 58,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 33,
-        isFeatured: true,
-        name: 'Cerise scallop tee',
-        price: 42,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 34,
-        isFeatured: false,
-        name: 'Shoulder rolls tee',
-        price: 27,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 35,
-        isFeatured: false,
-        name: 'Grey slouch tank',
-        price: 24,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 36,
-        isFeatured: false,
-        name: 'Sunshirt dress',
-        price: 58,
-      ),
-      Product(
-        category: Category.clothing,
-        id: 37,
-        isFeatured: true,
-        name: 'Fine lines tee',
-        price: 58,
-      ),
-    ];
-    if (category == Category.all) {
-      return allProducts;
-    } else {
-      return allProducts.where((Product p) => p.category == category).toList();
-    }
-  }
-}

examples/flutter_gallery/lib/demo/shrine/shopping_cart.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:scoped_model/scoped_model.dart';
-
-import 'package:flutter_gallery/demo/shrine/colors.dart';
-import 'package:flutter_gallery/demo/shrine/expanding_bottom_sheet.dart';
-import 'package:flutter_gallery/demo/shrine/model/app_state_model.dart';
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-
-const double _leftColumnWidth = 60.0;
-
-class ShoppingCartPage extends StatefulWidget {
-  @override
-  _ShoppingCartPageState createState() => _ShoppingCartPageState();
-}
-
-class _ShoppingCartPageState extends State<ShoppingCartPage> {
-  List<Widget> _createShoppingCartRows(AppStateModel model) {
-    return model.productsInCart.keys
-        .map((int id) => ShoppingCartRow(
-            product: model.getProductById(id),
-            quantity: model.productsInCart[id],
-            onPressed: () {
-              model.removeItemFromCart(id);
-            },
-          ),
-        )
-        .toList();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final ThemeData localTheme = Theme.of(context);
-
-    return Scaffold(
-      backgroundColor: kShrinePink50,
-      body: SafeArea(
-        child: Container(
-          child: ScopedModelDescendant<AppStateModel>(
-            builder: (BuildContext context, Widget child, AppStateModel model) {
-              return Stack(
-                children: <Widget>[
-                  ListView(
-                    children: <Widget>[
-                      Row(
-                        children: <Widget>[
-                          SizedBox(
-                            width: _leftColumnWidth,
-                            child: IconButton(
-                              icon: const Icon(Icons.keyboard_arrow_down),
-                              onPressed: () => ExpandingBottomSheet.of(context).close(),
-                            ),
-                          ),
-                          Text(
-                            'CART',
-                            style: localTheme.textTheme.subhead.copyWith(fontWeight: FontWeight.w600),
-                          ),
-                          const SizedBox(width: 16.0),
-                          Text('${model.totalCartQuantity} ITEMS'),
-                        ],
-                      ),
-                      const SizedBox(height: 16.0),
-                      Column(
-                        children: _createShoppingCartRows(model),
-                      ),
-                      ShoppingCartSummary(model: model),
-                      const SizedBox(height: 100.0),
-                    ],
-                  ),
-                  Positioned(
-                    bottom: 16.0,
-                    left: 16.0,
-                    right: 16.0,
-                    child: RaisedButton(
-                      shape: const BeveledRectangleBorder(
-                        borderRadius: BorderRadius.all(Radius.circular(7.0)),
-                      ),
-                      color: kShrinePink100,
-                      splashColor: kShrineBrown600,
-                      child: const Padding(
-                        padding: EdgeInsets.symmetric(vertical: 12.0),
-                        child: Text('CLEAR CART'),
-                      ),
-                      onPressed: () {
-                        model.clearCart();
-                        ExpandingBottomSheet.of(context).close();
-                      },
-                    ),
-                  ),
-                ],
-              );
-            },
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class ShoppingCartSummary extends StatelessWidget {
-  const ShoppingCartSummary({this.model});
-
-  final AppStateModel model;
-
-  @override
-  Widget build(BuildContext context) {
-    final TextStyle smallAmountStyle = Theme.of(context).textTheme.body1.copyWith(color: kShrineBrown600);
-    final TextStyle largeAmountStyle = Theme.of(context).textTheme.display1;
-    final NumberFormat formatter = NumberFormat.simpleCurrency(
-      decimalDigits: 2,
-      locale: Localizations.localeOf(context).toString(),
-    );
-
-    return Row(
-      children: <Widget>[
-        const SizedBox(width: _leftColumnWidth),
-        Expanded(
-          child: Padding(
-            padding: const EdgeInsets.only(right: 16.0),
-            child: Column(
-              children: <Widget>[
-                Row(
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: <Widget>[
-                    const Expanded(
-                      child: Text('TOTAL'),
-                    ),
-                    Text(
-                      formatter.format(model.totalCost),
-                      style: largeAmountStyle,
-                    ),
-                  ],
-                ),
-                const SizedBox(height: 16.0),
-                Row(
-                  children: <Widget>[
-                    const Expanded(
-                      child: Text('Subtotal:'),
-                    ),
-                    Text(
-                      formatter.format(model.subtotalCost),
-                      style: smallAmountStyle,
-                    ),
-                  ],
-                ),
-                const SizedBox(height: 4.0),
-                Row(
-                  children: <Widget>[
-                    const Expanded(
-                      child: Text('Shipping:'),
-                    ),
-                    Text(
-                      formatter.format(model.shippingCost),
-                      style: smallAmountStyle,
-                    ),
-                  ],
-                ),
-                const SizedBox(height: 4.0),
-                Row(
-                  children: <Widget>[
-                    const Expanded(
-                      child: Text('Tax:'),
-                    ),
-                    Text(
-                      formatter.format(model.tax),
-                      style: smallAmountStyle,
-                    ),
-                  ],
-                ),
-              ],
-            ),
-          ),
-        ),
-      ],
-    );
-  }
-}
-
-class ShoppingCartRow extends StatelessWidget {
-  const ShoppingCartRow({
-    @required this.product,
-    @required this.quantity,
-    this.onPressed,
-  });
-
-  final Product product;
-  final int quantity;
-  final VoidCallback onPressed;
-
-  @override
-  Widget build(BuildContext context) {
-    final NumberFormat formatter = NumberFormat.simpleCurrency(
-      decimalDigits: 0,
-      locale: Localizations.localeOf(context).toString(),
-    );
-    final ThemeData localTheme = Theme.of(context);
-
-    return Padding(
-      padding: const EdgeInsets.only(bottom: 16.0),
-      child: Row(
-        key: ValueKey<int>(product.id),
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: <Widget>[
-          SizedBox(
-            width: _leftColumnWidth,
-            child: IconButton(
-              icon: const Icon(Icons.remove_circle_outline),
-              onPressed: onPressed,
-            ),
-          ),
-          Expanded(
-            child: Padding(
-              padding: const EdgeInsets.only(right: 16.0),
-              child: Column(
-                children: <Widget>[
-                  Row(
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: <Widget>[
-                      Image.asset(
-                        product.assetName,
-                        package: product.assetPackage,
-                        fit: BoxFit.cover,
-                        width: 75.0,
-                        height: 75.0,
-                      ),
-                      const SizedBox(width: 16.0),
-                      Expanded(
-                        child: Column(
-                          crossAxisAlignment: CrossAxisAlignment.start,
-                          children: <Widget>[
-                            Row(
-                              children: <Widget>[
-                                Expanded(
-                                  child: Text('Quantity: $quantity'),
-                                ),
-                                Text('x ${formatter.format(product.price)}'),
-                              ],
-                            ),
-                            Text(
-                              product.name,
-                              style: localTheme.textTheme.subhead.copyWith(fontWeight: FontWeight.w600),
-                            ),
-                          ],
-                        ),
-                      ),
-                    ],
-                  ),
-                  const SizedBox(height: 16.0),
-                  const Divider(
-                    color: kShrineBrown900,
-                    height: 10.0,
-                  ),
-                ],
-              ),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-}

examples/flutter_gallery/lib/demo/shrine/shrine_data.dart

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'shrine_types.dart';
+
+const String _kGalleryAssetsPackage = 'flutter_gallery_assets';
+
+const Vendor _ali = Vendor(
+  name: 'Ali’s shop',
+  avatarAsset: 'people/square/ali.png',
+  avatarAssetPackage: _kGalleryAssetsPackage,
+  description:
+    'Ali Connor’s makes custom goods for folks of all shapes and sizes '
+    'made by hand and sometimes by machine, but always with love and care. '
+    'Custom orders are available upon request if you need something extra special.'
+);
+
+const Vendor _peter = Vendor(
+  name: 'Peter’s shop',
+  avatarAsset: 'people/square/peter.png',
+  avatarAssetPackage: _kGalleryAssetsPackage,
+  description:
+    'Peter 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 _sandra = 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 = Vendor(
+  name: 'Stella’s shop',
+  avatarAsset: 'people/square/stella.png',
+  avatarAssetPackage: _kGalleryAssetsPackage,
+  description:
+    'Stella sells awesome stuff at lovely prices. made by hand and sometimes by '
+    'machine, but always with love and care. Custom orders are available upon request '
+    'if you need something extra special.'
+);
+
+const Vendor _trevor = 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 = <Product> [
+  Product(
+    name: 'Vintage Brown Belt',
+    imageAsset: 'products/belt.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <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’ belt just got an upgrade. '
+  ),
+  Product(
+    name: 'Sunglasses',
+    imageAsset: 'products/sunnies.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['travel', 'fashion', 'beauty'],
+    price: 20.00,
+    vendor: _trevor,
+    description:
+      'Be an optimist. Carry Sunglasses with you at all times. All Tints and '
+      'Shades products come with polarized lenses and super duper UV protection '
+      'so you can look at the sun for however long you want. Sunglasses make you '
+      'look cool, wear them.'
+  ),
+  Product(
+    name: 'Flatwear',
+    imageAsset: 'products/flatwear.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['furniture'],
+    price: 30.00,
+    vendor: _trevor,
+    description:
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  ),
+  Product(
+    name: 'Salmon Sweater',
+    imageAsset: 'products/sweater.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['fashion'],
+    price: 300.00,
+    vendor: _stella,
+    description:
+      'Looks can be deceiving. This sweater comes in a wide variety of '
+      'flavors, including salmon, that pop as soon as they hit your eyes. '
+      'Sweaters heat quickly, so savor the warmth.'
+  ),
+  Product(
+    name: 'Pine Table',
+    imageAsset: 'products/table.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['furniture'],
+    price: 63.00,
+    vendor: _stella,
+    description:
+      'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  ),
+  Product(
+    name: 'Green Comfort Jacket',
+    imageAsset: 'products/jacket.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['fashion'],
+    price: 36.00,
+    vendor: _ali,
+    description:
+      'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  ),
+  Product(
+    name: 'Chambray Top',
+    imageAsset: 'products/top.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['fashion'],
+    price: 125.00,
+    vendor: _peter,
+    description:
+      'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  ),
+  Product(
+    name: 'Blue Cup',
+    imageAsset: 'products/cup.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['travel', 'furniture'],
+    price: 75.00,
+    vendor: _sandra,
+    description:
+      'Drinksy has been making extraordinary mugs for decades. With each '
+      'cup purchased Drinksy donates a cup to those in need. Buy yourself a mug, '
+      'buy someone else a mug.'
+  ),
+  Product(
+    name: 'Tea Set',
+    imageAsset: 'products/teaset.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['furniture', 'fashion'],
+    price: 70.00,
+    vendor: _trevor,
+    featureTitle: 'Beautiful glass teapot',
+    featureDescription:
+      'Teapot holds extremely hot liquids and pours them from the spout.',
+    description:
+      '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 right, '
+      'so your fingers don’t get burnt while pouring.'
+  ),
+  Product(
+    name: 'Blue linen napkins',
+    imageAsset: 'products/napkins.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['furniture', 'fashion'],
+    price: 89.00,
+    vendor: _trevor,
+    description:
+      'Blue linen napkins were meant to go with friends, so you may want to pick '
+      'up a bunch of these. These things are absorbant.'
+  ),
+  Product(
+    name: 'Dipped Earrings',
+    imageAsset: 'products/earrings.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['fashion', 'beauty'],
+    price: 25.00,
+    vendor: _stella,
+    description:
+      'WeDipIt does it again. These hand-dipped 4 inch earrings are perfect for '
+      'the office or the beach. Just be sure you don’t drop it in a bucket of '
+      'red paint, then they won’t look dipped anymore.'
+  ),
+  Product(
+    name: 'Perfect Planters',
+    imageAsset: 'products/planters.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['latest', 'furniture'],
+    price: 30.00,
+    vendor: _ali,
+    description:
+      'The Perfect Planter Co makes the best vessels for just about anything you '
+      'can pot. This set of Perfect Planters holds succulents and cuttings perfectly. '
+      'Looks great in any room. Keep out of reach from cats.'
+  ),
+  Product(
+    name: 'Cloud-White Dress',
+    imageAsset: 'products/dress.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['fashion'],
+    price: 54.00,
+    vendor: _sandra,
+    description:
+      'Trying to find the perfect outift to match your mood? Try no longer. '
+      '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.'
+  ),
+  Product(
+    name: 'Backpack',
+    imageAsset: 'products/backpack.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['travel', 'fashion'],
+    price: 25.00,
+    vendor: _peter,
+    description:
+      'This backpack by Bags ‘n’ stuff can hold just about anything: a laptop, '
+      'a pen, a protractor, notebooks, small animals, plugs for your devices, '
+      'sunglasses, gym clothes, shoes, gloves, two kittens, and even lunch!'
+  ),
+  Product(
+    name: 'Charcoal Straw Hat',
+    imageAsset: 'products/hat.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['travel', 'fashion', 'latest'],
+    price: 25.00,
+    vendor: _ali,
+    description:
+      'This is the  helmet for those warm summer days on the road. '
+      'Jetset approved, these hats have been rigorously tested. Keep that face '
+      'protected from the sun.'
+  ),
+  Product(
+    name: 'Ginger Scarf',
+    imageAsset: 'products/scarf.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['latest', 'fashion'],
+    price: 17.00,
+    vendor: _peter,
+    description:
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  ),
+  Product(
+    name: 'Blush Sweats',
+    imageAsset: 'products/sweats.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['travel', 'fashion', 'latest'],
+    price: 25.00,
+    vendor: _stella,
+    description:
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  ),
+  Product(
+    name: 'Mint Jumper',
+    imageAsset: 'products/jumper.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>['travel', 'fashion', 'beauty'],
+    price: 25.00,
+    vendor: _peter,
+    description:
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  ),
+  Product(
+    name: 'Ochre Shirt',
+    imageAsset: 'products/shirt.png',
+    imageAssetPackage: _kGalleryAssetsPackage,
+    categories: <String>[ 'fashion', 'latest'],
+    price: 120.00,
+    vendor: _stella,
+    description:
+    'Leave the tunnel and the rain is fallin amazing things happen when you wait'
+  )
+];
+
+List<Product> allProducts() {
+  assert(_allProducts.every((Product product) => product.isValid()));
+  return List<Product>.unmodifiable(_allProducts);
+}

examples/flutter_gallery/lib/demo/shrine/shrine_page.dart

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+import 'shrine_theme.dart';
+import 'shrine_types.dart';
+
+enum ShrineAction {
+  sortByPrice,
+  sortByProduct,
+  emptyCart
+}
+
+class ShrinePage extends StatefulWidget {
+  const ShrinePage({
+    Key key,
+    @required this.scaffoldKey,
+    @required this.body,
+    this.floatingActionButton,
+    this.products,
+    this.shoppingCart
+  }) : assert(body != null),
+       assert(scaffoldKey != null),
+       super(key: key);
+
+  final GlobalKey<ScaffoldState> scaffoldKey;
+  final Widget body;
+  final Widget floatingActionButton;
+  final List<Product> products;
+  final Map<Product, Order> shoppingCart;
+
+  @override
+  ShrinePageState createState() => ShrinePageState();
+}
+
+/// Defines the Scaffold, AppBar, etc that the demo pages have in common.
+class ShrinePageState extends State<ShrinePage> {
+  double _appBarElevation = 0.0;
+
+  bool _handleScrollNotification(ScrollNotification notification) {
+    final double elevation = notification.metrics.extentBefore <= 0.0 ? 0.0 : 1.0;
+    if (elevation != _appBarElevation) {
+      setState(() {
+        _appBarElevation = elevation;
+      });
+    }
+    return false;
+  }
+
+  void _showShoppingCart() {
+    showModalBottomSheet<void>(context: context, builder: (BuildContext context) {
+      if (widget.shoppingCart.isEmpty) {
+        return const Padding(
+          padding: EdgeInsets.all(24.0),
+          child: Text('The shopping cart is empty')
+        );
+      }
+      return ListView(
+        padding: kMaterialListPadding,
+        children: widget.shoppingCart.values.map((Order order) {
+          return ListTile(
+            title: Text(order.product.name),
+            leading: Text('${order.quantity}'),
+            subtitle: Text(order.product.vendor.name)
+          );
+        }).toList(),
+      );
+    });
+  }
+
+  void _sortByPrice() {
+    widget.products.sort((Product a, Product b) => a.price.compareTo(b.price));
+  }
+
+  void _sortByProduct() {
+    widget.products.sort((Product a, Product b) => a.name.compareTo(b.name));
+  }
+
+  void _emptyCart() {
+    widget.shoppingCart.clear();
+    widget.scaffoldKey.currentState.showSnackBar(const SnackBar(content: Text('Shopping cart is empty')));
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final ShrineTheme theme = ShrineTheme.of(context);
+    return Scaffold(
+      key: widget.scaffoldKey,
+      appBar: AppBar(
+        elevation: _appBarElevation,
+        backgroundColor: theme.appBarBackgroundColor,
+        iconTheme: Theme.of(context).iconTheme,
+        brightness: Brightness.light,
+        flexibleSpace: Container(
+          decoration: BoxDecoration(
+            border: Border(
+              bottom: BorderSide(color: theme.dividerColor)
+            )
+          )
+        ),
+        title: Text('SHRINE', style: ShrineTheme.of(context).appBarTitleStyle),
+        centerTitle: true,
+        actions: <Widget>[
+          IconButton(
+            icon: const Icon(Icons.shopping_cart),
+            tooltip: 'Shopping cart',
+            onPressed: _showShoppingCart
+          ),
+          PopupMenuButton<ShrineAction>(
+            itemBuilder: (BuildContext context) => <PopupMenuItem<ShrineAction>>[
+              const PopupMenuItem<ShrineAction>(
+                value: ShrineAction.sortByPrice,
+                child: Text('Sort by price')
+              ),
+              const PopupMenuItem<ShrineAction>(
+                value: ShrineAction.sortByProduct,
+                child: Text('Sort by product')
+              ),
+              const PopupMenuItem<ShrineAction>(
+                value: ShrineAction.emptyCart,
+                child: Text('Empty shopping cart')
+              )
+            ],
+            onSelected: (ShrineAction action) {
+              switch (action) {
+                case ShrineAction.sortByPrice:
+                  setState(_sortByPrice);
+                  break;
+                case ShrineAction.sortByProduct:
+                  setState(_sortByProduct);
+                  break;
+                case ShrineAction.emptyCart:
+                  setState(_emptyCart);
+                  break;
+              }
+            }
+          )
+        ]
+      ),
+      floatingActionButton: widget.floatingActionButton,
+      body: NotificationListener<ScrollNotification>(
+        onNotification: _handleScrollNotification,
+        child: widget.body
+      )
+    );
+  }
+}

examples/flutter_gallery/lib/demo/shrine/shrine_theme.dart

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter/material.dart';
+
+class ShrineStyle extends TextStyle {
+  const ShrineStyle.roboto(double size, FontWeight weight, Color color)
+    : super(inherit: false, color: color, fontSize: size, fontWeight: weight, textBaseline: TextBaseline.alphabetic);
+
+  const ShrineStyle.abrilFatface(double size, FontWeight weight, Color color)
+    : super(inherit: false, color: color, fontFamily: 'AbrilFatface', fontSize: size, fontWeight: weight, textBaseline: TextBaseline.alphabetic);
+}
+
+TextStyle robotoRegular12(Color color) => ShrineStyle.roboto(12.0, FontWeight.w500, color);
+TextStyle robotoLight12(Color color) => ShrineStyle.roboto(12.0, FontWeight.w300, color);
+TextStyle robotoRegular14(Color color) => ShrineStyle.roboto(14.0, FontWeight.w500, color);
+TextStyle robotoMedium14(Color color) => ShrineStyle.roboto(14.0, FontWeight.w600, color);
+TextStyle robotoLight14(Color color) => ShrineStyle.roboto(14.0, FontWeight.w300, color);
+TextStyle robotoRegular16(Color color) => ShrineStyle.roboto(16.0, FontWeight.w500, color);
+TextStyle robotoRegular20(Color color) => ShrineStyle.roboto(20.0, FontWeight.w500, color);
+TextStyle abrilFatfaceRegular24(Color color) => ShrineStyle.abrilFatface(24.0, FontWeight.w500, color);
+TextStyle abrilFatfaceRegular34(Color color) => ShrineStyle.abrilFatface(34.0, FontWeight.w500, color);
+
+/// The TextStyles and Colors used for titles, labels, and descriptions. This
+/// InheritedWidget is shared by all of the routes and widgets created for
+/// the Shrine app.
+class ShrineTheme extends InheritedWidget {
+  ShrineTheme({ Key key, @required Widget child })
+    : assert(child != null),
+      super(key: key, child: child);
+
+  final Color cardBackgroundColor = Colors.white;
+  final Color appBarBackgroundColor = Colors.white;
+  final Color dividerColor = const Color(0xFFD9D9D9);
+  final Color priceHighlightColor = const Color(0xFFFFE0E0);
+
+  final TextStyle appBarTitleStyle = robotoRegular20(Colors.black87);
+  final TextStyle vendorItemStyle = robotoRegular12(const Color(0xFF81959D));
+  final TextStyle priceStyle = robotoRegular14(Colors.black87);
+  final TextStyle featureTitleStyle = abrilFatfaceRegular34(const Color(0xFF0A3142));
+  final TextStyle featurePriceStyle = robotoRegular16(Colors.black87);
+  final TextStyle featureStyle = robotoLight14(Colors.black54);
+  final TextStyle orderTitleStyle = abrilFatfaceRegular24(Colors.black87);
+  final TextStyle orderStyle = robotoLight14(Colors.black54);
+  final TextStyle vendorTitleStyle = robotoMedium14(Colors.black87);
+  final TextStyle vendorStyle = robotoLight14(Colors.black54);
+  final TextStyle quantityMenuStyle = robotoLight14(Colors.black54);
+
+  static ShrineTheme of(BuildContext context) => context.inheritFromWidgetOfExactType(ShrineTheme);
+
+  @override
+  bool updateShouldNotify(ShrineTheme oldWidget) => false;
+}

examples/flutter_gallery/lib/demo/shrine/shrine_types.dart

+// Copyright 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:ui' show hashValues;
+
+import 'package:flutter/foundation.dart';
+
+class Vendor {
+  const Vendor({
+    this.name,
+    this.description,
+    this.avatarAsset,
+    this.avatarAssetPackage,
+  });
+
+  final String name;
+  final String description;
+  final String avatarAsset;
+  final String avatarAssetPackage;
+
+  bool isValid() {
+    return name != null &&
+      description != null &&
+      avatarAsset != null;
+  }
+
+  @override
+  String toString() => 'Vendor($name)';
+}
+
+class Product {
+  const Product({
+    this.name,
+    this.description,
+    this.featureTitle,
+    this.featureDescription,
+    this.imageAsset,
+    this.imageAssetPackage,
+    this.categories,
+    this.price,
+    this.vendor
+  });
+
+  final String name;
+  final String description;
+  final String featureTitle;
+  final String featureDescription;
+  final String imageAsset;
+  final String imageAssetPackage;
+  final List<String> categories;
+  final double price;
+  final Vendor vendor;
+
+  String get tag => name; // Unique value for Heroes
+  String get priceString => '\$${price.floor()}';
+
+  bool isValid() {
+    return name != null &&
+      description != null &&
+      imageAsset != null &&
+      categories != null &&
+      categories.isNotEmpty &&
+      price != null &&
+      vendor.isValid();
+  }
+
+  @override
+  String toString() => 'Product($name)';
+}
+
+class Order {
+  Order({ @required this.product, this.quantity = 1, this.inCart = false })
+    : assert(product != null),
+      assert(quantity != null && quantity >= 0),
+      assert(inCart != null);
+
+  final Product product;
+  final int quantity;
+  final bool inCart;
+
+  Order copyWith({ Product product, int quantity, bool inCart }) {
+    return Order(
+      product: product ?? this.product,
+      quantity: quantity ?? this.quantity,
+      inCart: inCart ?? this.inCart
+    );
+  }
+
+  @override
+  bool operator ==(dynamic other) {
+    if (identical(this, other))
+      return true;
+    if (other.runtimeType != runtimeType)
+      return false;
+    final Order typedOther = other;
+    return product == typedOther.product &&
+           quantity == typedOther.quantity &&
+           inCart == typedOther.inCart;
+  }
+
+  @override
+  int get hashCode => hashValues(product, quantity, inCart);
+
+  @override
+  String toString() => 'Order($product, quantity=$quantity, inCart=$inCart)';
+}

examples/flutter_gallery/lib/demo/shrine/supplemental/asymmetric_view.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-import 'package:flutter_gallery/demo/shrine/supplemental/product_columns.dart';
-
-class AsymmetricView extends StatelessWidget {
-  const AsymmetricView({Key key, this.products}) : super(key: key);
-
-  final List<Product> products;
-
-  List<Container> _buildColumns(BuildContext context) {
-    if (products == null || products.isEmpty) {
-      return const <Container>[];
-    }
-
-    // This will return a list of columns. It will oscillate between the two
-    // kinds of columns. Even cases of the index (0, 2, 4, etc) will be
-    // TwoProductCardColumn and the odd cases will be OneProductCardColumn.
-    //
-    // Each pair of columns will advance us 3 products forward (2 + 1). That's
-    // some kinda awkward math so we use _evenCasesIndex and _oddCasesIndex as
-    // helpers for creating the index of the product list that will correspond
-    // to the index of the list of columns.
-    return List<Container>.generate(_listItemCount(products.length), (int index) {
-      double width = .59 * MediaQuery.of(context).size.width;
-      Widget column;
-      if (index % 2 == 0) {
-        /// Even cases
-        final int bottom = _evenCasesIndex(index);
-        column = TwoProductCardColumn(
-          bottom: products[bottom],
-          top: products.length - 1 >= bottom + 1
-            ? products[bottom + 1]
-            : null,
-        );
-        width += 32.0;
-      } else {
-        /// Odd cases
-        column = OneProductCardColumn(
-          product: products[_oddCasesIndex(index)],
-        );
-      }
-      return Container(
-        width: width,
-        child: Padding(
-          padding: const EdgeInsets.symmetric(horizontal: 16.0),
-          child: column,
-        ),
-      );
-    }).toList();
-  }
-
-  int _evenCasesIndex(int input) {
-    // The operator ~/ is a cool one. It's the truncating division operator. It
-    // divides the number and if there's a remainder / decimal, it cuts it off.
-    // This is like dividing and then casting the result to int. Also, it's
-    // functionally equivalent to floor() in this case.
-    return input ~/ 2 * 3;
-  }
-
-  int _oddCasesIndex(int input) {
-    assert(input > 0);
-    return (input / 2).ceil() * 3 - 1;
-  }
-
-  int _listItemCount(int totalItems) {
-    return (totalItems % 3 == 0)
-      ? totalItems ~/ 3 * 2
-      : (totalItems / 3).ceil() * 2 - 1;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      scrollDirection: Axis.horizontal,
-      padding: const EdgeInsets.fromLTRB(0.0, 34.0, 16.0, 44.0),
-      children: _buildColumns(context),
-      physics: const AlwaysScrollableScrollPhysics(),
-    );
-  }
-}

examples/flutter_gallery/lib/demo/shrine/supplemental/cut_corners_border.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'dart:ui' show lerpDouble;
-
-import 'package:flutter/material.dart';
-import 'package:flutter/widgets.dart';
-
-class CutCornersBorder extends OutlineInputBorder {
-  const CutCornersBorder({
-    BorderSide borderSide = BorderSide.none,
-    BorderRadius borderRadius = const BorderRadius.all(Radius.circular(2.0)),
-    this.cut = 7.0,
-    double gapPadding = 2.0,
-  }) : super(
-    borderSide: borderSide,
-    borderRadius: borderRadius,
-    gapPadding: gapPadding,
-  );
-
-  @override
-  CutCornersBorder copyWith({
-    BorderSide borderSide,
-    BorderRadius borderRadius,
-    double gapPadding,
-    double cut,
-  }) {
-    return CutCornersBorder(
-      borderSide: borderSide ?? this.borderSide,
-      borderRadius: borderRadius ?? this.borderRadius,
-      gapPadding: gapPadding ?? this.gapPadding,
-      cut: cut ?? this.cut,
-    );
-  }
-
-  final double cut;
-
-  @override
-  ShapeBorder lerpFrom(ShapeBorder a, double t) {
-    if (a is CutCornersBorder) {
-      final CutCornersBorder outline = a;
-      return CutCornersBorder(
-        borderRadius: BorderRadius.lerp(outline.borderRadius, borderRadius, t),
-        borderSide: BorderSide.lerp(outline.borderSide, borderSide, t),
-        cut: cut,
-        gapPadding: outline.gapPadding,
-      );
-    }
-    return super.lerpFrom(a, t);
-  }
-
-  @override
-  ShapeBorder lerpTo(ShapeBorder b, double t) {
-    if (b is CutCornersBorder) {
-      final CutCornersBorder outline = b;
-      return CutCornersBorder(
-        borderRadius: BorderRadius.lerp(borderRadius, outline.borderRadius, t),
-        borderSide: BorderSide.lerp(borderSide, outline.borderSide, t),
-        cut: cut,
-        gapPadding: outline.gapPadding,
-      );
-    }
-    return super.lerpTo(b, t);
-  }
-
-  Path _notchedCornerPath(Rect center, [double start = 0.0, double extent = 0.0]) {
-    final Path path = Path();
-    if (start > 0.0 || extent > 0.0) {
-      path.relativeMoveTo(extent + start, center.top);
-      _notchedSidesAndBottom(center, path);
-      path..lineTo(center.left + cut, center.top)..lineTo(start, center.top);
-    } else {
-      path.moveTo(center.left + cut, center.top);
-      _notchedSidesAndBottom(center, path);
-      path.lineTo(center.left + cut, center.top);
-    }
-    return path;
-  }
-
-  Path _notchedSidesAndBottom(Rect center, Path path) {
-    return path
-      ..lineTo(center.right - cut, center.top)
-      ..lineTo(center.right, center.top + cut)
-      ..lineTo(center.right, center.top + center.height - cut)
-      ..lineTo(center.right - cut, center.top + center.height)
-      ..lineTo(center.left + cut, center.top + center.height)
-      ..lineTo(center.left, center.top + center.height - cut)
-      ..lineTo(center.left, center.top + cut);
-  }
-
-  @override
-  void paint(
-    Canvas canvas,
-    Rect rect, {
-    double gapStart,
-    double gapExtent = 0.0,
-    double gapPercentage = 0.0,
-    TextDirection textDirection,
-  }) {
-    assert(gapExtent != null);
-    assert(gapPercentage >= 0.0 && gapPercentage <= 1.0);
-
-    final Paint paint = borderSide.toPaint();
-    final RRect outer = borderRadius.toRRect(rect);
-    if (gapStart == null || gapExtent <= 0.0 || gapPercentage == 0.0) {
-      canvas.drawPath(_notchedCornerPath(outer.middleRect), paint);
-    } else {
-      final double extent = lerpDouble(0.0, gapExtent + gapPadding * 2.0, gapPercentage);
-      switch (textDirection) {
-        case TextDirection.rtl:
-          {
-            final Path path = _notchedCornerPath(outer.middleRect, gapStart + gapPadding - extent, extent);
-            canvas.drawPath(path, paint);
-            break;
-          }
-        case TextDirection.ltr:
-          {
-            final Path path = _notchedCornerPath(outer.middleRect, gapStart - gapPadding, extent);
-            canvas.drawPath(path, paint);
-            break;
-          }
-      }
-    }
-  }
-}

examples/flutter_gallery/lib/demo/shrine/supplemental/product_card.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-import 'package:intl/intl.dart';
-import 'package:scoped_model/scoped_model.dart';
-
-import 'package:flutter_gallery/demo/shrine/model/app_state_model.dart';
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-
-class ProductCard extends StatelessWidget {
-  const ProductCard({ this.imageAspectRatio = 33 / 49, this.product })
-      : assert(imageAspectRatio == null || imageAspectRatio > 0);
-
-  final double imageAspectRatio;
-  final Product product;
-
-  static const double kTextBoxHeight = 65.0;
-
-  @override
-  Widget build(BuildContext context) {
-    final NumberFormat formatter = NumberFormat.simpleCurrency(
-      decimalDigits: 0,
-      locale: Localizations.localeOf(context).toString(),
-    );
-
-    final ThemeData theme = Theme.of(context);
-
-    final Image imageWidget = Image.asset(
-      product.assetName,
-      package: product.assetPackage,
-      fit: BoxFit.cover,
-    );
-
-    return ScopedModelDescendant<AppStateModel>(
-      builder: (BuildContext context, Widget child, AppStateModel model) {
-        return GestureDetector(
-          onTap: () {
-            model.addProductToCart(product.id);
-            // TODO(redbrogdon): Add Snackbar
-          },
-          child: child,
-        );
-      },
-      child: Stack(
-        children: <Widget>[
-          Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            crossAxisAlignment: CrossAxisAlignment.center,
-            children: <Widget>[
-              AspectRatio(
-                aspectRatio: imageAspectRatio,
-                child: imageWidget,
-              ),
-              SizedBox(
-                height: kTextBoxHeight * MediaQuery.of(context).textScaleFactor,
-                width: 121.0,
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.end,
-                  crossAxisAlignment: CrossAxisAlignment.center,
-                  children: <Widget>[
-                    Text(
-                      product == null ? '' : product.name,
-                      style: theme.textTheme.button,
-                      softWrap: false,
-                      overflow: TextOverflow.ellipsis,
-                      maxLines: 1,
-                    ),
-                    const SizedBox(height: 4.0),
-                    Text(
-                      product == null ? '' : formatter.format(product.price),
-                      style: theme.textTheme.caption,
-                    ),
-                  ],
-                ),
-              ),
-            ],
-          ),
-          const Padding(
-            padding: EdgeInsets.all(16.0),
-            child: Icon(Icons.add_shopping_cart),
-          ),
-        ],
-      ),
-    );
-  }
-}

examples/flutter_gallery/lib/demo/shrine/supplemental/product_columns.dart

-// Copyright 2018-present the Flutter authors. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import 'package:flutter/material.dart';
-
-import 'package:flutter_gallery/demo/shrine/model/product.dart';
-import 'package:flutter_gallery/demo/shrine/supplemental/product_card.dart';
-
-class TwoProductCardColumn extends StatelessWidget {
-  const TwoProductCardColumn({
-    @required this.bottom,
-    this.top,
-  }) : assert(bottom != null);
-
-  final Product bottom, top;
-
-  @override
-  Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints) {
-      const double spacerHeight = 44.0;
-
-      final double heightOfCards = (constraints.biggest.height - spacerHeight) / 2.0;
-      final double heightOfImages = heightOfCards - ProductCard.kTextBoxHeight;
-      final double imageAspectRatio = (heightOfImages >= 0.0 && constraints.biggest.width > heightOfImages)
-        ? constraints.biggest.width / heightOfImages
-        : 33 / 49;
-
-      return ListView(
-        children: <Widget>[
-          Padding(
-            padding: const EdgeInsetsDirectional.only(start: 28.0),
-            child: top != null
-              ? ProductCard(
-                  imageAspectRatio: imageAspectRatio,
-                  product: top,
-                )
-              : SizedBox(
-                  height: heightOfCards > 0 ? heightOfCards : spacerHeight,
-                ),
-          ),
-          const SizedBox(height: spacerHeight),
-          Padding(
-            padding: const EdgeInsetsDirectional.only(end: 28.0),
-            child: ProductCard(
-              imageAspectRatio: imageAspectRatio,
-              product: bottom,
-            ),
-          ),
-        ],
-      );
-    });
-  }
-}
-
-class OneProductCardColumn extends StatelessWidget {
-  const OneProductCardColumn({this.product});
-
-  final Product product;
-
-  @override
-  Widget build(BuildContext context) {
-    return ListView(
-      reverse: true,
-      children: <Widget>[
-        const SizedBox(
-          height: 40.0,
-        ),
-        ProductCard(
-          product: product,
-        ),
-      ],
-    );
-  }
-}

examples/flutter_gallery/lib/demo/shrine_demo.dart

@@ -3,13 +3,40 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:flutter_gallery/demo/shrine/app.dart';
 
-class ShrineDemo extends StatelessWidget {
-  const ShrineDemo({ Key key }) : super(key: key);
+import 'shrine/shrine_home.dart' show ShrineHome;
+import 'shrine/shrine_theme.dart' show ShrineTheme;
+
+// This code would ordinarily be part of the MaterialApp's home. It's being
+// used by the ShrineDemo and by each route pushed from there because this
+// isn't a standalone app with its own main() and MaterialApp.
+Widget buildShrine(BuildContext context, Widget child) {
+  return Theme(
+    data: ThemeData(
+      primarySwatch: Colors.grey,
+      iconTheme: const IconThemeData(color: Color(0xFF707070)),
+      platform: Theme.of(context).platform,
+    ),
+    child: ShrineTheme(child: child)
+  );
+}
+
+// In a standalone version of this app, MaterialPageRoute<T> could be used directly.
+class ShrinePageRoute<T> extends MaterialPageRoute<T> {
+  ShrinePageRoute({
+    WidgetBuilder builder,
+    RouteSettings settings,
+  }) : super(builder: builder, settings: settings);
 
+  @override
+  Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
+    return buildShrine(context, super.buildPage(context, animation, secondaryAnimation));
+  }
+}
+
+class ShrineDemo extends StatelessWidget {
   static const String routeName = '/shrine'; // Used by the Gallery app.
 
   @override
-  Widget build(BuildContext context) => ShrineApp();
+  Widget build(BuildContext context) => buildShrine(context, ShrineHome());
 }

examples/flutter_gallery/lib/gallery/app.dart

@@ -7,8 +7,6 @@ import 'dart:async';
 import 'package:flutter/foundation.dart' show defaultTargetPlatform;
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart' show timeDilation;
-import 'package:flutter_gallery/demo/shrine/model/app_state_model.dart';
-import 'package:scoped_model/scoped_model.dart';
 
 import 'package:url_launcher/url_launcher.dart';
 
@@ -44,7 +42,6 @@ class GalleryApp extends StatefulWidget {
 class _GalleryAppState extends State<GalleryApp> {
   GalleryOptions _options;
   Timer _timeDilationTimer;
-  AppStateModel model;
 
   Map<String, WidgetBuilder> _buildRoutes() {
     // For a different example of how to set up an application routing table
@@ -66,7 +63,6 @@ class _GalleryAppState extends State<GalleryApp> {
       timeDilation: timeDilation,
       platform: defaultTargetPlatform,
     );
-    model = AppStateModel()..loadProducts();
   }
 
   @override
@@ -129,24 +125,22 @@ class _GalleryAppState extends State<GalleryApp> {
         child: home,
       );
     }
-    return ScopedModel<AppStateModel>(
-      model: model,
-      child: MaterialApp(
-        theme: _options.theme.data.copyWith(platform: _options.platform),
-        title: 'Flutter Gallery',
-        color: Colors.grey,
-        showPerformanceOverlay: _options.showPerformanceOverlay,
-        checkerboardOffscreenLayers: _options.showOffscreenLayersCheckerboard,
-        checkerboardRasterCacheImages: _options.showRasterCacheImagesCheckerboard,
-        routes: _buildRoutes(),
-        builder: (BuildContext context, Widget child) {
-          return Directionality(
-            textDirection: _options.textDirection,
-            child: _applyTextScaleFactor(child),
-          );
-        },
-        home: home,
-      ),
+
+    return MaterialApp(
+      theme: _options.theme.data.copyWith(platform: _options.platform),
+      title: 'Flutter Gallery',
+      color: Colors.grey,
+      showPerformanceOverlay: _options.showPerformanceOverlay,
+      checkerboardOffscreenLayers: _options.showOffscreenLayersCheckerboard,
+      checkerboardRasterCacheImages: _options.showRasterCacheImagesCheckerboard,
+      routes: _buildRoutes(),
+      builder: (BuildContext context, Widget child) {
+        return Directionality(
+          textDirection: _options.textDirection,
+          child: _applyTextScaleFactor(child),
+        );
+      },
+      home: home,
     );
   }
 }

examples/flutter_gallery/lib/gallery/demos.dart

@@ -93,7 +93,7 @@ List<GalleryDemo> _buildGalleryDemos() {
       icon: GalleryIcons.shrine,
       category: _kDemos,
       routeName: ShrineDemo.routeName,
-      buildRoute: (BuildContext context) => const ShrineDemo(),
+      buildRoute: (BuildContext context) => ShrineDemo(),
     ),
     GalleryDemo(
       title: 'Contact profile',

examples/flutter_gallery/pubspec.yaml

@@ -8,15 +8,13 @@ dependencies:
   flutter:
     sdk: flutter
   collection: 1.14.11
-  device_info: 0.3.0
+  device_info: 0.2.1
   intl: 0.15.7
   connectivity: 0.3.2
   string_scanner: 1.0.4
   url_launcher: 4.0.1
   cupertino_icons: 0.1.2
   video_player: 0.7.2
-  scoped_model: 0.3.0
-  shrine_images: 1.1.1
 
   # Also update dev/benchmarks/complex_layout/pubspec.yaml
   flutter_gallery_assets: 0.1.6
@@ -37,7 +35,7 @@ dev_dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -45,7 +43,7 @@ dev_dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -54,7 +52,7 @@ dev_dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -151,47 +149,6 @@ flutter:
     - packages/flutter_gallery_assets/people/square/sandra.png
     - packages/flutter_gallery_assets/people/square/stella.png
     - packages/flutter_gallery_assets/people/square/trevor.png
-    - packages/shrine_images/diamond.png
-    - packages/shrine_images/slanted_menu.png
-    - packages/shrine_images/0-0.jpg
-    - packages/shrine_images/1-0.jpg
-    - packages/shrine_images/2-0.jpg
-    - packages/shrine_images/3-0.jpg
-    - packages/shrine_images/4-0.jpg
-    - packages/shrine_images/5-0.jpg
-    - packages/shrine_images/6-0.jpg
-    - packages/shrine_images/7-0.jpg
-    - packages/shrine_images/8-0.jpg
-    - packages/shrine_images/9-0.jpg
-    - packages/shrine_images/10-0.jpg
-    - packages/shrine_images/11-0.jpg
-    - packages/shrine_images/12-0.jpg
-    - packages/shrine_images/13-0.jpg
-    - packages/shrine_images/14-0.jpg
-    - packages/shrine_images/15-0.jpg
-    - packages/shrine_images/16-0.jpg
-    - packages/shrine_images/17-0.jpg
-    - packages/shrine_images/18-0.jpg
-    - packages/shrine_images/19-0.jpg
-    - packages/shrine_images/20-0.jpg
-    - packages/shrine_images/21-0.jpg
-    - packages/shrine_images/22-0.jpg
-    - packages/shrine_images/23-0.jpg
-    - packages/shrine_images/24-0.jpg
-    - packages/shrine_images/25-0.jpg
-    - packages/shrine_images/26-0.jpg
-    - packages/shrine_images/27-0.jpg
-    - packages/shrine_images/28-0.jpg
-    - packages/shrine_images/29-0.jpg
-    - packages/shrine_images/30-0.jpg
-    - packages/shrine_images/31-0.jpg
-    - packages/shrine_images/32-0.jpg
-    - packages/shrine_images/33-0.jpg
-    - packages/shrine_images/34-0.jpg
-    - packages/shrine_images/35-0.jpg
-    - packages/shrine_images/36-0.jpg
-    - packages/shrine_images/37-0.jpg
-
   fonts:
     - family: Raleway
       fonts:
@@ -241,4 +198,4 @@ flutter:
         - asset: packages/flutter_gallery_assets/fonts/private/googlesans/GoogleSansDisplay-Regular.ttf
           weight: 400
 
-# PUBSPEC CHECKSUM: bd43
+# PUBSPEC CHECKSUM: ccf6

examples/platform_channel/pubspec.yaml

@@ -20,7 +20,7 @@ dev_dependencies:
     sdk: flutter
   test: 1.5.1
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   async: 2.0.8 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   boolean_selector: 1.0.4 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -29,7 +29,7 @@ dev_dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   file: 5.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http: 0.12.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -39,7 +39,7 @@ dev_dependencies:
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   js: 0.6.1+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   json_rpc_2: 2.0.9 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   mime: 0.9.6+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -74,4 +74,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: c324
+# PUBSPEC CHECKSUM: d4c2

examples/stocks/pubspec.yaml

@@ -14,7 +14,7 @@ dependencies:
   http: 0.12.0
   isolate: 2.0.2
 
-  analyzer: 0.33.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  analyzer: 0.33.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   args: 1.5.1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   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"
@@ -23,11 +23,11 @@ dependencies:
   crypto: 2.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   dart_style: 1.2.0 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+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"
   package_config: 1.0.5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -64,4 +64,4 @@ dev_dependencies:
 flutter:
   uses-material-design: true
 
-# PUBSPEC CHECKSUM: 5d4d
+# PUBSPEC CHECKSUM: ceeb

packages/flutter/lib/src/animation/tween_sequence.dart

@@ -82,9 +82,6 @@ class TweenSequence<T> extends Animatable<T> {
     assert(false, 'TweenSequence.evaluate() could not find a interval for $t');
     return null;
   }
-
-  @override
-  String toString() => 'TweenSequence(${_items.length} items)';
 }
 
 /// A simple holder for one element of a [TweenSequence].

packages/flutter/lib/src/material/text_field.dart

@@ -127,7 +127,6 @@ class TextField extends StatefulWidget {
     this.keyboardAppearance,
     this.scrollPadding = const EdgeInsets.all(20.0),
     this.enableInteractiveSelection = true,
-    this.onTap,
   }) : assert(textAlign != null),
        assert(autofocus != null),
        assert(obscureText != null),
@@ -145,44 +144,9 @@ class TextField extends StatefulWidget {
   /// If null, this widget will create its own [TextEditingController].
   final TextEditingController controller;
 
-  /// Defines the keyboard focus for this widget.
-  ///
-  /// The [focusNode] is a long-lived object that's typically managed by a
-  /// [StatefulWidget] parent. See [FocusNode] for more information.
-  ///
-  /// To give the keyboard focus to this widget provide a [focusNode] and then
-  /// use the current [FocusScope] to request the focus:
-  ///
-  /// ```dart
-  /// FocusScope.of(context).requestFocus(myFocusNode);
-  /// ```
-  ///
-  /// This happens automatically when the widget is tapped.
-  ///
-  /// To be notified when the widget gains or loses the focus, add a listener
-  /// to the [focusNode]:
-  ///
-  /// ```dart
-  /// focusNode.addListener(() { print(myFocusNode.hasFocus); });
-  /// ```
+  /// Controls whether this widget has keyboard focus.
   ///
   /// If null, this widget will create its own [FocusNode].
-  ///
-  /// ## Keyboard
-  ///
-  /// Requesting the focus will typically cause the the keyboard to be shown
-  /// if it's not showing already.
-  ///
-  /// On Android, the user can hide the keyboard - withouth changing the focus -
-  /// with the system back button. They can restore the keyboard's visibility
-  /// by tapping on a text field.  The user might hide the keyboard and
-  /// switch to a physical keyboard, or they might just need to get it
-  /// out of the way for a moment, to expose something it's
-  /// obscuring. In this case requesting the focus again will not
-  /// cause the focus to change, and will not make the keyboard visible.
-  ///
-  /// This widget builds an [EditableText] and will ensure that the keyboard is
-  /// showing when it is tapped by calling [EditableTextState.requestKeyboard()].
   final FocusNode focusNode;
 
   /// The decoration to show around the text field.
@@ -334,26 +298,6 @@ class TextField extends StatefulWidget {
   /// {@macro flutter.widgets.editableText.enableInteractiveSelection}
   final bool enableInteractiveSelection;
 
-  /// Called when the user taps on this textfield.
-  ///
-  /// The textfield builds a [GestureDetector] to handle input events like tap,
-  /// to trigger focus requests, to move the caret, adjust the selection, etc.
-  /// Handling some of those events by wrapping the textfield with a competing
-  /// GestureDetector is problematic.
-  ///
-  /// To unconditionally handle taps, without interfering with the textfield's
-  /// internal gesture detector, provide this callback.
-  ///
-  /// If the textfield is created with [enabled] false, taps will not be
-  /// recognized.
-  ///
-  /// To be notified when the textfield gains or loses the focus, provide a
-  /// [focusNode] and add a listener to that.
-  ///
-  /// To listen to arbitrary pointer events without competing with the
-  /// textfield's internal gesture detector, use a [Listener].
-  final GestureTapCallback onTap;
-
   @override
   _TextFieldState createState() => _TextFieldState();
 
@@ -371,7 +315,6 @@ class TextField extends StatefulWidget {
     properties.add(IntProperty('maxLines', maxLines, defaultValue: 1));
     properties.add(IntProperty('maxLength', maxLength, defaultValue: null));
     properties.add(FlagProperty('maxLengthEnforced', value: maxLengthEnforced, ifTrue: 'max length enforced'));
-    properties.add(DiagnosticsProperty<GestureTapCallback>('onTap', onTap, defaultValue: false));
   }
 }
 
@@ -510,8 +453,6 @@ class _TextFieldState extends State<TextField> with AutomaticKeepAliveClientMixi
       _renderEditable.handleTap();
     _requestKeyboard();
     _confirmCurrentSplash();
-    if (widget.onTap != null)
-      widget.onTap();
   }
 
   void _handleTapCancel() {

packages/flutter_tools/pubspec.yaml

@@ -9,7 +9,7 @@ environment:
 
 dependencies:
   # To update these, use "flutter update-packages --force-upgrade".
-  analyzer: 0.33.3+2
+  analyzer: 0.33.3
   archive: 2.0.4
   args: 1.5.1
   cli_util: 0.1.3+2
@@ -51,12 +51,12 @@ dependencies:
   convert: 2.0.2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   csslib: 0.14.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   dart2_constant: 1.0.2+dart2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  front_end: 0.1.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  front_end: 0.1.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   glob: 1.1.7 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   html: 0.13.3+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   http_parser: 3.1.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   io: 0.3.3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
-  kernel: 0.3.6+5 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
+  kernel: 0.3.6+3 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   logging: 0.11.3+2 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   matcher: 0.12.3+1 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
   package_resolver: 1.0.6 # THIS LINE IS AUTOGENERATED - TO UPDATE USE "flutter update-packages --force-upgrade"
@@ -94,4 +94,4 @@ dartdoc:
   # Exclude this package from the hosted API docs.
   nodoc: true
 
-# PUBSPEC CHECKSUM: 1cc9
+# PUBSPEC CHECKSUM: 1368