Skip to content

Commit 4a2ef4e

Browse files
jason-simmonsjason-simmons
committed
Update imports to match the latest directives_ordering analyzer check
See https://github.com/dart-lang/linter/issues/2609
1 parent 8d47b95 commit 4a2ef4e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+76
-88
lines changed

‎lib/data/demos.dart

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ import 'dart:collection';
66
import 'package:flutter/cupertino.dart';
77
import 'package:flutter/foundation.dart' show describeEnum;
88
import 'package:flutter/material.dart';
9+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
10+
import 'package:flutter_gen/gen_l10n/gallery_localizations_en.dart'
11+
show GalleryLocalizationsEn;
912
import 'package:gallery/codeviewer/code_displayer.dart';
1013
import 'package:gallery/codeviewer/code_segments.dart';
1114
import 'package:gallery/data/icons.dart';
@@ -14,25 +17,22 @@ import 'package:gallery/deferred_widget.dart';
1417
import 'package:gallery/demos/cupertino/cupertino_demos.dart'
1518
deferred as cupertino_demos;
1619
import 'package:gallery/demos/cupertino/demo_types.dart';
20+
import 'package:gallery/demos/material/material_demo_types.dart';
1721
import 'package:gallery/demos/material/material_demos.dart'
1822
deferred as material_demos;
19-
import 'package:gallery/demos/material/material_demo_types.dart';
23+
import 'package:gallery/demos/reference/colors_demo.dart'
24+
deferred as colors_demo;
2025
import 'package:gallery/demos/reference/motion_demo_container_transition.dart'
2126
deferred as motion_demo_container;
22-
import 'package:gallery/demos/reference/motion_demo_fade_through_transition.dart';
2327
import 'package:gallery/demos/reference/motion_demo_fade_scale_transition.dart';
28+
import 'package:gallery/demos/reference/motion_demo_fade_through_transition.dart';
2429
import 'package:gallery/demos/reference/motion_demo_shared_x_axis_transition.dart';
2530
import 'package:gallery/demos/reference/motion_demo_shared_y_axis_transition.dart';
2631
import 'package:gallery/demos/reference/motion_demo_shared_z_axis_transition.dart';
27-
import 'package:gallery/demos/reference/colors_demo.dart'
28-
deferred as colors_demo;
2932
import 'package:gallery/demos/reference/transformations_demo.dart'
3033
deferred as transformations_demo;
3134
import 'package:gallery/demos/reference/typography_demo.dart'
3235
deferred as typography;
33-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
34-
import 'package:flutter_gen/gen_l10n/gallery_localizations_en.dart'
35-
show GalleryLocalizationsEn;
3636

3737
const _docsBaseUrl = 'https://api.flutter.dev/flutter';
3838
const _docsAnimationsUrl =

‎lib/demos/material/bottom_navigation_demo.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/material.dart';
65
import 'package:animations/animations.dart';
7-
8-
import 'package:gallery/demos/material/material_demo_types.dart';
6+
import 'package:flutter/material.dart';
97
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
8+
import 'package:gallery/demos/material/material_demo_types.dart';
109

1110
// BEGIN bottomNavigationDemo
1211

‎lib/demos/material/data_table_demo.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import 'package:flutter/material.dart';
66
import 'package:flutter/rendering.dart';
7-
import 'package:gallery/data/gallery_options.dart';
87
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
8+
import 'package:gallery/data/gallery_options.dart';
99
import 'package:intl/intl.dart';
1010

1111
// BEGIN dataTableDemo

‎lib/demos/material/dialog_demo.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
import 'package:flutter/material.dart';
66

7+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
78
import 'package:gallery/data/gallery_options.dart';
89
import 'package:gallery/demos/material/material_demo_types.dart';
9-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
1010

1111
// BEGIN dialogDemo
1212

‎lib/demos/material/divider_demo.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
import 'package:gallery/demos/material/material_demo_types.dart';
76
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
7+
import 'package:gallery/demos/material/material_demo_types.dart';
88

99
class DividerDemo extends StatelessWidget {
1010
const DividerDemo({Key key, this.type}) : super(key: key);

‎lib/demos/material/material_demos.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
export 'package:gallery/demos/material/app_bar_demo.dart';
12
export 'package:gallery/demos/material/banner_demo.dart';
23
export 'package:gallery/demos/material/bottom_app_bar_demo.dart';
34
export 'package:gallery/demos/material/bottom_navigation_demo.dart';
@@ -21,4 +22,3 @@ export 'package:gallery/demos/material/snackbar_demo.dart';
2122
export 'package:gallery/demos/material/tabs_demo.dart';
2223
export 'package:gallery/demos/material/text_field_demo.dart';
2324
export 'package:gallery/demos/material/tooltip_demo.dart';
24-
export 'package:gallery/demos/material/app_bar_demo.dart';

‎lib/demos/material/navigation_drawer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'package:flutter/cupertino.dart';
56
import 'package:flutter/material.dart';
67
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
7-
import 'package:flutter/cupertino.dart';
88

99
// BEGIN navDrawerDemo
1010

‎lib/demos/material/text_field_demo.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
import 'package:flutter/gestures.dart' show DragStartBehavior;
56
import 'package:flutter/material.dart';
6-
77
import 'package:flutter/services.dart';
8-
import 'package:flutter/gestures.dart' show DragStartBehavior;
98

109
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
1110

‎lib/demos/reference/motion_demo_container_transition.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/material.dart';
65
import 'package:animations/animations.dart';
6+
import 'package:flutter/material.dart';
77
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
88

99
// BEGIN openContainerTransformDemo

‎lib/demos/reference/motion_demo_fade_scale_transition.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/material.dart';
65
import 'package:animations/animations.dart';
6+
import 'package:flutter/material.dart';
77
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
88

99
// BEGIN fadeScaleTransitionDemo

‎lib/demos/reference/motion_demo_fade_through_transition.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/material.dart';
65
import 'package:animations/animations.dart';
6+
import 'package:flutter/material.dart';
77
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
88

99
// BEGIN fadeThroughTransitionDemo

‎lib/demos/reference/motion_demo_shared_x_axis_transition.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/material.dart';
65
import 'package:animations/animations.dart';
6+
import 'package:flutter/material.dart';
77
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
88

99
// BEGIN sharedXAxisTransitionDemo

‎lib/demos/reference/motion_demo_shared_y_axis_transition.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:math';
2-
import 'package:flutter/material.dart';
32
import 'package:animations/animations.dart';
3+
import 'package:flutter/material.dart';
44
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
55

66
// BEGIN sharedYAxisTransitionDemo

‎lib/layout/adaptive.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/material.dart';
65
import 'package:adaptive_breakpoints/adaptive_breakpoints.dart';
6+
import 'package:flutter/material.dart';
77

88
/// Returns a boolean value whether the window is considered medium or large size.
99
///

‎lib/main.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ import 'package:flutter/material.dart';
77
import 'package:flutter/scheduler.dart' show timeDilation;
88
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
99
import 'package:flutter_localized_locales/flutter_localized_locales.dart';
10-
import 'package:gallery/routes.dart';
11-
import 'package:google_fonts/google_fonts.dart';
1210
import 'package:gallery/constants.dart';
1311
import 'package:gallery/data/gallery_options.dart';
1412
import 'package:gallery/pages/backdrop.dart';
1513
import 'package:gallery/pages/splash.dart';
14+
import 'package:gallery/routes.dart';
1615
import 'package:gallery/themes/gallery_theme_data.dart';
16+
import 'package:google_fonts/google_fonts.dart';
17+
1718
export 'package:gallery/data/demos.dart' show pumpDeferredLibraries;
1819

1920
void main() {

‎lib/pages/about.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44

55
import 'package:flutter/gestures.dart';
66
import 'package:flutter/material.dart';
7+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
78
import 'package:package_info/package_info.dart';
89
import 'package:url_launcher/url_launcher.dart';
910

10-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
11-
1211
void showAboutDialog({
1312
@required BuildContext context,
1413
}) {

‎lib/pages/backdrop.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import 'package:flutter/material.dart';
66
import 'package:flutter/rendering.dart';
77
import 'package:flutter/services.dart';
8+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
89
import 'package:gallery/constants.dart';
910
import 'package:gallery/data/gallery_options.dart';
10-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
1111
import 'package:gallery/layout/adaptive.dart';
1212
import 'package:gallery/pages/home.dart';
1313
import 'package:gallery/pages/settings.dart';

‎lib/pages/category_list_item.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
import 'package:gallery/data/demos.dart';
76
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
7+
import 'package:gallery/data/demos.dart';
88
import 'package:gallery/layout/adaptive.dart';
99
import 'package:gallery/pages/demo.dart';
1010

‎lib/pages/demo.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import 'package:flutter/cupertino.dart';
88
import 'package:flutter/foundation.dart';
99
import 'package:flutter/material.dart';
1010
import 'package:flutter/services.dart';
11+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
1112
import 'package:gallery/codeviewer/code_displayer.dart';
1213
import 'package:gallery/codeviewer/code_style.dart';
1314
import 'package:gallery/constants.dart';
1415
import 'package:gallery/data/demos.dart';
1516
import 'package:gallery/data/gallery_options.dart';
1617
import 'package:gallery/feature_discovery/feature_discovery.dart';
17-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
1818
import 'package:gallery/layout/adaptive.dart';
1919
import 'package:gallery/pages/splash.dart';
2020
import 'package:gallery/themes/gallery_theme_data.dart';

‎lib/pages/home.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import 'package:gallery/pages/splash.dart';
2020
import 'package:gallery/studies/crane/colors.dart';
2121
import 'package:gallery/studies/crane/routes.dart' as crane_routes;
2222
import 'package:gallery/studies/fortnightly/routes.dart' as fortnightly_routes;
23-
import 'package:gallery/studies/rally/routes.dart' as rally_routes;
2423
import 'package:gallery/studies/rally/colors.dart';
24+
import 'package:gallery/studies/rally/routes.dart' as rally_routes;
2525
import 'package:gallery/studies/reply/routes.dart' as reply_routes;
26-
import 'package:gallery/studies/shrine/routes.dart' as shrine_routes;
2726
import 'package:gallery/studies/shrine/colors.dart';
27+
import 'package:gallery/studies/shrine/routes.dart' as shrine_routes;
2828
import 'package:gallery/studies/starter/routes.dart' as starter_app_routes;
2929

3030
const _horizontalPadding = 32.0;

‎lib/pages/settings.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import 'dart:collection';
66

77
import 'package:collection/collection.dart';
88
import 'package:flutter/material.dart';
9+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
910
import 'package:flutter_localized_locales/flutter_localized_locales.dart';
1011
import 'package:gallery/constants.dart';
1112
import 'package:gallery/data/gallery_options.dart';
12-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
1313
import 'package:gallery/layout/adaptive.dart';
1414
import 'package:gallery/pages/about.dart' as about;
1515
import 'package:gallery/pages/home.dart';

‎lib/pages/settings_list_item.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import 'dart:collection';
66

77
import 'package:flutter/material.dart';
8-
import 'package:gallery/data/gallery_options.dart';
98
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
9+
import 'package:gallery/data/gallery_options.dart';
1010

1111
// Common constants between SlowMotionSetting and SettingsListItem.
1212
final settingItemBorderRadius = BorderRadius.circular(10);

‎lib/studies/crane/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
import 'package:gallery/data/gallery_options.dart';
76
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
7+
import 'package:gallery/data/gallery_options.dart';
88
import 'package:gallery/studies/crane/backdrop.dart';
99
import 'package:gallery/studies/crane/eat_form.dart';
1010
import 'package:gallery/studies/crane/fly_form.dart';

‎lib/studies/crane/theme.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
import 'package:google_fonts/google_fonts.dart';
7-
86
import 'package:gallery/layout/letter_spacing.dart';
97
import 'package:gallery/studies/crane/colors.dart';
8+
import 'package:google_fonts/google_fonts.dart';
109

1110
final ThemeData craneTheme = _buildCraneTheme();
1211

‎lib/studies/fortnightly/app.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44

55
import 'package:flutter/material.dart';
66

7+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
78
import 'package:gallery/data/gallery_options.dart';
89
import 'package:gallery/layout/adaptive.dart';
910
import 'package:gallery/layout/image_placeholder.dart';
1011
import 'package:gallery/layout/text_scale.dart';
11-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
12-
import 'package:gallery/studies/fortnightly/shared.dart';
1312
import 'package:gallery/studies/fortnightly/routes.dart' as routes;
13+
import 'package:gallery/studies/fortnightly/shared.dart';
1414

1515
const _fortnightlyTitle = 'Fortnightly';
1616

‎lib/studies/fortnightly/shared.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
// found in the LICENSE file.
44

55
import 'package:flutter/material.dart';
6-
7-
import 'package:google_fonts/google_fonts.dart';
8-
import 'package:intl/intl.dart';
6+
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
97

108
import 'package:gallery/data/gallery_options.dart';
11-
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
129
import 'package:gallery/layout/image_placeholder.dart';
1310
import 'package:gallery/layout/text_scale.dart';
1411

12+
import 'package:google_fonts/google_fonts.dart';
13+
import 'package:intl/intl.dart';
14+
1515
class ArticleData {
1616
ArticleData(
1717
{this.imageUrl,

‎lib/studies/rally/app.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:flutter/material.dart';
6-
import 'package:google_fonts/google_fonts.dart';
75
import 'package:animations/animations.dart';
8-
9-
import 'package:gallery/data/gallery_options.dart';
6+
import 'package:flutter/material.dart';
107
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
8+
import 'package:gallery/data/gallery_options.dart';
119
import 'package:gallery/layout/letter_spacing.dart';
1210
import 'package:gallery/studies/rally/colors.dart';
1311
import 'package:gallery/studies/rally/home.dart';
1412
import 'package:gallery/studies/rally/login.dart';
1513
import 'package:gallery/studies/rally/routes.dart' as routes;
14+
import 'package:google_fonts/google_fonts.dart';
1615

1716
/// The RallyApp is a MaterialApp with a theme and 2 routes.
1817
///

‎lib/studies/rally/charts/line_chart.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
import 'package:intl/intl.dart' as intl;
65
import 'package:flutter/material.dart';
76
import 'package:flutter/semantics.dart';
87

98
import 'package:gallery/data/gallery_options.dart';
10-
import 'package:gallery/layout/text_scale.dart';
119
import 'package:gallery/layout/adaptive.dart';
10+
import 'package:gallery/layout/text_scale.dart';
1211
import 'package:gallery/studies/rally/colors.dart';
1312
import 'package:gallery/studies/rally/data.dart';
1413
import 'package:gallery/studies/rally/formatters.dart';
14+
import 'package:intl/intl.dart' as intl;
1515

1616
class RallyLineChart extends StatelessWidget {
1717
const RallyLineChart({this.events = const <DetailedEventData>[]})

‎lib/studies/rally/finance.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
import 'dart:math' as math;
66

7+
import 'package:animations/animations.dart';
78
import 'package:flutter/material.dart';
89
import 'package:flutter/rendering.dart';
9-
10-
import 'package:animations/animations.dart';
11-
import 'package:gallery/data/gallery_options.dart';
1210
import 'package:flutter_gen/gen_l10n/gallery_localizations.dart';
11+
import 'package:gallery/data/gallery_options.dart';
1312
import 'package:gallery/layout/adaptive.dart';
1413
import 'package:gallery/layout/text_scale.dart';
1514
import 'package:gallery/studies/rally/charts/line_chart.dart';

0 commit comments

Comments
 (0)