- changed: migrated all relative imports to package-imports -> see al…

…so discussion here: https://stackoverflow.com/a/47142052/4014430
IvanHerreraCasas · May 16, 2023 · 53adac1 · 53adac1
1 parent 7ec822f
commit 53adac1
Show file tree

Hide file tree

Showing 20 changed files with 50 additions and 51 deletions.
diff --git a/lib/dynamic_timeline.dart b/lib/dynamic_timeline.dart
@@ -1,5 +1,6 @@
 library dynamic_timeline;
 
 export 'src/rendering/label_builder.dart';
-export 'src/rendering/painter/interval_painter/interval_painter.dart';
+export 'src/rendering/painter/interval_painter/colored_interval_painter.dart';
+export 'src/rendering/painter/interval_painter/interval_decoration_painter.dart';
 export 'src/widgets/widgets.dart';
diff --git a/lib/src/rendering/dynamic_timeline_layout.dart b/lib/src/rendering/dynamic_timeline_layout.dart
@@ -1,4 +1,4 @@
-// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars
 import 'dart:math';
 import 'package:dynamic_timeline/src/rendering/painter/interval_painter/interval_painter.dart';
 import 'package:flutter/material.dart';

diff --git a/lib/src/rendering/label_builder.dart b/lib/src/rendering/label_builder.dart
@@ -1,7 +1,7 @@
-// ignore_for_file: lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: lines_longer_than_80_chars
+import 'package:dynamic_timeline/dynamic_timeline.dart';
+import 'package:dynamic_timeline/src/widgets/timeline_label_container.dart';
 import 'package:flutter/material.dart';
-import '../../dynamic_timeline.dart';
-import '../widgets/timeline_label_container.dart';
 
 /// {@template label_builder}
 /// The label builder provides the main infrastructure for building the main axis

diff --git a/lib/src/rendering/painter/background_painter.dart b/lib/src/rendering/painter/background_painter.dart
@@ -1,6 +1,6 @@
-// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars
+import 'package:dynamic_timeline/src/rendering/painter/interval_painter/background_painter_data.dart';
 import 'package:flutter/material.dart';
-import 'interval_painter/background_painter_data.dart';
 
 abstract class BackgroundPainter {
   BackgroundPainter();

diff --git a/lib/src/rendering/painter/dynamic_timeline_painter.dart b/lib/src/rendering/painter/dynamic_timeline_painter.dart
@@ -1,7 +1,8 @@
-// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars
+import 'package:dynamic_timeline/src/rendering/dynamic_timeline_layout.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
-import '../rendering.dart';
+
 
 abstract class DynamicTimelinePainter  {
 

diff --git a/lib/src/rendering/painter/horizontal_timeline_painter.dart b/lib/src/rendering/painter/horizontal_timeline_painter.dart
@@ -1,7 +1,7 @@
-// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars
+import 'package:dynamic_timeline/src/rendering/dynamic_timeline_layout.dart';
+import 'package:dynamic_timeline/src/rendering/painter/dynamic_timeline_painter.dart';
 import 'package:flutter/material.dart';
-import 'dynamic_timeline_painter.dart';
-import '../rendering.dart';
 
 class HorizontalTimelinePainter extends DynamicTimelinePainter{
   HorizontalTimelinePainter({required DynamicTimelineLayout layouter, required Paint linePaint, required TextStyle labelTextStyle}) :

diff --git a/lib/src/rendering/painter/interval_painter/colored_interval_painter.dart b/lib/src/rendering/painter/interval_painter/colored_interval_painter.dart
@@ -1,6 +1,6 @@
-// ignore_for_file: lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: lines_longer_than_80_chars
+import 'package:dynamic_timeline/src/rendering/painter/interval_painter/interval_painter.dart';
 import 'package:flutter/material.dart';
-import 'interval_painter.dart';
 
 /// An implementation of [IntervalPainter] that paints the intervals with a filled [Paint] box.
 /// It has two factory methods available [ColoredIntervalPainter.createHorizontal] and

diff --git a/lib/src/rendering/painter/interval_painter/interval_decoration_painter.dart b/lib/src/rendering/painter/interval_painter/interval_decoration_painter.dart
@@ -1,6 +1,6 @@
-// ignore_for_file: lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: lines_longer_than_80_chars
+import 'package:dynamic_timeline/src/rendering/painter/interval_painter/interval_painter.dart';
 import 'package:flutter/material.dart';
-import 'interval_painter.dart';
 
 /// An implementation of [IntervalPainter] that draws a horizontal or vertical interval decorations.
 /// To construct there are two factory methods available

diff --git a/lib/src/rendering/painter/interval_painter/interval_painter.dart b/lib/src/rendering/painter/interval_painter/interval_painter.dart
@@ -1,11 +1,8 @@
-// ignore_for_file: lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: lines_longer_than_80_chars
+import 'package:dynamic_timeline/src/rendering/painter/background_painter.dart';
+import 'package:dynamic_timeline/src/rendering/painter/interval_painter/background_painter_data.dart';
 import 'package:flutter/material.dart';
-import '../background_painter.dart';
-import 'background_painter_data.dart';
-import  'colored_interval_painter.dart';
 
-export 'colored_interval_painter.dart';
-export 'interval_decoration_painter.dart';
 
 /// {@template interval_painter}
 /// The abstract base class for interval painters.

diff --git a/lib/src/rendering/painter/painter.dart b/lib/src/rendering/painter/painter.dart
diff --git a/lib/src/rendering/painter/vertical_timeline_painter.dart b/lib/src/rendering/painter/vertical_timeline_painter.dart
@@ -1,7 +1,7 @@
-// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars
+import 'package:dynamic_timeline/src/rendering/dynamic_timeline_layout.dart';
+import 'package:dynamic_timeline/src/rendering/painter/dynamic_timeline_painter.dart';
 import 'package:flutter/material.dart';
-import '../rendering.dart';
-import 'dynamic_timeline_painter.dart';
 
 class VerticalTimelinePainter extends DynamicTimelinePainter{
 

diff --git a/lib/src/rendering/render_dynamic_timeline.dart b/lib/src/rendering/render_dynamic_timeline.dart
@@ -1,8 +1,13 @@
 // ignore_for_file: public_member_api_docs, lines_longer_than_80_chars,
-// ignore_for_file: always_use_package_imports, curly_braces_in_flow_control_structures
+// ignore_for_file: curly_braces_in_flow_control_structures
+import 'package:dynamic_timeline/src/rendering/dynamic_timeline_layout.dart';
+import 'package:dynamic_timeline/src/rendering/dynamic_timeline_parent_data.dart';
+import 'package:dynamic_timeline/src/rendering/painter/dynamic_timeline_painter.dart';
+import 'package:dynamic_timeline/src/rendering/painter/horizontal_timeline_painter.dart';
+import 'package:dynamic_timeline/src/rendering/painter/interval_painter/interval_painter.dart';
+import 'package:dynamic_timeline/src/rendering/painter/vertical_timeline_painter.dart';
+import 'package:dynamic_timeline/src/rendering/render_timeline_item.dart';
 import 'package:flutter/rendering.dart';
-import 'painter/painter.dart';
-import 'rendering.dart';
 
 class RenderDynamicTimeline extends RenderBox
     with

diff --git a/lib/src/rendering/render_timeline_item.dart b/lib/src/rendering/render_timeline_item.dart
@@ -1,9 +1,9 @@
-// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars, always_use_package_imports
+// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars
 import 'package:dynamic_timeline/dynamic_timeline.dart';
+import 'package:dynamic_timeline/src/rendering/dynamic_timeline_parent_data.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/services.dart';
-import '../rendering/rendering.dart';
 
 
 class RenderTimelineItem extends RenderProxyBox

diff --git a/lib/src/rendering/rendering.dart b/lib/src/rendering/rendering.dart
diff --git a/lib/src/widgets/dynamic_timeline.dart b/lib/src/widgets/dynamic_timeline.dart
@@ -1,7 +1,7 @@
 import 'package:dynamic_timeline/dynamic_timeline.dart';
+import 'package:dynamic_timeline/src/rendering/painter/interval_painter/interval_painter.dart';
+import 'package:dynamic_timeline/src/rendering/render_dynamic_timeline.dart';
 import 'package:flutter/material.dart';
-import '../rendering/painter/interval_painter/interval_painter.dart';
-import '../rendering/rendering.dart';
 
 
 /// {@template dynamic_timeline}

diff --git a/lib/src/widgets/timeline_item.dart b/lib/src/widgets/timeline_item.dart
@@ -1,6 +1,6 @@
 import 'package:dynamic_timeline/dynamic_timeline.dart';
+import 'package:dynamic_timeline/src/rendering/render_timeline_item.dart';
 import 'package:flutter/widgets.dart';
-import '../rendering/rendering.dart';
 
 
 /// {@template timeline_item}

diff --git a/lib/src/widgets/timeline_label_container.dart b/lib/src/widgets/timeline_label_container.dart
@@ -1,7 +1,8 @@
-import 'package:flutter/src/widgets/framework.dart';
-import '../../dynamic_timeline.dart';
-import '../rendering/rendering.dart';
-import 'timeline_item.dart';
+// ignore_for_file: public_member_api_docs, lines_longer_than_80_chars
+import 'package:dynamic_timeline/dynamic_timeline.dart';
+import 'package:dynamic_timeline/src/rendering/render_timeline_item.dart';
+import 'package:dynamic_timeline/src/widgets/timeline_item.dart';
+import 'package:flutter/material.dart';
 
 class TimelineLabelContainer extends TimelineItem {
   TimelineLabelContainer(
@@ -13,7 +14,7 @@ class TimelineLabelContainer extends TimelineItem {
             key: key,
             startDateTime: startDateTime,
             endDateTime: startDateTime.add(interval),
-            child: child);
+            child: child,);
 
   @override
   RenderObject createRenderObject(BuildContext context) {

diff --git a/test/rendering/painter/test_layout_engine_factory.dart b/test/rendering/painter/test_layout_engine_factory.dart
@@ -1,4 +1,4 @@
-import 'package:dynamic_timeline/src/rendering/rendering.dart';
+import 'package:dynamic_timeline/src/rendering/dynamic_timeline_layout.dart';
 import 'package:flutter/material.dart';
 
 class TestLayoutEngineFactory{

diff --git a/test/widgets/dynamic_timeline_test.dart b/test/widgets/dynamic_timeline_test.dart
@@ -1,6 +1,7 @@
 import 'package:dynamic_timeline/dynamic_timeline.dart';
 import 'package:dynamic_timeline/src/rendering/painter/interval_painter/background_painter_data.dart';
-import 'package:dynamic_timeline/src/rendering/rendering.dart';
+import 'package:dynamic_timeline/src/rendering/painter/interval_painter/interval_painter.dart';
+import 'package:dynamic_timeline/src/rendering/render_dynamic_timeline.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shouldly/shouldly.dart';

diff --git a/test/widgets/timeline_item_test.dart b/test/widgets/timeline_item_test.dart
@@ -1,9 +1,10 @@
 import 'package:dynamic_timeline/dynamic_timeline.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:dynamic_timeline/src/rendering/rendering.dart';
-import 'package:flutter/rendering.dart';
+import 'package:dynamic_timeline/src/rendering/render_timeline_item.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+import 'package:flutter_test/flutter_test.dart';
+
 import '../helpers/helpers.dart';
 
 void main() {