style: stricter linting rules

dartoos-dev · Jan 9, 2022 · e191f64 · e191f64
1 parent 6c07f6d
commit e191f64
Show file tree

Hide file tree

Showing 47 changed files with 74 additions and 104 deletions.
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,8 +1,7 @@
 import 'package:eo_color/eo_color.dart';
+import 'package:eo_color_example/contrast.dart';
 import 'package:flutter/material.dart';
 
-import 'contrast.dart';
-
 void main() {
   runApp(const ExampleApp());
 }
@@ -70,16 +69,20 @@ class SwatchWidget extends StatelessWidget {
 
   /// Brown swatch.
   const SwatchWidget.browns({Key? key})
-      : this(const Browns(), const Contrast.forBrown(), "Brown", key: key);
+      : this(const Browns(), const Contrast.forBrown(), 'Brown', key: key);
 
   /// Blue-Grey swatch.
   const SwatchWidget.blueGreys({Key? key})
-      : this(const BlueGreys(), const Contrast.forBlueGrey(), "Blue-Grey",
-            key: key);
+      : this(
+          const BlueGreys(),
+          const Contrast.forBlueGrey(),
+          'Blue-Grey',
+          key: key,
+        );
 
   /// Grey swatch.
   const SwatchWidget.greys({Key? key})
-      : this(const Greys(), const Contrast.forGrey(), "Grey", key: key);
+      : this(const Greys(), const Contrast.forGrey(), 'Grey', key: key);
 
   final Swatch _swatch;
   // Text contrast colors.

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -21,7 +21,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -49,7 +49,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.1.9"
+    version: "2.1.0"
   fake_async:
     dependency: transitive
     description:
@@ -73,7 +73,7 @@ packages:
       name: lint
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.5.3"
+    version: "1.8.1"
   matcher:
     dependency: transitive
     description:
@@ -155,7 +155,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.1"
 sdks:
-  dart: ">=2.12.0 <3.0.0"
+  dart: ">=2.15.0-7.0.dev <3.0.0"
   flutter: ">=1.17.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -20,4 +20,4 @@ dependencies:
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  lint: ^1.5.3
+  lint: ^1.8.1
diff --git a/lib/src/gradient.dart b/lib/src/gradient.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'swatch.dart';
+import 'package:eo_color/swatches.dart';
 
 /// Represents a color gradient.
 ///

diff --git a/lib/src/gradient_immut.dart b/lib/src/gradient_immut.dart
@@ -1,9 +1,7 @@
 import 'dart:ui';
 
-import 'package:eo_color/src/palette.dart';
-
-import 'gradient.dart';
-import 'swatch_base.dart';
+import 'package:eo_color/palettes.dart';
+import 'package:eo_color/swatches.dart';
 
 /// Convenience [Gradient] that retrieves immutable lists of colors.
 abstract class GradientImmut extends SwatchBase implements Gradient {

diff --git a/lib/src/gradient_swatch.dart b/lib/src/gradient_swatch.dart
@@ -1,7 +1,7 @@
 import 'dart:ui';
 
-import 'gradient.dart';
-import 'swatch.dart';
+import 'package:eo_color/gradients.dart';
+import 'package:eo_color/swatches.dart';
 
 /// A [Gradient] from a [Swatch] instance.
 abstract class GradientSwatch implements Gradient {

diff --git a/lib/src/material/amber/amber_accents.dart b/lib/src/material/amber/amber_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'amber_accent.dart';
-
 /// Material Design shades of amber accent.
 ///
 /// See also

diff --git a/lib/src/material/amber/ambers.dart b/lib/src/material/amber/ambers.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'amber.dart';
-
 /// Material Design shades of amber.
 ///
 /// See also

diff --git a/lib/src/material/blue/blue_accents.dart b/lib/src/material/blue/blue_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'blue_accent.dart';
-
 /// Material Design shades of blue accent.
 ///
 /// See also

diff --git a/lib/src/material/blue/blues.dart b/lib/src/material/blue/blues.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'blue.dart';
-
 /// Material Design shades of blue.
 ///
 /// See also

diff --git a/lib/src/material/blue_grey/blue_greys.dart b/lib/src/material/blue_grey/blue_greys.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'blue_grey.dart';
-
 /// Material Design shades of blue-grey.
 ///
 /// See also

diff --git a/lib/src/material/brown/browns.dart b/lib/src/material/brown/browns.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'brown.dart';
-
 /// Material Design shades of brown.
 ///
 /// See also

diff --git a/lib/src/material/cyan/cyan_accents.dart b/lib/src/material/cyan/cyan_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'cyan_accent.dart';
-
 /// Material Design shades of cyan accent.
 ///
 /// See also

diff --git a/lib/src/material/cyan/cyans.dart b/lib/src/material/cyan/cyans.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'cyan.dart';
-
 /// Material Design shades of cyan.
 ///
 /// See also

diff --git a/lib/src/material/deep_orange/deep_orange_accents.dart b/lib/src/material/deep_orange/deep_orange_accents.dart
@@ -1,13 +1,13 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'deep_orange_accent.dart';
-
 /// Material Design shades of deep orange accent.
 ///
 /// See also
 /// - [deep orange accent](https://api.flutter.dev/flutter/material/Colors/deep orangeAccent-constant.html)
 class DeepOrangeAccents extends SwatchBase {
-  /// Four shades of deep orange accent; the higher the index, the darker the color.
+  /// Four shades of deep orange accent; the higher the index, the darker the
+  /// color.
   ///
   /// There are 4 valid indexes
   /// - 0, light ≡ 100

diff --git a/lib/src/material/deep_orange/deep_oranges.dart b/lib/src/material/deep_orange/deep_oranges.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'deep_orange.dart';
-
 /// Material Design shades of deep orange.
 ///
 /// See also

diff --git a/lib/src/material/deep_purple/deep_purple_accents.dart b/lib/src/material/deep_purple/deep_purple_accents.dart
@@ -1,13 +1,13 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'deep_purple_accent.dart';
-
 /// Material Design shades of deep purple accent.
 ///
 /// See also
 /// - [deep purple accent](https://api.flutter.dev/flutter/material/Colors/deepPurpleAccent-constant.html)
 class DeepPurpleAccents extends SwatchBase {
-  /// Four shades of deep purple accent; the higher the index, the darker the color.
+  /// Four shades of deep purple accent; the higher the index, the darker the
+  /// color.
   ///
   /// There are 4 valid indexes
   /// - 0, light ≡ 100

diff --git a/lib/src/material/deep_purple/deep_purples.dart b/lib/src/material/deep_purple/deep_purples.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'deep_purple.dart';
-
 /// Material Design shades of deep purple.
 ///
 /// See also

diff --git a/lib/src/material/grad_of.dart b/lib/src/material/grad_of.dart
@@ -1,5 +1,5 @@
-import '../../swatches.dart';
-import '../gradient_swatch.dart';
+import 'package:eo_color/gradients.dart';
+import 'package:eo_color/swatches.dart';
 
 /// The gradient of the shades of a Material Design color.
 ///

diff --git a/lib/src/material/green/green_accents.dart b/lib/src/material/green/green_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'green_accent.dart';
-
 /// Material Design shades of green accent.
 ///
 /// See also

diff --git a/lib/src/material/green/greens.dart b/lib/src/material/green/greens.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'green.dart';
-
 /// Material Design shades of green.
 ///
 /// See also

diff --git a/lib/src/material/grey/greys.dart b/lib/src/material/grey/greys.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'grey.dart';
-
 /// Material Design shades of grey.
 ///
 /// See also

diff --git a/lib/src/material/indigo/indigo_accents.dart b/lib/src/material/indigo/indigo_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'indigo_accent.dart';
-
 /// Material Design shades of indigo accent.
 ///
 /// See also

diff --git a/lib/src/material/indigo/indigos.dart b/lib/src/material/indigo/indigos.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'indigo.dart';
-
 /// Material Design shades of indigo.
 ///
 /// See also

diff --git a/lib/src/material/light_blue/light_blue.dart b/lib/src/material/light_blue/light_blue.dart
@@ -1,4 +1,4 @@
-import '../../../eo_color.dart';
+import 'package:eo_color/palettes.dart';
 
 /// Material Design light blue.
 ///

diff --git a/lib/src/material/light_blue/light_blue_accents.dart b/lib/src/material/light_blue/light_blue_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'light_blue_accent.dart';
-
 /// Material Design shades of light blue accent.
 ///
 /// Equivalence between constructor and shade index
@@ -13,7 +12,8 @@ import 'light_blue_accent.dart';
 /// See also
 /// - [light blue accent](https://api.flutter.dev/flutter/material/Colors/lightBlueAccent-constant.html)
 class LightBlueAccents extends SwatchBase {
-  /// Four shades of light blue accent; the higher the index, the darker the color.
+  /// Four shades of light blue accent; the higher the index, the darker the
+  /// color.
   ///
   /// There are 4 valid indexes
   /// - 0, light ≡ 100

diff --git a/lib/src/material/light_blue/light_blues.dart b/lib/src/material/light_blue/light_blues.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'light_blue.dart';
-
 /// Material Design shades of light blue.
 ///
 /// See also

diff --git a/lib/src/material/light_green/light_green_accents.dart b/lib/src/material/light_green/light_green_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'light_green_accent.dart';
-
 /// Material Design shades of light green accent.
 ///
 /// Equivalence between constructor and shade index
@@ -13,7 +12,8 @@ import 'light_green_accent.dart';
 /// See also
 /// - [light green accent](https://api.flutter.dev/flutter/material/Colors/lightGreenAccent-constant.html)
 class LightGreenAccents extends SwatchBase {
-  /// Four shades of light green accent; the higher the index, the darker the color.
+  /// Four shades of light green accent; the higher the index, the darker the
+  /// color.
   ///
   /// There are 4 valid indexes
   /// - 0, light ≡ 100

diff --git a/lib/src/material/light_green/light_greens.dart b/lib/src/material/light_green/light_greens.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'light_green.dart';
-
 /// Material Design shades of light green.
 ///
 /// See also

diff --git a/lib/src/material/lime/lime_accents.dart b/lib/src/material/lime/lime_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'lime_accent.dart';
-
 /// Material Design shades of lime accent.
 ///
 /// See also

diff --git a/lib/src/material/lime/limes.dart b/lib/src/material/lime/limes.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'lime.dart';
-
 /// Material Design shades of lime.
 ///
 /// See also

diff --git a/lib/src/material/orange/orange_accents.dart b/lib/src/material/orange/orange_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'orange_accent.dart';
-
 /// Material Design shades of orange accent.
 ///
 /// See also

diff --git a/lib/src/material/orange/oranges.dart b/lib/src/material/orange/oranges.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'orange.dart';
-
 /// Material Design shades of orange.
 ///
 /// See also

diff --git a/lib/src/material/pink/pink_accents.dart b/lib/src/material/pink/pink_accents.dart
@@ -1,7 +1,6 @@
+import 'package:eo_color/palettes.dart';
 import 'package:eo_color/swatches.dart';
 
-import 'pink_accent.dart';
-
 /// Material Design shades of pink accent.
 ///
 /// See also