diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2c4900b..85a938c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -20,6 +20,8 @@ dependencies { // This dependency is used by the application. implementation(libs.guava) implementation("com.google.code.gson:gson:2.10.1") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") } testing { diff --git a/app/src/main/java/blitz/Main.java b/app/src/main/java/blitz/Main.java index c5d1f93..6023200 100644 --- a/app/src/main/java/blitz/Main.java +++ b/app/src/main/java/blitz/Main.java @@ -19,8 +19,8 @@ import javax.swing.SwingUtilities; import blitz.configs.Config; -import blitz.services.Utils; import blitz.ui.application.MainFrame; +import blitz.utils.Utils; /** diff --git a/app/src/main/java/blitz/configs/Config.java b/app/src/main/java/blitz/configs/Config.java index 550b64d..781f448 100644 --- a/app/src/main/java/blitz/configs/Config.java +++ b/app/src/main/java/blitz/configs/Config.java @@ -19,8 +19,8 @@ import java.awt.Dimension; import java.awt.Font; -import blitz.services.CartesianCoordinate; -import blitz.services.HexColor; +import blitz.utils.CartesianCoordinate; +import blitz.utils.HexColor; public class Config { @@ -35,7 +35,7 @@ public class Config { public static final String SAVE_FILE_EXTENSION_TYPE_DESCRIPTION = "BLITZ JSON"; public static final String EXPORT_FILE_EXTENSION_TYPE = ".txt"; - public static final String PATH_TO_APP_ICON = "app/src/main/java/blitz/resources/images/icons/app/Blitz App Icon.png"; + public static final String PATH_TO_APP_ICON = "app/src/main/resources/images/icons/app/Blitz App Icon.png"; @@ -47,7 +47,7 @@ public class Config { // -=-=-=- MenuBar -=-=-=- - public static final String PATH_TO_FIELDS_DIRECTORY = "app/src/main/java/blitz/resources/images/fields"; + public static final String PATH_TO_FIELDS_DIRECTORY = "app/src/main/resources/images/fields"; @@ -67,18 +67,18 @@ public class Config { public static final HexColor TOOL_PANEL_OPTIONS_BACKGROUND_COLOR = new HexColor("#aaaaaa"); public static final HexColor TOOL_PANEL_EXTRA_BACKGROUND_COLOR = new HexColor("#eeeeee"); - public static final String PATH_TO_ADD_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/add-tool.png"; - public static final String PATH_TO_CUT_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/cut-tool.png"; - public static final String PATH_TO_INSERT_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/insert-tool.png"; - public static final String PATH_TO_EDIT_TIME_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/edit-time-tool.png"; - public static final String PATH_TO_MERGE_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/merge-tool.png"; - public static final String PATH_TO_MOVE_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/move-tool.png"; - public static final String PATH_TO_PAN_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/move-tool.png"; - public static final String PATH_TO_REMOVE_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/remove-tool.png"; - public static final String PATH_TO_RENDER_ALL_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/render-all-tool.png"; - public static final String PATH_TO_SHOW_ROBOT_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/show-robot-tool.png"; - public static final String PATH_TO_SELECTED_TOOL_BACKGROUND_ICON = "app/src/main/java/blitz/resources/images/icons/tools/selected-tool-background.png"; - public static final String PATH_TO_UNSELECTED_TOOL_BACKGROUND_ICON = "app/src/main/java/blitz/resources/images/icons/tools/unselected-tool-background.png"; + public static final String PATH_TO_ADD_TOOL_ICON = "app/src/main/resources/images/icons/tools/add-tool.png"; + public static final String PATH_TO_CUT_TOOL_ICON = "app/src/main/resources/images/icons/tools/cut-tool.png"; + public static final String PATH_TO_INSERT_TOOL_ICON = "app/src/main/resources/images/icons/tools/insert-tool.png"; + public static final String PATH_TO_EDIT_TIME_TOOL_ICON = "app/src/main/resources/images/icons/tools/edit-time-tool.png"; + public static final String PATH_TO_MERGE_TOOL_ICON = "app/src/main/resources/images/icons/tools/merge-tool.png"; + public static final String PATH_TO_MOVE_TOOL_ICON = "app/src/main/resources/images/icons/tools/move-tool.png"; + public static final String PATH_TO_PAN_TOOL_ICON = "app/src/main/resources/images/icons/tools/move-tool.png"; + public static final String PATH_TO_REMOVE_TOOL_ICON = "app/src/main/resources/images/icons/tools/remove-tool.png"; + public static final String PATH_TO_RENDER_ALL_TOOL_ICON = "app/src/main/resources/images/icons/tools/render-all-tool.png"; + public static final String PATH_TO_SHOW_ROBOT_TOOL_ICON = "app/src/main/resources/images/icons/tools/show-robot-tool.png"; + public static final String PATH_TO_SELECTED_TOOL_BACKGROUND_ICON = "app/src/main/resources/images/icons/tools/selected-tool-background.png"; + public static final String PATH_TO_UNSELECTED_TOOL_BACKGROUND_ICON = "app/src/main/resources/images/icons/tools/unselected-tool-background.png"; public static final int RENDER_ALL_DELAY = 200; @@ -97,9 +97,9 @@ public class Config { public static final CartesianCoordinate DEFAULT_OFFSET = new CartesianCoordinate(0, 0); public static final double CANVAS_PANEL_X_OFFSET = (CANVAS_PANEL_PREFERRED_DIMENSIONS.getWidth()) / 2; public static final double CANVAS_PANEL_Y_OFFSET = (CANVAS_PANEL_PREFERRED_DIMENSIONS.getHeight()) / 2; - public static final String PATH_TO_ZOOM_IN_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/zoom-in.png"; - public static final String PATH_TO_ZOOM_OUT_TOOL_ICON = "app/src/main/java/blitz/resources/images/icons/tools/zoom-out.png"; - public static final String PATH_TO_DEFAULT_FIELD = "app/src/main/java/blitz/resources/images/fields/V5RC - High Stakes - Match_size24x24.png"; + public static final String PATH_TO_ZOOM_IN_TOOL_ICON = "app/src/main/resources/images/icons/tools/zoom-in.png"; + public static final String PATH_TO_ZOOM_OUT_TOOL_ICON = "app/src/main/resources/images/icons/tools/zoom-out.png"; + public static final String PATH_TO_DEFAULT_FIELD = "app/src/main/resources/images/fields/V5RC - High Stakes - Match_size24x24.png"; public static final int PIXELS_IN_ONE_INCH = 36; public static final double MIN_ZOOM_SCALE_VALUE = 0.4; @@ -107,17 +107,17 @@ public class Config { public static final double ZOOM_IN_COEFFICIENT = 1.05; // Must be >1 public static final double ZOOM_OUT_COEFFICIENT = 0.95; // Must be <1 - public static final String PATH_TO_PLUS_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/plus.png"; - public static final String PATH_TO_SCISSORS_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/scissors.png"; - public static final String PATH_TO_MOVE_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/move.png"; - public static final String PATH_TO_HAND_OPEN_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/handopen.png"; - public static final String PATH_TO_HAND_GRABBING_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/handgrabbing.png"; - public static final String PATH_TO_HAND_POINTING_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/handpointing.png"; - public static final String PATH_TO_HELP_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/help.png"; - public static final String PATH_TO_MINUS_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/minus.png"; - public static final String PATH_TO_EYE_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/eye.png"; - public static final String PATH_TO_NOT_ALLOWED_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/notallowed.png"; - public static final String PATH_TO_UNKNOWN_CURSOR_IMAGE = "app/src/main/java/blitz/resources/images/cursors/unknown.png"; + public static final String PATH_TO_PLUS_CURSOR_IMAGE = "app/src/main/resources/images/cursors/plus.png"; + public static final String PATH_TO_SCISSORS_CURSOR_IMAGE = "app/src/main/resources/images/cursors/scissors.png"; + public static final String PATH_TO_MOVE_CURSOR_IMAGE = "app/src/main/resources/images/cursors/move.png"; + public static final String PATH_TO_HAND_OPEN_CURSOR_IMAGE = "app/src/main/resources/images/cursors/handopen.png"; + public static final String PATH_TO_HAND_GRABBING_CURSOR_IMAGE = "app/src/main/resources/images/cursors/handgrabbing.png"; + public static final String PATH_TO_HAND_POINTING_CURSOR_IMAGE = "app/src/main/resources/images/cursors/handpointing.png"; + public static final String PATH_TO_HELP_CURSOR_IMAGE = "app/src/main/resources/images/cursors/help.png"; + public static final String PATH_TO_MINUS_CURSOR_IMAGE = "app/src/main/resources/images/cursors/minus.png"; + public static final String PATH_TO_EYE_CURSOR_IMAGE = "app/src/main/resources/images/cursors/eye.png"; + public static final String PATH_TO_NOT_ALLOWED_CURSOR_IMAGE = "app/src/main/resources/images/cursors/notallowed.png"; + public static final String PATH_TO_UNKNOWN_CURSOR_IMAGE = "app/src/main/resources/images/cursors/unknown.png"; @@ -195,8 +195,8 @@ public class Config { public static final Font SELECTION_PANEL_TRAJECTORY_LABEL_FONT = new Font("Verdana", Font.PLAIN, 14); public static final Font SELECTION_PANEL_CONTROL_POINT_LABEL_FONT = new Font("Verdana", Font.PLAIN, 14); - public static final String PATH_TO_DELETE_OPTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/delete-option.png"; - public static final String PATH_TO_ADD_TRAJECTORY_OPTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/add-trajectory-option.png"; + public static final String PATH_TO_DELETE_OPTION_ICON = "app/src/main/resources/images/icons/selection/delete-option.png"; + public static final String PATH_TO_ADD_TRAJECTORY_OPTION_ICON = "app/src/main/resources/images/icons/selection/add-trajectory-option.png"; public static final HexColor TRAJECTORY_LAYER_BACKGROUND_COLOR = new HexColor("#fefefe"); public static final Dimension TRAJECTORY_LAYER_PREFERRED_DIMENSION = new Dimension((int)SELECTION_PANEL_PREFERRED_DIMENSIONS.getWidth(), 40); @@ -210,16 +210,16 @@ public class Config { public static final HexColor CONTROL_POINT_LAYER_BACKGROUND_COLOR = new HexColor("#dedede"); public static final Dimension CONTROL_POINT_LAYER_PREFERRED_DIMENSIONS = new Dimension((int)(TRAJECTORY_LAYER_PREFERRED_DIMENSION.getWidth() - TRAJECTORY_LAYER_PREFERRED_DIMENSION.getHeight()), (int)TRAJECTORY_LAYER_PREFERRED_DIMENSION.getHeight()); - public static final String PATH_TO_COLLAPSE_LAYERS_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/collapse-layers-selection-icon.png"; - public static final String PATH_TO_EXPAND_LAYERS_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/expand-layers-selection-icon.png"; - public static final String PATH_TO_HIDDEN_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/hidden-layer-selection-icon.png"; - public static final String PATH_TO_LOCKED_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/locked-layer-selection-icon.png"; - public static final String PATH_TO_MOVE_DOWN_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/move-down-layer-selection-icon.png"; - public static final String PATH_TO_MOVE_UP_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/move-up-layer-selection-icon.png"; - public static final String PATH_TO_SELECTED_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/selected-layer-selection-icon.png"; - public static final String PATH_TO_SHOWN_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/shown-layer-selection-icon.png"; - public static final String PATH_TO_UNLOCKED_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/unlocked-layer-selection-icon.png"; - public static final String PATH_TO_UNSELECTED_LAYER_SELECTION_ICON = "app/src/main/java/blitz/resources/images/icons/selection/unselected-layer-selection-icon.png"; + public static final String PATH_TO_COLLAPSE_LAYERS_SELECTION_ICON = "app/src/main/resources/images/icons/selection/collapse-layers-selection-icon.png"; + public static final String PATH_TO_EXPAND_LAYERS_SELECTION_ICON = "app/src/main/resources/images/icons/selection/expand-layers-selection-icon.png"; + public static final String PATH_TO_HIDDEN_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/hidden-layer-selection-icon.png"; + public static final String PATH_TO_LOCKED_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/locked-layer-selection-icon.png"; + public static final String PATH_TO_MOVE_DOWN_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/move-down-layer-selection-icon.png"; + public static final String PATH_TO_MOVE_UP_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/move-up-layer-selection-icon.png"; + public static final String PATH_TO_SELECTED_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/selected-layer-selection-icon.png"; + public static final String PATH_TO_SHOWN_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/shown-layer-selection-icon.png"; + public static final String PATH_TO_UNLOCKED_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/unlocked-layer-selection-icon.png"; + public static final String PATH_TO_UNSELECTED_LAYER_SELECTION_ICON = "app/src/main/resources/images/icons/selection/unselected-layer-selection-icon.png"; diff --git a/app/src/main/java/blitz/models/calculations/AbstractSpline.java b/app/src/main/java/blitz/models/calculations/AbstractSpline.java index 3c27c2e..6144611 100644 --- a/app/src/main/java/blitz/models/calculations/AbstractSpline.java +++ b/app/src/main/java/blitz/models/calculations/AbstractSpline.java @@ -17,7 +17,7 @@ package blitz.models.calculations; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.CartesianCoordinate; +import blitz.utils.CartesianCoordinate; /** * Abstract base class for spline calculations, providing methods for evaluating points diff --git a/app/src/main/java/blitz/models/calculations/interpolations/EquidistantIntp.java b/app/src/main/java/blitz/models/calculations/interpolations/EquidistantIntp.java index f5a7c5b..2c94ceb 100644 --- a/app/src/main/java/blitz/models/calculations/interpolations/EquidistantIntp.java +++ b/app/src/main/java/blitz/models/calculations/interpolations/EquidistantIntp.java @@ -24,8 +24,8 @@ import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; import blitz.models.trajectories.trajectoryComponents.FollowPoint; -import blitz.services.CartesianCoordinate; -import blitz.services.Table; +import blitz.utils.CartesianCoordinate; +import blitz.utils.Table; /** * Equidistant interpolation algorithm that calculates a set of equidistant diff --git a/app/src/main/java/blitz/models/calculations/interpolations/FixedAmountIntp.java b/app/src/main/java/blitz/models/calculations/interpolations/FixedAmountIntp.java index 4eaeb93..c7a8687 100644 --- a/app/src/main/java/blitz/models/calculations/interpolations/FixedAmountIntp.java +++ b/app/src/main/java/blitz/models/calculations/interpolations/FixedAmountIntp.java @@ -23,7 +23,7 @@ import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; import blitz.models.trajectories.trajectoryComponents.FollowPoint; -import blitz.services.CartesianCoordinate; +import blitz.utils.CartesianCoordinate; /** * Fixed amount interpolation algorithm that calculates a set number of follow points diff --git a/app/src/main/java/blitz/models/calculations/interpolations/UniformIntp.java b/app/src/main/java/blitz/models/calculations/interpolations/UniformIntp.java index 53d38f8..cd5684f 100644 --- a/app/src/main/java/blitz/models/calculations/interpolations/UniformIntp.java +++ b/app/src/main/java/blitz/models/calculations/interpolations/UniformIntp.java @@ -24,8 +24,8 @@ import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; import blitz.models.trajectories.trajectoryComponents.FollowPoint; -import blitz.services.CartesianCoordinate; -import blitz.services.Table; +import blitz.utils.CartesianCoordinate; +import blitz.utils.Table; /** * Uniform interpolation algorithm that calculates follow points diff --git a/app/src/main/java/blitz/models/calculations/splines/BezierSpline.java b/app/src/main/java/blitz/models/calculations/splines/BezierSpline.java index 39f6813..1a8189c 100644 --- a/app/src/main/java/blitz/models/calculations/splines/BezierSpline.java +++ b/app/src/main/java/blitz/models/calculations/splines/BezierSpline.java @@ -18,7 +18,7 @@ import blitz.models.calculations.AbstractSpline; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.CartesianCoordinate; +import blitz.utils.CartesianCoordinate; /** * Represents a Bezier spline that calculates the positions, arc length, diff --git a/app/src/main/java/blitz/models/calculations/splines/LinearSpline.java b/app/src/main/java/blitz/models/calculations/splines/LinearSpline.java index 1e0d540..be1b460 100644 --- a/app/src/main/java/blitz/models/calculations/splines/LinearSpline.java +++ b/app/src/main/java/blitz/models/calculations/splines/LinearSpline.java @@ -18,7 +18,7 @@ import blitz.models.calculations.AbstractSpline; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.CartesianCoordinate; +import blitz.utils.CartesianCoordinate; /** * Represents a linear spline that interpolates points along a straight line diff --git a/app/src/main/java/blitz/models/trajectories/Trajectory.java b/app/src/main/java/blitz/models/trajectories/Trajectory.java index acab52b..80f7858 100644 --- a/app/src/main/java/blitz/models/trajectories/Trajectory.java +++ b/app/src/main/java/blitz/models/trajectories/Trajectory.java @@ -28,7 +28,7 @@ import blitz.models.calculations.Calculations; import blitz.models.trajectories.trajectoryComponents.ControlPoint; import blitz.models.trajectories.trajectoryComponents.FollowPoint; -import blitz.services.CartesianCoordinate; +import blitz.utils.CartesianCoordinate; public class Trajectory { diff --git a/app/src/main/java/blitz/models/trajectories/trajectoryComponents/ControlPoint.java b/app/src/main/java/blitz/models/trajectories/trajectoryComponents/ControlPoint.java index c465180..bc2bc42 100644 --- a/app/src/main/java/blitz/models/trajectories/trajectoryComponents/ControlPoint.java +++ b/app/src/main/java/blitz/models/trajectories/trajectoryComponents/ControlPoint.java @@ -20,9 +20,9 @@ import java.util.Map; import blitz.configs.Config; -import blitz.services.CartesianCoordinate; -import blitz.services.PolarCoordinate; -import blitz.services.Utils; +import blitz.utils.CartesianCoordinate; +import blitz.utils.PolarCoordinate; +import blitz.utils.Utils; public final class ControlPoint { diff --git a/app/src/main/java/blitz/models/trajectories/trajectoryComponents/FollowPoint.java b/app/src/main/java/blitz/models/trajectories/trajectoryComponents/FollowPoint.java index d43966f..04e5b69 100644 --- a/app/src/main/java/blitz/models/trajectories/trajectoryComponents/FollowPoint.java +++ b/app/src/main/java/blitz/models/trajectories/trajectoryComponents/FollowPoint.java @@ -16,7 +16,7 @@ package blitz.models.trajectories.trajectoryComponents; -import blitz.services.CartesianCoordinate; +import blitz.utils.CartesianCoordinate; /** * Represents a follow point on a trajectory with its position, speed, diff --git a/app/src/main/java/blitz/ui/application/MainFrame.java b/app/src/main/java/blitz/ui/application/MainFrame.java index af1ed05..d37384c 100644 --- a/app/src/main/java/blitz/ui/application/MainFrame.java +++ b/app/src/main/java/blitz/ui/application/MainFrame.java @@ -45,8 +45,6 @@ import javax.swing.text.JTextComponent; import blitz.configs.Config; -import blitz.services.FieldImage; -import blitz.services.Utils; import blitz.ui.application.menu.Export; import blitz.ui.application.menu.Open; import blitz.ui.application.menu.Save; @@ -56,6 +54,8 @@ import blitz.ui.application.panels.selectionPanel.SelectionPanel; import blitz.ui.application.panels.toolPanel.ToolPanel; import blitz.ui.application.panels.toolPanel.tools.Tool.Tools; +import blitz.utils.FieldImage; +import blitz.utils.Utils; /** diff --git a/app/src/main/java/blitz/ui/application/menu/Export.java b/app/src/main/java/blitz/ui/application/menu/Export.java index 57eafcd..5d1f260 100644 --- a/app/src/main/java/blitz/ui/application/menu/Export.java +++ b/app/src/main/java/blitz/ui/application/menu/Export.java @@ -40,7 +40,7 @@ import blitz.configs.Config; import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoriesList.TrajectoriesList; -import blitz.services.FormatManager; +import blitz.utils.FormatManager; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/app/src/main/java/blitz/ui/application/panels/canvasPanel/CanvasPanel.java b/app/src/main/java/blitz/ui/application/panels/canvasPanel/CanvasPanel.java index ee79688..cfb5b7a 100644 --- a/app/src/main/java/blitz/ui/application/panels/canvasPanel/CanvasPanel.java +++ b/app/src/main/java/blitz/ui/application/panels/canvasPanel/CanvasPanel.java @@ -69,11 +69,10 @@ import blitz.models.trajectories.trajectoriesList.TrajectoriesList; import blitz.models.active.ActiveEntities; import blitz.ui.application.panels.canvasPanel.pointers.HelperPointer; - -import blitz.services.CartesianCoordinate; import blitz.ui.application.panels.toolPanel.tools.Tool; import blitz.ui.application.panels.toolPanel.tools.Tool.Tools; -import blitz.services.FieldImage; +import blitz.utils.CartesianCoordinate; +import blitz.utils.FieldImage; public class CanvasPanel extends JPanel implements MouseListener, MouseMotionListener, ActiveEntitiesListener, ToolListener, TrajectoriesListListener, VisibleTrajectoriesListener{ diff --git a/app/src/main/java/blitz/ui/application/panels/canvasPanel/pointers/FollowPointer.java b/app/src/main/java/blitz/ui/application/panels/canvasPanel/pointers/FollowPointer.java index d84c2a8..165dd9d 100644 --- a/app/src/main/java/blitz/ui/application/panels/canvasPanel/pointers/FollowPointer.java +++ b/app/src/main/java/blitz/ui/application/panels/canvasPanel/pointers/FollowPointer.java @@ -22,8 +22,8 @@ import blitz.configs.Config; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.Gradient; -import blitz.services.HexColor; +import blitz.utils.Gradient; +import blitz.utils.HexColor; /** * Represents a follow pointer that visually indicates a control point on the canvas. diff --git a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/AbstractLinePanel.java b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/AbstractLinePanel.java index 1f534a1..d170ce5 100644 --- a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/AbstractLinePanel.java +++ b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/AbstractLinePanel.java @@ -25,7 +25,7 @@ import blitz.configs.Config; import blitz.models.active.ActiveEntities; -import blitz.services.Utils; +import blitz.utils.Utils; /** * Represents an abstract panel that provides common functionalities for line-related panels. diff --git a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/DistanceLine.java b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/DistanceLine.java index 43d78b7..f9c9ac5 100644 --- a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/DistanceLine.java +++ b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/DistanceLine.java @@ -33,7 +33,7 @@ import blitz.models.calculations.Calculations; import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.DecimalFilter; +import blitz.utils.DecimalFilter; /** * Represents a panel for displaying and editing the distance-related properties of a trajectory. diff --git a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperEndLine.java b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperEndLine.java index 26a8f8e..171336c 100644 --- a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperEndLine.java +++ b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperEndLine.java @@ -33,7 +33,7 @@ import blitz.models.calculations.Calculations; import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.DecimalFilter; +import blitz.utils.DecimalFilter; /** * Represents a panel for displaying and editing the end-related properties of a control point. diff --git a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperStartLine.java b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperStartLine.java index 77ca264..1fcb1e2 100644 --- a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperStartLine.java +++ b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/HelperStartLine.java @@ -33,7 +33,7 @@ import blitz.models.calculations.Calculations; import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.DecimalFilter; +import blitz.utils.DecimalFilter; /** * Represents a panel for displaying and editing the start-related properties of a control point. diff --git a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/NumSegmentsLine.java b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/NumSegmentsLine.java index a6086a7..2439bf9 100644 --- a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/NumSegmentsLine.java +++ b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/NumSegmentsLine.java @@ -33,7 +33,7 @@ import blitz.models.calculations.Calculations; import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.DecimalFilter; +import blitz.utils.DecimalFilter; /** * Represents a panel for displaying and editing the number of segments of a control point. diff --git a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/PositionLine.java b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/PositionLine.java index cd2586c..04dac8e 100644 --- a/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/PositionLine.java +++ b/app/src/main/java/blitz/ui/application/panels/infoPanel/linePanels/PositionLine.java @@ -32,7 +32,7 @@ import blitz.models.active.ActiveEntitiesListener; import blitz.models.trajectories.Trajectory; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.DecimalFilter; +import blitz.utils.DecimalFilter; /** * Represents a panel for displaying and editing the position (x, y) of a control point. diff --git a/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/ControlPointLayer.java b/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/ControlPointLayer.java index faad276..a2e95ea 100644 --- a/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/ControlPointLayer.java +++ b/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/ControlPointLayer.java @@ -36,7 +36,7 @@ import blitz.models.active.ActiveEntities; import blitz.models.trajectories.trajectoriesList.TrajectoriesList; import blitz.models.trajectories.trajectoryComponents.ControlPoint; -import blitz.services.Utils; +import blitz.utils.Utils; public class ControlPointLayer extends JPanel{ diff --git a/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/TrajectoryLayer.java b/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/TrajectoryLayer.java index 96ffa19..9c6b6c2 100644 --- a/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/TrajectoryLayer.java +++ b/app/src/main/java/blitz/ui/application/panels/selectionPanel/selectionLayers/TrajectoryLayer.java @@ -41,7 +41,7 @@ import blitz.models.trajectories.trajectoriesList.TrajectoriesList; import blitz.models.trajectories.trajectoryComponents.ControlPoint; import blitz.models.trajectories.visibleTrajectories.VisibleTrajectories; -import blitz.services.Utils; +import blitz.utils.Utils; /** * Represents a layer for displaying and managing a trajectory within the selection panel. diff --git a/app/src/main/java/blitz/services/CartesianCoordinate.java b/app/src/main/java/blitz/utils/CartesianCoordinate.java similarity index 98% rename from app/src/main/java/blitz/services/CartesianCoordinate.java rename to app/src/main/java/blitz/utils/CartesianCoordinate.java index 8be466d..86a7b29 100644 --- a/app/src/main/java/blitz/services/CartesianCoordinate.java +++ b/app/src/main/java/blitz/utils/CartesianCoordinate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; /** * Represents a point in a 2D Cartesian coordinate system. diff --git a/app/src/main/java/blitz/services/DecimalFilter.java b/app/src/main/java/blitz/utils/DecimalFilter.java similarity index 99% rename from app/src/main/java/blitz/services/DecimalFilter.java rename to app/src/main/java/blitz/utils/DecimalFilter.java index ffb5c9c..0e9481f 100644 --- a/app/src/main/java/blitz/services/DecimalFilter.java +++ b/app/src/main/java/blitz/utils/DecimalFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; import javax.swing.text.AttributeSet; import javax.swing.text.BadLocationException; diff --git a/app/src/main/java/blitz/services/FieldImage.java b/app/src/main/java/blitz/utils/FieldImage.java similarity index 99% rename from app/src/main/java/blitz/services/FieldImage.java rename to app/src/main/java/blitz/utils/FieldImage.java index 09a2fe9..b71967f 100644 --- a/app/src/main/java/blitz/services/FieldImage.java +++ b/app/src/main/java/blitz/utils/FieldImage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; import java.awt.image.BufferedImage; import java.io.File; diff --git a/app/src/main/java/blitz/services/FormatManager.java b/app/src/main/java/blitz/utils/FormatManager.java similarity index 99% rename from app/src/main/java/blitz/services/FormatManager.java rename to app/src/main/java/blitz/utils/FormatManager.java index 6efed57..6a36f47 100644 --- a/app/src/main/java/blitz/services/FormatManager.java +++ b/app/src/main/java/blitz/utils/FormatManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/blitz/services/Gradient.java b/app/src/main/java/blitz/utils/Gradient.java similarity index 99% rename from app/src/main/java/blitz/services/Gradient.java rename to app/src/main/java/blitz/utils/Gradient.java index cd5180a..154ae76 100644 --- a/app/src/main/java/blitz/services/Gradient.java +++ b/app/src/main/java/blitz/utils/Gradient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/blitz/services/HexColor.java b/app/src/main/java/blitz/utils/HexColor.java similarity index 99% rename from app/src/main/java/blitz/services/HexColor.java rename to app/src/main/java/blitz/utils/HexColor.java index 69bab68..41f2c81 100644 --- a/app/src/main/java/blitz/services/HexColor.java +++ b/app/src/main/java/blitz/utils/HexColor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; import java.awt.Color; diff --git a/app/src/main/java/blitz/services/PolarCoordinate.java b/app/src/main/java/blitz/utils/PolarCoordinate.java similarity index 99% rename from app/src/main/java/blitz/services/PolarCoordinate.java rename to app/src/main/java/blitz/utils/PolarCoordinate.java index 818ebd0..d6b63ae 100644 --- a/app/src/main/java/blitz/services/PolarCoordinate.java +++ b/app/src/main/java/blitz/utils/PolarCoordinate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; /** * Represents a point in a 2D polar coordinate system. diff --git a/app/src/main/java/blitz/services/Table.java b/app/src/main/java/blitz/utils/Table.java similarity index 99% rename from app/src/main/java/blitz/services/Table.java rename to app/src/main/java/blitz/utils/Table.java index 5bc81e7..37aad44 100644 --- a/app/src/main/java/blitz/services/Table.java +++ b/app/src/main/java/blitz/utils/Table.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; import java.util.Map; import java.util.NavigableMap; diff --git a/app/src/main/java/blitz/services/Utils.java b/app/src/main/java/blitz/utils/Utils.java similarity index 99% rename from app/src/main/java/blitz/services/Utils.java rename to app/src/main/java/blitz/utils/Utils.java index 1c31d8e..25d54b7 100644 --- a/app/src/main/java/blitz/services/Utils.java +++ b/app/src/main/java/blitz/utils/Utils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package blitz.services; +package blitz.utils; import java.awt.Component; import java.awt.Graphics2D; diff --git a/app/src/main/java/blitz/resources/.DS_Store b/app/src/main/resources/.DS_Store similarity index 100% rename from app/src/main/java/blitz/resources/.DS_Store rename to app/src/main/resources/.DS_Store diff --git a/app/src/main/java/blitz/resources/images/.DS_Store b/app/src/main/resources/images/.DS_Store similarity index 100% rename from app/src/main/java/blitz/resources/images/.DS_Store rename to app/src/main/resources/images/.DS_Store diff --git a/app/src/main/java/blitz/resources/images/cursors/.DS_Store b/app/src/main/resources/images/cursors/.DS_Store similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/.DS_Store rename to app/src/main/resources/images/cursors/.DS_Store diff --git a/app/src/main/java/blitz/resources/images/cursors/Eye.png b/app/src/main/resources/images/cursors/Eye.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/Eye.png rename to app/src/main/resources/images/cursors/Eye.png diff --git a/app/src/main/java/blitz/resources/images/cursors/beachball.png b/app/src/main/resources/images/cursors/beachball.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/beachball.png rename to app/src/main/resources/images/cursors/beachball.png diff --git a/app/src/main/java/blitz/resources/images/cursors/busy.png b/app/src/main/resources/images/cursors/busy.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/busy.png rename to app/src/main/resources/images/cursors/busy.png diff --git a/app/src/main/java/blitz/resources/images/cursors/cell.png b/app/src/main/resources/images/cursors/cell.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/cell.png rename to app/src/main/resources/images/cursors/cell.png diff --git a/app/src/main/java/blitz/resources/images/cursors/contetualmenu.png b/app/src/main/resources/images/cursors/contetualmenu.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/contetualmenu.png rename to app/src/main/resources/images/cursors/contetualmenu.png diff --git a/app/src/main/java/blitz/resources/images/cursors/cross.png b/app/src/main/resources/images/cursors/cross.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/cross.png rename to app/src/main/resources/images/cursors/cross.png diff --git a/app/src/main/java/blitz/resources/images/cursors/default.png b/app/src/main/resources/images/cursors/default.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/default.png rename to app/src/main/resources/images/cursors/default.png diff --git a/app/src/main/java/blitz/resources/images/cursors/handgrabbing.png b/app/src/main/resources/images/cursors/handgrabbing.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/handgrabbing.png rename to app/src/main/resources/images/cursors/handgrabbing.png diff --git a/app/src/main/java/blitz/resources/images/cursors/handopen.png b/app/src/main/resources/images/cursors/handopen.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/handopen.png rename to app/src/main/resources/images/cursors/handopen.png diff --git a/app/src/main/java/blitz/resources/images/cursors/handpointing.png b/app/src/main/resources/images/cursors/handpointing.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/handpointing.png rename to app/src/main/resources/images/cursors/handpointing.png diff --git a/app/src/main/java/blitz/resources/images/cursors/help.png b/app/src/main/resources/images/cursors/help.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/help.png rename to app/src/main/resources/images/cursors/help.png diff --git a/app/src/main/java/blitz/resources/images/cursors/makealias.png b/app/src/main/resources/images/cursors/makealias.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/makealias.png rename to app/src/main/resources/images/cursors/makealias.png diff --git a/app/src/main/java/blitz/resources/images/cursors/minus.png b/app/src/main/resources/images/cursors/minus.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/minus.png rename to app/src/main/resources/images/cursors/minus.png diff --git a/app/src/main/java/blitz/resources/images/cursors/move.png b/app/src/main/resources/images/cursors/move.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/move.png rename to app/src/main/resources/images/cursors/move.png diff --git a/app/src/main/java/blitz/resources/images/cursors/notallowed.png b/app/src/main/resources/images/cursors/notallowed.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/notallowed.png rename to app/src/main/resources/images/cursors/notallowed.png diff --git a/app/src/main/java/blitz/resources/images/cursors/plus.png b/app/src/main/resources/images/cursors/plus.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/plus.png rename to app/src/main/resources/images/cursors/plus.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizedown.png b/app/src/main/resources/images/cursors/resizedown.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizedown.png rename to app/src/main/resources/images/cursors/resizedown.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizeeast.png b/app/src/main/resources/images/cursors/resizeeast.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizeeast.png rename to app/src/main/resources/images/cursors/resizeeast.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizeleft.png b/app/src/main/resources/images/cursors/resizeleft.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizeleft.png rename to app/src/main/resources/images/cursors/resizeleft.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizeleftright.png b/app/src/main/resources/images/cursors/resizeleftright.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizeleftright.png rename to app/src/main/resources/images/cursors/resizeleftright.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizenorth 2.png b/app/src/main/resources/images/cursors/resizenorth 2.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizenorth 2.png rename to app/src/main/resources/images/cursors/resizenorth 2.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizenorth.png b/app/src/main/resources/images/cursors/resizenorth.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizenorth.png rename to app/src/main/resources/images/cursors/resizenorth.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizenortheast.png b/app/src/main/resources/images/cursors/resizenortheast.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizenortheast.png rename to app/src/main/resources/images/cursors/resizenortheast.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizenortheastsouthwest.png b/app/src/main/resources/images/cursors/resizenortheastsouthwest.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizenortheastsouthwest.png rename to app/src/main/resources/images/cursors/resizenortheastsouthwest.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizenorthsouth.png b/app/src/main/resources/images/cursors/resizenorthsouth.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizenorthsouth.png rename to app/src/main/resources/images/cursors/resizenorthsouth.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizenorthwest.png b/app/src/main/resources/images/cursors/resizenorthwest.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizenorthwest.png rename to app/src/main/resources/images/cursors/resizenorthwest.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizenorthwestsoutheast.png b/app/src/main/resources/images/cursors/resizenorthwestsoutheast.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizenorthwestsoutheast.png rename to app/src/main/resources/images/cursors/resizenorthwestsoutheast.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizeright.png b/app/src/main/resources/images/cursors/resizeright.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizeright.png rename to app/src/main/resources/images/cursors/resizeright.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizesouth.png b/app/src/main/resources/images/cursors/resizesouth.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizesouth.png rename to app/src/main/resources/images/cursors/resizesouth.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizesoutheast.png b/app/src/main/resources/images/cursors/resizesoutheast.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizesoutheast.png rename to app/src/main/resources/images/cursors/resizesoutheast.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizesouthwest.png b/app/src/main/resources/images/cursors/resizesouthwest.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizesouthwest.png rename to app/src/main/resources/images/cursors/resizesouthwest.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizeup.png b/app/src/main/resources/images/cursors/resizeup.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizeup.png rename to app/src/main/resources/images/cursors/resizeup.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizeupdown.png b/app/src/main/resources/images/cursors/resizeupdown.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizeupdown.png rename to app/src/main/resources/images/cursors/resizeupdown.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizewest.png b/app/src/main/resources/images/cursors/resizewest.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizewest.png rename to app/src/main/resources/images/cursors/resizewest.png diff --git a/app/src/main/java/blitz/resources/images/cursors/resizewesteast.png b/app/src/main/resources/images/cursors/resizewesteast.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/resizewesteast.png rename to app/src/main/resources/images/cursors/resizewesteast.png diff --git a/app/src/main/java/blitz/resources/images/cursors/scissors.png b/app/src/main/resources/images/cursors/scissors.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/scissors.png rename to app/src/main/resources/images/cursors/scissors.png diff --git a/app/src/main/java/blitz/resources/images/cursors/screenshotselection.png b/app/src/main/resources/images/cursors/screenshotselection.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/screenshotselection.png rename to app/src/main/resources/images/cursors/screenshotselection.png diff --git a/app/src/main/java/blitz/resources/images/cursors/screenshotwindow.png b/app/src/main/resources/images/cursors/screenshotwindow.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/screenshotwindow.png rename to app/src/main/resources/images/cursors/screenshotwindow.png diff --git a/app/src/main/java/blitz/resources/images/cursors/tetcursor.png b/app/src/main/resources/images/cursors/tetcursor.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/tetcursor.png rename to app/src/main/resources/images/cursors/tetcursor.png diff --git a/app/src/main/java/blitz/resources/images/cursors/tetcursorvertical.png b/app/src/main/resources/images/cursors/tetcursorvertical.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/tetcursorvertical.png rename to app/src/main/resources/images/cursors/tetcursorvertical.png diff --git a/app/src/main/java/blitz/resources/images/cursors/unknown.png b/app/src/main/resources/images/cursors/unknown.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/unknown.png rename to app/src/main/resources/images/cursors/unknown.png diff --git a/app/src/main/java/blitz/resources/images/cursors/zoomin.png b/app/src/main/resources/images/cursors/zoomin.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/zoomin.png rename to app/src/main/resources/images/cursors/zoomin.png diff --git a/app/src/main/java/blitz/resources/images/cursors/zoomout.png b/app/src/main/resources/images/cursors/zoomout.png similarity index 100% rename from app/src/main/java/blitz/resources/images/cursors/zoomout.png rename to app/src/main/resources/images/cursors/zoomout.png diff --git a/app/src/main/java/blitz/resources/images/fields/.DS_Store b/app/src/main/resources/images/fields/.DS_Store similarity index 100% rename from app/src/main/java/blitz/resources/images/fields/.DS_Store rename to app/src/main/resources/images/fields/.DS_Store diff --git a/app/src/main/java/blitz/resources/images/fields/V5RC - High Stakes - Match_size24x24.png b/app/src/main/resources/images/fields/V5RC - High Stakes - Match_size24x24.png similarity index 100% rename from app/src/main/java/blitz/resources/images/fields/V5RC - High Stakes - Match_size24x24.png rename to app/src/main/resources/images/fields/V5RC - High Stakes - Match_size24x24.png diff --git a/app/src/main/java/blitz/resources/images/fields/V5RC - High Stakes - Skils_size24x24.png b/app/src/main/resources/images/fields/V5RC - High Stakes - Skils_size24x24.png similarity index 100% rename from app/src/main/java/blitz/resources/images/fields/V5RC - High Stakes - Skils_size24x24.png rename to app/src/main/resources/images/fields/V5RC - High Stakes - Skils_size24x24.png diff --git a/app/src/main/java/blitz/resources/images/icons/.DS_Store b/app/src/main/resources/images/icons/.DS_Store similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/.DS_Store rename to app/src/main/resources/images/icons/.DS_Store diff --git a/app/src/main/java/blitz/resources/images/icons/app/.DS_Store b/app/src/main/resources/images/icons/app/.DS_Store similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/app/.DS_Store rename to app/src/main/resources/images/icons/app/.DS_Store diff --git a/app/src/main/java/blitz/resources/images/icons/app/Blitz App Icon (No Background).png b/app/src/main/resources/images/icons/app/Blitz App Icon (No Background).png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/app/Blitz App Icon (No Background).png rename to app/src/main/resources/images/icons/app/Blitz App Icon (No Background).png diff --git a/app/src/main/java/blitz/resources/images/icons/app/Blitz App Icon.png b/app/src/main/resources/images/icons/app/Blitz App Icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/app/Blitz App Icon.png rename to app/src/main/resources/images/icons/app/Blitz App Icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/cursors/insertCursor.png b/app/src/main/resources/images/icons/cursors/insertCursor.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/cursors/insertCursor.png rename to app/src/main/resources/images/icons/cursors/insertCursor.png diff --git a/app/src/main/java/blitz/resources/images/icons/cursors/moveCursor.png b/app/src/main/resources/images/icons/cursors/moveCursor.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/cursors/moveCursor.png rename to app/src/main/resources/images/icons/cursors/moveCursor.png diff --git a/app/src/main/java/blitz/resources/images/icons/cursors/removeCursor.png b/app/src/main/resources/images/icons/cursors/removeCursor.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/cursors/removeCursor.png rename to app/src/main/resources/images/icons/cursors/removeCursor.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/add-trajectory-option.png b/app/src/main/resources/images/icons/selection/add-trajectory-option.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/add-trajectory-option.png rename to app/src/main/resources/images/icons/selection/add-trajectory-option.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/collapse-layers-selection-icon.png b/app/src/main/resources/images/icons/selection/collapse-layers-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/collapse-layers-selection-icon.png rename to app/src/main/resources/images/icons/selection/collapse-layers-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/delete-option.png b/app/src/main/resources/images/icons/selection/delete-option.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/delete-option.png rename to app/src/main/resources/images/icons/selection/delete-option.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/expand-layers-selection-icon.png b/app/src/main/resources/images/icons/selection/expand-layers-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/expand-layers-selection-icon.png rename to app/src/main/resources/images/icons/selection/expand-layers-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/hidden-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/hidden-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/hidden-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/hidden-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/locked-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/locked-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/locked-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/locked-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/move-down-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/move-down-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/move-down-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/move-down-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/move-up-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/move-up-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/move-up-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/move-up-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/selected-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/selected-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/selected-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/selected-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/shown-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/shown-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/shown-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/shown-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/unlocked-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/unlocked-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/unlocked-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/unlocked-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/selection/unselected-layer-selection-icon.png b/app/src/main/resources/images/icons/selection/unselected-layer-selection-icon.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/selection/unselected-layer-selection-icon.png rename to app/src/main/resources/images/icons/selection/unselected-layer-selection-icon.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/add-tool.png b/app/src/main/resources/images/icons/tools/add-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/add-tool.png rename to app/src/main/resources/images/icons/tools/add-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/cut-tool.png b/app/src/main/resources/images/icons/tools/cut-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/cut-tool.png rename to app/src/main/resources/images/icons/tools/cut-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/edit-time-tool.png b/app/src/main/resources/images/icons/tools/edit-time-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/edit-time-tool.png rename to app/src/main/resources/images/icons/tools/edit-time-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/insert-tool.png b/app/src/main/resources/images/icons/tools/insert-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/insert-tool.png rename to app/src/main/resources/images/icons/tools/insert-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/merge-tool.png b/app/src/main/resources/images/icons/tools/merge-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/merge-tool.png rename to app/src/main/resources/images/icons/tools/merge-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/move-tool.png b/app/src/main/resources/images/icons/tools/move-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/move-tool.png rename to app/src/main/resources/images/icons/tools/move-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/remove-tool.png b/app/src/main/resources/images/icons/tools/remove-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/remove-tool.png rename to app/src/main/resources/images/icons/tools/remove-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/render-all-tool.png b/app/src/main/resources/images/icons/tools/render-all-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/render-all-tool.png rename to app/src/main/resources/images/icons/tools/render-all-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/selected-tool-background.png b/app/src/main/resources/images/icons/tools/selected-tool-background.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/selected-tool-background.png rename to app/src/main/resources/images/icons/tools/selected-tool-background.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/show-robot-tool.png b/app/src/main/resources/images/icons/tools/show-robot-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/show-robot-tool.png rename to app/src/main/resources/images/icons/tools/show-robot-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/unselected-tool-background.png b/app/src/main/resources/images/icons/tools/unselected-tool-background.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/unselected-tool-background.png rename to app/src/main/resources/images/icons/tools/unselected-tool-background.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/zoom-in-tool.png b/app/src/main/resources/images/icons/tools/zoom-in-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/zoom-in-tool.png rename to app/src/main/resources/images/icons/tools/zoom-in-tool.png diff --git a/app/src/main/java/blitz/resources/images/icons/tools/zoom-out-tool.png b/app/src/main/resources/images/icons/tools/zoom-out-tool.png similarity index 100% rename from app/src/main/java/blitz/resources/images/icons/tools/zoom-out-tool.png rename to app/src/main/resources/images/icons/tools/zoom-out-tool.png