refactor: move classes

2025-02-01 23:06:11 +01:00
parent 91c645e34f
commit 86aa6e9bb5
18 changed files with 26 additions and 21 deletions
--- a/app/src/main/java/gui/Main.java
+++ b/app/src/main/java/gui/Main.java
@@ -1,5 +1,7 @@
 package gui;

+import gui.constants.Fonts;
+import gui.constants.Images;
 import gui.menu.MainMenu;
 import gui.menu.StateMachine;
 import imgui.app.Application;
--- a/app/src/main/java/gui/constants/Fonts.java
+++ b/app/src/main/java/gui/constants/Fonts.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;

 import imgui.ImFont;
 import imgui.ImFontConfig;
--- a/app/src/main/java/gui/constants/Images.java
+++ b/app/src/main/java/gui/constants/Images.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;

 import java.nio.ByteBuffer;

--- a/app/src/main/java/gui/constants/Options.java
+++ b/app/src/main/java/gui/constants/Options.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;

 public class Options {

--- a/app/src/main/java/gui/constants/SudokuType.java
+++ b/app/src/main/java/gui/constants/SudokuType.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;

 import java.util.List;

--- a/app/src/main/java/gui/constants/Symbols.java
+++ b/app/src/main/java/gui/constants/Symbols.java
@@ -1,4 +1,4 @@
-package gui;
+package gui.constants;

 import java.util.ArrayList;
 import java.util.List;
--- a/app/src/main/java/gui/menu/OptionsMenu.java
+++ b/app/src/main/java/gui/menu/OptionsMenu.java
@@ -1,7 +1,7 @@
 package gui.menu;

-import gui.Options;
-import gui.Symbols;
+import gui.constants.Options;
+import gui.constants.Symbols;
 import imgui.ImGui;
 import imgui.type.ImInt;

--- a/app/src/main/java/gui/menu/StateMachine.java
+++ b/app/src/main/java/gui/menu/StateMachine.java
@@ -2,7 +2,7 @@ package gui.menu;

 import java.util.Stack;

-import gui.AnimatedBackground;
+import gui.widget.AnimatedBackground;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiKey;
--- a/app/src/main/java/gui/widget/AnimatedBackground.java
+++ b/app/src/main/java/gui/widget/AnimatedBackground.java
@@ -1,5 +1,7 @@
-package gui;
+package gui.widget;

+import gui.constants.Images;
+import gui.constants.Options;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.flag.ImGuiWindowFlags;
--- a/app/src/main/java/gui/widget/SudokuRenderer.java
+++ b/app/src/main/java/gui/widget/SudokuRenderer.java
@@ -9,11 +9,11 @@ import java.util.Set;
 import common.ConsumerSignal;
 import common.Signal;
 import gui.ColorGenerator;
-import gui.Fonts;
-import gui.Options;
-import gui.RenderableMultidoku;
-import gui.Symbols;
 import gui.ColorGenerator.Color;
+import gui.RenderableMultidoku;
+import gui.constants.Fonts;
+import gui.constants.Options;
+import gui.constants.Symbols;
 import imgui.ImGui;
 import imgui.ImVec2;
 import imgui.ImVec4;
--- a/app/src/main/java/gui/widget/SudokuSelector.java
+++ b/app/src/main/java/gui/widget/SudokuSelector.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;

 import common.ConsumerSignal;
-import gui.SudokuType;
+import gui.constants.SudokuType;
 import imgui.ImGui;
 import imgui.extension.imguifiledialog.ImGuiFileDialog;
 import imgui.extension.imguifiledialog.flag.ImGuiFileDialogFlags;
--- a/app/src/main/java/sudoku/Main.java
+++ b/app/src/main/java/sudoku/Main.java
@@ -4,7 +4,7 @@
 package sudoku;

 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.ConsoleInterface;
 import sudoku.io.SudokuPrinter;
 import sudoku.io.SudokuSerializer;
--- a/app/src/main/java/sudoku/io/ConsoleInterface.java
+++ b/app/src/main/java/sudoku/io/ConsoleInterface.java
@@ -1,7 +1,7 @@
 package sudoku.io;

 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.constraint.*;
 import sudoku.solver.*;
 import sudoku.structure.*;
--- a/app/src/main/java/sudoku/io/SudokuPrinter.java
+++ b/app/src/main/java/sudoku/io/SudokuPrinter.java
@@ -1,7 +1,7 @@
 package sudoku.io;

 import gui.RenderableMultidoku;
-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
 import sudoku.structure.Sudoku;
--- a/app/src/main/java/sudoku/solver/HumanSolver.java
+++ b/app/src/main/java/sudoku/solver/HumanSolver.java
@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;

-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
--- a/app/src/main/java/sudoku/solver/MixedSolver.java
+++ b/app/src/main/java/sudoku/solver/MixedSolver.java
@@ -5,7 +5,7 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;

-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
--- a/app/src/main/java/sudoku/solver/RandomSolver.java
+++ b/app/src/main/java/sudoku/solver/RandomSolver.java
@@ -5,7 +5,7 @@ import java.util.Random;
 import java.util.concurrent.CancellationException;
 import java.util.logging.Level;

-import gui.Symbols;
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.structure.Cell;
 import sudoku.structure.MultiDoku;
--- a/app/src/test/java/sudoku/solver/SolverTest.java
+++ b/app/src/test/java/sudoku/solver/SolverTest.java
@@ -1,7 +1,8 @@
 package sudoku.solver;

-import gui.Symbols;
 import org.junit.jupiter.api.Test;
+
+import gui.constants.Symbols;
 import sudoku.io.SudokuPrinter;
 import sudoku.io.SudokuSerializer;
 import sudoku.structure.Cell;