multi-device: rewording and view improvement
Correct wording concerning multidevice Linking function.
Fix windows size in the account creation wizard.
Addings user hints to better understand Linking function.
Tuleap: #1158
Change-Id: I0d68a68ba61f51200052bb1a4428b82e79848447
diff --git a/ui/Base.lproj/RingWizardLinkAccount.xib b/ui/Base.lproj/RingWizardLinkAccount.xib
index f38c63e..af699ae 100644
--- a/ui/Base.lproj/RingWizardLinkAccount.xib
+++ b/ui/Base.lproj/RingWizardLinkAccount.xib
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11201" systemVersion="16B2553a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11201"/>
</dependencies>
@@ -8,6 +8,7 @@
<connections>
<outlet property="createButton" destination="xmI-fH-GpH" id="VnH-tA-YA2"/>
<outlet property="errorContainer" destination="B0P-LC-JmW" id="lKa-Nb-o79"/>
+ <outlet property="helpContainer" destination="VJx-c6-hvT" id="dQM-IP-fmp"/>
<outlet property="initialContainer" destination="jR6-WY-o19" id="zJs-xD-OjK"/>
<outlet property="loadingContainer" destination="PQA-fA-Rio" id="Vgf-yn-jFS"/>
<outlet property="passwordField" destination="VeW-tY-k3K" id="LH6-sz-3EY"/>
@@ -21,14 +22,14 @@
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView id="kG1-xB-0op">
- <rect key="frame" x="0.0" y="0.0" width="350" height="203"/>
+ <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<view translatesAutoresizingMaskIntoConstraints="NO" id="B0P-LC-JmW">
- <rect key="frame" x="0.0" y="0.0" width="350" height="203"/>
+ <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
<subviews>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hwa-xK-TuM">
- <rect key="frame" x="-2" y="76" width="354" height="51"/>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hwa-xK-TuM">
+ <rect key="frame" x="-2" y="88" width="359" height="17"/>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="An error occured, please check your password and pin." id="DyG-SJ-U1Q">
<font key="font" metaFont="system"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -36,7 +37,7 @@
</textFieldCell>
</textField>
<button translatesAutoresizingMaskIntoConstraints="NO" id="daZ-Bz-vsM">
- <rect key="frame" x="260" y="17" width="72" height="29"/>
+ <rect key="frame" x="265" y="17" width="72" height="29"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="vNb-db-X99"/>
</constraints>
@@ -61,10 +62,10 @@
</constraints>
</view>
<view translatesAutoresizingMaskIntoConstraints="NO" id="PQA-fA-Rio">
- <rect key="frame" x="0.0" y="0.0" width="350" height="203"/>
+ <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="80Z-XU-adp">
- <rect key="frame" x="3" y="63" width="344" height="17"/>
+ <rect key="frame" x="6" y="59" width="344" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="340" id="OcO-zL-LBK"/>
</constraints>
@@ -75,7 +76,7 @@
</textFieldCell>
</textField>
<button translatesAutoresizingMaskIntoConstraints="NO" id="moc-jn-6gS">
- <rect key="frame" x="260" y="17" width="72" height="29"/>
+ <rect key="frame" x="265" y="17" width="72" height="29"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="p5l-CE-iab"/>
</constraints>
@@ -91,7 +92,7 @@
</connections>
</button>
<progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="uxb-PD-AaW">
- <rect key="frame" x="127" y="85" width="96" height="32"/>
+ <rect key="frame" x="130" y="116" width="96" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="96" id="QHN-gm-GxV"/>
</constraints>
@@ -100,17 +101,17 @@
<constraints>
<constraint firstItem="uxb-PD-AaW" firstAttribute="centerX" secondItem="PQA-fA-Rio" secondAttribute="centerX" id="5a0-wi-oYZ"/>
<constraint firstAttribute="bottom" secondItem="moc-jn-6gS" secondAttribute="bottom" constant="20" id="ENl-ng-a12"/>
- <constraint firstItem="uxb-PD-AaW" firstAttribute="centerY" secondItem="PQA-fA-Rio" secondAttribute="centerY" id="Reg-FH-UrX"/>
+ <constraint firstItem="uxb-PD-AaW" firstAttribute="centerY" secondItem="PQA-fA-Rio" secondAttribute="centerY" constant="-35.5" id="Reg-FH-UrX"/>
<constraint firstItem="uxb-PD-AaW" firstAttribute="centerX" secondItem="80Z-XU-adp" secondAttribute="centerX" id="ZiA-sz-Pnl"/>
- <constraint firstItem="80Z-XU-adp" firstAttribute="top" secondItem="uxb-PD-AaW" secondAttribute="bottom" constant="5" id="a6L-fb-blD"/>
+ <constraint firstItem="80Z-XU-adp" firstAttribute="top" secondItem="uxb-PD-AaW" secondAttribute="bottom" constant="40" id="a6L-fb-blD"/>
<constraint firstAttribute="trailing" secondItem="moc-jn-6gS" secondAttribute="trailing" constant="20" id="fK2-ny-217"/>
</constraints>
</view>
<view translatesAutoresizingMaskIntoConstraints="NO" id="jR6-WY-o19">
- <rect key="frame" x="0.0" y="0.0" width="350" height="203"/>
+ <rect key="frame" x="0.0" y="0.0" width="355" height="193"/>
<subviews>
<button translatesAutoresizingMaskIntoConstraints="NO" id="xmI-fH-GpH">
- <rect key="frame" x="260" y="17" width="72" height="29"/>
+ <rect key="frame" x="265" y="17" width="72" height="29"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="Tl8-9U-xp5"/>
</constraints>
@@ -135,7 +136,7 @@
</connections>
</button>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BFR-6z-UlF">
- <rect key="frame" x="75" y="134" width="200" height="22"/>
+ <rect key="frame" x="78" y="124" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="ql3-eF-0Q3"/>
</constraints>
@@ -154,7 +155,7 @@
</connections>
</textField>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="VeW-tY-k3K" customClass="NSSecureTextField">
- <rect key="frame" x="75" y="75" width="200" height="22"/>
+ <rect key="frame" x="78" y="65" width="200" height="22"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="EQr-I3-bWf"/>
<constraint firstAttribute="width" constant="200" id="XLF-Bw-hQ5"/>
@@ -174,9 +175,9 @@
</connections>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Nms-13-N3F">
- <rect key="frame" x="3" y="166" width="344" height="17"/>
+ <rect key="frame" x="76" y="156" width="198" height="17"/>
<constraints>
- <constraint firstAttribute="width" constant="340" id="dTT-oe-Tym"/>
+ <constraint firstAttribute="width" constant="194" id="dTT-oe-Tym"/>
</constraints>
<textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Enter your pin" id="3ik-rY-Gig">
<font key="font" metaFont="system"/>
@@ -184,19 +185,8 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGs-mP-zJd">
- <rect key="frame" x="3" y="107" width="344" height="17"/>
- <constraints>
- <constraint firstAttribute="width" constant="340" id="3tj-c0-BEv"/>
- </constraints>
- <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Enter your password" id="U2K-fu-INc">
- <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 translatesAutoresizingMaskIntoConstraints="NO" id="XWj-I6-wlG">
- <rect key="frame" x="182" y="17" width="72" height="29"/>
+ <rect key="frame" x="187" y="17" width="72" height="29"/>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="68" id="gkI-h7-faT"/>
</constraints>
@@ -211,17 +201,40 @@
<action selector="dismissViewWithError:" target="-2" id="TQx-1Z-tFa"/>
</connections>
</button>
+ <button horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V74-wv-Su2">
+ <rect key="frame" x="255" y="151" width="25" height="25"/>
+ <buttonCell key="cell" type="help" bezelStyle="helpButton" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5do-zL-T0O">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ <connections>
+ <action selector="showHelp:" target="-2" id="uXe-rC-7LO"/>
+ </connections>
+ </buttonCell>
+ </button>
+ <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" misplaced="YES" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGs-mP-zJd">
+ <rect key="frame" x="62" y="95" width="227" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="3tj-c0-BEv"/>
+ </constraints>
+ <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="center" title="Enter your Ring account password" id="U2K-fu-INc">
+ <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>
</subviews>
<constraints>
<constraint firstItem="BFR-6z-UlF" firstAttribute="top" secondItem="Nms-13-N3F" secondAttribute="bottom" constant="10" id="9rR-Bz-IV5"/>
<constraint firstItem="BFR-6z-UlF" firstAttribute="centerX" secondItem="jR6-WY-o19" secondAttribute="centerX" id="B1d-wB-vV0"/>
+ <constraint firstItem="V74-wv-Su2" firstAttribute="centerY" secondItem="Nms-13-N3F" secondAttribute="centerY" id="Je7-2h-AOY"/>
<constraint firstItem="XWj-I6-wlG" firstAttribute="baseline" secondItem="xmI-fH-GpH" secondAttribute="baseline" id="Mew-0a-C7j"/>
<constraint firstItem="AGs-mP-zJd" firstAttribute="top" secondItem="BFR-6z-UlF" secondAttribute="bottom" constant="10" id="Mlp-x7-UId"/>
+ <constraint firstItem="V74-wv-Su2" firstAttribute="leading" secondItem="Nms-13-N3F" secondAttribute="trailing" constant="-15" id="NZC-gz-G7l"/>
<constraint firstAttribute="bottom" secondItem="xmI-fH-GpH" secondAttribute="bottom" constant="20" id="ONV-r0-v26"/>
<constraint firstItem="Nms-13-N3F" firstAttribute="top" secondItem="jR6-WY-o19" secondAttribute="top" constant="20" id="PM0-u5-7XA"/>
<constraint firstItem="xmI-fH-GpH" firstAttribute="leading" secondItem="XWj-I6-wlG" secondAttribute="trailing" constant="10" id="Pmj-x8-RJe"/>
<constraint firstItem="VeW-tY-k3K" firstAttribute="top" secondItem="AGs-mP-zJd" secondAttribute="bottom" constant="10" id="Qo1-zb-2YI"/>
- <constraint firstItem="Nms-13-N3F" firstAttribute="centerX" secondItem="BFR-6z-UlF" secondAttribute="centerX" id="Wn8-Vg-MAJ"/>
+ <constraint firstItem="Nms-13-N3F" firstAttribute="centerX" secondItem="BFR-6z-UlF" secondAttribute="centerX" constant="-3" id="Wn8-Vg-MAJ"/>
<constraint firstItem="AGs-mP-zJd" firstAttribute="centerX" secondItem="jR6-WY-o19" secondAttribute="centerX" id="cPy-QT-Sue"/>
<constraint firstAttribute="trailing" secondItem="xmI-fH-GpH" secondAttribute="trailing" constant="20" id="kub-6B-85y"/>
<constraint firstItem="VeW-tY-k3K" firstAttribute="leading" secondItem="BFR-6z-UlF" secondAttribute="leading" id="qVJ-Qu-dRy"/>
@@ -243,8 +256,45 @@
<constraint firstItem="jR6-WY-o19" firstAttribute="top" secondItem="kG1-xB-0op" secondAttribute="top" id="rUX-4w-KaX"/>
<constraint firstItem="B0P-LC-JmW" firstAttribute="bottom" secondItem="jR6-WY-o19" secondAttribute="bottom" id="vlI-JJ-jbZ"/>
</constraints>
- <point key="canvasLocation" x="75" y="436.5"/>
+ <point key="canvasLocation" x="77.5" y="378.5"/>
</customView>
<userDefaultsController representsSharedInstance="YES" id="gsL-dH-zL7"/>
+ <viewController id="vkb-GT-Yko" userLabel="Popover View Controller">
+ <connections>
+ <outlet property="view" destination="uuC-qZ-khm" id="FPI-6k-Ebl"/>
+ </connections>
+ </viewController>
+ <popover behavior="t" id="VJx-c6-hvT">
+ <connections>
+ <outlet property="contentViewController" destination="vkb-GT-Yko" id="Ui0-tO-DXc"/>
+ </connections>
+ </popover>
+ <customView id="uuC-qZ-khm">
+ <rect key="frame" x="0.0" y="0.0" width="360" height="176"/>
+ <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qJX-2a-zrV">
+ <rect key="frame" x="18" y="20" width="324" height="136"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="320" id="ZSe-1s-7bf"/>
+ </constraints>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" id="dJ0-Rk-Rqr">
+ <font key="font" metaFont="system"/>
+ <mutableString key="title">To link this device to another account, you first need to obtain a pin code.
To generate the pin code, go to the account management setting of a previous device, choose the Ring Account to use and select "Link another device to this account".
You will get the necessary pin to complete this form.
The Pin is only valid for 10 minutes.</mutableString>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstItem="qJX-2a-zrV" firstAttribute="leading" secondItem="uuC-qZ-khm" secondAttribute="leading" constant="20" id="JN9-ga-U2w"/>
+ <constraint firstItem="qJX-2a-zrV" firstAttribute="centerX" secondItem="uuC-qZ-khm" secondAttribute="centerX" id="bKT-Y2-imb"/>
+ <constraint firstItem="qJX-2a-zrV" firstAttribute="top" secondItem="uuC-qZ-khm" secondAttribute="top" constant="20" id="gcM-Rh-gFF"/>
+ <constraint firstAttribute="trailing" secondItem="qJX-2a-zrV" secondAttribute="trailing" constant="20" id="kd7-rz-uXG"/>
+ <constraint firstItem="qJX-2a-zrV" firstAttribute="centerY" secondItem="uuC-qZ-khm" secondAttribute="centerY" id="taw-HH-WyB"/>
+ <constraint firstAttribute="bottom" secondItem="qJX-2a-zrV" secondAttribute="bottom" constant="20" id="uoG-vi-5PS"/>
+ </constraints>
+ <point key="canvasLocation" x="303" y="677"/>
+ </customView>
</objects>
</document>