account: refactor account selection
Change-Id: Ib45a5388d6e6860970c1dd2a31709d0aaea123d2
Reviewed-by: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
diff --git a/ui/Base.lproj/ChooseAccount.xib b/ui/Base.lproj/ChooseAccount.xib
index d929053..7ad0989 100644
--- a/ui/Base.lproj/ChooseAccount.xib
+++ b/ui/Base.lproj/ChooseAccount.xib
@@ -9,6 +9,7 @@
<customObject id="-2" userLabel="File's Owner" customClass="ChooseAccountVC">
<connections>
<outlet property="accountSelectionButton" destination="sMr-ym-Q7q" id="aWB-iE-k1f"/>
+ <outlet property="accountStatus" destination="3O0-W6-QCM" id="5i7-92-c94"/>
<outlet property="profileImage" destination="JSg-rZ-Xia" id="keh-R2-VI8"/>
<outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
</connections>
@@ -26,19 +27,42 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="JSg-rZ-Xia">
- <rect key="frame" x="5" y="0.0" width="30" height="30"/>
+ <rect key="frame" x="13" y="0.0" width="30" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="V0B-Kr-2Kw"/>
<constraint firstAttribute="width" constant="30" id="b29-LU-Chc"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="riX-D8-veh"/>
</imageView>
+ <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="3O0-W6-QCM" userLabel="AccountStatus" customClass="RoundedTextField">
+ <rect key="frame" x="35" y="0.0" width="10" height="11"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="6.5" id="4Ks-ia-6rg"/>
+ <constraint firstAttribute="height" constant="10.5" id="GGv-tJ-9Ps"/>
+ </constraints>
+ <textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="center" id="Wdm-ve-lDX">
+ <font key="font" metaFont="system"/>
+ <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="color" keyPath="bgColor">
+ <color key="value" red="0.29803921570000003" green="0.85098039219999999" blue="0.3921568627" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+ <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="borderThickness">
+ <real key="value" value="0.5"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ </textField>
<popUpButton translatesAutoresizingMaskIntoConstraints="NO" id="sMr-ym-Q7q">
<rect key="frame" x="38" y="6" width="159" height="19"/>
<constraints>
<constraint firstAttribute="width" constant="155" id="RHk-BK-YeF"/>
</constraints>
- <popUpButtonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" lineBreakMode="truncatingTail" state="on" borderStyle="bezel" inset="2" selectedItem="CTF-me-3R0" id="AKJ-ja-nkI">
+ <popUpButtonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="bezel" inset="2" selectedItem="CTF-me-3R0" id="AKJ-ja-nkI">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system" size="16"/>
<menu key="menu" id="R46-PB-Vne">
@@ -58,10 +82,12 @@
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="sMr-ym-Q7q" secondAttribute="trailing" constant="5" id="BD9-ZS-cZa"/>
- <constraint firstItem="sMr-ym-Q7q" firstAttribute="leading" secondItem="JSg-rZ-Xia" secondAttribute="trailing" constant="5" id="L9t-7Q-Cw2"/>
+ <constraint firstItem="sMr-ym-Q7q" firstAttribute="leading" secondItem="JSg-rZ-Xia" secondAttribute="trailing" constant="-3" id="L9t-7Q-Cw2"/>
<constraint firstItem="JSg-rZ-Xia" firstAttribute="top" secondItem="HA7-fk-gse" secondAttribute="top" id="Rw2-Sd-7Hz"/>
<constraint firstItem="sMr-ym-Q7q" firstAttribute="centerY" secondItem="JSg-rZ-Xia" secondAttribute="centerY" id="S2w-ph-Hue"/>
<constraint firstAttribute="bottom" secondItem="JSg-rZ-Xia" secondAttribute="bottom" id="VyP-Jt-INt"/>
+ <constraint firstItem="3O0-W6-QCM" firstAttribute="trailing" secondItem="JSg-rZ-Xia" secondAttribute="trailing" id="ogd-CG-BuC"/>
+ <constraint firstItem="3O0-W6-QCM" firstAttribute="bottom" secondItem="JSg-rZ-Xia" secondAttribute="bottom" id="r5p-jD-VkY"/>
</constraints>
</view>
</box>