From df864bc511bd81ce141cf2c8220fe738406061dd Mon Sep 17 00:00:00 2001 From: tommyxchow Date: Sun, 14 Nov 2021 23:18:43 -0500 Subject: [PATCH] Add `directives_ordering` lint rule --- analysis_options.yaml | 1 + lib/api/twitch_api.dart | 3 ++- lib/main.dart | 2 +- lib/screens/home.dart | 3 ++- lib/stores/auth_store.dart | 8 ++++---- lib/stores/stream_list_store.dart | 4 ++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/analysis_options.yaml b/analysis_options.yaml index 61b6c4de..397f418f 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -22,6 +22,7 @@ linter: # `// ignore_for_file: name_of_lint` syntax on the line or in the file # producing the lint. rules: + - directives_ordering # avoid_print: false # Uncomment to disable the `avoid_print` rule # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule diff --git a/lib/api/twitch_api.dart b/lib/api/twitch_api.dart index 70c8d430..96689ec2 100644 --- a/lib/api/twitch_api.dart +++ b/lib/api/twitch_api.dart @@ -1,10 +1,11 @@ import 'dart:convert'; + import 'package:flutter/foundation.dart'; import 'package:frosty/constants.dart'; import 'package:frosty/models/badges.dart'; import 'package:frosty/models/channel.dart'; -import 'package:frosty/models/stream.dart'; import 'package:frosty/models/emotes.dart'; +import 'package:frosty/models/stream.dart'; import 'package:frosty/models/user.dart'; import 'package:http/http.dart' as http; diff --git a/lib/main.dart b/lib/main.dart index 8c715067..4506215c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,9 +3,9 @@ import 'dart:io'; import 'package:flutter/material.dart'; import 'package:frosty/screens/home.dart'; import 'package:frosty/stores/auth_store.dart'; -import 'package:frosty/stores/stream_list_store.dart'; import 'package:frosty/stores/home_store.dart'; import 'package:frosty/stores/settings_store.dart'; +import 'package:frosty/stores/stream_list_store.dart'; import 'package:provider/provider.dart'; void main() { diff --git a/lib/screens/home.dart b/lib/screens/home.dart index a7046453..bd87e6b5 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -3,10 +3,11 @@ import 'package:flutter_mobx/flutter_mobx.dart'; import 'package:frosty/screens/search.dart'; import 'package:frosty/screens/settings.dart'; import 'package:frosty/stores/auth_store.dart'; -import 'package:frosty/stores/stream_list_store.dart'; import 'package:frosty/stores/home_store.dart'; import 'package:frosty/stores/settings_store.dart'; +import 'package:frosty/stores/stream_list_store.dart'; import 'package:provider/provider.dart'; + import '../widgets/stream_list.dart'; class Home extends StatefulWidget { diff --git a/lib/stores/auth_store.dart b/lib/stores/auth_store.dart index 439487af..deb9072c 100644 --- a/lib/stores/auth_store.dart +++ b/lib/stores/auth_store.dart @@ -1,10 +1,10 @@ -import 'package:frosty/api/twitch_api.dart'; -import 'package:mobx/mobx.dart'; import 'package:flutter/foundation.dart'; -import 'package:frosty/constants.dart'; -import 'package:frosty/models/user.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_web_auth/flutter_web_auth.dart'; +import 'package:frosty/api/twitch_api.dart'; +import 'package:frosty/constants.dart'; +import 'package:frosty/models/user.dart'; +import 'package:mobx/mobx.dart'; part 'auth_store.g.dart'; diff --git a/lib/stores/stream_list_store.dart b/lib/stores/stream_list_store.dart index e3b181fe..e406ef6c 100644 --- a/lib/stores/stream_list_store.dart +++ b/lib/stores/stream_list_store.dart @@ -1,7 +1,7 @@ import 'package:frosty/api/twitch_api.dart'; -import 'package:mobx/mobx.dart'; -import 'package:frosty/stores/auth_store.dart'; import 'package:frosty/models/stream.dart'; +import 'package:frosty/stores/auth_store.dart'; +import 'package:mobx/mobx.dart'; part 'stream_list_store.g.dart';