diff options
author | Eddie Ehlin <eddiex@eddiex.se> | 2013-03-17 22:21:48 +0100 |
---|---|---|
committer | Eddie Ehlin <eddiex@eddiex.se> | 2013-03-17 22:21:48 +0100 |
commit | e93159a85efcb8521e026d171c42a0fbab708ecf (patch) | |
tree | fc7ccb0ea392aec9ec2d90996c9b2cf7d21d3447 /iBean | |
parent | 7d7d17b957595ce43094c7e1959af9c09cd55d3d (diff) | |
download | iBean-e93159a85efcb8521e026d171c42a0fbab708ecf.tar.gz iBean-e93159a85efcb8521e026d171c42a0fbab708ecf.zip |
Added new display for insta-bean.
Diffstat (limited to 'iBean')
-rw-r--r-- | iBean/iBean.xcodeproj/project.pbxproj | 8 | ||||
-rw-r--r-- | iBean/iBean.xcodeproj/project.xcworkspace/xcuserdata/eddiex.xcuserdatad/UserInterfaceState.xcuserstate | bin | 58055 -> 58274 bytes | |||
-rw-r--r-- | iBean/iBean/.DS_Store | bin | 6148 -> 6148 bytes | |||
-rw-r--r-- | iBean/iBean/Graphics/instant-extraction-display.svg | 232 | ||||
-rw-r--r-- | iBean/iBean/Graphics/instant-extraction-ipad.png | bin | 0 -> 5663 bytes | |||
-rw-r--r-- | iBean/iBean/Graphics/instant-extraction-iphone.png | bin | 0 -> 4828 bytes | |||
-rw-r--r-- | iBean/iBean/iPadStoryboard.storyboard | 35 | ||||
-rw-r--r-- | iBean/iBean/iPhoneStoryboard.storyboard | 42 |
8 files changed, 289 insertions, 28 deletions
diff --git a/iBean/iBean.xcodeproj/project.pbxproj b/iBean/iBean.xcodeproj/project.pbxproj index c34a6f7..5a303f0 100644 --- a/iBean/iBean.xcodeproj/project.pbxproj +++ b/iBean/iBean.xcodeproj/project.pbxproj @@ -53,6 +53,8 @@ 02B36BBA16F48A27000FFCF8 /* Default-Portrait@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B36BB916F48A27000FFCF8 /* Default-Portrait@2x~ipad.png */; }; 02B36BBC16F49F07000FFCF8 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B36BBB16F49F07000FFCF8 /* Default-Landscape~ipad.png */; }; 02B36BBE16F49F11000FFCF8 /* Default-Landscape@2x~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B36BBD16F49F11000FFCF8 /* Default-Landscape@2x~ipad.png */; }; + 02B36BC416F6653C000FFCF8 /* instant-extraction-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B36BC316F6653C000FFCF8 /* instant-extraction-ipad.png */; }; + 02B36BC616F667F1000FFCF8 /* instant-extraction-iphone.png in Resources */ = {isa = PBXBuildFile; fileRef = 02B36BC516F667F1000FFCF8 /* instant-extraction-iphone.png */; }; 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 */; }; @@ -139,6 +141,8 @@ 02B36BB916F48A27000FFCF8 /* Default-Portrait@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait@2x~ipad.png"; path = "../Default-Portrait@2x~ipad.png"; sourceTree = "<group>"; }; 02B36BBB16F49F07000FFCF8 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "../Default-Landscape~ipad.png"; sourceTree = "<group>"; }; 02B36BBD16F49F11000FFCF8 /* Default-Landscape@2x~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape@2x~ipad.png"; path = "../Default-Landscape@2x~ipad.png"; sourceTree = "<group>"; }; + 02B36BC316F6653C000FFCF8 /* instant-extraction-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "instant-extraction-ipad.png"; path = "Graphics/instant-extraction-ipad.png"; sourceTree = "<group>"; }; + 02B36BC516F667F1000FFCF8 /* instant-extraction-iphone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "instant-extraction-iphone.png"; path = "Graphics/instant-extraction-iphone.png"; 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>"; }; @@ -354,6 +358,8 @@ 024CB02216C0543B009CBC15 /* Graphics */ = { isa = PBXGroup; children = ( + 02B36BC516F667F1000FFCF8 /* instant-extraction-iphone.png */, + 02B36BC316F6653C000FFCF8 /* instant-extraction-ipad.png */, 02B5369216DA74280006C5FE /* Icons */, 024CC6EA16D6B36000F84F3D /* ibean-extraction-dropdown-background.png */, 023AAB3D16C98B2A00B6886C /* ibean-beancell-bean.png */, @@ -516,6 +522,8 @@ 02B36BBA16F48A27000FFCF8 /* Default-Portrait@2x~ipad.png in Resources */, 02B36BBC16F49F07000FFCF8 /* Default-Landscape~ipad.png in Resources */, 02B36BBE16F49F11000FFCF8 /* Default-Landscape@2x~ipad.png in Resources */, + 02B36BC416F6653C000FFCF8 /* instant-extraction-ipad.png in Resources */, + 02B36BC616F667F1000FFCF8 /* instant-extraction-iphone.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 49a20ff..6173785 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 432a0e2..352b5f0 100644 --- a/iBean/iBean/.DS_Store +++ b/iBean/iBean/.DS_Store diff --git a/iBean/iBean/Graphics/instant-extraction-display.svg b/iBean/iBean/Graphics/instant-extraction-display.svg new file mode 100644 index 0000000..2ec0090 --- /dev/null +++ b/iBean/iBean/Graphics/instant-extraction-display.svg @@ -0,0 +1,232 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="599" + height="355" + id="svg2" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="instant-extraction-display.svg" + inkscape:export-filename="/Users/eddiex/Projekt/ibean.hg/iBean/iBean/Graphics/instant-extraction-iphone5.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4"> + <linearGradient + inkscape:collect="always" + id="linearGradient3931"> + <stop + style="stop-color:#666666;stop-opacity:1;" + offset="0" + id="stop3933" /> + <stop + style="stop-color:#666666;stop-opacity:0;" + offset="1" + id="stop3935" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3851"> + <stop + style="stop-color:#1a1a1a;stop-opacity:1;" + offset="0" + id="stop3853" /> + <stop + style="stop-color:#1a1a1a;stop-opacity:0;" + offset="1" + id="stop3855" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3001"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3003" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3005" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3001" + id="radialGradient3007" + cx="308.07874" + cy="661.47321" + fx="308.07874" + fy="661.47321" + r="245.71428" + gradientTransform="matrix(2.1830562,1.2061054,-1.424658,2.5791975,264.10561,-1132.4262)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3001" + id="radialGradient3014" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.1830562,1.2061054,-1.424658,2.5791975,264.10561,-1132.4262)" + cx="308.07874" + cy="661.47321" + fx="308.07874" + fy="661.47321" + r="245.71428" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3001" + id="radialGradient3017" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2439302,0.68725253,-0.81178628,1.469656,197.83394,-395.88612)" + cx="308.07874" + cy="661.47321" + fx="308.07874" + fy="661.47321" + r="245.71428" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3001" + id="radialGradient3026" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2439302,0.68725253,-0.81178628,1.469656,197.83394,-395.88612)" + cx="308.07874" + cy="661.47321" + fx="308.07874" + fy="661.47321" + r="245.71428" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3001" + id="radialGradient3029" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.320457,0.68725253,-0.86172753,1.469656,201.12932,-410.02825)" + cx="308.07874" + cy="661.47321" + fx="308.07874" + fy="661.47321" + r="245.71428" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3001" + id="radialGradient3035" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.320457,0.68725253,-0.86172753,1.469656,406.19028,-304.97239)" + cx="308.07874" + cy="661.47321" + fx="308.07874" + fy="661.47321" + r="245.71428" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3001" + id="radialGradient3845" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.320457,0.68725253,-0.86172753,1.469656,201.12932,-410.02825)" + cx="308.07874" + cy="661.47321" + fx="308.07874" + fy="661.47321" + r="245.71428" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3851" + id="linearGradient3857" + x1="206.5762" + y1="581.12604" + x2="206.5762" + y2="491.72751" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3931" + id="linearGradient4021" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-14.142136,19.697975)" + x1="162.63457" + y1="501.82904" + x2="162.63457" + y2="422.02539" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3931" + id="linearGradient4023" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.7236914,-13.131983,-348.41971)" + x1="162.63457" + y1="501.82904" + x2="162.63457" + y2="422.02539" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.4" + inkscape:cx="340.87027" + inkscape:cy="126.45573" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1556" + inkscape:window-height="977" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-697.36218)"> + <g + id="g4016" + transform="matrix(2.4506843,0,0,2.4506843,-50.45322,-235.6381)"> + <rect + ry="8.2568893" + rx="8.8416719" + y="381.11581" + x="20.708126" + height="144.45181" + width="244.45691" + id="rect3927" + style="fill:#1a1a1a;fill-opacity:1" /> + <rect + style="fill:url(#linearGradient4021);fill-opacity:1" + id="rect3929" + width="244.45691" + height="144.45181" + x="20.708126" + y="381.11581" + rx="8.8416719" + ry="8.2568893" /> + <path + inkscape:connector-curvature="0" + id="rect3939" + d="m 30.555516,274.53314 c -4.898286,0 -8.84375,6.38959 -8.84375,14.27431 l 0,220.52477 c 0,7.56222 3.631781,13.67629 8.25,14.1666 1.294206,0.0249 2.575637,0.0538 3.875,0.0538 121.698164,0 221.134884,-109.33329 227.906254,-247.08039 -1.29976,-1.20632 -2.7922,-1.93915 -4.40625,-1.93915 l -226.781254,0 z" + style="opacity:0.24727275;fill:url(#linearGradient4023);fill-opacity:1" /> + </g> + </g> +</svg> diff --git a/iBean/iBean/Graphics/instant-extraction-ipad.png b/iBean/iBean/Graphics/instant-extraction-ipad.png Binary files differnew file mode 100644 index 0000000..7e4adb7 --- /dev/null +++ b/iBean/iBean/Graphics/instant-extraction-ipad.png diff --git a/iBean/iBean/Graphics/instant-extraction-iphone.png b/iBean/iBean/Graphics/instant-extraction-iphone.png Binary files differnew file mode 100644 index 0000000..d165778 --- /dev/null +++ b/iBean/iBean/Graphics/instant-extraction-iphone.png diff --git a/iBean/iBean/iPadStoryboard.storyboard b/iBean/iBean/iPadStoryboard.storyboard index 26c6b5f..884b2bd 100644 --- a/iBean/iBean/iPadStoryboard.storyboard +++ b/iBean/iBean/iPadStoryboard.storyboard @@ -68,13 +68,16 @@ <rect key="frame" x="0.0" y="20" width="768" height="955"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="instant-extraction-ipad.png" translatesAutoresizingMaskIntoConstraints="NO" id="hGb-ty-bIf"/> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="0.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fba-0S-Ta7"> <constraints> - <constraint firstAttribute="height" constant="103" id="5en-Fd-aqT"/> + <constraint firstAttribute="height" constant="309" id="YMN-3Q-wGd"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="72"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" type="system" pointSize="124"/> + <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> + <color key="shadowColor" cocoaTouchSystemColor="darkTextColor"/> + <size key="shadowOffset" width="2" height="1"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Q1Z-8l-rFs"> <constraints> @@ -92,15 +95,15 @@ <action selector="startExtraction:" destination="snc-Lv-58m" eventType="touchUpInside" id="i6E-hk-iYW"/> </connections> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="XX" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A29-JZ-SFZ"> - <constraints> - <constraint firstAttribute="width" constant="64" id="02m-Hx-nhD"/> - </constraints> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="XX" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A29-JZ-SFZ"> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="900" stepValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="xVi-QL-6wy"> + <constraints> + <constraint firstAttribute="width" constant="94" id="OBb-ve-ERa"/> + </constraints> <connections> <action selector="setExtractionTimer:" destination="snc-Lv-58m" eventType="valueChanged" id="EOp-fY-mfJ"/> </connections> @@ -108,15 +111,20 @@ </subviews> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> <constraints> - <constraint firstAttribute="bottom" secondItem="xVi-QL-6wy" secondAttribute="bottom" constant="164" id="6TJ-9m-Kic"/> + <constraint firstItem="fba-0S-Ta7" firstAttribute="centerY" secondItem="hGb-ty-bIf" secondAttribute="centerY" type="default" id="1w5-ra-SvJ"/> + <constraint firstItem="fba-0S-Ta7" firstAttribute="centerX" secondItem="Q1Z-8l-rFs" secondAttribute="centerX" type="default" id="5qU-nn-IDp"/> + <constraint firstItem="hGb-ty-bIf" firstAttribute="top" secondItem="c9L-k2-8ja" secondAttribute="top" constant="20" symbolic="YES" type="default" id="D1M-hg-K5h"/> <constraint firstItem="fba-0S-Ta7" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="DXm-OF-sSU"/> - <constraint firstItem="Q1Z-8l-rFs" firstAttribute="centerX" secondItem="fba-0S-Ta7" secondAttribute="centerX" type="default" id="RTV-e3-fiG"/> + <constraint firstAttribute="trailing" secondItem="xVi-QL-6wy" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="G0O-sj-OLi"/> + <constraint firstItem="A29-JZ-SFZ" firstAttribute="centerY" secondItem="xVi-QL-6wy" secondAttribute="centerY" type="default" id="H26-k9-Hrr"/> + <constraint firstItem="xVi-QL-6wy" firstAttribute="leading" secondItem="A29-JZ-SFZ" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="U2D-w8-j1u"/> + <constraint firstItem="fba-0S-Ta7" firstAttribute="top" secondItem="c9L-k2-8ja" secondAttribute="top" constant="68" id="XMx-7P-ZuH"/> <constraint firstAttribute="trailing" secondItem="fba-0S-Ta7" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="aMq-hL-bSl"/> <constraint firstAttribute="bottom" secondItem="Q1Z-8l-rFs" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="jAH-sv-LAR"/> - <constraint firstItem="A29-JZ-SFZ" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="53" id="nib-Jd-JOE"/> - <constraint firstItem="fba-0S-Ta7" firstAttribute="top" secondItem="c9L-k2-8ja" secondAttribute="top" constant="20" symbolic="YES" type="default" id="tO1-xj-DHd"/> - <constraint firstAttribute="trailing" secondItem="xVi-QL-6wy" secondAttribute="trailing" constant="65" id="wE7-Bf-CRF"/> - <constraint firstItem="A29-JZ-SFZ" firstAttribute="centerY" secondItem="c9L-k2-8ja" secondAttribute="centerY" type="default" id="zCt-OP-qI9"/> + <constraint firstItem="A29-JZ-SFZ" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="nYl-JE-Sq7"/> + <constraint firstItem="xVi-QL-6wy" firstAttribute="top" secondItem="hGb-ty-bIf" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="qyi-qF-JkO"/> + <constraint firstAttribute="trailing" secondItem="hGb-ty-bIf" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="tWR-dZ-Wlv"/> + <constraint firstItem="hGb-ty-bIf" firstAttribute="leading" secondItem="c9L-k2-8ja" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="uYB-hR-s1m"/> </constraints> </view> <tabBarItem key="tabBarItem" title="Insta bean" image="78-stopwatch.png" id="x5n-0b-kTy"/> @@ -1310,6 +1318,7 @@ <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"/> + <image name="instant-extraction-ipad.png" width="697" height="412"/> </resources> <classes> <class className="AddBeanViewController" superclassName="UIViewController"> diff --git a/iBean/iBean/iPhoneStoryboard.storyboard b/iBean/iBean/iPhoneStoryboard.storyboard index ab0c1db..fb0db74 100644 --- a/iBean/iBean/iPhoneStoryboard.storyboard +++ b/iBean/iBean/iPhoneStoryboard.storyboard @@ -66,17 +66,24 @@ <rect key="frame" x="0.0" y="20" width="320" height="499"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> + <imageView userInteractionEnabled="NO" contentMode="scaleToFill" image="instant-extraction-iphone.png" translatesAutoresizingMaskIntoConstraints="NO" id="IFF-H2-0dN"> + <constraints> + <constraint firstAttribute="height" constant="180" id="ZfW-Ua-Qpd"/> + </constraints> + </imageView> <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="0.0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lEG-3K-UB7"> <constraints> - <constraint firstAttribute="height" constant="103" id="aXh-eI-eWT"/> + <constraint firstAttribute="height" constant="120" id="Qal-Jd-LoQ"/> </constraints> - <fontDescription key="fontDescription" type="system" pointSize="72"/> - <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> + <fontDescription key="fontDescription" type="system" pointSize="86"/> + <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> + <color key="shadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> + <size key="shadowOffset" width="1" height="1"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tqq-sa-xOv"> <constraints> - <constraint firstAttribute="width" constant="151" id="xXo-KZ-Bxg"/> + <constraint firstAttribute="width" constant="151" id="4N9-BM-D1u"/> </constraints> <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/> <state key="normal" title="Start extraction"> @@ -90,31 +97,35 @@ <action selector="startExtraction:" destination="b3D-qj-cdZ" eventType="touchUpInside" id="3og-GU-Y4N"/> </connections> </button> - <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="XX" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6By-yy-oRj"> - <constraints> - <constraint firstAttribute="width" constant="64" id="mDz-ZC-HDN"/> - </constraints> + <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="25.0" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6By-yy-oRj"> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> <nil key="highlightedColor"/> </label> <stepper opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="900" stepValue="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="bjC-aZ-VLh"> + <constraints> + <constraint firstAttribute="width" constant="94" id="xAB-MU-h9A"/> + </constraints> <connections> <action selector="setExtractionTimer:" destination="b3D-qj-cdZ" eventType="valueChanged" id="OWg-MT-u0R"/> </connections> </stepper> </subviews> - <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> + <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/> <constraints> - <constraint firstItem="6By-yy-oRj" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="53" id="1cy-mz-O3s"/> <constraint firstAttribute="bottom" secondItem="Tqq-sa-xOv" secondAttribute="bottom" constant="20" symbolic="YES" type="default" id="5Ym-7L-8ew"/> - <constraint firstAttribute="trailing" secondItem="bjC-aZ-VLh" secondAttribute="trailing" constant="65" id="C7T-W1-quY"/> - <constraint firstAttribute="bottom" secondItem="bjC-aZ-VLh" secondAttribute="bottom" constant="164" id="Ikw-rT-jPk"/> + <constraint firstItem="IFF-H2-0dN" firstAttribute="top" secondItem="NBj-4q-93f" secondAttribute="top" constant="20" symbolic="YES" type="default" id="6Rh-kR-fCa"/> + <constraint firstItem="6By-yy-oRj" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="GeL-hb-8dO"/> + <constraint firstItem="lEG-3K-UB7" firstAttribute="centerY" secondItem="IFF-H2-0dN" secondAttribute="centerY" type="default" id="HNN-xY-hTV"/> + <constraint firstAttribute="trailing" secondItem="IFF-H2-0dN" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="M4v-PQ-ia3"/> <constraint firstAttribute="trailing" secondItem="lEG-3K-UB7" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="W1F-DA-pzd"/> - <constraint firstItem="Tqq-sa-xOv" firstAttribute="centerX" secondItem="lEG-3K-UB7" secondAttribute="centerX" type="default" id="W8b-DX-M74"/> - <constraint firstItem="lEG-3K-UB7" firstAttribute="top" secondItem="NBj-4q-93f" secondAttribute="top" constant="20" symbolic="YES" type="default" id="jYn-8Z-78M"/> - <constraint firstItem="6By-yy-oRj" firstAttribute="centerY" secondItem="NBj-4q-93f" secondAttribute="centerY" type="default" id="m8k-NG-K2Q"/> + <constraint firstItem="bjC-aZ-VLh" firstAttribute="leading" secondItem="6By-yy-oRj" secondAttribute="trailing" constant="8" symbolic="YES" type="default" id="gqd-LV-oGI"/> + <constraint firstItem="bjC-aZ-VLh" firstAttribute="top" secondItem="IFF-H2-0dN" secondAttribute="bottom" constant="8" symbolic="YES" type="default" id="iIr-v2-gtB"/> + <constraint firstItem="IFF-H2-0dN" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="o2C-bw-hfg"/> + <constraint firstItem="Tqq-sa-xOv" firstAttribute="centerX" secondItem="lEG-3K-UB7" secondAttribute="centerX" type="default" id="pFS-wc-Hgo"/> <constraint firstItem="lEG-3K-UB7" firstAttribute="leading" secondItem="NBj-4q-93f" secondAttribute="leading" constant="20" symbolic="YES" type="default" id="sSe-lI-xMk"/> + <constraint firstAttribute="trailing" secondItem="bjC-aZ-VLh" secondAttribute="trailing" constant="20" symbolic="YES" type="default" id="vjV-8h-RcP"/> + <constraint firstItem="6By-yy-oRj" firstAttribute="centerY" secondItem="bjC-aZ-VLh" secondAttribute="centerY" type="default" id="zq4-iE-v07"/> </constraints> </view> <tabBarItem key="tabBarItem" title="Insta bean" image="78-stopwatch.png" id="K06-La-tNv"/> @@ -1290,6 +1301,7 @@ <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"/> + <image name="instant-extraction-iphone.png" width="599" height="355"/> </resources> <classes> <class className="AddBeanViewController" superclassName="UIViewController"> |