From e191f64a49dc8cecad57a84549376d2dd07b19f1 Mon Sep 17 00:00:00 2001 From: rafael Date: Sun, 9 Jan 2022 11:40:08 -0300 Subject: [PATCH] style: stricter linting rules --- example/lib/main.dart | 15 +++++++++------ example/pubspec.lock | 10 +++++----- example/pubspec.yaml | 2 +- lib/src/gradient.dart | 2 +- lib/src/gradient_immut.dart | 6 ++---- lib/src/gradient_swatch.dart | 4 ++-- lib/src/material/amber/amber_accents.dart | 3 +-- lib/src/material/amber/ambers.dart | 3 +-- lib/src/material/blue/blue_accents.dart | 3 +-- lib/src/material/blue/blues.dart | 3 +-- lib/src/material/blue_grey/blue_greys.dart | 3 +-- lib/src/material/brown/browns.dart | 3 +-- lib/src/material/cyan/cyan_accents.dart | 3 +-- lib/src/material/cyan/cyans.dart | 3 +-- .../material/deep_orange/deep_orange_accents.dart | 6 +++--- lib/src/material/deep_orange/deep_oranges.dart | 3 +-- .../material/deep_purple/deep_purple_accents.dart | 6 +++--- lib/src/material/deep_purple/deep_purples.dart | 3 +-- lib/src/material/grad_of.dart | 4 ++-- lib/src/material/green/green_accents.dart | 3 +-- lib/src/material/green/greens.dart | 3 +-- lib/src/material/grey/greys.dart | 3 +-- lib/src/material/indigo/indigo_accents.dart | 3 +-- lib/src/material/indigo/indigos.dart | 3 +-- lib/src/material/light_blue/light_blue.dart | 2 +- .../material/light_blue/light_blue_accents.dart | 6 +++--- lib/src/material/light_blue/light_blues.dart | 3 +-- .../material/light_green/light_green_accents.dart | 6 +++--- lib/src/material/light_green/light_greens.dart | 3 +-- lib/src/material/lime/lime_accents.dart | 3 +-- lib/src/material/lime/limes.dart | 3 +-- lib/src/material/orange/orange_accents.dart | 3 +-- lib/src/material/orange/oranges.dart | 3 +-- lib/src/material/pink/pink_accents.dart | 3 +-- lib/src/material/pink/pinks.dart | 3 +-- lib/src/material/purple/purple_accents.dart | 3 +-- lib/src/material/purple/purples.dart | 3 +-- lib/src/material/red/red_accents.dart | 3 +-- lib/src/material/red/reds.dart | 3 +-- lib/src/material/teal/teal_accents.dart | 3 +-- lib/src/material/teal/teals.dart | 3 +-- lib/src/material/yellow/yellow_accents.dart | 3 +-- lib/src/material/yellow/yellows.dart | 3 +-- lib/src/palette_rgb.dart | 2 +- lib/src/swatch_base.dart | 4 ++-- pubspec.lock | 8 ++++---- pubspec.yaml | 2 +- 47 files changed, 74 insertions(+), 104 deletions(-) diff --git a/example/lib/main.dart b/example/lib/main.dart index 30c7d15..87f5ecd 100644 --- 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 index 66b63a9..3de7d37 100644 --- 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 index 0d6221e..285fc81 100644 --- 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 index c46c83b..f230a48 100644 --- 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 index 97c9809..376108a 100644 --- 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 index 44912c1..e7aebfd 100644 --- 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 index b6e443b..91dc1d5 100644 --- 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 index 96d82c8..07ad413 100644 --- 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 index 62b91e1..30a4bc0 100644 --- 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 index 87bf181..9588aaf 100644 --- 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 index bedc081..93ebbd1 100644 --- 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 index bc6860d..d845ada 100644 --- 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 index 1569adc..f7e57d7 100644 --- 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 index 5f82994..323ab13 100644 --- 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 index bd39daf..67c1686 100644 --- 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 index 51f93a4..2d4c728 100644 --- 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 index 86c355f..c3ffe54 100644 --- 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 index 2b3910d..be5db5c 100644 --- 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 index 8cf9d15..bbce64f 100644 --- 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 index 1cb434a..5c67f38 100644 --- 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 index 9353cf7..f5accda 100644 --- 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 index 780782c..42c0576 100644 --- 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 index 0c0ca86..78dbe99 100644 --- 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 index 54699ca..55a514d 100644 --- 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 index 2fe620e..18ff1bc 100644 --- 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 index 9b58c81..b81f810 100644 --- 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 index 1419481..735e04b 100644 --- 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 index 8a79b97..cb3b48b 100644 --- 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 index d9b1c2a..d8c7573 100644 --- 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 index 47f3656..1ee2f16 100644 --- 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 index a78e5b0..b126a65 100644 --- 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 index e6fa091..be68824 100644 --- 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 index 55dac61..7ef56bd 100644 --- 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 index 70cffa4..df5c1f3 100644 --- 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 diff --git a/lib/src/material/pink/pinks.dart b/lib/src/material/pink/pinks.dart index a1c0db7..387d169 100644 --- a/lib/src/material/pink/pinks.dart +++ b/lib/src/material/pink/pinks.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'pink.dart'; - /// Material Design shades of pink. /// /// See also diff --git a/lib/src/material/purple/purple_accents.dart b/lib/src/material/purple/purple_accents.dart index 301486d..6ebd1c9 100644 --- a/lib/src/material/purple/purple_accents.dart +++ b/lib/src/material/purple/purple_accents.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'purple_accent.dart'; - /// Material Design shades of purple accent. /// /// See also diff --git a/lib/src/material/purple/purples.dart b/lib/src/material/purple/purples.dart index 0f9f08a..dd7b706 100644 --- a/lib/src/material/purple/purples.dart +++ b/lib/src/material/purple/purples.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'purple.dart'; - /// Material Design shades of purple. /// /// See also diff --git a/lib/src/material/red/red_accents.dart b/lib/src/material/red/red_accents.dart index 44cafa9..16742c5 100644 --- a/lib/src/material/red/red_accents.dart +++ b/lib/src/material/red/red_accents.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'red_accent.dart'; - /// Material Design shades of red accent. /// /// See also diff --git a/lib/src/material/red/reds.dart b/lib/src/material/red/reds.dart index d017db4..105d8e3 100644 --- a/lib/src/material/red/reds.dart +++ b/lib/src/material/red/reds.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'red.dart'; - /// Material Design shades of red. /// /// See also diff --git a/lib/src/material/teal/teal_accents.dart b/lib/src/material/teal/teal_accents.dart index 5f60bb5..eeb0544 100644 --- a/lib/src/material/teal/teal_accents.dart +++ b/lib/src/material/teal/teal_accents.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'teal_accent.dart'; - /// Material Design shades of teal accent. /// /// See also diff --git a/lib/src/material/teal/teals.dart b/lib/src/material/teal/teals.dart index 68274d6..166356e 100644 --- a/lib/src/material/teal/teals.dart +++ b/lib/src/material/teal/teals.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'teal.dart'; - /// Material Design shades of teal. /// /// See also diff --git a/lib/src/material/yellow/yellow_accents.dart b/lib/src/material/yellow/yellow_accents.dart index 9a0d5f0..f63068b 100644 --- a/lib/src/material/yellow/yellow_accents.dart +++ b/lib/src/material/yellow/yellow_accents.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'yellow_accent.dart'; - /// Material Design shades of yellow accent. /// /// See also diff --git a/lib/src/material/yellow/yellows.dart b/lib/src/material/yellow/yellows.dart index d60908b..aaba94d 100644 --- a/lib/src/material/yellow/yellows.dart +++ b/lib/src/material/yellow/yellows.dart @@ -1,7 +1,6 @@ +import 'package:eo_color/palettes.dart'; import 'package:eo_color/swatches.dart'; -import 'yellow.dart'; - /// Material Design shades of yellow. /// /// See also diff --git a/lib/src/palette_rgb.dart b/lib/src/palette_rgb.dart index ebf6370..4366809 100644 --- a/lib/src/palette_rgb.dart +++ b/lib/src/palette_rgb.dart @@ -1,6 +1,6 @@ import 'dart:ui'; -import 'palette.dart'; +import 'package:eo_color/palettes.dart'; /// A Palette Color from alpha, red, green and blue. /// diff --git a/lib/src/swatch_base.dart b/lib/src/swatch_base.dart index 26a9313..d866b2d 100644 --- a/lib/src/swatch_base.dart +++ b/lib/src/swatch_base.dart @@ -1,7 +1,7 @@ import 'dart:ui'; -import 'palette.dart'; -import 'swatch.dart'; +import 'package:eo_color/palettes.dart'; +import 'package:eo_color/swatches.dart'; /// Base Swatch. abstract class SwatchBase implements Swatch { diff --git a/pubspec.lock b/pubspec.lock index 115640a..29f605b 100644 --- a/pubspec.lock +++ b/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: @@ -66,7 +66,7 @@ packages: name: lint url: "https://pub.dartlang.org" source: hosted - version: "1.7.2" + version: "1.8.1" matcher: dependency: transitive description: @@ -148,7 +148,7 @@ packages: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.1.1" sdks: - dart: ">=2.14.0-360.0.dev <3.0.0" + dart: ">=2.15.0-7.0.dev <3.0.0" flutter: ">=1.17.0" diff --git a/pubspec.yaml b/pubspec.yaml index f8dc292..43db900 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,4 +15,4 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - lint: ^1.7.2 + lint: ^1.8.1