Refactoring: compare to class diagram.

ilopX · ilopX · commit c42aadf644b3 · 2022-06-03T00:41:04.000+03:00
diff --git a/patterns/state/manipulator_state/app/base_manipulation.dart b/patterns/state/manipulator_state/app/base_manipulation.dart
diff --git a/patterns/state/manipulator_state/pattern/manipulator.dart b/patterns/state/manipulator_state/pattern/manipulator.dart
@@ -5,7 +5,7 @@ import '../states/_/paint_style.dart';
 import '../app/shapes.dart';
 
 part 'manipulation_state.dart';
-part '../app/base_manipulationt.dart';
+part '../app/base_manipulation.dart';
 
 abstract class Manipulator {
   ManipulationState get state;
diff --git a/patterns/state/manipulator_state/states/_/marker.dart b/patterns/state/manipulator_state/states/_/marker.dart
diff --git a/patterns/state/manipulator_state/states/_/sub_states/parent_state.dart b/patterns/state/manipulator_state/states/_/sub_states/parent_state.dart
@@ -4,7 +4,7 @@ import '../../selections/selection_state.dart';
 import 'child_state.dart';
 import '../../../shapes/shape.dart';
 
-class ParentState<T extends Shape> extends SelectionState<T> {
+abstract class ParentState<T extends Shape> extends SelectionState<T> {
   ParentState({
     required super.selectedShape,
   });
diff --git a/patterns/state/manipulator_state/states/free_sate.dart b/patterns/state/manipulator_state/states/free_sate.dart
@@ -1,6 +1,6 @@
 import '../pattern/manipulator.dart';
 import '_/mixins/hover_shape_mixin.dart';
-import 'selections/moving_state.dart';
+import 'selections/move_state.dart';
 
 class FreeState extends ManipulationState with HoverShapeMixin {
   @override
@@ -16,7 +16,7 @@ class FreeState extends ManipulationState with HoverShapeMixin {
     }
 
     context.changeState(
-      MovingState(
+      MoveState(
         startX: x,
         startY: y,
         selectedShape: selectedShape,
diff --git a/patterns/state/manipulator_state/states/selections/inner_radius_markers/inner_radius_marker_state.dart b/patterns/state/manipulator_state/states/selections/inner_radius_markers/inner_radius_marker_state.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/src/services/mouse_cursor.dart';
 
 import '../../../shapes/circle_shape.dart';
-import '../../_/corner_marker.dart';
+import '../../_/marker.dart';
 
 class InnerRadiusMarkerState extends Marker<CircleShape> {
   InnerRadiusMarkerState({required super.parentState});
diff --git a/patterns/state/manipulator_state/states/selections/move_state.dart b/patterns/state/manipulator_state/states/selections/move_state.dart
@@ -1,10 +1,10 @@
 import 'selection_state.dart';
 
-class MovingState extends SelectionState {
+class MoveState extends SelectionState {
   final double startX;
   final double startY;
 
-  MovingState({
+  MoveState({
     required double startX,
     required double startY,
     required super.selectedShape,
diff --git a/patterns/state/manipulator_state/states/selections/resizable_markers/bottom_left_marker_state.dart b/patterns/state/manipulator_state/states/selections/resizable_markers/bottom_left_marker_state.dart
@@ -1,4 +1,4 @@
-import '../../_/corner_marker.dart';
+import '../../_/marker.dart';
 
 class BottomLeftMarkerState extends Marker {
   BottomLeftMarkerState({
diff --git a/patterns/state/manipulator_state/states/selections/resizable_markers/bottom_right_marker_state.dart b/patterns/state/manipulator_state/states/selections/resizable_markers/bottom_right_marker_state.dart
@@ -1,4 +1,4 @@
-import '../../_/corner_marker.dart';
+import '../../_/marker.dart';
 
 class BottomRightMarkerState extends Marker {
   BottomRightMarkerState({
diff --git a/patterns/state/manipulator_state/states/selections/resizable_markers/top_left_marker_state.dart b/patterns/state/manipulator_state/states/selections/resizable_markers/top_left_marker_state.dart
@@ -1,4 +1,4 @@
-import '../../_/corner_marker.dart';
+import '../../_/marker.dart';
 
 class TopLeftMarkerState extends Marker {
   TopLeftMarkerState({
diff --git a/patterns/state/manipulator_state/states/selections/resizable_markers/top_right_marker_state.dart b/patterns/state/manipulator_state/states/selections/resizable_markers/top_right_marker_state.dart
@@ -1,4 +1,4 @@
-import '../../_/corner_marker.dart';
+import '../../_/marker.dart';
 
 class TopRightMarkerState extends Marker {
   TopRightMarkerState({
diff --git a/patterns/state/manipulator_state/states/selections/selection_state.dart b/patterns/state/manipulator_state/states/selections/selection_state.dart
@@ -3,8 +3,8 @@ import 'package:flutter/material.dart';
 import '../../shapes/shape.dart';
 import '../free_sate.dart';
 
-class SelectionState<T extends Shape> extends FreeState {
-  final T selectedShape;
+class SelectionState<TShape extends Shape> extends FreeState {
+  final TShape selectedShape;
 
   SelectionState({required this.selectedShape});
 
diff --git a/patterns/state/manipulator_state/states/selections/text/text_cursor.dart b/patterns/state/manipulator_state/states/selections/text/text_cursor.dart
@@ -10,7 +10,8 @@ class TextCursor {
   void changePosition(double x) {
     x = x - _textShape.x;
 
-    final pos = _textShape.paragraph.getPositionForOffset(Offset(x, _textShape.y));
+    final pos =
+        _textShape.paragraph.getPositionForOffset(Offset(x, _textShape.y));
 
     _charIndex = pos.offset;
     _xPosition = _textShape.x;
@@ -48,7 +49,8 @@ class TextCursor {
       return;
     }
 
-    final range = _textShape.paragraph.getBoxesForRange(_charIndex - 1, _charIndex);
+    final range =
+        _textShape.paragraph.getBoxesForRange(_charIndex - 1, _charIndex);
 
     if (range.isNotEmpty) {
       _xPosition += range.first.right;
@@ -65,7 +67,8 @@ class TextCursor {
       return;
     }
 
-    final range = _textShape.paragraph.getBoxesForRange(_charIndex - 1, _charIndex);
+    final range =
+        _textShape.paragraph.getBoxesForRange(_charIndex - 1, _charIndex);
 
     if (range.isNotEmpty) {
       _xPosition += range.first.right;
diff --git a/patterns/state/manipulator_state/states/selections/text/text_size_marker_state.dart b/patterns/state/manipulator_state/states/selections/text/text_size_marker_state.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/services.dart';
 
 import '../../../shapes/text_shape.dart';
-import '../../_/corner_marker.dart';
+import '../../_/marker.dart';
 
 class TextSizeMarkerState extends Marker<TextShape> {
   TextSizeMarkerState({required super.parentState});
diff --git a/patterns/state/manipulator_state/states/selections/text_resize_state.dart b/patterns/state/manipulator_state/states/selections/text_resize_state.dart
@@ -3,7 +3,7 @@ import 'dart:ui';
 import '../../shapes/text_shape.dart';
 import '../_/sub_states/parent_state.dart';
 import 'text_edit_state.dart';
-import 'text/text_resize_marker_state.dart';
+import 'text/text_size_marker_state.dart';
 
 class TextResizeState extends ParentState<TextShape> {
   TextResizeState({required super.selectedShape}) {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import '../../_/corner_marker.dart';`
	`1`	`+import '../../_/marker.dart';`
`2`	`2`
`3`	`3`	`class BottomLeftMarkerState extends Marker {`
`4`	`4`	`BottomLeftMarkerState({`