create account: link to new lrc
Change-Id: I08b578cc29f0fc8f664763b3aeecb8406a6aa328
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
diff --git a/ui/Base.lproj/RingWizardNewAccount.xib b/ui/Base.lproj/RingWizardNewAccount.xib
index fdcba1f..24ad0f9 100644
--- a/ui/Base.lproj/RingWizardNewAccount.xib
+++ b/ui/Base.lproj/RingWizardNewAccount.xib
@@ -28,22 +28,14 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<view id="gKX-gX-nko">
- <rect key="frame" x="0.0" y="0.0" width="400" height="375"/>
+ <rect key="frame" x="0.0" y="0.0" width="400" height="492"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jeO-GS-TdY">
- <rect key="frame" x="153" y="319" width="214" height="17"/>
- <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" title="Enter your full name" id="tzf-88-Yn5">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
<button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vby-AD-tor">
- <rect key="frame" x="76" y="266" width="71" height="70"/>
+ <rect key="frame" x="155" y="343" width="91" height="90"/>
<constraints>
- <constraint firstAttribute="width" constant="71" id="ELE-xo-8Tx"/>
- <constraint firstAttribute="height" constant="70" id="SD5-rB-QBD"/>
+ <constraint firstAttribute="width" constant="91" id="ELE-xo-8Tx"/>
+ <constraint firstAttribute="height" constant="90" id="SD5-rB-QBD"/>
</constraints>
<buttonCell key="cell" type="inline" bezelStyle="inline" imagePosition="only" alignment="center" focusRingType="none" imageScaling="proportionallyUpOrDown" inset="2" id="BTW-ug-E0p">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -54,11 +46,11 @@
</connections>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="99y-na-GTj">
- <rect key="frame" x="155" y="289" width="200" height="22"/>
+ <rect key="frame" x="100" y="301" width="200" height="22"/>
<constraints>
- <constraint firstAttribute="width" constant="200" id="JX3-TK-cw0"/>
+ <constraint firstAttribute="width" constant="200" id="Bbt-Ht-gth"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="'Unknown' if empty..." bezelStyle="round" id="gEy-ak-Cgq">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="center" placeholderString="Enter name" bezelStyle="round" id="gEy-ak-Cgq">
<font key="font" metaFont="system"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -68,7 +60,7 @@
</connections>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="g1K-rU-VmV">
- <rect key="frame" x="96" y="286" width="30" height="30"/>
+ <rect key="frame" x="185" y="373" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="Jaq-dR-uDc"/>
<constraint firstAttribute="height" constant="30" id="pcT-zj-yr9"/>
@@ -76,26 +68,25 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_picture" id="mZY-aY-Y5g"/>
</imageView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Nny-Rd-SVl">
- <rect key="frame" x="18" y="348" width="364" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Create your profile" id="gki-BR-jc3">
- <font key="font" metaFont="systemSemibold" size="13"/>
+ <rect key="frame" x="18" y="474" width="364" height="18"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Profile" id="gki-BR-jc3">
+ <font key="font" metaFont="systemSemibold" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8hq-sG-FEh">
- <rect key="frame" x="18" y="229" width="364" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Create your account" id="qQl-Xn-c88">
+ <rect key="frame" x="18" y="243" width="364" height="17"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Account" id="qQl-Xn-c88">
<font key="font" metaFont="systemSemibold" size="13"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LVv-bg-Ols">
- <rect key="frame" x="100" y="173" width="200" height="22"/>
+ <rect key="frame" x="100" y="179" width="200" height="22"/>
<constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Fb8-ez-8VT"/>
- <constraint firstAttribute="width" constant="200" id="tbX-cT-w6C"/>
+ <constraint firstAttribute="width" constant="200" id="6iv-B2-Q5y"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="" bezelStyle="round" id="bdC-Uc-Qhs">
<font key="font" metaFont="system"/>
@@ -115,10 +106,7 @@
</connections>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="hwE-M9-zUH">
- <rect key="frame" x="98" y="148" width="204" height="17"/>
- <constraints>
- <constraint firstAttribute="width" constant="200" id="nga-zR-QQ3"/>
- </constraints>
+ <rect key="frame" x="98" y="147" width="147" height="17"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Choose your password" id="B6x-jj-48R">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -126,11 +114,9 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ie2-fK-FsB" customClass="NSSecureTextField">
- <rect key="frame" x="100" y="118" width="200" height="22"/>
+ <rect key="frame" x="100" y="117" width="200" height="22"/>
<constraints>
- <constraint firstAttribute="width" constant="200" id="RoG-9m-EB3"/>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="nTg-zI-DZQ"/>
- <constraint firstAttribute="width" relation="lessThanOrEqual" constant="200" id="rpN-DX-4Gf"/>
+ <constraint firstAttribute="width" constant="200" id="pWh-QR-JoM"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Mandatory*" bezelStyle="round" id="1TO-Ov-S8j" customClass="NSSecureTextFieldCell">
<font key="font" metaFont="system"/>
@@ -147,10 +133,7 @@
</connections>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yaf-61-UuK">
- <rect key="frame" x="102" y="89" width="196" height="17"/>
- <constraints>
- <constraint firstAttribute="width" constant="192" id="x3M-VB-dWw"/>
- </constraints>
+ <rect key="frame" x="98" y="85" width="143" height="17"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Repeat your password" id="fEY-eO-HwI">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -158,11 +141,9 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tXp-94-ns5" customClass="NSSecureTextField">
- <rect key="frame" x="100" y="59" width="200" height="22"/>
+ <rect key="frame" x="100" y="55" width="200" height="22"/>
<constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="K6O-5F-lrk"/>
- <constraint firstAttribute="width" constant="200" id="ZEO-wC-sob"/>
- <constraint firstAttribute="width" relation="lessThanOrEqual" constant="200" id="yL4-ra-YrQ"/>
+ <constraint firstAttribute="width" constant="200" id="d76-Xo-Zpq"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Mandatory*" bezelStyle="round" id="BCg-5V-Ek4" customClass="NSSecureTextFieldCell">
<font key="font" metaFont="system"/>
@@ -177,64 +158,32 @@
</binding>
</connections>
</textField>
- <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mU4-ba-cip">
- <rect key="frame" x="308" y="60" width="20" height="20"/>
- <constraints>
- <constraint firstAttribute="width" constant="20" id="D4O-G0-LqM"/>
- <constraint firstAttribute="height" constant="20" id="Oua-Tw-qkD"/>
- </constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_action_accept" id="QRW-2G-oy5"/>
- <connections>
- <binding destination="-2" name="hidden" keyPath="self.isRepeatPasswordValid" id="coH-eJ-Nvy">
- <dictionary key="options">
- <string key="NSValueTransformerName">NSNegateBoolean</string>
- </dictionary>
- </binding>
- </connections>
- </imageView>
- <button translatesAutoresizingMaskIntoConstraints="NO" id="b0r-ri-6ZA">
- <rect key="frame" x="112" y="201" width="176" height="18"/>
- <buttonCell key="cell" type="check" title="Register public username" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="AG5-GR-bii">
- <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="toggleSignupRing:" target="-2" id="cg6-N8-VNb"/>
- <binding destination="-2" name="value" keyPath="self.signUpBlockchainState" id="73i-5L-W1I"/>
- <outlet property="nextKeyView" destination="LVv-bg-Ols" id="jvK-de-mUM"/>
- </connections>
- </button>
- <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WGe-uI-HhQ">
- <rect key="frame" x="296" y="196" width="25" height="25"/>
- <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="joF-an-KU7">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="showBlockchainHelp:" target="-2" id="Cdv-Dx-5Ta"/>
- </connections>
- </button>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="JGA-h8-Nhd">
- <rect key="frame" x="300" y="173" width="36" height="22"/>
+ <rect key="frame" x="308" y="179" width="20" height="20"/>
<subviews>
<progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="Osd-Vq-u7C">
- <rect key="frame" x="10" y="4" width="16" height="16"/>
+ <rect key="frame" x="0.0" y="2" width="16" height="16"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="16" id="N5C-XW-x0D"/>
+ <constraint firstAttribute="width" constant="16" id="qJb-WJ-fNn"/>
+ </constraints>
</progressIndicator>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kfj-jZ-xal">
- <rect key="frame" x="8" y="2" width="20" height="20"/>
+ <rect key="frame" x="0.0" y="0.0" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="Ukr-7U-1Lh"/>
<constraint firstAttribute="width" constant="20" id="XOS-nb-g7U"/>
</constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="70V-q1-CFT"/>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyDown" id="70V-q1-CFT"/>
</imageView>
</subviews>
<constraints>
- <constraint firstAttribute="width" constant="36" id="IVh-Ql-XWq"/>
- <constraint firstItem="Osd-Vq-u7C" firstAttribute="top" secondItem="JGA-h8-Nhd" secondAttribute="top" constant="2" id="QCZ-3B-Liq"/>
- <constraint firstItem="kfj-jZ-xal" firstAttribute="top" secondItem="JGA-h8-Nhd" secondAttribute="top" id="QMo-Hp-R0Z"/>
- <constraint firstItem="Osd-Vq-u7C" firstAttribute="leading" secondItem="kfj-jZ-xal" secondAttribute="trailing" constant="-18" id="hYw-u6-0di"/>
- <constraint firstItem="kfj-jZ-xal" firstAttribute="leading" secondItem="JGA-h8-Nhd" secondAttribute="leading" constant="8" id="meP-Fh-jjj"/>
+ <constraint firstItem="kfj-jZ-xal" firstAttribute="leading" secondItem="JGA-h8-Nhd" secondAttribute="leading" id="37J-CM-c9V"/>
+ <constraint firstItem="kfj-jZ-xal" firstAttribute="centerY" secondItem="JGA-h8-Nhd" secondAttribute="centerY" id="4J7-Ug-26u"/>
+ <constraint firstAttribute="width" constant="20" id="IVh-Ql-XWq"/>
+ <constraint firstItem="Osd-Vq-u7C" firstAttribute="leading" secondItem="JGA-h8-Nhd" secondAttribute="leading" id="gMv-ul-7J0"/>
+ <constraint firstItem="Osd-Vq-u7C" firstAttribute="centerY" secondItem="JGA-h8-Nhd" secondAttribute="centerY" id="iOR-Ft-PmR"/>
+ <constraint firstAttribute="height" constant="20" id="rAW-bo-N5h"/>
</constraints>
<connections>
<binding destination="-2" name="hidden" keyPath="self.withBlockchain" id="C1L-aT-rhf">
@@ -245,7 +194,11 @@
</connections>
</customView>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rxZ-gN-ou1">
- <rect key="frame" x="306" y="115" width="25" height="25"/>
+ <rect key="frame" x="244" y="142" width="25" height="25"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="21" id="WAj-GL-p4F"/>
+ <constraint firstAttribute="width" constant="21" id="bpK-gh-j1s"/>
+ </constraints>
<buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ly6-pu-kRm">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -302,50 +255,114 @@
<action selector="cancel:" target="-2" id="oao-V9-D0B"/>
</connections>
</button>
+ <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="4oE-Ad-4bY">
+ <rect key="frame" x="20" y="451" width="360" height="5"/>
+ </box>
+ <button translatesAutoresizingMaskIntoConstraints="NO" id="b0r-ri-6ZA">
+ <rect key="frame" x="98" y="207" width="176" height="18"/>
+ <buttonCell key="cell" type="check" title="Register public username" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="AG5-GR-bii">
+ <behavior key="behavior" pushIn="YES" changeContents="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="toggleSignupRing:" target="-2" id="cg6-N8-VNb"/>
+ <binding destination="-2" name="value" keyPath="self.signUpBlockchainState" id="73i-5L-W1I"/>
+ <outlet property="nextKeyView" destination="LVv-bg-Ols" id="jvK-de-mUM"/>
+ </connections>
+ </button>
+ <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="jta-f3-H1W">
+ <rect key="frame" x="20" y="278" width="360" height="5"/>
+ </box>
+ <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="mU4-ba-cip">
+ <rect key="frame" x="308" y="56" width="20" height="20"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="20" id="D4O-G0-LqM"/>
+ <constraint firstAttribute="height" constant="20" id="Oua-Tw-qkD"/>
+ </constraints>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_action_accept" id="QRW-2G-oy5"/>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.isRepeatPasswordValid" id="coH-eJ-Nvy">
+ <dictionary key="options">
+ <string key="NSValueTransformerName">NSNegateBoolean</string>
+ </dictionary>
+ </binding>
+ </connections>
+ </imageView>
+ <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WGe-uI-HhQ">
+ <rect key="frame" x="273" y="202" width="25" height="25"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="21" id="MJy-xo-Aku"/>
+ <constraint firstAttribute="height" constant="21" id="bOr-0V-hsn"/>
+ </constraints>
+ <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="joF-an-KU7">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="showBlockchainHelp:" target="-2" id="Cdv-Dx-5Ta"/>
+ </connections>
+ </button>
+ <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="de8-5s-scH">
+ <rect key="frame" x="308" y="56" width="20" height="20"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="20" id="4rj-Oc-P6W"/>
+ <constraint firstAttribute="height" constant="20" id="J3w-4w-iyQ"/>
+ </constraints>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_action_cancel" id="FsO-MC-Cje"/>
+ <connections>
+ <binding destination="-2" name="hidden" keyPath="self.isRepeatPasswordValid" id="5I2-nW-I8P"/>
+ </connections>
+ </imageView>
</subviews>
<constraints>
- <constraint firstItem="mU4-ba-cip" firstAttribute="centerY" secondItem="tXp-94-ns5" secondAttribute="centerY" id="14E-wP-O6C"/>
- <constraint firstItem="Nny-Rd-SVl" firstAttribute="top" secondItem="gKX-gX-nko" secondAttribute="top" constant="10" id="3Ig-u7-01L"/>
- <constraint firstItem="mU4-ba-cip" firstAttribute="leading" secondItem="tXp-94-ns5" secondAttribute="trailing" constant="8" id="3oh-Hh-47x"/>
- <constraint firstItem="jeO-GS-TdY" firstAttribute="top" secondItem="vby-AD-tor" secondAttribute="top" id="3pG-bf-QKN"/>
- <constraint firstItem="ie2-fK-FsB" firstAttribute="top" secondItem="hwE-M9-zUH" secondAttribute="bottom" constant="8" id="62Y-A4-bfu"/>
+ <constraint firstItem="ie2-fK-FsB" firstAttribute="leading" secondItem="hwE-M9-zUH" secondAttribute="leading" id="1Ha-Vy-p9h"/>
+ <constraint firstItem="Nny-Rd-SVl" firstAttribute="top" secondItem="gKX-gX-nko" secondAttribute="top" id="3Ig-u7-01L"/>
+ <constraint firstItem="WGe-uI-HhQ" firstAttribute="centerY" secondItem="b0r-ri-6ZA" secondAttribute="centerY" id="4FT-Ah-t63"/>
+ <constraint firstItem="WGe-uI-HhQ" firstAttribute="leading" secondItem="b0r-ri-6ZA" secondAttribute="trailing" constant="3" id="4Km-fL-QuX"/>
+ <constraint firstItem="de8-5s-scH" firstAttribute="centerY" secondItem="mU4-ba-cip" secondAttribute="centerY" id="5fr-98-682"/>
<constraint firstItem="8hq-sG-FEh" firstAttribute="leading" secondItem="gKX-gX-nko" secondAttribute="leading" constant="20" id="6Ei-bL-EqF"/>
<constraint firstAttribute="trailing" secondItem="Nny-Rd-SVl" secondAttribute="trailing" constant="20" id="6bc-Ei-eFR"/>
- <constraint firstItem="hwE-M9-zUH" firstAttribute="top" secondItem="JGA-h8-Nhd" secondAttribute="bottom" constant="8" id="7N4-cG-eiE"/>
+ <constraint firstItem="vby-AD-tor" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="8Dl-Bk-xeJ"/>
+ <constraint firstItem="tXp-94-ns5" firstAttribute="top" secondItem="yaf-61-UuK" secondAttribute="bottom" constant="8" id="8Gh-0q-sSg"/>
<constraint firstAttribute="trailing" secondItem="FAG-OH-C4R" secondAttribute="trailing" constant="20" id="9N4-Eq-Msh"/>
- <constraint firstItem="JGA-h8-Nhd" firstAttribute="leading" secondItem="LVv-bg-Ols" secondAttribute="trailing" id="AoQ-tc-cOY"/>
+ <constraint firstItem="8hq-sG-FEh" firstAttribute="top" secondItem="jta-f3-H1W" secondAttribute="bottom" constant="20" id="A53-b6-S1u"/>
<constraint firstItem="Nny-Rd-SVl" firstAttribute="leading" secondItem="gKX-gX-nko" secondAttribute="leading" constant="20" id="At4-FW-aZa"/>
- <constraint firstItem="LVv-bg-Ols" firstAttribute="top" secondItem="b0r-ri-6ZA" secondAttribute="bottom" constant="8" id="CMV-NZ-PbM"/>
- <constraint firstItem="rxZ-gN-ou1" firstAttribute="baseline" secondItem="ie2-fK-FsB" secondAttribute="baseline" id="DVQ-AM-l4O"/>
<constraint firstItem="g1K-rU-VmV" firstAttribute="centerX" secondItem="vby-AD-tor" secondAttribute="centerX" id="ERU-oX-yYL"/>
<constraint firstAttribute="trailing" secondItem="8hq-sG-FEh" secondAttribute="trailing" constant="20" id="EVS-8R-CR0"/>
- <constraint firstItem="JGA-h8-Nhd" firstAttribute="top" secondItem="b0r-ri-6ZA" secondAttribute="bottom" constant="8" id="OG6-9B-XNN"/>
- <constraint firstItem="WGe-uI-HhQ" firstAttribute="centerY" secondItem="b0r-ri-6ZA" secondAttribute="centerY" id="PNY-Dd-WE7"/>
- <constraint firstItem="99y-na-GTj" firstAttribute="leading" secondItem="jeO-GS-TdY" secondAttribute="leading" id="QYF-KI-96A"/>
- <constraint firstItem="yaf-61-UuK" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="Tgw-p2-191"/>
- <constraint firstItem="99y-na-GTj" firstAttribute="top" secondItem="jeO-GS-TdY" secondAttribute="bottom" constant="8" id="VD8-IF-BTq"/>
- <constraint firstItem="WGe-uI-HhQ" firstAttribute="leading" secondItem="b0r-ri-6ZA" secondAttribute="trailing" constant="12" id="VZZ-D7-FbZ"/>
- <constraint firstItem="8hq-sG-FEh" firstAttribute="top" secondItem="vby-AD-tor" secondAttribute="bottom" constant="20" id="WM7-0e-hPA"/>
- <constraint firstItem="b0r-ri-6ZA" firstAttribute="top" secondItem="8hq-sG-FEh" secondAttribute="bottom" constant="12" id="XDr-hz-DJt"/>
- <constraint firstItem="yaf-61-UuK" firstAttribute="top" secondItem="ie2-fK-FsB" secondAttribute="bottom" constant="12" id="XVP-m5-evm"/>
- <constraint firstItem="jeO-GS-TdY" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" constant="59.5" id="Y9W-sA-eay"/>
+ <constraint firstItem="de8-5s-scH" firstAttribute="height" secondItem="mU4-ba-cip" secondAttribute="height" id="Esi-Ry-LUP"/>
+ <constraint firstItem="de8-5s-scH" firstAttribute="centerX" secondItem="mU4-ba-cip" secondAttribute="centerX" id="Jdx-U5-SRr"/>
+ <constraint firstAttribute="trailing" secondItem="4oE-Ad-4bY" secondAttribute="trailing" constant="20" id="K66-8A-h0N"/>
+ <constraint firstItem="jta-f3-H1W" firstAttribute="top" secondItem="99y-na-GTj" secondAttribute="bottom" constant="20" id="N6i-8s-rnl"/>
+ <constraint firstItem="mU4-ba-cip" firstAttribute="leading" secondItem="JGA-h8-Nhd" secondAttribute="leading" id="O5c-Px-dnR"/>
+ <constraint firstItem="4oE-Ad-4bY" firstAttribute="top" secondItem="Nny-Rd-SVl" secondAttribute="bottom" constant="20" id="RO6-TB-9e4"/>
+ <constraint firstAttribute="trailing" secondItem="jta-f3-H1W" secondAttribute="trailing" constant="20" id="SX0-7R-MJl"/>
+ <constraint firstItem="yaf-61-UuK" firstAttribute="top" secondItem="ie2-fK-FsB" secondAttribute="bottom" constant="15" id="Sxu-Ev-Jnh"/>
+ <constraint firstItem="LVv-bg-Ols" firstAttribute="top" secondItem="b0r-ri-6ZA" secondAttribute="bottom" constant="8" id="T0g-el-LD4"/>
+ <constraint firstItem="ie2-fK-FsB" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="XRE-vc-Pt0"/>
<constraint firstAttribute="bottom" secondItem="FAG-OH-C4R" secondAttribute="bottom" constant="20" id="YE6-QP-dDj"/>
- <constraint firstItem="hwE-M9-zUH" firstAttribute="top" secondItem="LVv-bg-Ols" secondAttribute="bottom" constant="8" id="Yf9-Ly-ZFf"/>
+ <constraint firstItem="LVv-bg-Ols" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="Zgw-sa-Pg4"/>
<constraint firstItem="FAG-OH-C4R" firstAttribute="leading" secondItem="NHb-Jx-MH0" secondAttribute="trailing" constant="10" id="aGL-DS-6od"/>
- <constraint firstItem="LVv-bg-Ols" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="aaE-co-6si"/>
- <constraint firstItem="vby-AD-tor" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" constant="-89" id="c2D-SD-zpf"/>
- <constraint firstItem="hwE-M9-zUH" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="d8P-ya-vyH"/>
- <constraint firstItem="tXp-94-ns5" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="dHt-Rk-6CL"/>
+ <constraint firstItem="rxZ-gN-ou1" firstAttribute="leading" secondItem="hwE-M9-zUH" secondAttribute="trailing" constant="3" id="c7T-UX-ozI"/>
+ <constraint firstItem="tXp-94-ns5" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="do1-ZG-nHg"/>
<constraint firstItem="g1K-rU-VmV" firstAttribute="centerY" secondItem="vby-AD-tor" secondAttribute="centerY" id="gKa-0L-f4d"/>
+ <constraint firstItem="ie2-fK-FsB" firstAttribute="top" secondItem="hwE-M9-zUH" secondAttribute="bottom" constant="8" id="gPF-hK-XOB"/>
+ <constraint firstItem="de8-5s-scH" firstAttribute="width" secondItem="mU4-ba-cip" secondAttribute="width" id="gfc-lb-RvZ"/>
+ <constraint firstItem="JGA-h8-Nhd" firstAttribute="bottom" secondItem="LVv-bg-Ols" secondAttribute="bottom" id="gwe-Bw-aG4"/>
<constraint firstAttribute="bottom" secondItem="NHb-Jx-MH0" secondAttribute="bottom" constant="20" id="hOB-yc-j6O"/>
- <constraint firstItem="ie2-fK-FsB" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="iOZ-In-DP5"/>
- <constraint firstItem="jeO-GS-TdY" firstAttribute="leading" secondItem="vby-AD-tor" secondAttribute="trailing" constant="8" id="iui-IS-s54"/>
- <constraint firstItem="tXp-94-ns5" firstAttribute="top" secondItem="yaf-61-UuK" secondAttribute="bottom" constant="8" id="qJQ-3W-TTt"/>
- <constraint firstItem="mU4-ba-cip" firstAttribute="leading" secondItem="rxZ-gN-ou1" secondAttribute="leading" id="sba-Ff-Sx8"/>
- <constraint firstItem="b0r-ri-6ZA" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="vCC-Ez-Vm1"/>
- <constraint firstItem="vby-AD-tor" firstAttribute="top" secondItem="Nny-Rd-SVl" secondAttribute="bottom" constant="12" id="w60-qB-TrQ"/>
+ <constraint firstItem="jta-f3-H1W" firstAttribute="leading" secondItem="gKX-gX-nko" secondAttribute="leading" constant="20" id="hc1-YP-MBT"/>
+ <constraint firstItem="hwE-M9-zUH" firstAttribute="top" secondItem="LVv-bg-Ols" secondAttribute="bottom" constant="15" id="hzl-QN-rPP"/>
+ <constraint firstItem="vby-AD-tor" firstAttribute="top" secondItem="4oE-Ad-4bY" secondAttribute="bottom" constant="20" id="i51-x5-Dvk"/>
+ <constraint firstItem="tXp-94-ns5" firstAttribute="leading" secondItem="yaf-61-UuK" secondAttribute="leading" id="mSO-ZD-8S1"/>
+ <constraint firstItem="mU4-ba-cip" firstAttribute="centerY" secondItem="tXp-94-ns5" secondAttribute="centerY" id="ol5-Vh-gop"/>
+ <constraint firstItem="99y-na-GTj" firstAttribute="top" secondItem="vby-AD-tor" secondAttribute="bottom" constant="20" id="r9w-lC-pe3"/>
+ <constraint firstItem="b0r-ri-6ZA" firstAttribute="top" secondItem="8hq-sG-FEh" secondAttribute="bottom" constant="20" id="rfm-9m-nQK"/>
+ <constraint firstItem="rxZ-gN-ou1" firstAttribute="centerY" secondItem="hwE-M9-zUH" secondAttribute="centerY" id="rlS-7G-12B"/>
+ <constraint firstItem="99y-na-GTj" firstAttribute="centerX" secondItem="gKX-gX-nko" secondAttribute="centerX" id="syr-CX-eyE"/>
+ <constraint firstItem="JGA-h8-Nhd" firstAttribute="leading" secondItem="LVv-bg-Ols" secondAttribute="trailing" constant="8" id="x8S-ie-153"/>
+ <constraint firstItem="LVv-bg-Ols" firstAttribute="leading" secondItem="b0r-ri-6ZA" secondAttribute="leading" id="xlV-fq-lwI"/>
+ <constraint firstItem="4oE-Ad-4bY" firstAttribute="leading" secondItem="gKX-gX-nko" secondAttribute="leading" constant="20" id="zbc-0N-sAn"/>
</constraints>
- <point key="canvasLocation" x="-339" y="146.5"/>
+ <point key="canvasLocation" x="-339" y="205"/>
</view>
<viewController id="Frg-Sy-HN6" userLabel="Popover View Controller">
<connections>
@@ -369,11 +386,11 @@
</popover>
<userDefaultsController representsSharedInstance="YES" id="JOT-gS-qe2"/>
<customView id="WWd-Hs-Pwi">
- <rect key="frame" x="0.0" y="0.0" width="413" height="70"/>
+ <rect key="frame" x="0.0" y="0.0" width="413" height="60"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1hK-Hw-cJh">
- <rect key="frame" x="34" y="7" width="344" height="17"/>
+ <rect key="frame" x="34" y="-12" width="344" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="340" id="tHE-Zh-IYn"/>
</constraints>
@@ -384,15 +401,15 @@
</textFieldCell>
</textField>
<progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="1rt-CR-Wpz">
- <rect key="frame" x="158" y="32" width="96" height="32"/>
+ <rect key="frame" x="158" y="13" width="96" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="g01-Ci-luV"/>
</constraints>
</progressIndicator>
</subviews>
<constraints>
+ <constraint firstItem="1rt-CR-Wpz" firstAttribute="top" secondItem="WWd-Hs-Pwi" secondAttribute="top" constant="15" id="AIR-Rw-eac"/>
<constraint firstItem="1hK-Hw-cJh" firstAttribute="top" secondItem="1rt-CR-Wpz" secondAttribute="bottom" constant="8" id="kRx-lu-H03"/>
- <constraint firstItem="1rt-CR-Wpz" firstAttribute="centerY" secondItem="WWd-Hs-Pwi" secondAttribute="centerY" constant="-13" id="tFP-f6-B38"/>
<constraint firstItem="1hK-Hw-cJh" firstAttribute="centerX" secondItem="1rt-CR-Wpz" secondAttribute="centerX" id="upr-bY-gXb"/>
<constraint firstItem="1rt-CR-Wpz" firstAttribute="centerX" secondItem="WWd-Hs-Pwi" secondAttribute="centerX" id="vuy-f9-mI8"/>
</constraints>
@@ -454,6 +471,7 @@
</objects>
<resources>
<image name="ic_action_accept" width="72" height="72"/>
+ <image name="ic_action_cancel" width="72" height="72"/>
<image name="ic_picture" width="72" height="72"/>
</resources>
</document>