Refactored InstaBean into InstantExtraction which also resulted in a more general core data entity for handling configurations. Config variables related to instant extraction is prefixed with instantExtraction.

2 files changed, 22 insertions, 16 deletions

diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj
index 68cbbd0..5775776 100644
--- a/iBean/iBean.xcodeproj/project.pbxproj
+++ b/iBean/iBean.xcodeproj/project.pbxproj
@@ -19,8 +19,6 @@
 		020C55B01691014E00D8224C /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 020C55AF1691014E00D8224C /* Default-568h@2x.png */; };
 		020C55B31691014E00D8224C /* iBean.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 020C55B11691014E00D8224C /* iBean.xcdatamodeld */; };
 		020C55BD169101FB00D8224C /* iPhoneStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 020C55BC169101FB00D8224C /* iPhoneStoryboard.storyboard */; };
-		020C55C41691059800D8224C /* InstaBeanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55C31691059800D8224C /* InstaBeanViewController.m */; };
-		020C55C716910EAD00D8224C /* InstaBeanConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55C616910EAD00D8224C /* InstaBeanConfiguration.m */; };
 		020C55CA1691100000D8224C /* AppDelegate+Storage.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55C91691100000D8224C /* AppDelegate+Storage.m */; };
 		020C55FA16983E9900D8224C /* BeanCollectionListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C55F916983E9900D8224C /* BeanCollectionListViewController.m */; };
 		020C560316989D4500D8224C /* BeanCollectionInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C560216989D4500D8224C /* BeanCollectionInfoViewController.m */; };
@@ -32,6 +30,9 @@
 		020C5683169F5FBB00D8224C /* BeanCollection+Interface.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C5682169F5FBB00D8224C /* BeanCollection+Interface.m */; };
 		020C568F16A1CE0E00D8224C /* EditBeanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C568E16A1CE0E00D8224C /* EditBeanViewController.m */; };
 		020C569316A1E55600D8224C /* ExtractionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C569216A1E55600D8224C /* ExtractionViewController.m */; };
+		020C569916A49C5900D8224C /* Configuration.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C569816A49C5900D8224C /* Configuration.m */; };
+		020C569C16A49C8300D8224C /* Configuration+Interface.m in Sources */ = {isa = PBXBuildFile; fileRef = 020C569B16A49C8300D8224C /* Configuration+Interface.m */; };
+		024F676D16A4A61D004A1201 /* InstantExtractionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 024F676C16A4A61D004A1201 /* InstantExtractionViewController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -51,10 +52,6 @@
 		020C55AF1691014E00D8224C /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
 		020C55B21691014E00D8224C /* iBean.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = iBean.xcdatamodel; sourceTree = "<group>"; };
 		020C55BC169101FB00D8224C /* iPhoneStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPhoneStoryboard.storyboard; sourceTree = "<group>"; };
-		020C55C21691059800D8224C /* InstaBeanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstaBeanViewController.h; sourceTree = "<group>"; };
-		020C55C31691059800D8224C /* InstaBeanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstaBeanViewController.m; sourceTree = "<group>"; };
-		020C55C516910EAD00D8224C /* InstaBeanConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstaBeanConfiguration.h; sourceTree = "<group>"; };
-		020C55C616910EAD00D8224C /* InstaBeanConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstaBeanConfiguration.m; sourceTree = "<group>"; };
 		020C55C81691100000D8224C /* AppDelegate+Storage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "AppDelegate+Storage.h"; sourceTree = "<group>"; };
 		020C55C91691100000D8224C /* AppDelegate+Storage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "AppDelegate+Storage.m"; sourceTree = "<group>"; };
 		020C55F816983E9900D8224C /* BeanCollectionListViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCollectionListViewController.h; sourceTree = "<group>"; };
@@ -77,6 +74,12 @@
 		020C568E16A1CE0E00D8224C /* EditBeanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditBeanViewController.m; sourceTree = "<group>"; };
 		020C569116A1E55600D8224C /* ExtractionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExtractionViewController.h; sourceTree = "<group>"; };
 		020C569216A1E55600D8224C /* ExtractionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExtractionViewController.m; sourceTree = "<group>"; };
+		020C569716A49C5900D8224C /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Configuration.h; sourceTree = "<group>"; };
+		020C569816A49C5900D8224C /* Configuration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Configuration.m; sourceTree = "<group>"; };
+		020C569A16A49C8300D8224C /* Configuration+Interface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Configuration+Interface.h"; sourceTree = "<group>"; };
+		020C569B16A49C8300D8224C /* Configuration+Interface.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Configuration+Interface.m"; sourceTree = "<group>"; };
+		024F676B16A4A61D004A1201 /* InstantExtractionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstantExtractionViewController.h; sourceTree = "<group>"; };
+		024F676C16A4A61D004A1201 /* InstantExtractionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstantExtractionViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -126,8 +129,9 @@
 			isa = PBXGroup;
 			children = (
 				020C55D31695C2C800D8224C /* iBean */,
+				020C55B9169101A300D8224C /* InstantExtraction */,
+				020C55DF169792F800D8224C /* Data */,
 				020C55BB169101CE00D8224C /* Storyboards */,
-				020C55B9169101A300D8224C /* InstaBean */,
 				020C55A81691014E00D8224C /* AppDelegate.h */,
 				020C55A91691014E00D8224C /* AppDelegate.m */,
 				020C55B11691014E00D8224C /* iBean.xcdatamodeld */,
@@ -152,15 +156,13 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
-		020C55B9169101A300D8224C /* InstaBean */ = {
+		020C55B9169101A300D8224C /* InstantExtraction */ = {
 			isa = PBXGroup;
 			children = (
-				020C55C516910EAD00D8224C /* InstaBeanConfiguration.h */,
-				020C55C616910EAD00D8224C /* InstaBeanConfiguration.m */,
-				020C55C21691059800D8224C /* InstaBeanViewController.h */,
-				020C55C31691059800D8224C /* InstaBeanViewController.m */,
+				024F676B16A4A61D004A1201 /* InstantExtractionViewController.h */,
+				024F676C16A4A61D004A1201 /* InstantExtractionViewController.m */,
 			);
-			name = InstaBean;
+			name = InstantExtraction;
 			sourceTree = "<group>";
 		};
 		020C55BB169101CE00D8224C /* Storyboards */ = {
@@ -179,7 +181,6 @@
 				020C56071698F4DC00D8224C /* Step 2 - BeanCollectionBeanList */,
 				020C566E169E1ACB00D8224C /* Step 3 - Bean */,
 				020C569016A1E50200D8224C /* Step 4 - Extraction */,
-				020C55DF169792F800D8224C /* Data */,
 			);
 			name = iBean;
 			sourceTree = "<group>";
@@ -188,6 +189,8 @@
 			isa = PBXGroup;
 			children = (
 				020C5684169F603700D8224C /* Interface */,
+				020C569716A49C5900D8224C /* Configuration.h */,
+				020C569816A49C5900D8224C /* Configuration.m */,
 				020C567B169F597300D8224C /* BeanCollection.h */,
 				020C567C169F597300D8224C /* BeanCollection.m */,
 				020C5678169F597300D8224C /* Bean.h */,
@@ -241,6 +244,8 @@
 				020C567F169F5E9900D8224C /* Bean+Interface.m */,
 				020C5681169F5FBA00D8224C /* BeanCollection+Interface.h */,
 				020C5682169F5FBB00D8224C /* BeanCollection+Interface.m */,
+				020C569A16A49C8300D8224C /* Configuration+Interface.h */,
+				020C569B16A49C8300D8224C /* Configuration+Interface.m */,
 			);
 			name = Interface;
 			sourceTree = "<group>";
@@ -323,8 +328,6 @@
 				020C55A61691014E00D8224C /* main.m in Sources */,
 				020C55AA1691014E00D8224C /* AppDelegate.m in Sources */,
 				020C55B31691014E00D8224C /* iBean.xcdatamodeld in Sources */,
-				020C55C41691059800D8224C /* InstaBeanViewController.m in Sources */,
-				020C55C716910EAD00D8224C /* InstaBeanConfiguration.m in Sources */,
 				020C55CA1691100000D8224C /* AppDelegate+Storage.m in Sources */,
 				020C55FA16983E9900D8224C /* BeanCollectionListViewController.m in Sources */,
 				020C560316989D4500D8224C /* BeanCollectionInfoViewController.m in Sources */,
@@ -336,6 +339,9 @@
 				020C5683169F5FBB00D8224C /* BeanCollection+Interface.m in Sources */,
 				020C568F16A1CE0E00D8224C /* EditBeanViewController.m in Sources */,
 				020C569316A1E55600D8224C /* ExtractionViewController.m in Sources */,
+				020C569916A49C5900D8224C /* Configuration.m in Sources */,
+				020C569C16A49C8300D8224C /* Configuration+Interface.m in Sources */,
+				024F676D16A4A61D004A1201 /* InstantExtractionViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
index ca0e38e..59502e2 100644
--- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate