diff options
14 files changed, 72 insertions, 4 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 Binary files differindex 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 diff --git a/iBean/iBean/.DS_Store b/iBean/iBean/.DS_Store Binary files differindex e72bc32..9f472dc 100644 --- a/iBean/iBean/.DS_Store +++ b/iBean/iBean/.DS_Store diff --git a/iBean/iBean/Graphics/nav-bar/78-stopwatch-white.png b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white.png Binary files differnew file mode 100644 index 0000000..cc717a0 --- /dev/null +++ b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white.png diff --git a/iBean/iBean/Graphics/nav-bar/78-stopwatch-white@2x.png b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white@2x.png Binary files differnew file mode 100644 index 0000000..64ee479 --- /dev/null +++ b/iBean/iBean/Graphics/nav-bar/78-stopwatch-white@2x.png diff --git a/iBean/iBean/Graphics/tab-bar/20-gear-2.png b/iBean/iBean/Graphics/tab-bar/20-gear-2.png Binary files differnew file mode 100644 index 0000000..8f6b6b8 --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/20-gear-2.png diff --git a/iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png b/iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png Binary files differnew file mode 100644 index 0000000..b241d94 --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/20-gear-2@2x.png diff --git a/iBean/iBean/Graphics/tab-bar/34-coffee.png b/iBean/iBean/Graphics/tab-bar/34-coffee.png Binary files differnew file mode 100644 index 0000000..829a9aa --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/34-coffee.png diff --git a/iBean/iBean/Graphics/tab-bar/34-coffee@2x.png b/iBean/iBean/Graphics/tab-bar/34-coffee@2x.png Binary files differnew file mode 100644 index 0000000..9c1a60a --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/34-coffee@2x.png diff --git a/iBean/iBean/Graphics/tab-bar/44-shoebox.png b/iBean/iBean/Graphics/tab-bar/44-shoebox.png Binary files differnew file mode 100644 index 0000000..0679f21 --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/44-shoebox.png diff --git a/iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png b/iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png Binary files differnew file mode 100644 index 0000000..51ffa29 --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/44-shoebox@2x.png diff --git a/iBean/iBean/Graphics/tab-bar/78-stopwatch.png b/iBean/iBean/Graphics/tab-bar/78-stopwatch.png Binary files differnew file mode 100644 index 0000000..4f3f47c --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/78-stopwatch.png diff --git a/iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png b/iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png Binary files differnew file mode 100644 index 0000000..f054726 --- /dev/null +++ b/iBean/iBean/Graphics/tab-bar/78-stopwatch@2x.png 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 @@ <constraint firstItem="lEG-3K-UB7" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="sSe-lI-xMk"/> </constraints> </view> - <tabBarItem key="tabBarItem" title="Insta bean" id="K06-La-tNv"/> + <tabBarItem key="tabBarItem" title="Insta bean" image="78-stopwatch.png" id="K06-La-tNv"/> <connections> <outlet property="extractionButton" destination="Tqq-sa-xOv" id="FDa-X0-Fdl"/> <outlet property="extractionProgressLabel" destination="lEG-3K-UB7" id="JzM-Tz-DiG"/> @@ -609,7 +609,7 @@ <scene sceneID="Omk-M9-1jr"> <objects> <navigationController id="jaX-Mv-rfK" sceneMemberID="viewController"> - <tabBarItem key="tabBarItem" title="iBean" id="oPy-o0-nRx"/> + <tabBarItem key="tabBarItem" title="iBean" image="34-coffee.png" id="oPy-o0-nRx"/> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="KUF-uQ-pkr"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> @@ -1230,7 +1230,7 @@ </constraints> </view> <navigationItem key="navigationItem" id="nKM-NZ-clm"> - <barButtonItem key="rightBarButtonItem" title="Extract!" id="ikw-nF-0l3"> + <barButtonItem key="rightBarButtonItem" image="78-stopwatch-white.png" id="ikw-nF-0l3"> <connections> <action selector="showExtractionTimer:" destination="aA5-tc-vwr" id="HI3-s8-R1U"/> </connections> @@ -1253,7 +1253,7 @@ <scene sceneID="zzz-XS-En2"> <objects> <navigationController id="A4w-PM-KKG" sceneMemberID="viewController"> - <tabBarItem key="tabBarItem" title="Settings" id="PWm-sv-T3a"/> + <tabBarItem key="tabBarItem" title="Settings" image="20-gear-2.png" id="PWm-sv-T3a"/> <toolbarItems/> <navigationBar key="navigationBar" contentMode="scaleToFill" id="qdu-XP-0k9"> <rect key="frame" x="0.0" y="0.0" width="320" height="44"/> @@ -1271,6 +1271,10 @@ </scene> </scenes> <resources> + <image name="20-gear-2.png" width="26" height="28"/> + <image name="34-coffee.png" width="24" height="26"/> + <image name="78-stopwatch-white.png" width="22" height="26"/> + <image name="78-stopwatch.png" width="22" height="26"/> <image name="ibean-beancell-bean.png" width="200" height="198"/> <image name="ibean-extraction-dropdown-background.png" width="320" height="240"/> </resources> |
