Merge branch 'feature/RefactorViews' into develop

Lisergishnu · May 1, 2019 · 6eac763 · 6eac763
2 parents 969c43e + 8b81b19
commit 6eac763
Show file tree

Hide file tree

Showing 20 changed files with 710 additions and 301 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,8 @@ Here I will update any noteworthy changes to the TetraVex project.
 
 ### Changed
 - Using Swift 4.
-- Upgraded project to target macOS 10.11+
+- Upgraded project to target macOS 10.13+
+- Refactored views.
 
 ## [0.1.2] - 2017-08-30
 ### Added

diff --git a/Podfile.lock b/Podfile.lock
@@ -1,3 +1,3 @@
 PODFILE CHECKSUM: b68152751600f324bec1b7e537ed4b31cf8f8309
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.7.0.beta.3
diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock
diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Pods/Target Support Files/Pods-TetraVex/Pods-TetraVex-Info.plist b/Pods/Target Support Files/Pods-TetraVex/Pods-TetraVex-Info.plist
diff --git a/Pods/Target Support Files/Pods-TetraVex/Pods-TetraVex.debug.xcconfig b/Pods/Target Support Files/Pods-TetraVex/Pods-TetraVex.debug.xcconfig
diff --git a/Pods/Target Support Files/Pods-TetraVex/Pods-TetraVex.release.xcconfig b/Pods/Target Support Files/Pods-TetraVex/Pods-TetraVex.release.xcconfig
diff --git a/TetraVex.xcodeproj/project.pbxproj b/TetraVex.xcodeproj/project.pbxproj
@@ -421,21 +421,21 @@
 					FF57E9021D13B5CB004D2AE1 = {
 						CreatedOnToolsVersion = 7.3;
 						DevelopmentTeam = 3F7SUY6C44;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1020;
 						ProvisioningStyle = Automatic;
 					};
 					FF57E9131D13B5CB004D2AE1 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1020;
 						TestTargetID = FF57E9021D13B5CB004D2AE1;
 					};
 					FF57E9271D13B5E0004D2AE1 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1020;
 					};
 					FF57E9301D13B5E0004D2AE1 = {
 						CreatedOnToolsVersion = 7.3;
-						LastSwiftMigration = 0920;
+						LastSwiftMigration = 1020;
 						TestTargetID = FF57E9021D13B5CB004D2AE1;
 					};
 				};
@@ -445,6 +445,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -704,12 +705,11 @@
 				DEVELOPMENT_TEAM = 3F7SUY6C44;
 				INFOPLIST_FILE = TetraVex/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = lisergishnu.TetraVex;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -725,12 +725,11 @@
 				DEVELOPMENT_TEAM = 3F7SUY6C44;
 				INFOPLIST_FILE = TetraVex/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = lisergishnu.TetraVex;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
@@ -742,8 +741,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = lisergishnu.TetraVexUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = TetraVex;
 			};
 			name = Debug;
@@ -756,8 +754,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = lisergishnu.TetraVexUITests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_TARGET_NAME = TetraVex;
 			};
 			name = Release;
@@ -781,8 +778,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -806,8 +802,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = lisergishnu.TetraVexKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -821,8 +816,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = lisergishnu.TetraVexKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TetraVex.app/Contents/MacOS/TetraVex";
 			};
 			name = Debug;
@@ -835,8 +829,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = lisergishnu.TetraVexKitTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/TetraVex.app/Contents/MacOS/TetraVex";
 			};
 			name = Release;

diff --git a/TetraVex.xcodeproj/xcshareddata/xcschemes/TetraVex.xcscheme b/TetraVex.xcodeproj/xcshareddata/xcschemes/TetraVex.xcscheme
@@ -26,7 +26,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
@@ -66,7 +65,6 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/TetraVex.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/TetraVex.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/TetraVex.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/TetraVex.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>
diff --git a/TetraVex/Assets.xcassets/Board Background Color.colorset/Contents.json b/TetraVex/Assets.xcassets/Board Background Color.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.748",
+          "alpha" : "1.000",
+          "blue" : "0.748",
+          "green" : "0.748"
+        }
+      }
+    }
+  ]
+}
diff --git a/TetraVex/Assets.xcassets/Contents.json b/TetraVex/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/TetraVex/Assets.xcassets/Piece Inner Stroke Color.colorset/Contents.json b/TetraVex/Assets.xcassets/Piece Inner Stroke Color.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "1.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000"
+        }
+      }
+    }
+  ]
+}
diff --git a/TetraVex/Assets.xcassets/Piece Outer Stroke Color.colorset/Contents.json b/TetraVex/Assets.xcassets/Piece Outer Stroke Color.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "0.000",
+          "alpha" : "1.000",
+          "blue" : "0.000",
+          "green" : "0.000"
+        }
+      }
+    }
+  ]
+}
diff --git a/TetraVex/Assets.xcassets/Piece Text Color.colorset/Contents.json b/TetraVex/Assets.xcassets/Piece Text Color.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "colors" : [
+    {
+      "idiom" : "universal",
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "red" : "1.000",
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000"
+        }
+      }
+    }
+  ]
+}