From e160f5261ccc2c616ea0190d9e58f191b623d352 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Sat, 9 Oct 2021 03:18:41 +1100 Subject: [PATCH] `experimental/linting_tool`: dart fix (#915) --- experimental/linting_tool/lib/app.dart | 4 ++-- experimental/linting_tool/lib/model/profiles_store.dart | 5 +++-- experimental/linting_tool/lib/model/rules_store.dart | 2 +- experimental/linting_tool/lib/pages/home_page.dart | 2 +- experimental/linting_tool/lib/repository/repository.dart | 2 +- experimental/linting_tool/lib/widgets/adaptive_nav.dart | 3 ++- experimental/linting_tool/test/widget_test.dart | 3 ++- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/experimental/linting_tool/lib/app.dart b/experimental/linting_tool/lib/app.dart index 8937e70f8..802b36d9b 100644 --- a/experimental/linting_tool/lib/app.dart +++ b/experimental/linting_tool/lib/app.dart @@ -3,13 +3,13 @@ // found in the LICENSE file. import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; import 'package:linting_tool/model/profiles_store.dart'; import 'package:linting_tool/model/rules_store.dart'; +import 'package:linting_tool/routes.dart' as routes; import 'package:linting_tool/theme/app_theme.dart'; import 'package:linting_tool/widgets/adaptive_nav.dart'; -import 'package:linting_tool/routes.dart' as routes; import 'package:provider/provider.dart'; -import 'package:http/http.dart' as http; final client = http.Client(); diff --git a/experimental/linting_tool/lib/model/profiles_store.dart b/experimental/linting_tool/lib/model/profiles_store.dart index b18a32470..f20eb0c42 100644 --- a/experimental/linting_tool/lib/model/profiles_store.dart +++ b/experimental/linting_tool/lib/model/profiles_store.dart @@ -6,14 +6,15 @@ import 'dart:convert'; import 'dart:developer'; import 'dart:io'; import 'dart:typed_data'; + +import 'package:file_selector/file_selector.dart' as file_selector; import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; import 'package:json2yaml/json2yaml.dart'; import 'package:linting_tool/model/profile.dart'; import 'package:linting_tool/model/rule.dart'; import 'package:linting_tool/repository/hive_service.dart'; import 'package:linting_tool/repository/repository.dart'; -import 'package:http/http.dart' as http; -import 'package:file_selector/file_selector.dart' as file_selector; import 'package:yaml/yaml.dart'; const _boxName = 'rules_profile'; diff --git a/experimental/linting_tool/lib/model/rules_store.dart b/experimental/linting_tool/lib/model/rules_store.dart index e1024762f..ddfd26b17 100644 --- a/experimental/linting_tool/lib/model/rules_store.dart +++ b/experimental/linting_tool/lib/model/rules_store.dart @@ -6,10 +6,10 @@ import 'dart:developer'; import 'dart:io'; import 'package:flutter/material.dart'; +import 'package:http/http.dart' as http; import 'package:linting_tool/model/profile.dart'; import 'package:linting_tool/model/rule.dart'; import 'package:linting_tool/repository/repository.dart'; -import 'package:http/http.dart' as http; /// Manages fetching rules from the web. class RuleStore extends ChangeNotifier { diff --git a/experimental/linting_tool/lib/pages/home_page.dart b/experimental/linting_tool/lib/pages/home_page.dart index 6a1173a1b..60dc32687 100644 --- a/experimental/linting_tool/lib/pages/home_page.dart +++ b/experimental/linting_tool/lib/pages/home_page.dart @@ -3,8 +3,8 @@ // found in the LICENSE file. import 'package:flutter/material.dart'; -import 'package:linting_tool/model/rules_store.dart'; import 'package:linting_tool/layout/adaptive.dart'; +import 'package:linting_tool/model/rules_store.dart'; import 'package:linting_tool/widgets/lint_expansion_tile.dart'; import 'package:provider/provider.dart'; diff --git a/experimental/linting_tool/lib/repository/repository.dart b/experimental/linting_tool/lib/repository/repository.dart index 9f5b8ff7c..cf7812bc2 100644 --- a/experimental/linting_tool/lib/repository/repository.dart +++ b/experimental/linting_tool/lib/repository/repository.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:http/http.dart' as http; import 'package:linting_tool/model/rule.dart'; import 'package:linting_tool/repository/api_provider.dart'; -import 'package:http/http.dart' as http; import 'package:yaml/yaml.dart'; class Repository { diff --git a/experimental/linting_tool/lib/widgets/adaptive_nav.dart b/experimental/linting_tool/lib/widgets/adaptive_nav.dart index 96fef4782..9f30c13cb 100644 --- a/experimental/linting_tool/lib/widgets/adaptive_nav.dart +++ b/experimental/linting_tool/lib/widgets/adaptive_nav.dart @@ -3,12 +3,13 @@ // found in the LICENSE file. import 'dart:math' as math; + import 'package:flutter/material.dart'; import 'package:flutter/rendering.dart'; +import 'package:linting_tool/layout/adaptive.dart'; import 'package:linting_tool/pages/default_lints_page.dart'; import 'package:linting_tool/pages/home_page.dart'; import 'package:linting_tool/pages/saved_lints_page.dart'; -import 'package:linting_tool/layout/adaptive.dart'; import 'package:linting_tool/theme/colors.dart'; final navKey = GlobalKey(); diff --git a/experimental/linting_tool/test/widget_test.dart b/experimental/linting_tool/test/widget_test.dart index 48c64818c..111ee27bc 100644 --- a/experimental/linting_tool/test/widget_test.dart +++ b/experimental/linting_tool/test/widget_test.dart @@ -7,6 +7,7 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:hive_flutter/hive_flutter.dart'; +import 'package:http/http.dart' as http; import 'package:linting_tool/app.dart'; import 'package:linting_tool/model/profile.dart'; import 'package:linting_tool/model/profiles_store.dart'; @@ -20,7 +21,7 @@ import 'package:linting_tool/widgets/adaptive_nav.dart'; import 'package:mockito/annotations.dart'; import 'package:mockito/mockito.dart'; import 'package:provider/provider.dart'; -import 'package:http/http.dart' as http; + import 'widget_test.mocks.dart'; late MockClient _mockClient;