Update imports to match the latest directives_ordering analyzer check (…

…flutter#494) See https://github.com/dart-lang/linter/issues/2609
thkim1011 · Apr 29, 2021 · a9b8d6c · a9b8d6c
1 parent 8d47b95
commit a9b8d6c
Show file tree

Hide file tree

Showing 50 changed files with 112 additions and 124 deletions.
diff --git a/lib/codeviewer/code_segments.dart b/lib/codeviewer/code_segments.dart
@@ -2134,30 +2134,30 @@ 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'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       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,23 +22003,23 @@ 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'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       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,15 +23819,15 @@ 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'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       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,15 +47465,15 @@ 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'),
       TextSpan(style: codeStyle.baseStyle, text: ' '),
       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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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