Remove material import where possible

wiredashio · Feb 14, 2025 · 2a7e33d · 2a7e33d
1 parent 8a270d8
commit 2a7e33d
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 32 deletions.
diff --git a/lib/src/core/lifecycle/lifecycle_notifier.dart b/lib/src/core/lifecycle/lifecycle_notifier.dart
@@ -1,6 +1,7 @@
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart'
+    show AppLifecycleState, WidgetsBindingObserver;
 import 'package:flutter/semantics.dart';
 import 'package:wiredash/src/core/lifecycle/lifecycle_stub.dart'
     if (dart.library.html) 'package:wiredash/src/core/lifecycle/lifecycle_web.dart';

diff --git a/lib/src/core/support/material_support_layer.dart b/lib/src/core/support/material_support_layer.dart
@@ -4,7 +4,8 @@ import 'dart:io';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart'
+    show Colors, Material, MaterialLocalizations, Theme, ThemeData;
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';
 import 'package:wiredash/src/utils/semver.dart';

diff --git a/lib/src/core/support/not_a_widgets_app.dart b/lib/src/core/support/not_a_widgets_app.dart
@@ -1,6 +1,4 @@
-// ignore_for_file: join_return_with_assignment
-
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 /// Wrapper with default that most widgets required that are now wrapped by a
 /// [WidgetsApp]

diff --git a/lib/src/core/theme/wiredash_theme_data.dart b/lib/src/core/theme/wiredash_theme_data.dart
@@ -1,4 +1,7 @@
-import 'package:flutter/material.dart';
+import 'dart:ui';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart' show TextStyle;
 import 'package:material_color_utilities/material_color_utilities.dart';
 import 'package:wiredash/src/core/theme/color_ext.dart';
 import 'package:wiredash/src/core/theme/key_point_interpolator.dart';

diff --git a/lib/src/core/widgets/animated_shape.dart b/lib/src/core/widgets/animated_shape.dart
@@ -1,4 +1,5 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show ShapeBorderTween;
+import 'package:flutter/widgets.dart';
 
 class AnimatedShape extends ImplicitlyAnimatedWidget {
   const AnimatedShape({

diff --git a/lib/src/core/widgets/backdrop/fake_app_status_bar.dart b/lib/src/core/widgets/backdrop/fake_app_status_bar.dart
@@ -1,7 +1,7 @@
 import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';
 import 'package:wiredash/src/core/wiredash_localizations_ext.dart';
 

diff --git a/lib/src/core/widgets/backdrop/pull_to_close_detector.dart b/lib/src/core/widgets/backdrop/pull_to_close_detector.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 enum CloseDirection {

diff --git a/lib/src/core/widgets/backdrop/step_page_scaffold.dart b/lib/src/core/widgets/backdrop/step_page_scaffold.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
 import 'dart:math' as math;
 
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show Scrollbar, Theme, VerticalDivider;
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/support/widget_binding_support.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';

diff --git a/lib/src/core/widgets/backdrop/wiredash_backdrop.dart b/lib/src/core/widgets/backdrop/wiredash_backdrop.dart
@@ -2,7 +2,8 @@ import 'dart:async';
 import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show Colors;
+import 'package:flutter/widgets.dart';
 import 'package:flutter/physics.dart';
 import 'package:wiredash/src/core/support/back_button_interceptor.dart';
 import 'package:wiredash/src/core/support/widget_binding_support.dart';

diff --git a/lib/src/core/widgets/larry_page_view.dart b/lib/src/core/widgets/larry_page_view.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/physics.dart';
 import 'package:flutter/rendering.dart';
+import 'package:flutter/widgets.dart';
 
 /// A vertical [PageView] that fades items out and in
 ///

diff --git a/lib/src/core/widgets/tron/animated_fade_widget_switcher.dart b/lib/src/core/widgets/tron/animated_fade_widget_switcher.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/support/widget_binding_support.dart';
 import 'package:wiredash/src/core/widgets/tron/animations_lib.dart';

diff --git a/lib/src/core/widgets/tron/tron_button.dart b/lib/src/core/widgets/tron/tron_button.dart
@@ -1,7 +1,6 @@
 import 'dart:math' as math;
 
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/color_ext.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';

diff --git a/lib/src/core/wiredash_controller.dart b/lib/src/core/wiredash_controller.dart
@@ -2,7 +2,8 @@ import 'dart:async';
 
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show Theme, ThemeData;
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/context_cache.dart';
 import 'package:wiredash/src/core/widgets/backdrop/wiredash_backdrop.dart';
 import 'package:wiredash/src/core/wiredash_model.dart';

diff --git a/lib/src/core/wiredash_widget.dart b/lib/src/core/wiredash_widget.dart
@@ -3,7 +3,7 @@ import 'dart:ui' as ui;
 
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/context_cache.dart';
 import 'package:wiredash/src/core/lifecycle/lifecycle_notifier.dart';
 import 'package:wiredash/src/core/services/error_report.dart';

diff --git a/lib/src/feedback/feedback_backdrop.dart b/lib/src/feedback/feedback_backdrop.dart
@@ -1,6 +1,7 @@
 import 'dart:math' as math;
 
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show Colors;
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/support/back_button_interceptor.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';
 import 'package:wiredash/src/core/widgets/backdrop/wiredash_backdrop.dart';

diff --git a/lib/src/feedback/picasso/picasso.dart b/lib/src/feedback/picasso/picasso.dart
@@ -2,7 +2,8 @@ import 'dart:async';
 import 'dart:typed_data';
 import 'dart:ui' as ui;
 
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show Colors;
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/feedback/picasso/sketcher.dart';
 import 'package:wiredash/src/feedback/picasso/stroke.dart';
 

diff --git a/lib/src/feedback/picasso/sketcher.dart b/lib/src/feedback/picasso/sketcher.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/feedback/picasso/stroke.dart';
 
 class Sketcher extends CustomPainter {

diff --git a/lib/src/feedback/picasso/stroke.dart b/lib/src/feedback/picasso/stroke.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 enum StrokeType { dot, line }
 

diff --git a/lib/src/feedback/steps/step_1_feedback_message.dart b/lib/src/feedback/steps/step_1_feedback_message.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart'
-    show TextFormField, InputDecoration, OutlineInputBorder, Colors;
+    show Colors, InputDecoration, OutlineInputBorder, TextFormField;
 import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/color_ext.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';

diff --git a/lib/src/feedback/steps/step_5_email.dart b/lib/src/feedback/steps/step_5_email.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart'
-    show TextFormField, InputDecoration, OutlineInputBorder, Colors;
+    show Colors, InputDecoration, OutlineInputBorder, TextFormField;
 import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/support/widget_binding_support.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';

diff --git a/lib/src/feedback/steps/step_7_submitting.dart b/lib/src/feedback/steps/step_7_submitting.dart
@@ -1,4 +1,5 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show ExpansionTile;
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';
 import 'package:wiredash/src/core/widgets/backdrop/step_page_scaffold.dart';

diff --git a/lib/src/feedback/ui/base_click_target.dart b/lib/src/feedback/ui/base_click_target.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 
 const buttonBlue = Color(0xFF1A56DB);

diff --git a/lib/src/feedback/ui/color_palette.dart b/lib/src/feedback/ui/color_palette.dart
@@ -1,7 +1,8 @@
 import 'dart:async';
 
 import 'package:flutter/gestures.dart';
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart' show Colors;
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/color_ext.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';

diff --git a/lib/src/feedback/ui/screencapture.dart b/lib/src/feedback/ui/screencapture.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:ui' as ui;
 
-import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/services/error_report.dart';

diff --git a/lib/src/feedback/ui/semi_transparent_statusbar.dart b/lib/src/feedback/ui/semi_transparent_statusbar.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';
 import 'package:wiredash/src/core/widgets/backdrop/backdrop_controller_provider.dart';
 import 'package:wiredash/src/core/widgets/backdrop/wiredash_backdrop.dart';

diff --git a/lib/src/feedback/ui/slider/stroke_width_slider_painter.dart b/lib/src/feedback/ui/slider/stroke_width_slider_painter.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 
 class StrokeWidthSliderPainter extends CustomPainter {
   StrokeWidthSliderPainter({

diff --git a/lib/src/feedback/ui/slider/stroke_width_slider_widget.dart b/lib/src/feedback/ui/slider/stroke_width_slider_widget.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';
 import 'package:wiredash/src/feedback/ui/slider/stroke_width_slider_painter.dart';
 

diff --git a/lib/src/promoterscore/ps_flow.dart b/lib/src/promoterscore/ps_flow.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/support/material_support_layer.dart';
 import 'package:wiredash/src/core/widgets/larry_page_view.dart';

diff --git a/lib/src/promoterscore/step_2_message.dart b/lib/src/promoterscore/step_2_message.dart
@@ -1,4 +1,6 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/material.dart'
+    show Colors, InputBorder, InputDecoration, OutlineInputBorder, TextField;
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';
 import 'package:wiredash/src/core/widgets/backdrop/step_page_scaffold.dart';

diff --git a/lib/src/promoterscore/step_3_thanks.dart b/lib/src/promoterscore/step_3_thanks.dart
@@ -1,4 +1,4 @@
-import 'package:flutter/material.dart';
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';
 import 'package:wiredash/src/core/theme/wiredash_theme.dart';
 import 'package:wiredash/src/core/widgets/backdrop/step_page_scaffold.dart';