Update: code structure

fluttercandies · Sep 27, 2023 · 055cd0d · 055cd0d
1 parent d7aa51c
commit 055cd0d
Show file tree

Hide file tree

Showing 21 changed files with 153 additions and 151 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 See the [Migration Guide](guides/migration_guide.md) for the details of breaking changes between versions.
 
+## 2.0.5
+
+### Improvements
+
+- Improve code structure.
+
 ## 2.0.4
 
 ### Fixes

diff --git a/lib/flutter_tilt.dart b/lib/flutter_tilt.dart
@@ -1,10 +1,10 @@
 library flutter_tilt;
 
 export 'src/enums.dart';
-export 'src/model/tilt_model.dart';
 export 'src/tilt.dart';
 export 'src/tilt_light.dart';
 export 'src/tilt_shadow.dart';
-export 'src/type/tilt_light_type.dart';
-export 'src/type/tilt_shadow_type.dart';
-export 'src/type/tilt_type.dart';
+export 'src/config/tilt_light_config.dart';
+export 'src/config/tilt_shadow_config.dart';
+export 'src/config/tilt_config.dart';
+export 'src/data/tilt_data.dart' show TiltDataModel;
diff --git a/lib/src/type/tilt_type.dart → lib/src/config/tilt_config.dart b/lib/src/type/tilt_type.dart → lib/src/config/tilt_config.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/model/tilt_model.dart';
+import '../enums.dart';
+import '../data/tilt_data.dart';
 
 /// 倾斜回调
 typedef TiltCallback = void Function(

diff --git a/lib/src/type/tilt_light_type.dart → lib/src/config/tilt_light_config.dart b/lib/src/type/tilt_light_type.dart → lib/src/config/tilt_light_config.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/type/tilt_shadow_type.dart';
+import '../enums.dart';
+import '../config/tilt_shadow_config.dart';
 
 /// 光源配置
 @immutable

diff --git a/lib/src/type/tilt_shadow_type.dart → lib/src/config/tilt_shadow_config.dart b/lib/src/type/tilt_shadow_type.dart → lib/src/config/tilt_shadow_config.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/type/tilt_light_type.dart';
+import '../enums.dart';
+import '../config/tilt_light_config.dart';
 
 /// 阴影配置
 @immutable

diff --git a/lib/src/data/tilt_data.dart b/lib/src/data/tilt_data.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/model/tilt_model.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
-import 'package:flutter_tilt/src/utils.dart';
+import '../utils.dart';
+import '../enums.dart';
+import '../config/tilt_config.dart';
 
 /// 倾斜数据
 @immutable
@@ -62,3 +62,90 @@ class TiltData {
   /// 禁用
   bool get disable => tiltConfig.disable;
 }
+
+/// 倾斜数据
+@immutable
+class TiltDataModel {
+  /// 倾斜数据
+  const TiltDataModel({
+    required this.position,
+    required this.areaProgress,
+    required this.transform,
+    required this.angle,
+  });
+
+  /// 当前坐标
+  final Offset position;
+
+  /// 区域进度
+  ///
+  /// {@template tilt.TiltDataModel.areaProgress}
+  /// 正常范围 (x, y)：(1, 1) 至 (-1, -1)
+  ///
+  /// 移动过程中的最大倾斜量按照 [TiltConfig.angle] 进行倾斜
+  ///
+  /// 例如：
+  /// * (0, 0) 会保持平面
+  /// * (1.0, 1.0) 倾斜左上角 [TiltConfig.angle] 最大角度
+  /// * (-1.0, -1.0) 倾斜右下角 [TiltConfig.angle] 最大角度
+  /// {@endtemplate}
+  final Offset areaProgress;
+
+  /// Transform
+  final Matrix4 transform;
+
+  /// 角度（区分区域）
+  ///
+  /// {@template tilt.TiltDataModel.angle}
+  /// 正常范围 (x, y)：(angle, angle) 至 (-angle, -angle)
+  ///
+  /// 移动过程中的最大倾斜量按照 [TiltConfig.angle] 进行倾斜
+  ///
+  /// 例如：
+  /// * (0, 0) 会保持平面
+  /// * (angle, angle) 倾斜左上角 [TiltConfig.angle] 最大角度
+  /// * (-angle, -angle) 倾斜右下角 [TiltConfig.angle] 最大角度
+  /// {@endtemplate}
+  final Offset angle;
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) {
+      return true;
+    }
+    if (other.runtimeType != runtimeType) {
+      return false;
+    }
+    return other is TiltDataModel &&
+        other.position == position &&
+        other.areaProgress == areaProgress &&
+        other.transform == transform &&
+        other.angle == angle;
+  }
+
+  @override
+  int get hashCode => Object.hash(
+        position.hashCode,
+        areaProgress.hashCode,
+        transform.hashCode,
+        angle.hashCode,
+      );
+}
+
+/// 倾斜 Stream
+@immutable
+class TiltStream {
+  const TiltStream({
+    required this.position,
+    required this.gesturesType,
+    this.enableRevert,
+  });
+
+  /// 当前坐标
+  final Offset position;
+
+  final GesturesType gesturesType;
+
+  /// 是否开启复原
+  final bool? enableRevert;
+}
diff --git a/lib/src/gestures_listener.dart b/lib/src/gestures_listener.dart
@@ -2,9 +2,9 @@ import 'dart:async' as async;
 import 'package:flutter/gestures.dart';
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/model/tilt_model.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
+import 'enums.dart';
+import 'data/tilt_data.dart';
+import 'config/tilt_config.dart';
 
 /// 手势监听
 class GesturesListener extends StatefulWidget {

diff --git a/lib/src/model/tilt_model.dart b/lib/src/model/tilt_model.dart
diff --git a/lib/src/state/tilt_state.dart b/lib/src/state/tilt_state.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
+import '../enums.dart';
+import '../config/tilt_config.dart';
 
 /// Tilt State
 class TiltState extends InheritedWidget {

diff --git a/lib/src/tilt.dart b/lib/src/tilt.dart
@@ -1,18 +1,17 @@
 import 'dart:async' as async;
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/data/tilt_data.dart';
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/gestures_listener.dart';
-import 'package:flutter_tilt/src/tilt_stream_builder.dart';
-import 'package:flutter_tilt/src/state/tilt_state.dart';
-import 'package:flutter_tilt/src/tilt_container.dart';
-import 'package:flutter_tilt/src/tilt_parallax_container.dart';
-import 'package:flutter_tilt/src/type/tilt_light_type.dart';
-import 'package:flutter_tilt/src/type/tilt_shadow_type.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
-import 'package:flutter_tilt/src/utils.dart';
-import 'package:flutter_tilt/src/model/tilt_model.dart';
+import 'utils.dart';
+import 'enums.dart';
+import 'gestures_listener.dart';
+import 'tilt_stream_builder.dart';
+import 'tilt_container.dart';
+import 'tilt_parallax_container.dart';
+import 'data/tilt_data.dart';
+import 'state/tilt_state.dart';
+import 'config/tilt_light_config.dart';
+import 'config/tilt_shadow_config.dart';
+import 'config/tilt_config.dart';
 
 /// 倾斜
 class Tilt extends TiltContainer {

diff --git a/lib/src/tilt_container.dart b/lib/src/tilt_container.dart
@@ -1,14 +1,14 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/data/tilt_data.dart';
-import 'package:flutter_tilt/src/state/tilt_state.dart';
-import 'package:flutter_tilt/src/tilt_light.dart';
-import 'package:flutter_tilt/src/tilt_shadow.dart';
-import 'package:flutter_tilt/src/type/tilt_light_type.dart';
-import 'package:flutter_tilt/src/type/tilt_shadow_type.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
-import 'package:flutter_tilt/src/utils.dart';
+import 'utils.dart';
+import 'enums.dart';
+import 'tilt_light.dart';
+import 'tilt_shadow.dart';
+import 'data/tilt_data.dart';
+import 'state/tilt_state.dart';
+import 'config/tilt_light_config.dart';
+import 'config/tilt_shadow_config.dart';
+import 'config/tilt_config.dart';
 
 class TiltContainer extends StatefulWidget {
   const TiltContainer({

diff --git a/lib/src/tilt_light.dart b/lib/src/tilt_light.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/type/tilt_light_type.dart';
-import 'package:flutter_tilt/src/utils.dart';
+import 'utils.dart';
+import 'enums.dart';
+import 'config/tilt_light_config.dart';
 
 /// 光源
 class TiltLight extends StatelessWidget {

diff --git a/lib/src/tilt_parallax_container.dart b/lib/src/tilt_parallax_container.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/state/tilt_state.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
-import 'package:flutter_tilt/src/utils.dart';
+import 'utils.dart';
+import 'enums.dart';
+import 'state/tilt_state.dart';
+import 'config/tilt_config.dart';
 
 /// 倾斜视差
 @immutable

diff --git a/lib/src/tilt_shadow.dart b/lib/src/tilt_shadow.dart
@@ -1,9 +1,9 @@
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/type/tilt_light_type.dart';
-import 'package:flutter_tilt/src/type/tilt_shadow_type.dart';
-import 'package:flutter_tilt/src/utils.dart';
+import 'utils.dart';
+import 'enums.dart';
+import 'config/tilt_light_config.dart';
+import 'config/tilt_shadow_config.dart';
 
 /// 阴影
 class TiltShadow extends StatelessWidget {

diff --git a/lib/src/tilt_stream_builder.dart b/lib/src/tilt_stream_builder.dart
@@ -4,10 +4,10 @@ import 'package:flutter/widgets.dart';
 import 'package:sensors_plus/sensors_plus.dart';
 import 'package:stream_transform/stream_transform.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/utils.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
-import 'package:flutter_tilt/src/model/tilt_model.dart';
+import 'utils.dart';
+import 'enums.dart';
+import 'data/tilt_data.dart';
+import 'config/tilt_config.dart';
 
 /// Tilt StreamBuilder
 class TiltStreamBuilder extends StatefulWidget {

diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -3,8 +3,8 @@ import 'dart:math';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/widgets.dart';
 
-import 'package:flutter_tilt/src/enums.dart';
-import 'package:flutter_tilt/src/type/tilt_type.dart';
+import 'enums.dart';
+import 'config/tilt_config.dart';
 
 /// 传感器平台支持
 bool sensorsPlatformSupport() {