account: add rendezvous option on account creation
Change-Id: I60055cdaf56a63ece0873ef92b4d6be786a4b69f
diff --git a/ui/Base.lproj/RingWizardNewAccount.xib b/ui/Base.lproj/RingWizardNewAccount.xib
index 4722c93..a16d89e 100644
--- a/ui/Base.lproj/RingWizardNewAccount.xib
+++ b/ui/Base.lproj/RingWizardNewAccount.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.3"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -11,16 +11,19 @@
<outlet property="buttonTopConstraint" destination="s3C-aR-8WF" id="7Gq-0D-898"/>
<outlet property="creationView" destination="gKX-gX-nko" id="NrN-dl-Z6R"/>
<outlet property="displayNameField" destination="99y-na-GTj" id="5q8-Rc-7Hv"/>
+ <outlet property="enableUsername" destination="b0r-ri-6ZA" id="PJE-MJ-kZg"/>
<outlet property="helpBlockchainContainer" destination="ViR-CC-taB" id="JfQ-Sn-nC2"/>
<outlet property="helpPasswordContainer" destination="p6j-6c-1y0" id="sbo-6b-zZN"/>
<outlet property="indicatorLookupResult" destination="Osd-Vq-u7C" id="Adn-ta-XTG"/>
<outlet property="loadingView" destination="WWd-Hs-Pwi" id="SX4-nP-C2J"/>
<outlet property="passwordButton" destination="5ex-9x-0TY" id="Fle-n3-TQC"/>
+ <outlet property="passwordButtonContainer" destination="TOm-jH-fte" id="lJJ-IO-MF4"/>
<outlet property="passwordError" destination="Dzm-7R-IHD" id="Jto-8O-1v9"/>
<outlet property="passwordField" destination="ie2-fK-FsB" id="0Q7-CU-mcB"/>
<outlet property="passwordRepeatField" destination="tXp-94-ns5" id="iXz-tJ-m7r"/>
<outlet property="photoView" destination="vby-AD-tor" id="uoF-rR-eSf"/>
<outlet property="progressBar" destination="1rt-CR-Wpz" id="UGj-xL-Fp8"/>
+ <outlet property="registerInfoButton" destination="WGe-uI-HhQ" id="iOb-O1-8bX"/>
<outlet property="registeredNameError" destination="U8N-zg-AeT" id="0gI-RR-ngB"/>
<outlet property="registeredNameField" destination="LVv-bg-Ols" id="2Cc-TI-koh"/>
<outlet property="repeatPasswordView" destination="KeQ-OT-gkr" id="OQG-8k-ldE"/>
@@ -30,14 +33,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="577" height="460"/>
+ <rect key="frame" x="0.0" y="0.0" width="577" height="471"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oR9-WB-ay5">
- <rect key="frame" x="20" y="66" width="537" height="389"/>
+ <rect key="frame" x="20" y="66" width="537" height="400"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Nny-Rd-SVl">
- <rect key="frame" x="-2" y="371" width="541" height="18"/>
+ <rect key="frame" x="-2" y="382" width="541" height="18"/>
<constraints>
<constraint firstAttribute="height" constant="18" id="DAQ-zH-Dpj"/>
</constraints>
@@ -48,7 +51,7 @@
</textFieldCell>
</textField>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="CFm-IB-vKH" userLabel="photoWidget">
- <rect key="frame" x="224" y="272" width="90" height="91"/>
+ <rect key="frame" x="224" y="283" width="90" height="91"/>
<subviews>
<button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="vby-AD-tor">
<rect key="frame" x="0.0" y="0.0" width="90" height="91"/>
@@ -99,10 +102,17 @@
<constraint firstAttribute="trailing" secondItem="vby-AD-tor" secondAttribute="trailing" id="zMA-DL-Osx"/>
</constraints>
</customView>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="99y-na-GTj">
- <rect key="frame" x="144" y="242" width="250" height="22"/>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="PGI-PQ-B8r">
+ <rect key="frame" x="266" y="270" width="5" height="5"/>
<constraints>
- <constraint firstAttribute="width" constant="250" id="Bbt-Ht-gth"/>
+ <constraint firstAttribute="height" constant="5" id="3Io-dh-Vq9"/>
+ <constraint firstAttribute="width" constant="5" id="J21-3g-5ep"/>
+ </constraints>
+ </customView>
+ <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="99y-na-GTj">
+ <rect key="frame" x="127" y="240" width="283" height="22"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="250" id="Bbt-Ht-gth"/>
<constraint firstAttribute="height" constant="22" id="I4K-hX-jrd"/>
</constraints>
<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">
@@ -115,14 +125,14 @@
</connections>
</textField>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="6ql-S3-HrB">
- <rect key="frame" x="266" y="229" width="5" height="5"/>
+ <rect key="frame" x="266" y="227" width="5" height="5"/>
<constraints>
<constraint firstAttribute="width" constant="5" id="Scu-0k-uNE"/>
<constraint firstAttribute="height" constant="5" id="a5W-7S-jWp"/>
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8hq-sG-FEh">
- <rect key="frame" x="-2" y="204" width="541" height="17"/>
+ <rect key="frame" x="-2" y="202" width="541" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="h2Y-IA-Cma"/>
</constraints>
@@ -133,17 +143,17 @@
</textFieldCell>
</textField>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="lPU-Y9-n5k">
- <rect key="frame" x="266" y="191" width="5" height="5"/>
+ <rect key="frame" x="266" y="189" width="5" height="5"/>
<constraints>
<constraint firstAttribute="height" constant="5" id="28C-4U-DWe"/>
<constraint firstAttribute="width" constant="5" id="mv9-Oa-k4K"/>
</constraints>
</customView>
<stackView distribution="fillEqually" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BrF-Yv-f3y">
- <rect key="frame" x="144" y="158" width="201" height="25"/>
+ <rect key="frame" x="127" y="156" width="283" height="25"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="b0r-ri-6ZA">
- <rect key="frame" x="-2" y="4" width="176" height="18"/>
+ <rect key="frame" x="-2" y="4" width="258" height="18"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="mK9-B1-XvQ"/>
</constraints>
@@ -158,7 +168,7 @@
</connections>
</button>
<button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WGe-uI-HhQ">
- <rect key="frame" x="178" y="-2" width="25" height="25"/>
+ <rect key="frame" x="260" y="-2" width="25" height="25"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="21" id="MJy-xo-Aku"/>
<constraint firstAttribute="height" constant="21" id="bOr-0V-hsn"/>
@@ -185,10 +195,10 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ks2-jt-H9F">
- <rect key="frame" x="116" y="109" width="306" height="41"/>
+ <rect key="frame" x="99" y="108" width="339" height="40"/>
<subviews>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="dAU-zf-lXe">
- <rect key="frame" x="0.0" y="16" width="306" height="25"/>
+ <rect key="frame" x="0.0" y="15" width="339" height="25"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="FN9-dz-EvH">
<rect key="frame" x="0.0" y="3" width="20" height="20"/>
@@ -198,9 +208,8 @@
</constraints>
</customView>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LVv-bg-Ols">
- <rect key="frame" x="28" y="2" width="250" height="22"/>
+ <rect key="frame" x="28" y="2" width="283" height="22"/>
<constraints>
- <constraint firstAttribute="width" constant="250" id="6iv-B2-Q5y"/>
<constraint firstAttribute="height" constant="22" id="lTC-5N-1Sr"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Username..." bezelStyle="round" id="bdC-Uc-Qhs">
@@ -225,7 +234,7 @@
</connections>
</textField>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="JGA-h8-Nhd">
- <rect key="frame" x="286" y="3" width="20" height="20"/>
+ <rect key="frame" x="319" y="3" 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="0.0" y="2" width="16" height="16"/>
@@ -265,7 +274,7 @@
</customSpacing>
</stackView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="U8N-zg-AeT">
- <rect key="frame" x="126" y="0.0" width="54" height="16"/>
+ <rect key="frame" x="143" y="0.0" width="54" height="15"/>
<textFieldCell key="cell" lineBreakMode="clipping" id="rCA-Tm-eFe">
<font key="font" metaFont="systemLight" size="12"/>
<color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
@@ -283,7 +292,7 @@
</customSpacing>
</stackView>
<stackView distribution="fillEqually" orientation="horizontal" alignment="centerY" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TOm-jH-fte">
- <rect key="frame" x="144" y="76" width="283" height="25"/>
+ <rect key="frame" x="127" y="75" width="283" height="25"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="5ex-9x-0TY">
<rect key="frame" x="-2" y="4" width="258" height="18"/>
@@ -327,10 +336,7 @@
</customSpacing>
</stackView>
<textField verticalHuggingPriority="750" tag="3" translatesAutoresizingMaskIntoConstraints="NO" id="ie2-fK-FsB" customClass="NSSecureTextField">
- <rect key="frame" x="144" y="46" width="250" height="22"/>
- <constraints>
- <constraint firstAttribute="width" constant="250" id="awO-sr-QxG"/>
- </constraints>
+ <rect key="frame" x="127" y="45" width="283" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Password..." bezelStyle="round" id="1TO-Ov-S8j" customClass="NSSecureTextFieldCell">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -351,13 +357,10 @@
</connections>
</textField>
<stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="KeQ-OT-gkr">
- <rect key="frame" x="144" y="0.0" width="250" height="38"/>
+ <rect key="frame" x="127" y="0.0" width="283" height="37"/>
<subviews>
<textField verticalHuggingPriority="750" tag="4" translatesAutoresizingMaskIntoConstraints="NO" id="tXp-94-ns5" customClass="NSSecureTextField">
- <rect key="frame" x="0.0" y="16" width="250" height="22"/>
- <constraints>
- <constraint firstAttribute="width" constant="250" id="Rdy-kH-1d7"/>
- </constraints>
+ <rect key="frame" x="0.0" y="15" width="283" height="22"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" placeholderString="Repeat password" bezelStyle="round" id="BCg-5V-Ek4" customClass="NSSecureTextFieldCell">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -377,7 +380,7 @@
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Dzm-7R-IHD">
- <rect key="frame" x="98" y="0.0" width="54" height="16"/>
+ <rect key="frame" x="115" y="0.0" width="54" height="15"/>
<textFieldCell key="cell" lineBreakMode="clipping" id="XZe-oo-yf4">
<font key="font" metaFont="systemLight" size="12"/>
<color key="textColor" name="systemRedColor" catalog="System" colorSpace="catalog"/>
@@ -399,12 +402,22 @@
<constraint firstItem="Nny-Rd-SVl" firstAttribute="leading" secondItem="oR9-WB-ay5" secondAttribute="leading" id="1I7-51-U4Y"/>
<constraint firstAttribute="trailing" secondItem="Nny-Rd-SVl" secondAttribute="trailing" id="275-Ma-VP2"/>
<constraint firstItem="KeQ-OT-gkr" firstAttribute="leading" secondItem="ie2-fK-FsB" secondAttribute="leading" id="7db-hV-Uc1"/>
+ <constraint firstItem="LVv-bg-Ols" firstAttribute="trailing" secondItem="99y-na-GTj" secondAttribute="trailing" id="ACi-Wf-L2p"/>
<constraint firstItem="8hq-sG-FEh" firstAttribute="leading" secondItem="oR9-WB-ay5" secondAttribute="leading" id="E50-HI-A2C"/>
+ <constraint firstItem="TOm-jH-fte" firstAttribute="trailing" secondItem="99y-na-GTj" secondAttribute="trailing" id="EuT-a9-nYt"/>
<constraint firstAttribute="trailing" secondItem="8hq-sG-FEh" secondAttribute="trailing" id="Hpp-na-aUw"/>
<constraint firstItem="5ex-9x-0TY" firstAttribute="leading" secondItem="b0r-ri-6ZA" secondAttribute="leading" id="UJJ-Vb-Ahd"/>
+ <constraint firstItem="ie2-fK-FsB" firstAttribute="leading" secondItem="99y-na-GTj" secondAttribute="leading" id="Xpb-z9-Oy4"/>
+ <constraint firstItem="tXp-94-ns5" firstAttribute="trailing" secondItem="99y-na-GTj" secondAttribute="trailing" id="ajf-ro-UeS"/>
<constraint firstItem="KeQ-OT-gkr" firstAttribute="trailing" secondItem="ie2-fK-FsB" secondAttribute="trailing" id="doT-pK-E5a"/>
<constraint firstItem="ie2-fK-FsB" firstAttribute="trailing" secondItem="LVv-bg-Ols" secondAttribute="trailing" id="jwz-BZ-cuc"/>
+ <constraint firstItem="LVv-bg-Ols" firstAttribute="leading" secondItem="99y-na-GTj" secondAttribute="leading" id="kTG-DL-pJs"/>
+ <constraint firstItem="tXp-94-ns5" firstAttribute="leading" secondItem="99y-na-GTj" secondAttribute="leading" id="lQp-bN-y6S"/>
<constraint firstItem="ie2-fK-FsB" firstAttribute="leading" secondItem="5ex-9x-0TY" secondAttribute="leading" id="mNE-le-Xhu"/>
+ <constraint firstItem="ie2-fK-FsB" firstAttribute="trailing" secondItem="99y-na-GTj" secondAttribute="trailing" id="riO-sE-P5j"/>
+ <constraint firstItem="BrF-Yv-f3y" firstAttribute="leading" secondItem="99y-na-GTj" secondAttribute="leading" id="sfM-Js-7T5"/>
+ <constraint firstItem="BrF-Yv-f3y" firstAttribute="trailing" secondItem="99y-na-GTj" secondAttribute="trailing" id="snd-kO-H0s"/>
+ <constraint firstItem="TOm-jH-fte" firstAttribute="leading" secondItem="99y-na-GTj" secondAttribute="leading" id="y89-Kt-Z3D"/>
</constraints>
<visibilityPriorities>
<integer value="1000"/>
@@ -418,6 +431,7 @@
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
+ <integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
@@ -431,6 +445,7 @@
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FAG-OH-C4R">
@@ -521,7 +536,7 @@
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1hK-Hw-cJh">
- <rect key="frame" x="28" y="78" width="344" height="17"/>
+ <rect key="frame" x="28" y="79" width="344" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="340" id="tHE-Zh-IYn"/>
</constraints>
@@ -561,7 +576,7 @@
<constraint firstAttribute="width" constant="310" id="kiE-3q-jrv"/>
</constraints>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="justified" id="0qE-Sz-hdc">
- <font key="font" metaFont="smallSystem"/>
+ <font key="font" metaFont="message" size="11"/>
<string key="title">By checking this, you will register a unique username on Jami network. People can use it to contact you instead of using your D which is 40 characters long.</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
@@ -588,7 +603,7 @@
<constraint firstAttribute="width" constant="308" id="fAL-sO-RRi"/>
</constraints>
<textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="zUH-kc-cik">
- <font key="font" metaFont="smallSystem"/>
+ <font key="font" metaFont="message" size="11"/>
<string key="title">This password will be used to encrypt your account data and link new devices to your account. It is not mandatory but recommended to set one.</string>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>