Added Glyphis icons and updated the Tab-bar and Nav-bar (on extraction view) with these new icons.

2 files changed, 64 insertions, 0 deletions

diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj
index 7e41fc4..de5877f 100644
--- a/iBean/iBean.xcodeproj/project.pbxproj
+++ b/iBean/iBean.xcodeproj/project.pbxproj
@@ -44,6 +44,16 @@
 		0276254216B5A64000EE2F4E /* ThresholdListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0276254116B5A64000EE2F4E /* ThresholdListViewController.m */; };
 		0276254516B5AACF00EE2F4E /* ThresholdViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0276254416B5AACF00EE2F4E /* ThresholdViewController.m */; };
 		0276254816B5BC5300EE2F4E /* ThresholdCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 0276254716B5BC5300EE2F4E /* ThresholdCell.m */; };
+		02B5369B16DA74390006C5FE /* 20-gear-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369316DA74390006C5FE /* 20-gear-2.png */; };
+		02B5369C16DA74390006C5FE /* 20-gear-2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369416DA74390006C5FE /* 20-gear-2@2x.png */; };
+		02B5369D16DA74390006C5FE /* 34-coffee.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369516DA74390006C5FE /* 34-coffee.png */; };
+		02B5369E16DA74390006C5FE /* 34-coffee@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369616DA74390006C5FE /* 34-coffee@2x.png */; };
+		02B5369F16DA74390006C5FE /* 44-shoebox.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369716DA74390006C5FE /* 44-shoebox.png */; };
+		02B536A016DA74390006C5FE /* 44-shoebox@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369816DA74390006C5FE /* 44-shoebox@2x.png */; };
+		02B536A116DA74390006C5FE /* 78-stopwatch.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369916DA74390006C5FE /* 78-stopwatch.png */; };
+		02B536A216DA74390006C5FE /* 78-stopwatch@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B5369A16DA74390006C5FE /* 78-stopwatch@2x.png */; };
+		02B536AB16DA76AF0006C5FE /* 78-stopwatch-white.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B536A916DA76AF0006C5FE /* 78-stopwatch-white.png */; };
+		02B536AC16DA76AF0006C5FE /* 78-stopwatch-white@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B536AA16DA76AF0006C5FE /* 78-stopwatch-white@2x.png */; };
 		02E557AE16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 02E557AD16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m */; };
 		02E557B116A9CFB50080FBBA /* BeanCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 02E557B016A9CFB50080FBBA /* BeanCell.m */; };
 /* End PBXBuildFile section */
@@ -111,6 +121,16 @@
 		0276254416B5AACF00EE2F4E /* ThresholdViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThresholdViewController.m; sourceTree = "<group>"; };
 		0276254616B5BC5300EE2F4E /* ThresholdCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThresholdCell.h; sourceTree = "<group>"; };
 		0276254716B5BC5300EE2F4E /* ThresholdCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThresholdCell.m; sourceTree = "<group>"; };
+		02B5369316DA74390006C5FE /* 20-gear-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "20-gear-2.png"; path = "Graphics/tab-bar/20-gear-2.png"; sourceTree = "<group>"; };
+		02B5369416DA74390006C5FE /* 20-gear-2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "20-gear-2@2x.png"; path = "Graphics/tab-bar/20-gear-2@2x.png"; sourceTree = "<group>"; };
+		02B5369516DA74390006C5FE /* 34-coffee.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "34-coffee.png"; path = "Graphics/tab-bar/34-coffee.png"; sourceTree = "<group>"; };
+		02B5369616DA74390006C5FE /* 34-coffee@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "34-coffee@2x.png"; path = "Graphics/tab-bar/34-coffee@2x.png"; sourceTree = "<group>"; };
+		02B5369716DA74390006C5FE /* 44-shoebox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "44-shoebox.png"; path = "Graphics/tab-bar/44-shoebox.png"; sourceTree = "<group>"; };
+		02B5369816DA74390006C5FE /* 44-shoebox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "44-shoebox@2x.png"; path = "Graphics/tab-bar/44-shoebox@2x.png"; sourceTree = "<group>"; };
+		02B5369916DA74390006C5FE /* 78-stopwatch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "78-stopwatch.png"; path = "Graphics/tab-bar/78-stopwatch.png"; sourceTree = "<group>"; };
+		02B5369A16DA74390006C5FE /* 78-stopwatch@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "78-stopwatch@2x.png"; path = "Graphics/tab-bar/78-stopwatch@2x.png"; sourceTree = "<group>"; };
+		02B536A916DA76AF0006C5FE /* 78-stopwatch-white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "78-stopwatch-white.png"; path = "Graphics/nav-bar/78-stopwatch-white.png"; sourceTree = "<group>"; };
+		02B536AA16DA76AF0006C5FE /* 78-stopwatch-white@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "78-stopwatch-white@2x.png"; path = "Graphics/nav-bar/78-stopwatch-white@2x.png"; sourceTree = "<group>"; };
 		02E557AC16A9C1E40080FBBA /* BeanCollectionExtractionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCollectionExtractionViewController.h; sourceTree = "<group>"; };
 		02E557AD16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCollectionExtractionViewController.m; sourceTree = "<group>"; };
 		02E557AF16A9CFB50080FBBA /* BeanCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCell.h; sourceTree = "<group>"; };
@@ -318,6 +338,7 @@
 		024CB02216C0543B009CBC15 /* Graphics */ = {
 			isa = PBXGroup;
 			children = (
+				02B5369216DA74280006C5FE /* Icons */,
 				024CC6EA16D6B36000F84F3D /* ibean-extraction-dropdown-background.png */,
 				023AAB3D16C98B2A00B6886C /* ibean-beancell-bean.png */,
 			);
@@ -339,6 +360,39 @@
 			name = Settings;
 			sourceTree = "<group>";
 		};
+		02B5369216DA74280006C5FE /* Icons */ = {
+			isa = PBXGroup;
+			children = (
+				02B536A416DA76460006C5FE /* Nav-bar */,
+				02B536A316DA76370006C5FE /* Tab-bar */,
+			);
+			name = Icons;
+			sourceTree = "<group>";
+		};
+		02B536A316DA76370006C5FE /* Tab-bar */ = {
+			isa = PBXGroup;
+			children = (
+				02B5369316DA74390006C5FE /* 20-gear-2.png */,
+				02B5369416DA74390006C5FE /* 20-gear-2@2x.png */,
+				02B5369516DA74390006C5FE /* 34-coffee.png */,
+				02B5369616DA74390006C5FE /* 34-coffee@2x.png */,
+				02B5369716DA74390006C5FE /* 44-shoebox.png */,
+				02B5369816DA74390006C5FE /* 44-shoebox@2x.png */,
+				02B5369916DA74390006C5FE /* 78-stopwatch.png */,
+				02B5369A16DA74390006C5FE /* 78-stopwatch@2x.png */,
+			);
+			name = "Tab-bar";
+			sourceTree = "<group>";
+		};
+		02B536A416DA76460006C5FE /* Nav-bar */ = {
+			isa = PBXGroup;
+			children = (
+				02B536A916DA76AF0006C5FE /* 78-stopwatch-white.png */,
+				02B536AA16DA76AF0006C5FE /* 78-stopwatch-white@2x.png */,
+			);
+			name = "Nav-bar";
+			sourceTree = "<group>";
+		};
 		02E557AA16A9C1B90080FBBA /* BeanCollectionExtraction */ = {
 			isa = PBXGroup;
 			children = (
@@ -408,6 +462,16 @@
 				020C55BD169101FB00D8224C /* iPhoneStoryboard.storyboard in Resources */,
 				023AAB3E16C98B2A00B6886C /* ibean-beancell-bean.png in Resources */,
 				024CC6EB16D6B36000F84F3D /* ibean-extraction-dropdown-background.png in Resources */,
+				02B5369B16DA74390006C5FE /* 20-gear-2.png in Resources */,
+				02B5369C16DA74390006C5FE /* 20-gear-2@2x.png in Resources */,
+				02B5369D16DA74390006C5FE /* 34-coffee.png in Resources */,
+				02B5369E16DA74390006C5FE /* 34-coffee@2x.png in Resources */,
+				02B5369F16DA74390006C5FE /* 44-shoebox.png in Resources */,
+				02B536A016DA74390006C5FE /* 44-shoebox@2x.png in Resources */,
+				02B536A116DA74390006C5FE /* 78-stopwatch.png in Resources */,
+				02B536A216DA74390006C5FE /* 78-stopwatch@2x.png in Resources */,
+				02B536AB16DA76AF0006C5FE /* 78-stopwatch-white.png in Resources */,
+				02B536AC16DA76AF0006C5FE /* 78-stopwatch-white@2x.png in Resources */,
 			);
 			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 1ef6ee7..92f82a3 100644
--- a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate