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

12 files changed, 8 insertions, 4 deletions

diff --git a/iBean/iBean/.DS_Store b/iBean/iBean/.DS_Store
index 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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
new 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>