From c91cbeba1af96fd950dc42cc2e0a9514170e37cd Mon Sep 17 00:00:00 2001 From: Nick Fisher Date: Thu, 26 Sep 2024 10:46:52 +0800 Subject: [PATCH] chore: rearrange flutter gesture/widget directory structure --- .../default_keyboard_camera_flight_delegate.dart | 2 +- .../lib/src/gestures/default_pick_delegate.dart | 2 +- .../lib/src/gestures/default_velocity_delegate.dart | 2 +- .../src/gestures/default_zoom_camera_delegate.dart | 2 +- .../lib/src/gestures/delegate_gesture_handler.dart | 10 +++++----- .../fixed_orbit_camera_rotation_delegate.dart | 2 +- .../src/gestures/free_flight_camera_delegate.dart | 2 +- .../src/gestures/picking_camera_gesture_handler.dart | 2 +- .../mobile_gesture_handler_selector_widget.dart | 2 +- .../gestures/thermion_gesture_detector_desktop.dart | 2 +- .../camera/gestures/thermion_gesture_handler.dart | 2 +- .../camera/gestures/thermion_listener_widget.dart | 2 +- .../lib/src/widgets/thermion_widget.dart | 4 ++-- .../thermion_flutter/lib/thermion_flutter.dart | 12 ++++++------ 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/default_keyboard_camera_flight_delegate.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/default_keyboard_camera_flight_delegate.dart index 4630acbc..72213fe2 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_keyboard_camera_flight_delegate.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_keyboard_camera_flight_delegate.dart @@ -3,7 +3,7 @@ import 'dart:ui'; import 'package:flutter/services.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; import 'package:vector_math/vector_math_64.dart'; class DefaultKeyboardCameraFlightDelegate diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/default_pick_delegate.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/default_pick_delegate.dart index 6d3ab24c..f43ed86b 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_pick_delegate.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_pick_delegate.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; class DefaultPickDelegate extends PickDelegate { final ThermionViewer _viewer; diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/default_velocity_delegate.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/default_velocity_delegate.dart index a25eb0c6..b6c096eb 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_velocity_delegate.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_velocity_delegate.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'dart:ui'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; import 'package:vector_math/vector_math_64.dart'; class DefaultVelocityDelegate extends VelocityDelegate { diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/default_zoom_camera_delegate.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/default_zoom_camera_delegate.dart index a8571173..7d453d8b 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/default_zoom_camera_delegate.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/default_zoom_camera_delegate.dart @@ -2,7 +2,7 @@ import 'dart:math'; import 'package:flutter/widgets.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; import 'package:vector_math/vector_math_64.dart'; class DefaultZoomCameraDelegate { diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/delegate_gesture_handler.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/delegate_gesture_handler.dart index dcd7f15f..76c0cf8a 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/delegate_gesture_handler.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/delegate_gesture_handler.dart @@ -3,11 +3,11 @@ import 'package:flutter/gestures.dart'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:logging/logging.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/default_pick_delegate.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/default_velocity_delegate.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/fixed_orbit_camera_rotation_delegate.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/free_flight_camera_delegate.dart'; +import 'package:thermion_flutter/src/gestures/default_pick_delegate.dart'; +import 'package:thermion_flutter/src/gestures/default_velocity_delegate.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; +import 'package:thermion_flutter/src/gestures/fixed_orbit_camera_rotation_delegate.dart'; +import 'package:thermion_flutter/src/gestures/free_flight_camera_delegate.dart'; import 'package:thermion_flutter/thermion_flutter.dart'; import 'package:vector_math/vector_math_64.dart'; diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/fixed_orbit_camera_rotation_delegate.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/fixed_orbit_camera_rotation_delegate.dart index 76bcc717..ed2bd753 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/fixed_orbit_camera_rotation_delegate.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/fixed_orbit_camera_rotation_delegate.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'dart:math'; import 'package:flutter/services.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; import 'package:vector_math/vector_math_64.dart'; /// A camera delegate that rotates the camera around the origin. diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/free_flight_camera_delegate.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/free_flight_camera_delegate.dart index 3ae4512c..595f48e6 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/free_flight_camera_delegate.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/free_flight_camera_delegate.dart @@ -4,7 +4,7 @@ import 'dart:ui'; import 'package:flutter/scheduler.dart'; import 'package:flutter/services.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; import 'package:vector_math/vector_math_64.dart'; class FreeFlightCameraDelegate implements CameraDelegate { diff --git a/thermion_flutter/thermion_flutter/lib/src/gestures/picking_camera_gesture_handler.dart b/thermion_flutter/thermion_flutter/lib/src/gestures/picking_camera_gesture_handler.dart index 09f723cf..4cb461da 100644 --- a/thermion_flutter/thermion_flutter/lib/src/gestures/picking_camera_gesture_handler.dart +++ b/thermion_flutter/thermion_flutter/lib/src/gestures/picking_camera_gesture_handler.dart @@ -6,7 +6,7 @@ import 'package:logging/logging.dart'; import 'package:thermion_dart/thermion_dart/entities/abstract_gizmo.dart'; import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; import 'dart:ui'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/thermion_gesture_handler.dart'; +import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart'; // Renamed implementation class PickingCameraGestureHandler implements ThermionGestureHandler { diff --git a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/mobile_gesture_handler_selector_widget.dart b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/mobile_gesture_handler_selector_widget.dart index 210ee718..3cff8d0e 100644 --- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/mobile_gesture_handler_selector_widget.dart +++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/mobile_gesture_handler_selector_widget.dart @@ -1,5 +1,5 @@ import 'package:flutter/widgets.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/thermion_gesture_handler.dart'; +import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart'; class MobileGestureHandlerSelectorWidget extends StatelessWidget { final ThermionGestureHandler handler; diff --git a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_detector_desktop.dart b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_detector_desktop.dart index aa766ab4..888c741d 100644 --- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_detector_desktop.dart +++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_detector_desktop.dart @@ -5,7 +5,7 @@ import 'package:thermion_dart/thermion_dart/thermion_viewer.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/thermion_gesture_handler.dart'; +import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart'; import 'package:vector_math/vector_math_64.dart' as v64; class ThermionGestureDetectorDesktop extends StatefulWidget { diff --git a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_handler.dart b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_handler.dart index 867921f1..206bbf81 100644 --- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_handler.dart +++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_gesture_handler.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:flutter/gestures.dart'; import 'package:flutter/services.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/v2/delegates.dart'; +import 'package:thermion_flutter/src/gestures/delegates.dart'; enum GestureType { LMB_DOWN, diff --git a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_listener_widget.dart b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_listener_widget.dart index 0dcb1642..906cdc3e 100644 --- a/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_listener_widget.dart +++ b/thermion_flutter/thermion_flutter/lib/src/widgets/camera/gestures/thermion_listener_widget.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/gestures.dart'; import 'package:flutter/material.dart'; -import 'package:thermion_flutter/thermion/widgets/camera/gestures/thermion_gesture_handler.dart'; +import 'package:thermion_flutter/src/widgets/camera/gestures/thermion_gesture_handler.dart'; /// /// A widget that captures swipe/pointer events. diff --git a/thermion_flutter/thermion_flutter/lib/src/widgets/thermion_widget.dart b/thermion_flutter/thermion_flutter/lib/src/widgets/thermion_widget.dart index c0d0eff4..0174c9dc 100644 --- a/thermion_flutter/thermion_flutter/lib/src/widgets/thermion_widget.dart +++ b/thermion_flutter/thermion_flutter/lib/src/widgets/thermion_widget.dart @@ -2,8 +2,8 @@ import 'dart:io'; import 'dart:math'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:thermion_flutter/thermion/widgets/thermion_widget_web.dart'; -import 'package:thermion_flutter/thermion/widgets/transparent_filament_widget.dart'; +import 'package:thermion_flutter/src/widgets/thermion_widget_web.dart'; +import 'package:thermion_flutter/src/widgets/transparent_filament_widget.dart'; import 'package:thermion_flutter_platform_interface/thermion_flutter_platform_interface.dart'; import 'dart:async'; diff --git a/thermion_flutter/thermion_flutter/lib/thermion_flutter.dart b/thermion_flutter/thermion_flutter/lib/thermion_flutter.dart index 0620499c..d55ed8e1 100644 --- a/thermion_flutter/thermion_flutter/lib/thermion_flutter.dart +++ b/thermion_flutter/thermion_flutter/lib/thermion_flutter.dart @@ -1,11 +1,11 @@ library thermion_flutter; -export 'thermion/thermion_flutter_plugin.dart'; -export 'thermion/widgets/thermion_widget.dart'; -export 'thermion/widgets/camera/gestures/thermion_gesture_detector.dart'; -export 'thermion/widgets/camera/gestures/thermion_gesture_handler.dart'; -export 'thermion/widgets/camera/gestures/v2/delegate_gesture_handler.dart'; +export 'src/thermion_flutter_plugin.dart'; +export 'src/widgets/thermion_widget.dart'; +export 'src/widgets/camera/gestures/thermion_gesture_detector.dart'; +export 'src/widgets/camera/gestures/thermion_gesture_handler.dart'; +export 'src/gestures/delegate_gesture_handler.dart'; -export 'thermion/widgets/camera/camera_orientation_widget.dart'; +export 'src/widgets/camera/camera_orientation_widget.dart'; export 'package:thermion_flutter_platform_interface/thermion_flutter_platform_interface.dart'; export 'package:thermion_dart/thermion_dart.dart';