From f53672ad31bbbc64d0e06ae6b0830596f9cd432b Mon Sep 17 00:00:00 2001 From: Eddie Ehlin Date: Sun, 24 Feb 2013 17:38:46 +0100 Subject: Added Glyphis icons and updated the Tab-bar and Nav-bar (on extraction view) with these new icons. --- iBean/iBean.xcodeproj/project.pbxproj | 64 +++++++++++++++++++++ .../UserInterfaceState.xcuserstate | Bin 50741 -> 51824 bytes iBean/iBean/.DS_Store | Bin 6148 -> 6148 bytes .../iBean/Graphics/nav-bar/78-stopwatch-white.png | Bin 0 -> 502 bytes .../Graphics/nav-bar/78-stopwatch-white@2x.png | Bin 0 -> 716 bytes iBean/iBean/Graphics/tab-bar/20-gear-2.png | Bin 0 -> 1454 bytes iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png | Bin 0 -> 2269 bytes iBean/iBean/Graphics/tab-bar/34-coffee.png | Bin 0 -> 1220 bytes iBean/iBean/Graphics/tab-bar/34-coffee@2x.png | Bin 0 -> 1808 bytes iBean/iBean/Graphics/tab-bar/44-shoebox.png | Bin 0 -> 1204 bytes iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png | Bin 0 -> 1604 bytes iBean/iBean/Graphics/tab-bar/78-stopwatch.png | Bin 0 -> 1358 bytes iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png | Bin 0 -> 1976 bytes iBean/iBean/iPhoneStoryboard.storyboard | 12 ++-- 14 files changed, 72 insertions(+), 4 deletions(-) create mode 100644 iBean/iBean/Graphics/nav-bar/78-stopwatch-white.png create mode 100644 iBean/iBean/Graphics/nav-bar/78-stopwatch-white@2x.png create mode 100644 iBean/iBean/Graphics/tab-bar/20-gear-2.png create mode 100644 iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png create mode 100644 iBean/iBean/Graphics/tab-bar/34-coffee.png create mode 100644 iBean/iBean/Graphics/tab-bar/34-coffee@2x.png create mode 100644 iBean/iBean/Graphics/tab-bar/44-shoebox.png create mode 100644 iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png create mode 100644 iBean/iBean/Graphics/tab-bar/78-stopwatch.png create mode 100644 iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png (limited to 'iBean') 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 = ""; }; 0276254616B5BC5300EE2F4E /* ThresholdCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThresholdCell.h; sourceTree = ""; }; 0276254716B5BC5300EE2F4E /* ThresholdCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThresholdCell.m; sourceTree = ""; }; + 02B5369316DA74390006C5FE /* 20-gear-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "20-gear-2.png"; path = "Graphics/tab-bar/20-gear-2.png"; sourceTree = ""; }; + 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 = ""; }; + 02B5369516DA74390006C5FE /* 34-coffee.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "34-coffee.png"; path = "Graphics/tab-bar/34-coffee.png"; sourceTree = ""; }; + 02B5369616DA74390006C5FE /* 34-coffee@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "34-coffee@2x.png"; path = "Graphics/tab-bar/34-coffee@2x.png"; sourceTree = ""; }; + 02B5369716DA74390006C5FE /* 44-shoebox.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "44-shoebox.png"; path = "Graphics/tab-bar/44-shoebox.png"; sourceTree = ""; }; + 02B5369816DA74390006C5FE /* 44-shoebox@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "44-shoebox@2x.png"; path = "Graphics/tab-bar/44-shoebox@2x.png"; sourceTree = ""; }; + 02B5369916DA74390006C5FE /* 78-stopwatch.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "78-stopwatch.png"; path = "Graphics/tab-bar/78-stopwatch.png"; sourceTree = ""; }; + 02B5369A16DA74390006C5FE /* 78-stopwatch@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "78-stopwatch@2x.png"; path = "Graphics/tab-bar/78-stopwatch@2x.png"; sourceTree = ""; }; + 02B536A916DA76AF0006C5FE /* 78-stopwatch-white.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "78-stopwatch-white.png"; path = "Graphics/nav-bar/78-stopwatch-white.png"; sourceTree = ""; }; + 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 = ""; }; 02E557AC16A9C1E40080FBBA /* BeanCollectionExtractionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCollectionExtractionViewController.h; sourceTree = ""; }; 02E557AD16A9C1E40080FBBA /* BeanCollectionExtractionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BeanCollectionExtractionViewController.m; sourceTree = ""; }; 02E557AF16A9CFB50080FBBA /* BeanCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BeanCell.h; sourceTree = ""; }; @@ -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 = ""; }; + 02B5369216DA74280006C5FE /* Icons */ = { + isa = PBXGroup; + children = ( + 02B536A416DA76460006C5FE /* Nav-bar */, + 02B536A316DA76370006C5FE /* Tab-bar */, + ); + name = Icons; + sourceTree = ""; + }; + 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 = ""; + }; + 02B536A416DA76460006C5FE /* Nav-bar */ = { + isa = PBXGroup; + children = ( + 02B536A916DA76AF0006C5FE /* 78-stopwatch-white.png */, + 02B536AA16DA76AF0006C5FE /* 78-stopwatch-white@2x.png */, + ); + name = "Nav-bar"; + sourceTree = ""; + }; 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 Binary files a/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate and b/iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/iBean/iBean/.DS_Store b/iBean/iBean/.DS_Store index e72bc32..9f472dc 100644 Binary files a/iBean/iBean/.DS_Store and b/iBean/iBean/.DS_Store differ diff --git a/iBean/iBean/Graphics/nav-bar/78-stopwatch-white.png b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white.png new file mode 100644 index 0000000..cc717a0 Binary files /dev/null and b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white.png differ diff --git a/iBean/iBean/Graphics/nav-bar/78-stopwatch-white@2x.png b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white@2x.png new file mode 100644 index 0000000..64ee479 Binary files /dev/null and b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white@2x.png differ diff --git a/iBean/iBean/Graphics/tab-bar/20-gear-2.png b/iBean/iBean/Graphics/tab-bar/20-gear-2.png new file mode 100644 index 0000000..8f6b6b8 Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/20-gear-2.png differ diff --git a/iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png b/iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png new file mode 100644 index 0000000..b241d94 Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png differ diff --git a/iBean/iBean/Graphics/tab-bar/34-coffee.png b/iBean/iBean/Graphics/tab-bar/34-coffee.png new file mode 100644 index 0000000..829a9aa Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/34-coffee.png differ diff --git a/iBean/iBean/Graphics/tab-bar/34-coffee@2x.png b/iBean/iBean/Graphics/tab-bar/34-coffee@2x.png new file mode 100644 index 0000000..9c1a60a Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/34-coffee@2x.png differ diff --git a/iBean/iBean/Graphics/tab-bar/44-shoebox.png b/iBean/iBean/Graphics/tab-bar/44-shoebox.png new file mode 100644 index 0000000..0679f21 Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/44-shoebox.png differ diff --git a/iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png b/iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png new file mode 100644 index 0000000..51ffa29 Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png differ diff --git a/iBean/iBean/Graphics/tab-bar/78-stopwatch.png b/iBean/iBean/Graphics/tab-bar/78-stopwatch.png new file mode 100644 index 0000000..4f3f47c Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/78-stopwatch.png differ diff --git a/iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png b/iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png new file mode 100644 index 0000000..f054726 Binary files /dev/null and b/iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png differ diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard index dc14d97..5ac8ac0 100644 --- a/iBean/iBean/iPhoneStoryboard.storyboard +++ b/iBean/iBean/iPhoneStoryboard.storyboard @@ -117,7 +117,7 @@ - + @@ -609,7 +609,7 @@ - + @@ -1230,7 +1230,7 @@ - + @@ -1253,7 +1253,7 @@ - + @@ -1271,6 +1271,10 @@ + + + + -- cgit v1.2.3