Remove barrel file (#382)

* Remove ps barrel file * Remove all barrel files * Remove material import where possible
wiredashio · Feb 14, 2025 · ecc5da2 · ecc5da2
1 parent 49f5a0d
commit ecc5da2
Show file tree

Hide file tree

Showing 95 changed files with 452 additions and 284 deletions.
diff --git a/lib/src/_feedback.dart b/lib/src/_feedback.dart
diff --git a/lib/src/_ps.dart b/lib/src/_ps.dart
diff --git a/lib/src/_wiredash_internal.dart b/lib/src/_wiredash_internal.dart
@@ -1,23 +1,4 @@
 library _wiredash_interal;
 
-export 'package:wiredash/assets/l10n/wiredash_localizations.g.dart';
-export 'package:wiredash/src/core/network/wiredash_api.dart';
-export 'package:wiredash/src/core/services/error_report.dart';
-export 'package:wiredash/src/core/services/services.dart';
-export 'package:wiredash/src/core/wiredash_controller.dart';
-export 'package:wiredash/src/core/wiredash_localizations_ext.dart';
-export 'package:wiredash/src/core/wiredash_model.dart';
-export 'package:wiredash/src/core/wiredash_model_provider.dart';
-export 'package:wiredash/src/core/wiredash_registry.dart';
-export 'package:wiredash/src/core/wuid_generator.dart';
-export 'package:wiredash/src/metadata/all_meta_data.dart';
-export 'package:wiredash/src/metadata/build_info/app_info.dart';
-export 'package:wiredash/src/metadata/build_info/build_info.dart';
-export 'package:wiredash/src/metadata/device_info/device_info.dart';
-export 'package:wiredash/src/metadata/device_info/device_info_generator.dart';
-export 'package:wiredash/src/metadata/session_meta_data.dart';
-export 'package:wiredash/src/utils/object_util.dart';
-export 'package:wiredash/src/utils/standard_kt.dart';
-
 /// `true` when Wiredash is in development mode, enables enhanced logging
 const bool kDevMode = false;
diff --git a/lib/src/_wiredash_ui.dart b/lib/src/_wiredash_ui.dart
diff --git a/lib/src/analytics/analytics.dart b/lib/src/analytics/analytics.dart
@@ -5,9 +5,11 @@ import 'dart:isolate';
 import 'package:clock/clock.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/widgets.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
 import 'package:wiredash/src/analytics/event_store.dart';
+import 'package:wiredash/src/core/services/error_report.dart';
+import 'package:wiredash/src/core/services/services.dart';
 import 'package:wiredash/src/core/version.dart';
+import 'package:wiredash/src/core/wiredash_registry.dart';
 import 'package:wiredash/src/core/wiredash_widget.dart';
 
 /// Interact with the Wiredash Analytics service.

diff --git a/lib/src/analytics/event_submitter.dart b/lib/src/analytics/event_submitter.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:clock/clock.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
 import 'package:wiredash/src/analytics/event_store.dart';
-import 'package:wiredash/src/core/network/send_events_request.dart';
+import 'package:wiredash/src/core/network/wiredash_api.dart';
+import 'package:wiredash/src/core/services/error_report.dart';
 import 'package:wiredash/src/utils/delay.dart';
 
 /// Abstract interface for submitting events to the backend

diff --git a/lib/src/core/lifecycle/lifecycle_notifier.dart b/lib/src/core/lifecycle/lifecycle_notifier.dart
@@ -1,8 +1,8 @@
 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';
 import 'package:wiredash/src/core/support/widget_binding_support.dart';

diff --git a/lib/src/core/network/api_exceptions.dart b/lib/src/core/network/api_exceptions.dart
@@ -1,7 +1,6 @@
 import 'dart:convert';
 
 import 'package:collection/collection.dart';
-import 'package:http/http.dart';
 import 'package:wiredash/src/core/network/wiredash_api.dart';
 
 /// Generic error from the Wiredash API
@@ -81,6 +80,7 @@ class UnauthenticatedWiredashApiException extends WiredashApiException {
 /// Backend returns an error which silences the SDK for one week
 class KillSwitchException extends WiredashApiException {
   const KillSwitchException({super.response});
+
   @override
   String toString() {
     return 'KillSwitchException{${response?.statusCode}, body: ${response?.body}}';

diff --git a/lib/src/core/network/ping_request.dart b/lib/src/core/network/ping_request.dart
@@ -2,7 +2,6 @@
 
 import 'dart:convert';
 
-import 'package:http/http.dart';
 import 'package:wiredash/src/core/network/wiredash_api.dart';
 import 'package:wiredash/src/core/version.dart';
 

diff --git a/lib/src/core/network/send_events_request.dart b/lib/src/core/network/send_events_request.dart
@@ -3,8 +3,6 @@
 import 'dart:convert';
 
 import 'package:collection/collection.dart';
-import 'package:http/http.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
 import 'package:wiredash/src/core/network/wiredash_api.dart';
 import 'package:wiredash/src/core/version.dart';
 

diff --git a/lib/src/core/network/send_feedback_request.dart b/lib/src/core/network/send_feedback_request.dart
@@ -2,9 +2,8 @@
 
 import 'dart:convert';
 
-import 'package:http/http.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
 import 'package:wiredash/src/core/network/serializers.dart';
+import 'package:wiredash/src/core/network/wiredash_api.dart';
 import 'package:wiredash/src/core/version.dart';
 import 'package:wiredash/src/feedback/data/feedback_item.dart';
 

diff --git a/lib/src/core/network/send_promoter_score_request.dart b/lib/src/core/network/send_promoter_score_request.dart
@@ -1,10 +1,13 @@
 import 'dart:convert';
 
 import 'package:http/http.dart';
-import 'package:wiredash/src/_ps.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
 import 'package:wiredash/src/core/network/serializers.dart';
+import 'package:wiredash/src/core/network/wiredash_api.dart'
+    show ApiClientContext;
 import 'package:wiredash/src/core/version.dart';
+import 'package:wiredash/src/metadata/all_meta_data.dart' show AllMetaData;
+import 'package:wiredash/src/promoterscore/ps_model.dart'
+    show PromoterScoreRating, PsRatingExt;
 
 Future<void> postSendPromoterScore(
   ApiClientContext context,

diff --git a/lib/src/core/network/serializers.dart b/lib/src/core/network/serializers.dart
@@ -4,7 +4,9 @@ import 'dart:collection';
 import 'dart:convert';
 import 'dart:ui';
 
-import 'package:wiredash/src/_wiredash_internal.dart';
+import 'package:wiredash/src/core/services/error_report.dart';
+import 'package:wiredash/src/core/wuid_generator.dart';
+import 'package:wiredash/src/metadata/all_meta_data.dart';
 
 extension AllMetaDataRequestJson on AllMetaData {
   Map<String, Object?> toRequestJson() {

diff --git a/lib/src/core/network/upload_attachment_request.dart b/lib/src/core/network/upload_attachment_request.dart
@@ -1,7 +1,6 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:http/http.dart';
 import 'package:http_parser/http_parser.dart';
 import 'package:wiredash/src/core/network/wiredash_api.dart';
 import 'package:wiredash/src/core/version.dart';

diff --git a/lib/src/core/network/wiredash_api.dart b/lib/src/core/network/wiredash_api.dart
@@ -14,8 +14,10 @@ import 'package:wiredash/src/core/network/upload_attachment_request.dart';
 import 'package:wiredash/src/core/services/error_report.dart';
 import 'package:wiredash/src/feedback/data/feedback_item.dart';
 
+export 'package:http/http.dart';
 export 'package:wiredash/src/core/network/api_exceptions.dart';
 export 'package:wiredash/src/core/network/ping_request.dart';
+export 'package:wiredash/src/core/network/send_events_request.dart';
 export 'package:wiredash/src/core/network/send_feedback_request.dart';
 export 'package:wiredash/src/core/network/send_promoter_score_request.dart';
 export 'package:wiredash/src/core/network/upload_attachment_request.dart';

diff --git a/lib/src/core/services/services.dart b/lib/src/core/services/services.dart
@@ -2,35 +2,66 @@ import 'dart:ui';
 
 import 'package:file/local.dart';
 import 'package:flutter/foundation.dart';
-import 'package:http/http.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wiredash/src/_ps.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
 import 'package:wiredash/src/analytics/event_store.dart';
 import 'package:wiredash/src/analytics/event_submitter.dart';
-import 'package:wiredash/src/core/lifecycle/lifecycle_notifier.dart';
-import 'package:wiredash/src/core/options/environment_detector.dart';
-import 'package:wiredash/src/core/project_credential_validator.dart';
+import 'package:wiredash/src/core/network/wiredash_api.dart';
 import 'package:wiredash/src/core/services/streampod.dart';
 import 'package:wiredash/src/core/sync/app_telemetry_job.dart';
 import 'package:wiredash/src/core/sync/event_upload_job.dart';
 import 'package:wiredash/src/core/sync/ping_job.dart';
-import 'package:wiredash/src/core/sync/sync_engine.dart';
 import 'package:wiredash/src/core/sync/sync_feedback_job.dart';
-import 'package:wiredash/src/core/telemetry/app_telemetry.dart';
-import 'package:wiredash/src/core/telemetry/wiredash_telemetry.dart';
-import 'package:wiredash/src/core/widgets/backdrop/wiredash_backdrop.dart';
 import 'package:wiredash/src/feedback/data/direct_feedback_submitter.dart';
-import 'package:wiredash/src/feedback/data/feedback_submitter.dart';
 import 'package:wiredash/src/feedback/data/pending_feedback_item_storage.dart';
 import 'package:wiredash/src/feedback/data/retrying_feedback_submitter.dart';
 import 'package:wiredash/src/feedback/feedback_model.dart';
-import 'package:wiredash/src/feedback/picasso/picasso.dart';
-import 'package:wiredash/src/feedback/ui/screencapture.dart';
-import 'package:wiredash/src/metadata/meta_data_collector.dart';
-import 'package:wiredash/src/utils/test_detector.dart';
-import 'package:wiredash/wiredash.dart';
+import 'package:wiredash/src/metadata/build_info/build_info.dart';
+import 'package:wiredash/src/promoterscore/ps_trigger.dart';
+
+export 'package:wiredash/src/analytics/event_store.dart'
+    show AnalyticsEventStore;
+export 'package:wiredash/src/analytics/event_submitter.dart'
+    show EventSubmitter;
+export 'package:wiredash/src/core/lifecycle/lifecycle_notifier.dart'
+    show FlutterAppLifecycleNotifier;
+export 'package:wiredash/src/core/network/wiredash_api.dart' show WiredashApi;
+export 'package:wiredash/src/core/options/environment_detector.dart'
+    show EnvironmentDetector;
+export 'package:wiredash/src/core/options/wiredash_options_data.dart'
+    show WiredashOptionsData;
+export 'package:wiredash/src/core/project_credential_validator.dart'
+    show ProjectCredentialValidator;
+export 'package:wiredash/src/core/services/streampod.dart'
+    show InjectableLocator;
+export 'package:wiredash/src/core/sync/sync_engine.dart' show SyncEngine;
+export 'package:wiredash/src/core/telemetry/app_telemetry.dart'
+    show AppTelemetry;
+export 'package:wiredash/src/core/telemetry/wiredash_telemetry.dart'
+    show WiredashTelemetry;
+export 'package:wiredash/src/core/widgets/backdrop/wiredash_backdrop.dart'
+    show BackdropController;
+export 'package:wiredash/src/core/wiredash_model.dart' show WiredashModel;
+export 'package:wiredash/src/core/wiredash_widget.dart' show Wiredash;
+export 'package:wiredash/src/core/wuid_generator.dart' show WuidGenerator;
+export 'package:wiredash/src/core/wuid_generator.dart';
+export 'package:wiredash/src/feedback/data/feedback_submitter.dart'
+    show FeedbackSubmitter;
+export 'package:wiredash/src/feedback/data/pending_feedback_item_storage.dart'
+    show SharedPreferences;
+export 'package:wiredash/src/feedback/feedback_model.dart' show FeedbackModel;
+export 'package:wiredash/src/feedback/picasso/picasso.dart'
+    show PicassoController;
+export 'package:wiredash/src/feedback/ui/screencapture.dart'
+    show ScreenCaptureController;
+export 'package:wiredash/src/metadata/build_info/build_info.dart'
+    show BuildInfo;
+export 'package:wiredash/src/metadata/device_info/device_info_generator.dart'
+    show FlutterInfoCollector;
+export 'package:wiredash/src/metadata/meta_data_collector.dart'
+    show MetaDataCollector;
+export 'package:wiredash/src/promoterscore/ps_model.dart' show PsModel;
+export 'package:wiredash/src/promoterscore/ps_trigger.dart' show PsTrigger;
+export 'package:wiredash/src/utils/test_detector.dart' show TestDetector;
 
 /// Internal service locator
 class WiredashServices extends ChangeNotifier {

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/sync/ping_job.dart b/lib/src/core/sync/ping_job.dart
@@ -1,9 +1,10 @@
 import 'package:clock/clock.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
+import 'package:wiredash/src/core/network/wiredash_api.dart';
 import 'package:wiredash/src/core/options/environment_detector.dart';
 import 'package:wiredash/src/core/sync/sync_engine.dart';
 import 'package:wiredash/src/core/version.dart';
+import 'package:wiredash/src/core/wuid_generator.dart';
 import 'package:wiredash/src/metadata/meta_data_collector.dart';
 
 class PingJob extends Job {

diff --git a/lib/src/core/sync/sync_feedback_job.dart b/lib/src/core/sync/sync_feedback_job.dart
@@ -1,6 +1,7 @@
-import 'package:wiredash/src/_feedback.dart';
 import 'package:wiredash/src/_wiredash_internal.dart';
+import 'package:wiredash/src/core/services/services.dart';
 import 'package:wiredash/src/core/sync/sync_engine.dart';
+import 'package:wiredash/src/feedback/data/retrying_feedback_submitter.dart';
 
 class UploadPendingFeedbackJob extends Job {
   final FeedbackSubmitter Function() feedbackSubmitterProvider;

diff --git a/lib/src/core/theme/color_ext.dart b/lib/src/core/theme/color_ext.dart
@@ -2,6 +2,8 @@ import 'dart:ui';
 
 import 'package:flutter/painting.dart';
 
+export 'dart:ui' show Brightness;
+
 extension ColorBrightness on Color {
   Color darken([double amount = .1]) {
     assert(amount >= 0 && amount <= 1);

diff --git a/lib/src/core/theme/wiredash_theme_data.dart b/lib/src/core/theme/wiredash_theme_data.dart
@@ -1,6 +1,8 @@
-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/_wiredash_ui.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,9 +1,9 @@
 import 'dart:math' as math;
 
 import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'package:wiredash/src/_wiredash_internal.dart';
+import 'package:flutter/widgets.dart';
 import 'package:wiredash/src/core/theme/wirecons.dart';
+import 'package:wiredash/src/core/wiredash_localizations_ext.dart';
 
 /// Fakes the system statusbar when the app is floating in [WiredashBackdrop]
 class FakeAppStatusBar extends StatelessWidget {

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/safe_area_calculator.dart b/lib/src/core/widgets/backdrop/safe_area_calculator.dart
@@ -4,6 +4,7 @@ import 'dart:ui';
 /// overlapping insets.
 class SafeAreaCalculator {
   final Size screenSize;
+
   SafeAreaCalculator({
     required this.screenSize,
   });
@@ -26,6 +27,7 @@ class SafeAreaCalculator {
   }
 
   double get topInset => _topInsets.maxBy((it) => it.height)?.height ?? 0.0;
+
   double get bottomInset =>
       _bottomInsets.maxBy((it) => it.height)?.height ?? 0.0;