diff --git a/lib/codeviewer/code_segments.dart b/lib/codeviewer/code_segments.dart
index a0dc1c325e..1eb1915c2b 100644
--- a/lib/codeviewer/code_segments.dart
+++ b/lib/codeviewer/code_segments.dart
@@ -2134,22 +2134,22 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:animations/animations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:animations/animations.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
-      TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
+      TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
           text:
-              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
+              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -2157,7 +2157,7 @@ class CodeSegments {
       TextSpan(
           style: codeStyle.stringStyle,
           text:
-              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
+              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'class'),
@@ -18826,15 +18826,15 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:gallery/data/gallery_options.dart\u0027'),
+          text:
+              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text:
-              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
+          text: '\u0027package:gallery/data/gallery_options.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -22003,15 +22003,15 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:gallery/data/gallery_options.dart\u0027'),
+          text:
+              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text:
-              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
+          text: '\u0027package:gallery/data/gallery_options.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -22019,7 +22019,7 @@ class CodeSegments {
       TextSpan(
           style: codeStyle.stringStyle,
           text:
-              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
+              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'class'),
@@ -23819,7 +23819,7 @@ class CodeSegments {
       TextSpan(
           style: codeStyle.stringStyle,
           text:
-              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
+              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -23827,7 +23827,7 @@ class CodeSegments {
       TextSpan(
           style: codeStyle.stringStyle,
           text:
-              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
+              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'class'),
@@ -24018,14 +24018,14 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:animations/animations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:animations/animations.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -24826,14 +24826,14 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:animations/animations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:animations/animations.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -29160,22 +29160,22 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:flutter/cupertino.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text:
-              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/cupertino.dart\u0027'),
+          text:
+              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
       TextSpan(
@@ -30017,14 +30017,14 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:animations/animations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:animations/animations.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -35925,14 +35925,14 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:animations/animations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:animations/animations.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -37182,14 +37182,14 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:animations/animations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:animations/animations.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -41127,23 +41127,23 @@ class CodeSegments {
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/material.dart\u0027'),
+          text: '\u0027package:flutter/gestures.dart\u0027'),
+      TextSpan(style: codeStyle.baseStyle, text: ' show '),
+      TextSpan(style: codeStyle.classStyle, text: 'DragStartBehavior'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
-      TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
+      TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/services.dart\u0027'),
+          text: '\u0027package:flutter/material.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       TextSpan(
           style: codeStyle.stringStyle,
-          text: '\u0027package:flutter/gestures.dart\u0027'),
-      TextSpan(style: codeStyle.baseStyle, text: ' show '),
-      TextSpan(style: codeStyle.classStyle, text: 'DragStartBehavior'),
+          text: '\u0027package:flutter/services.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -47465,7 +47465,7 @@ class CodeSegments {
       TextSpan(
           style: codeStyle.stringStyle,
           text:
-              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
+              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'import'),
@@ -47473,7 +47473,7 @@ class CodeSegments {
       TextSpan(
           style: codeStyle.stringStyle,
           text:
-              '\u0027package:flutter_gen/gen_l10n/gallery_localizations.dart\u0027'),
+              '\u0027package:gallery/demos/material/material_demo_types.dart\u0027'),
       TextSpan(style: codeStyle.punctuationStyle, text: ';'),
       TextSpan(style: codeStyle.baseStyle, text: '\u000a\u000a'),
       TextSpan(style: codeStyle.keywordStyle, text: 'class'),
diff --git a/lib/data/demos.dart b/lib/data/demos.dart
index 1f3c7d8fde..1be98e9952 100644
--- a/lib/data/demos.dart
+++ b/lib/data/demos.dart
@@ -6,6 +6,9 @@ import 'dart:collection';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart' show describeEnum;
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations_en.dart'
+    show GalleryLocalizationsEn;
 import 'package:gallery/codeviewer/code_displayer.dart';
 import 'package:gallery/codeviewer/code_segments.dart';
 import 'package:gallery/data/icons.dart';
@@ -14,25 +17,22 @@ import 'package:gallery/deferred_widget.dart';
 import 'package:gallery/demos/cupertino/cupertino_demos.dart'
     deferred as cupertino_demos;
 import 'package:gallery/demos/cupertino/demo_types.dart';
+import 'package:gallery/demos/material/material_demo_types.dart';
 import 'package:gallery/demos/material/material_demos.dart'
     deferred as material_demos;
-import 'package:gallery/demos/material/material_demo_types.dart';
+import 'package:gallery/demos/reference/colors_demo.dart'
+    deferred as colors_demo;
 import 'package:gallery/demos/reference/motion_demo_container_transition.dart'
     deferred as motion_demo_container;
-import 'package:gallery/demos/reference/motion_demo_fade_through_transition.dart';
 import 'package:gallery/demos/reference/motion_demo_fade_scale_transition.dart';
+import 'package:gallery/demos/reference/motion_demo_fade_through_transition.dart';
 import 'package:gallery/demos/reference/motion_demo_shared_x_axis_transition.dart';
 import 'package:gallery/demos/reference/motion_demo_shared_y_axis_transition.dart';
 import 'package:gallery/demos/reference/motion_demo_shared_z_axis_transition.dart';
-import 'package:gallery/demos/reference/colors_demo.dart'
-    deferred as colors_demo;
 import 'package:gallery/demos/reference/transformations_demo.dart'
     deferred as transformations_demo;
 import 'package:gallery/demos/reference/typography_demo.dart'
     deferred as typography;
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations_en.dart'
-    show GalleryLocalizationsEn;
 
 const _docsBaseUrl = 'https://api.flutter.dev/flutter';
 const _docsAnimationsUrl =
diff --git a/lib/demos/material/bottom_navigation_demo.dart b/lib/demos/material/bottom_navigation_demo.dart
index de713f6016..986fc839ed 100644
--- a/lib/demos/material/bottom_navigation_demo.dart
+++ b/lib/demos/material/bottom_navigation_demo.dart
@@ -2,11 +2,10 @@
 // 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 'package:animations/animations.dart';
-
-import 'package:gallery/demos/material/material_demo_types.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/demos/material/material_demo_types.dart';
 
 // BEGIN bottomNavigationDemo
 
diff --git a/lib/demos/material/data_table_demo.dart b/lib/demos/material/data_table_demo.dart
index 0c9233652d..70078281f9 100644
--- a/lib/demos/material/data_table_demo.dart
+++ b/lib/demos/material/data_table_demo.dart
@@ -4,8 +4,8 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:intl/intl.dart';
 
 // BEGIN dataTableDemo
diff --git a/lib/demos/material/dialog_demo.dart b/lib/demos/material/dialog_demo.dart
index 0a4247100d..49444b926f 100644
--- a/lib/demos/material/dialog_demo.dart
+++ b/lib/demos/material/dialog_demo.dart
@@ -4,9 +4,9 @@
 
 import 'package:flutter/material.dart';
 
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/demos/material/material_demo_types.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 // BEGIN dialogDemo
 
diff --git a/lib/demos/material/divider_demo.dart b/lib/demos/material/divider_demo.dart
index b0acdb0452..a95efbc023 100644
--- a/lib/demos/material/divider_demo.dart
+++ b/lib/demos/material/divider_demo.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gallery/demos/material/material_demo_types.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/demos/material/material_demo_types.dart';
 
 class DividerDemo extends StatelessWidget {
   const DividerDemo({Key key, this.type}) : super(key: key);
diff --git a/lib/demos/material/material_demos.dart b/lib/demos/material/material_demos.dart
index 5651a5fc29..7239da9204 100644
--- a/lib/demos/material/material_demos.dart
+++ b/lib/demos/material/material_demos.dart
@@ -1,3 +1,4 @@
+export 'package:gallery/demos/material/app_bar_demo.dart';
 export 'package:gallery/demos/material/banner_demo.dart';
 export 'package:gallery/demos/material/bottom_app_bar_demo.dart';
 export 'package:gallery/demos/material/bottom_navigation_demo.dart';
@@ -21,4 +22,3 @@ export 'package:gallery/demos/material/snackbar_demo.dart';
 export 'package:gallery/demos/material/tabs_demo.dart';
 export 'package:gallery/demos/material/text_field_demo.dart';
 export 'package:gallery/demos/material/tooltip_demo.dart';
-export 'package:gallery/demos/material/app_bar_demo.dart';
diff --git a/lib/demos/material/navigation_drawer.dart b/lib/demos/material/navigation_drawer.dart
index 88e03d3fd3..4e093d6b90 100644
--- a/lib/demos/material/navigation_drawer.dart
+++ b/lib/demos/material/navigation_drawer.dart
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
-import 'package:flutter/cupertino.dart';
 
 // BEGIN navDrawerDemo
 
diff --git a/lib/demos/material/text_field_demo.dart b/lib/demos/material/text_field_demo.dart
index fa5814bbd3..70c49cc5bb 100644
--- a/lib/demos/material/text_field_demo.dart
+++ b/lib/demos/material/text_field_demo.dart
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+import 'package:flutter/gestures.dart' show DragStartBehavior;
 import 'package:flutter/material.dart';
-
 import 'package:flutter/services.dart';
-import 'package:flutter/gestures.dart' show DragStartBehavior;
 
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
diff --git a/lib/demos/reference/motion_demo_container_transition.dart b/lib/demos/reference/motion_demo_container_transition.dart
index 8d96ea81bd..5c98c88aa2 100644
--- a/lib/demos/reference/motion_demo_container_transition.dart
+++ b/lib/demos/reference/motion_demo_container_transition.dart
@@ -2,8 +2,8 @@
 // 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 'package:animations/animations.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 // BEGIN openContainerTransformDemo
diff --git a/lib/demos/reference/motion_demo_fade_scale_transition.dart b/lib/demos/reference/motion_demo_fade_scale_transition.dart
index c3e845f76e..299266a0a4 100644
--- a/lib/demos/reference/motion_demo_fade_scale_transition.dart
+++ b/lib/demos/reference/motion_demo_fade_scale_transition.dart
@@ -2,8 +2,8 @@
 // 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 'package:animations/animations.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 // BEGIN fadeScaleTransitionDemo
diff --git a/lib/demos/reference/motion_demo_fade_through_transition.dart b/lib/demos/reference/motion_demo_fade_through_transition.dart
index 231036155f..4d66674c66 100644
--- a/lib/demos/reference/motion_demo_fade_through_transition.dart
+++ b/lib/demos/reference/motion_demo_fade_through_transition.dart
@@ -2,8 +2,8 @@
 // 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 'package:animations/animations.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 // BEGIN fadeThroughTransitionDemo
diff --git a/lib/demos/reference/motion_demo_shared_x_axis_transition.dart b/lib/demos/reference/motion_demo_shared_x_axis_transition.dart
index da423c17fa..66dfab764d 100644
--- a/lib/demos/reference/motion_demo_shared_x_axis_transition.dart
+++ b/lib/demos/reference/motion_demo_shared_x_axis_transition.dart
@@ -2,8 +2,8 @@
 // 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 'package:animations/animations.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 // BEGIN sharedXAxisTransitionDemo
diff --git a/lib/demos/reference/motion_demo_shared_y_axis_transition.dart b/lib/demos/reference/motion_demo_shared_y_axis_transition.dart
index 311f8e3b34..04ef6f53b7 100644
--- a/lib/demos/reference/motion_demo_shared_y_axis_transition.dart
+++ b/lib/demos/reference/motion_demo_shared_y_axis_transition.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
-import 'package:flutter/material.dart';
 import 'package:animations/animations.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 // BEGIN sharedYAxisTransitionDemo
diff --git a/lib/layout/adaptive.dart b/lib/layout/adaptive.dart
index 83601b2e6f..d7469d963f 100644
--- a/lib/layout/adaptive.dart
+++ b/lib/layout/adaptive.dart
@@ -2,8 +2,8 @@
 // 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 'package:adaptive_breakpoints/adaptive_breakpoints.dart';
+import 'package:flutter/material.dart';
 
 /// Returns a boolean value whether the window is considered medium or large size.
 ///
diff --git a/lib/main.dart b/lib/main.dart
index 85d32da2fe..50bed89083 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -7,13 +7,14 @@ import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart' show timeDilation;
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
-import 'package:gallery/routes.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:gallery/constants.dart';
 import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/pages/backdrop.dart';
 import 'package:gallery/pages/splash.dart';
+import 'package:gallery/routes.dart';
 import 'package:gallery/themes/gallery_theme_data.dart';
+import 'package:google_fonts/google_fonts.dart';
+
 export 'package:gallery/data/demos.dart' show pumpDeferredLibraries;
 
 void main() {
diff --git a/lib/pages/about.dart b/lib/pages/about.dart
index 718c73242f..e962e0d983 100644
--- a/lib/pages/about.dart
+++ b/lib/pages/about.dart
@@ -4,11 +4,10 @@
 
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:package_info/package_info.dart';
 import 'package:url_launcher/url_launcher.dart';
 
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
-
 void showAboutDialog({
   @required BuildContext context,
 }) {
diff --git a/lib/pages/backdrop.dart b/lib/pages/backdrop.dart
index 003271b6ec..24fc02fd02 100644
--- a/lib/pages/backdrop.dart
+++ b/lib/pages/backdrop.dart
@@ -5,9 +5,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/constants.dart';
 import 'package:gallery/data/gallery_options.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/pages/home.dart';
 import 'package:gallery/pages/settings.dart';
diff --git a/lib/pages/category_list_item.dart b/lib/pages/category_list_item.dart
index ee57b12475..3ce734f5e0 100644
--- a/lib/pages/category_list_item.dart
+++ b/lib/pages/category_list_item.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gallery/data/demos.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/demos.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/pages/demo.dart';
 
diff --git a/lib/pages/demo.dart b/lib/pages/demo.dart
index f217060eea..c039a2e329 100644
--- a/lib/pages/demo.dart
+++ b/lib/pages/demo.dart
@@ -8,13 +8,13 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/codeviewer/code_displayer.dart';
 import 'package:gallery/codeviewer/code_style.dart';
 import 'package:gallery/constants.dart';
 import 'package:gallery/data/demos.dart';
 import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/feature_discovery/feature_discovery.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/pages/splash.dart';
 import 'package:gallery/themes/gallery_theme_data.dart';
diff --git a/lib/pages/home.dart b/lib/pages/home.dart
index 8179afa8c0..ae06fa7157 100644
--- a/lib/pages/home.dart
+++ b/lib/pages/home.dart
@@ -20,11 +20,11 @@ import 'package:gallery/pages/splash.dart';
 import 'package:gallery/studies/crane/colors.dart';
 import 'package:gallery/studies/crane/routes.dart' as crane_routes;
 import 'package:gallery/studies/fortnightly/routes.dart' as fortnightly_routes;
-import 'package:gallery/studies/rally/routes.dart' as rally_routes;
 import 'package:gallery/studies/rally/colors.dart';
+import 'package:gallery/studies/rally/routes.dart' as rally_routes;
 import 'package:gallery/studies/reply/routes.dart' as reply_routes;
-import 'package:gallery/studies/shrine/routes.dart' as shrine_routes;
 import 'package:gallery/studies/shrine/colors.dart';
+import 'package:gallery/studies/shrine/routes.dart' as shrine_routes;
 import 'package:gallery/studies/starter/routes.dart' as starter_app_routes;
 
 const _horizontalPadding = 32.0;
diff --git a/lib/pages/settings.dart b/lib/pages/settings.dart
index f9b2242343..c68c0edcab 100644
--- a/lib/pages/settings.dart
+++ b/lib/pages/settings.dart
@@ -6,10 +6,10 @@ import 'dart:collection';
 
 import 'package:collection/collection.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
 import 'package:gallery/constants.dart';
 import 'package:gallery/data/gallery_options.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/pages/about.dart' as about;
 import 'package:gallery/pages/home.dart';
diff --git a/lib/pages/settings_list_item.dart b/lib/pages/settings_list_item.dart
index 76c597802f..0120a916f2 100644
--- a/lib/pages/settings_list_item.dart
+++ b/lib/pages/settings_list_item.dart
@@ -5,8 +5,8 @@
 import 'dart:collection';
 
 import 'package:flutter/material.dart';
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 
 // Common constants between SlowMotionSetting and SettingsListItem.
 final settingItemBorderRadius = BorderRadius.circular(10);
diff --git a/lib/studies/crane/app.dart b/lib/studies/crane/app.dart
index e5d8fb1944..77068b9929 100644
--- a/lib/studies/crane/app.dart
+++ b/lib/studies/crane/app.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/studies/crane/backdrop.dart';
 import 'package:gallery/studies/crane/eat_form.dart';
 import 'package:gallery/studies/crane/fly_form.dart';
diff --git a/lib/studies/crane/theme.dart b/lib/studies/crane/theme.dart
index 1f96c446f3..29353b852e 100644
--- a/lib/studies/crane/theme.dart
+++ b/lib/studies/crane/theme.dart
@@ -3,10 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
-
 import 'package:gallery/layout/letter_spacing.dart';
 import 'package:gallery/studies/crane/colors.dart';
+import 'package:google_fonts/google_fonts.dart';
 
 final ThemeData craneTheme = _buildCraneTheme();
 
diff --git a/lib/studies/fortnightly/app.dart b/lib/studies/fortnightly/app.dart
index 963d6574b5..8a1ea1b602 100644
--- a/lib/studies/fortnightly/app.dart
+++ b/lib/studies/fortnightly/app.dart
@@ -4,13 +4,13 @@
 
 import 'package:flutter/material.dart';
 
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/image_placeholder.dart';
 import 'package:gallery/layout/text_scale.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
-import 'package:gallery/studies/fortnightly/shared.dart';
 import 'package:gallery/studies/fortnightly/routes.dart' as routes;
+import 'package:gallery/studies/fortnightly/shared.dart';
 
 const _fortnightlyTitle = 'Fortnightly';
 
diff --git a/lib/studies/fortnightly/shared.dart b/lib/studies/fortnightly/shared.dart
index c186baa69e..a022e5afe8 100644
--- a/lib/studies/fortnightly/shared.dart
+++ b/lib/studies/fortnightly/shared.dart
@@ -3,15 +3,15 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-
-import 'package:google_fonts/google_fonts.dart';
-import 'package:intl/intl.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 import 'package:gallery/data/gallery_options.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/image_placeholder.dart';
 import 'package:gallery/layout/text_scale.dart';
 
+import 'package:google_fonts/google_fonts.dart';
+import 'package:intl/intl.dart';
+
 class ArticleData {
   ArticleData(
       {this.imageUrl,
diff --git a/lib/studies/rally/app.dart b/lib/studies/rally/app.dart
index e0728baa90..581368a3f6 100644
--- a/lib/studies/rally/app.dart
+++ b/lib/studies/rally/app.dart
@@ -2,17 +2,16 @@
 // 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 'package:google_fonts/google_fonts.dart';
 import 'package:animations/animations.dart';
-
-import 'package:gallery/data/gallery_options.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/letter_spacing.dart';
 import 'package:gallery/studies/rally/colors.dart';
 import 'package:gallery/studies/rally/home.dart';
 import 'package:gallery/studies/rally/login.dart';
 import 'package:gallery/studies/rally/routes.dart' as routes;
+import 'package:google_fonts/google_fonts.dart';
 
 /// The RallyApp is a MaterialApp with a theme and 2 routes.
 ///
diff --git a/lib/studies/rally/charts/line_chart.dart b/lib/studies/rally/charts/line_chart.dart
index c4f940fa54..30a096063a 100644
--- a/lib/studies/rally/charts/line_chart.dart
+++ b/lib/studies/rally/charts/line_chart.dart
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:intl/intl.dart' as intl;
 import 'package:flutter/material.dart';
 import 'package:flutter/semantics.dart';
 
 import 'package:gallery/data/gallery_options.dart';
-import 'package:gallery/layout/text_scale.dart';
 import 'package:gallery/layout/adaptive.dart';
+import 'package:gallery/layout/text_scale.dart';
 import 'package:gallery/studies/rally/colors.dart';
 import 'package:gallery/studies/rally/data.dart';
 import 'package:gallery/studies/rally/formatters.dart';
+import 'package:intl/intl.dart' as intl;
 
 class RallyLineChart extends StatelessWidget {
   const RallyLineChart({this.events = const <DetailedEventData>[]})
diff --git a/lib/studies/rally/finance.dart b/lib/studies/rally/finance.dart
index 85af04c304..e7b60069cb 100644
--- a/lib/studies/rally/finance.dart
+++ b/lib/studies/rally/finance.dart
@@ -4,12 +4,11 @@
 
 import 'dart:math' as math;
 
+import 'package:animations/animations.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-
-import 'package:animations/animations.dart';
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/text_scale.dart';
 import 'package:gallery/studies/rally/charts/line_chart.dart';
diff --git a/lib/studies/rally/home.dart b/lib/studies/rally/home.dart
index d9605eb20c..a31ed61bf3 100644
--- a/lib/studies/rally/home.dart
+++ b/lib/studies/rally/home.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/text_scale.dart';
 import 'package:gallery/studies/rally/tabs/accounts.dart';
diff --git a/lib/studies/rally/login.dart b/lib/studies/rally/login.dart
index 1ec3379ce7..621e652e52 100644
--- a/lib/studies/rally/login.dart
+++ b/lib/studies/rally/login.dart
@@ -4,9 +4,9 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 import 'package:gallery/data/gallery_options.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/image_placeholder.dart';
 import 'package:gallery/layout/text_scale.dart';
diff --git a/lib/studies/rally/tabs/overview.dart b/lib/studies/rally/tabs/overview.dart
index 1021ced882..3c35fe9d74 100644
--- a/lib/studies/rally/tabs/overview.dart
+++ b/lib/studies/rally/tabs/overview.dart
@@ -7,9 +7,9 @@ import 'dart:math' as math;
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:gallery/data/gallery_options.dart';
-
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/text_scale.dart';
 import 'package:gallery/studies/rally/colors.dart';
diff --git a/lib/studies/rally/tabs/settings.dart b/lib/studies/rally/tabs/settings.dart
index 50beb4d561..ed5292f702 100644
--- a/lib/studies/rally/tabs/settings.dart
+++ b/lib/studies/rally/tabs/settings.dart
@@ -5,9 +5,9 @@
 import 'package:flutter/material.dart';
 
 import 'package:gallery/layout/adaptive.dart';
-import 'package:gallery/studies/rally/routes.dart' as rally_route;
 import 'package:gallery/studies/rally/colors.dart';
 import 'package:gallery/studies/rally/data.dart';
+import 'package:gallery/studies/rally/routes.dart' as rally_route;
 
 class SettingsView extends StatefulWidget {
   @override
diff --git a/lib/studies/shrine/app.dart b/lib/studies/shrine/app.dart
index 646972eeda..57a5dcd983 100644
--- a/lib/studies/shrine/app.dart
+++ b/lib/studies/shrine/app.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/studies/shrine/backdrop.dart';
 import 'package:gallery/studies/shrine/category_menu_page.dart';
diff --git a/lib/studies/shrine/backdrop.dart b/lib/studies/shrine/backdrop.dart
index 56ecf9d5b0..47d6fac61c 100644
--- a/lib/studies/shrine/backdrop.dart
+++ b/lib/studies/shrine/backdrop.dart
@@ -5,11 +5,10 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:gallery/studies/shrine/page_status.dart';
-import 'package:meta/meta.dart';
-
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/studies/shrine/category_menu_page.dart';
+import 'package:gallery/studies/shrine/page_status.dart';
+import 'package:meta/meta.dart';
 
 const Cubic _accelerateCurve = Cubic(0.548, 0, 0.757, 0.464);
 const Cubic _decelerateCurve = Cubic(0.23, 0.94, 0.41, 1);
diff --git a/lib/studies/shrine/category_menu_page.dart b/lib/studies/shrine/category_menu_page.dart
index 386b9673d8..3edde44ebe 100644
--- a/lib/studies/shrine/category_menu_page.dart
+++ b/lib/studies/shrine/category_menu_page.dart
@@ -3,10 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:scoped_model/scoped_model.dart';
-
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/text_scale.dart';
 import 'package:gallery/studies/shrine/app.dart';
@@ -15,6 +13,7 @@ import 'package:gallery/studies/shrine/model/app_state_model.dart';
 import 'package:gallery/studies/shrine/model/product.dart';
 import 'package:gallery/studies/shrine/page_status.dart';
 import 'package:gallery/studies/shrine/triangle_category_indicator.dart';
+import 'package:scoped_model/scoped_model.dart';
 
 double desktopCategoryMenuPageWidth({
   BuildContext context,
diff --git a/lib/studies/shrine/expanding_bottom_sheet.dart b/lib/studies/shrine/expanding_bottom_sheet.dart
index 2fda9ee04a..4e6920ab28 100644
--- a/lib/studies/shrine/expanding_bottom_sheet.dart
+++ b/lib/studies/shrine/expanding_bottom_sheet.dart
@@ -5,17 +5,16 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:meta/meta.dart';
-import 'package:scoped_model/scoped_model.dart';
-
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/text_scale.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/studies/shrine/colors.dart';
 import 'package:gallery/studies/shrine/model/app_state_model.dart';
 import 'package:gallery/studies/shrine/model/product.dart';
 import 'package:gallery/studies/shrine/page_status.dart';
 import 'package:gallery/studies/shrine/shopping_cart.dart';
+import 'package:meta/meta.dart';
+import 'package:scoped_model/scoped_model.dart';
 
 // These curves define the emphasized easing curve.
 const Cubic _accelerateCurve = Cubic(0.548, 0, 0.757, 0.464);
diff --git a/lib/studies/shrine/login.dart b/lib/studies/shrine/login.dart
index ed1afb7bbb..83ad885659 100644
--- a/lib/studies/shrine/login.dart
+++ b/lib/studies/shrine/login.dart
@@ -5,13 +5,13 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
+import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
 import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/image_placeholder.dart';
 import 'package:gallery/layout/letter_spacing.dart';
 import 'package:gallery/layout/text_scale.dart';
-import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/studies/shrine/app.dart';
 import 'package:gallery/studies/shrine/colors.dart';
 import 'package:gallery/studies/shrine/theme.dart';
diff --git a/lib/studies/shrine/model/app_state_model.dart b/lib/studies/shrine/model/app_state_model.dart
index 5d117df392..f7dd1c78b5 100644
--- a/lib/studies/shrine/model/app_state_model.dart
+++ b/lib/studies/shrine/model/app_state_model.dart
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:scoped_model/scoped_model.dart';
-
 import 'package:gallery/studies/shrine/model/product.dart';
 import 'package:gallery/studies/shrine/model/products_repository.dart';
+import 'package:scoped_model/scoped_model.dart';
 
 double _salesTaxRate = 0.06;
 double _shippingCostPerItem = 7;
diff --git a/lib/studies/shrine/model/product.dart b/lib/studies/shrine/model/product.dart
index 0e064a931a..2e3dea208f 100644
--- a/lib/studies/shrine/model/product.dart
+++ b/lib/studies/shrine/model/product.dart
@@ -2,8 +2,8 @@
 // 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 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
 
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 
diff --git a/lib/studies/shrine/model/products_repository.dart b/lib/studies/shrine/model/products_repository.dart
index c903dbc69c..fd33039d4a 100644
--- a/lib/studies/shrine/model/products_repository.dart
+++ b/lib/studies/shrine/model/products_repository.dart
@@ -2,9 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:gallery/studies/shrine/model/product.dart';
-
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/studies/shrine/model/product.dart';
 
 class ProductsRepository {
   static List<Product> loadProducts(Category category) {
diff --git a/lib/studies/shrine/shopping_cart.dart b/lib/studies/shrine/shopping_cart.dart
index d4ba23cdb6..7165643646 100644
--- a/lib/studies/shrine/shopping_cart.dart
+++ b/lib/studies/shrine/shopping_cart.dart
@@ -4,9 +4,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:intl/intl.dart';
-import 'package:scoped_model/scoped_model.dart';
-
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/letter_spacing.dart';
 import 'package:gallery/studies/shrine/colors.dart';
@@ -14,6 +11,8 @@ import 'package:gallery/studies/shrine/expanding_bottom_sheet.dart';
 import 'package:gallery/studies/shrine/model/app_state_model.dart';
 import 'package:gallery/studies/shrine/model/product.dart';
 import 'package:gallery/studies/shrine/theme.dart';
+import 'package:intl/intl.dart';
+import 'package:scoped_model/scoped_model.dart';
 
 const _startColumnWidth = 60.0;
 const _ordinalSortKeyName = 'shopping_cart';
diff --git a/lib/studies/shrine/supplemental/asymmetric_view.dart b/lib/studies/shrine/supplemental/asymmetric_view.dart
index 8492b8d3bf..a26426c9bd 100644
--- a/lib/studies/shrine/supplemental/asymmetric_view.dart
+++ b/lib/studies/shrine/supplemental/asymmetric_view.dart
@@ -10,11 +10,11 @@ import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/layout/text_scale.dart';
 import 'package:gallery/studies/shrine/category_menu_page.dart';
 import 'package:gallery/studies/shrine/model/product.dart';
-import 'package:gallery/studies/shrine/supplemental/balanced_layout.dart';
 import 'package:gallery/studies/shrine/page_status.dart';
+import 'package:gallery/studies/shrine/supplemental/balanced_layout.dart';
 import 'package:gallery/studies/shrine/supplemental/desktop_product_columns.dart';
-import 'package:gallery/studies/shrine/supplemental/product_columns.dart';
 import 'package:gallery/studies/shrine/supplemental/product_card.dart';
+import 'package:gallery/studies/shrine/supplemental/product_columns.dart';
 
 const _topPadding = 34.0;
 const _bottomPadding = 44.0;
diff --git a/lib/studies/shrine/supplemental/product_card.dart b/lib/studies/shrine/supplemental/product_card.dart
index 3946be967c..7275eea7a6 100644
--- a/lib/studies/shrine/supplemental/product_card.dart
+++ b/lib/studies/shrine/supplemental/product_card.dart
@@ -4,14 +4,13 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import 'package:intl/intl.dart';
-import 'package:scoped_model/scoped_model.dart';
-
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
 import 'package:gallery/layout/adaptive.dart';
 import 'package:gallery/layout/image_placeholder.dart';
 import 'package:gallery/studies/shrine/model/app_state_model.dart';
 import 'package:gallery/studies/shrine/model/product.dart';
+import 'package:intl/intl.dart';
+import 'package:scoped_model/scoped_model.dart';
 
 class MobileProductCard extends StatelessWidget {
   const MobileProductCard({this.imageAspectRatio = 33 / 49, this.product})
diff --git a/lib/studies/shrine/theme.dart b/lib/studies/shrine/theme.dart
index 581c21a0aa..8e37b4d66e 100644
--- a/lib/studies/shrine/theme.dart
+++ b/lib/studies/shrine/theme.dart
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:google_fonts/google_fonts.dart';
 import 'package:gallery/layout/letter_spacing.dart';
 import 'package:gallery/studies/shrine/colors.dart';
 import 'package:gallery/studies/shrine/supplemental/cut_corners_border.dart';
+import 'package:google_fonts/google_fonts.dart';
 
 const defaultLetterSpacing = 0.03;
 const mediumLetterSpacing = 0.04;
diff --git a/lib/studies/starter/app.dart b/lib/studies/starter/app.dart
index a4475915cb..360b3ac050 100644
--- a/lib/studies/starter/app.dart
+++ b/lib/studies/starter/app.dart
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:gallery/data/gallery_options.dart';
 import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
+import 'package:gallery/data/gallery_options.dart';
 import 'package:gallery/studies/starter/home.dart';
 import 'package:gallery/studies/starter/routes.dart' as routes;
 
diff --git a/pubspec.lock b/pubspec.lock
index e745758fe0..1c84f6bebd 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -49,7 +49,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.6.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -595,7 +595,7 @@ packages:
       name: vm_service
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.1.0+1"
+    version: "6.2.0"
   watcher:
     dependency: transitive
     description:
diff --git a/test_benchmarks/web_bundle_size_test.dart b/test_benchmarks/web_bundle_size_test.dart
index e07095e8bc..3cb9771f6c 100644
--- a/test_benchmarks/web_bundle_size_test.dart
+++ b/test_benchmarks/web_bundle_size_test.dart
@@ -4,8 +4,8 @@
 
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
 
 // Benchmark size in kB.
 const int bundleSizeBenchmark = 5000;
diff --git a/test_goldens/testing/font_loader.dart b/test_goldens/testing/font_loader.dart
index 31499a82c4..3daf0e4e7b 100644
--- a/test_goldens/testing/font_loader.dart
+++ b/test_goldens/testing/font_loader.dart
@@ -8,9 +8,9 @@ import 'dart:typed_data';
 
 import 'package:flutter/services.dart';
 
-import 'package:path/path.dart' as path;
 import 'package:google_fonts/src/google_fonts_family_with_variant.dart';
 import 'package:google_fonts/src/google_fonts_variant.dart';
+import 'package:path/path.dart' as path;
 
 /// Load fonts to make sure they show up in golden tests.
 Future<void> loadFonts() async {