Redundancy and refactor

p-larson · Apr 20, 2023 · b0351a4 · b0351a4
1 parent 8c616ea
commit b0351a4
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 8 deletions.
diff --git a/TCA-Snake 2.xcodeproj/project.pbxproj b/TCA-Snake 2.xcodeproj/project.pbxproj
@@ -65,6 +65,41 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		988B0CA229F1A33700A325F1 /* Dependencies */ = {
+			isa = PBXGroup;
+			children = (
+				98DBFEA829E6076500679032 /* CoordinateGenerator.swift */,
+				9827301029E84D580015C7AD /* HighScoreClient.swift */,
+			);
+			path = Dependencies;
+			sourceTree = "<group>";
+		};
+		988B0CA329F1A33E00A325F1 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				98B6056C29E36538005449FE /* Vector.swift */,
+				98B6056E29E368DF005449FE /* Coordinate.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		988B0CA429F1A34200A325F1 /* Core */ = {
+			isa = PBXGroup;
+			children = (
+				98C2C76029DB358200A48C27 /* Snake.swift */,
+				988B0CA329F1A33E00A325F1 /* Models */,
+			);
+			path = Core;
+			sourceTree = "<group>";
+		};
+		988B0CA529F1A34700A325F1 /* View */ = {
+			isa = PBXGroup;
+			children = (
+				9827301229E8AB210015C7AD /* SnakeView.swift */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		98B6056429E3612D005449FE /* TCA-Snake 2 Tests */ = {
 			isa = PBXGroup;
 			children = (
@@ -95,12 +130,9 @@
 			isa = PBXGroup;
 			children = (
 				98C2C74E29DB352C00A48C27 /* TCA_Snake_2App.swift */,
-				9827301229E8AB210015C7AD /* SnakeView.swift */,
-				98C2C76029DB358200A48C27 /* Snake.swift */,
-				98B6056C29E36538005449FE /* Vector.swift */,
-				98B6056E29E368DF005449FE /* Coordinate.swift */,
-				98DBFEA829E6076500679032 /* CoordinateGenerator.swift */,
-				9827301029E84D580015C7AD /* HighScoreClient.swift */,
+				988B0CA529F1A34700A325F1 /* View */,
+				988B0CA429F1A34200A325F1 /* Core */,
+				988B0CA229F1A33700A325F1 /* Dependencies */,
 				98C2C75229DB352E00A48C27 /* Assets.xcassets */,
 				98C2C75729DB352E00A48C27 /* TCA_Snake_2.entitlements */,
 				98C2C75429DB352E00A48C27 /* Preview Content */,

diff --git a/TCA-Snake 2/Coordinate.swift → TCA-Snake 2/Core/Models/Coordinate.swift b/TCA-Snake 2/Coordinate.swift → TCA-Snake 2/Core/Models/Coordinate.swift
diff --git a/TCA-Snake 2/Vector.swift → TCA-Snake 2/Core/Models/Vector.swift b/TCA-Snake 2/Vector.swift → TCA-Snake 2/Core/Models/Vector.swift
diff --git a/TCA-Snake 2/Snake.swift → TCA-Snake 2/Core/Snake.swift b/TCA-Snake 2/Snake.swift → TCA-Snake 2/Core/Snake.swift
@@ -18,8 +18,8 @@ struct Snake: ReducerProtocol {
     static let cellSize: Int = 20
 
     struct State: Equatable {
-        @BindingState var width: Int 
-        @BindingState var height: Int
+        var width: Int 
+        var height: Int
         var player: [Coordinate]
         var food: Coordinate
         var direction: Vector = .zero

diff --git a/TCA-Snake 2/CoordinateGenerator.swift → ... 2/Dependencies/CoordinateGenerator.swift b/TCA-Snake 2/CoordinateGenerator.swift → ... 2/Dependencies/CoordinateGenerator.swift
diff --git a/TCA-Snake 2/HighScoreClient.swift → ...nake 2/Dependencies/HighScoreClient.swift b/TCA-Snake 2/HighScoreClient.swift → ...nake 2/Dependencies/HighScoreClient.swift
diff --git a/TCA-Snake 2/SnakeView.swift → TCA-Snake 2/View/SnakeView.swift b/TCA-Snake 2/SnakeView.swift → TCA-Snake 2/View/SnakeView.swift