Skip to content

Commit 656af90

Browse files
committed
Modify UI of fingerprint table and authentication dialogs
For the authentication dialogs, change some label colors for better viewing on Dark/Light mode For fingerprint dialog, modify table cells to use autoresizing masks instead of constraints This commit also includes all the other "optimizations" that Xcode makes to xib files which is too much to sift through and exclude.
1 parent 7ef4b26 commit 656af90

File tree

3 files changed

+135
-155
lines changed

3 files changed

+135
-155
lines changed

Resources/User Interface/Base.lproj/OTRKitAuthenticationDialogIncoming.xib

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13196" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23077.2" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<deployment identifier="macosx"/>
5-
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13196"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23077.2"/>
66
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
77
</dependencies>
88
<objects>
@@ -31,39 +31,39 @@
3131
</customObject>
3232
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
3333
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
34-
<window title="Off-the-Record Messaging: Authenticate Chat Partner" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="u9F-DW-xfz">
34+
<window title="Off-the-Record Messaging: Authenticate Chat Partner" allowsToolTipsWhenApplicationIsInactive="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="u9F-DW-xfz">
3535
<windowStyleMask key="styleMask" titled="YES"/>
3636
<rect key="contentRect" x="283" y="305" width="415" height="381"/>
37-
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
37+
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
3838
<view key="contentView" id="UXA-GQ-9Kf">
3939
<rect key="frame" x="0.0" y="0.0" width="415" height="381"/>
4040
<autoresizingMask key="autoresizingMask"/>
4141
<subviews>
4242
<customView translatesAutoresizingMaskIntoConstraints="NO" id="nul-iT-XfB" userLabel="Fingerprint View">
43-
<rect key="frame" x="0.0" y="61" width="415" height="216"/>
43+
<rect key="frame" x="0.0" y="60" width="415" height="219"/>
4444
</customView>
4545
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nJn-7s-TTk">
46-
<rect key="frame" x="18" y="295" width="379" height="34"/>
46+
<rect key="frame" x="18" y="297" width="379" height="32"/>
4747
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="%@ has requested that you authenticate yourself to prove that you are indeed who you claim to be." id="VIJ-Fn-A6O">
4848
<font key="font" metaFont="system"/>
4949
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
5050
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
5151
</textFieldCell>
5252
</textField>
5353
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="469-ev-1jO">
54-
<rect key="frame" x="18" y="274" width="380" height="5"/>
54+
<rect key="frame" x="18" y="276" width="380" height="5"/>
5555
<constraints>
5656
<constraint firstAttribute="width" constant="380" id="JCO-To-7O7"/>
5757
</constraints>
5858
</box>
5959
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="Oc6-dm-sed">
60-
<rect key="frame" x="18" y="59" width="380" height="5"/>
60+
<rect key="frame" x="18" y="58" width="380" height="5"/>
6161
<constraints>
6262
<constraint firstAttribute="width" constant="380" id="ayE-4K-n6c"/>
6363
</constraints>
6464
</box>
6565
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6jF-Wm-92c">
66-
<rect key="frame" x="307" y="13" width="94" height="32"/>
66+
<rect key="frame" x="314" y="13" width="88" height="32"/>
6767
<buttonCell key="cell" type="push" title="Respond" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Gx6-oe-dsi">
6868
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
6969
<font key="font" metaFont="system"/>
@@ -76,7 +76,7 @@ DQ
7676
</connections>
7777
</button>
7878
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZvQ-8e-Y0V">
79-
<rect key="frame" x="225" y="13" width="82" height="32"/>
79+
<rect key="frame" x="240" y="13" width="76" height="32"/>
8080
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XKX-5m-7Gx">
8181
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
8282
<font key="font" metaFont="system"/>
@@ -89,10 +89,10 @@ Gw
8989
</connections>
9090
</button>
9191
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SCu-5F-RtM">
92-
<rect key="frame" x="92" y="337" width="231" height="24"/>
92+
<rect key="frame" x="93" y="337" width="230" height="24"/>
9393
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Authentication Request" id="Ash-IT-Ya7">
9494
<font key="font" metaFont="systemBold" size="20"/>
95-
<color key="textColor" red="0.20000000300000001" green="0.20000000300000001" blue="0.20000000300000001" alpha="1" colorSpace="calibratedRGB"/>
95+
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
9696
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
9797
</textFieldCell>
9898
</textField>
@@ -121,29 +121,29 @@ Gw
121121
<point key="canvasLocation" x="616" y="265"/>
122122
</window>
123123
<customView translatesAutoresizingMaskIntoConstraints="NO" id="55E-YG-Jbg" userLabel="Shared Secret View" customClass="OTRKitAutoExpandingTextField">
124-
<rect key="frame" x="0.0" y="0.0" width="415" height="128"/>
124+
<rect key="frame" x="0.0" y="0.0" width="415" height="126"/>
125125
<subviews>
126126
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="r0y-1N-aNB">
127-
<rect key="frame" x="18" y="46" width="118" height="16"/>
127+
<rect key="frame" x="18" y="45" width="117" height="15"/>
128128
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="The shared secret:" id="T34-ro-sII">
129129
<font key="font" metaFont="systemBold" size="12"/>
130130
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
131131
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
132132
</textFieldCell>
133133
</textField>
134134
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nmj-3U-Mew">
135-
<rect key="frame" x="18" y="81" width="378" height="28"/>
135+
<rect key="frame" x="18" y="79" width="378" height="28"/>
136136
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="To authenticate, %@ has requested that you respond with a secret that was predetermined." id="h53-Nb-yJY">
137137
<font key="font" metaFont="smallSystem"/>
138138
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
139139
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
140140
</textFieldCell>
141141
</textField>
142142
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="375" translatesAutoresizingMaskIntoConstraints="NO" id="XgO-9G-gkL" customClass="OTRKitAutoExpandingTextField">
143-
<rect key="frame" x="20" y="20" width="375" height="22"/>
143+
<rect key="frame" x="20" y="20" width="375" height="21"/>
144144
<textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="gKm-FX-n0a">
145145
<font key="font" metaFont="system"/>
146-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
146+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
147147
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
148148
</textFieldCell>
149149
<connections>
@@ -166,45 +166,45 @@ Gw
166166
<point key="canvasLocation" x="607.5" y="288"/>
167167
</customView>
168168
<customView translatesAutoresizingMaskIntoConstraints="NO" id="2uI-Wj-ugA" userLabel="Question &amp; Answer View">
169-
<rect key="frame" x="0.0" y="0.0" width="415" height="172"/>
169+
<rect key="frame" x="0.0" y="0.0" width="415" height="168"/>
170170
<subviews>
171171
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RN2-3h-6nK">
172-
<rect key="frame" x="17" y="125" width="381" height="28"/>
172+
<rect key="frame" x="17" y="121" width="381" height="28"/>
173173
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="left" title="To authenticate, %@ has requested that you answer the question that's presented below." id="578-4j-aAv">
174174
<font key="font" metaFont="smallSystem"/>
175175
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
176176
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
177177
</textFieldCell>
178178
</textField>
179179
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GhQ-yf-T1m">
180-
<rect key="frame" x="16" y="93" width="63" height="16"/>
180+
<rect key="frame" x="16" y="90" width="63" height="15"/>
181181
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Question:" id="PW8-df-9T5">
182182
<font key="font" metaFont="systemBold" size="12"/>
183183
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
184184
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
185185
</textFieldCell>
186186
</textField>
187187
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="375" translatesAutoresizingMaskIntoConstraints="NO" id="o2Y-80-kWB" customClass="OTRKitAutoExpandingTextField">
188-
<rect key="frame" x="18" y="20" width="378" height="22"/>
188+
<rect key="frame" x="18" y="20" width="378" height="21"/>
189189
<textFieldCell key="cell" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="B6n-WL-7vN">
190190
<font key="font" metaFont="system"/>
191-
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
191+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
192192
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
193193
</textFieldCell>
194194
<connections>
195195
<outlet property="delegate" destination="-2" id="2KC-Go-x0f"/>
196196
</connections>
197197
</textField>
198198
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bJ2-d1-pNi">
199-
<rect key="frame" x="16" y="47" width="153" height="16"/>
199+
<rect key="frame" x="16" y="46" width="153" height="15"/>
200200
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Answer (case sensitive):" id="7ul-99-cDt">
201201
<font key="font" metaFont="systemBold" size="12"/>
202202
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
203203
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
204204
</textFieldCell>
205205
</textField>
206206
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DfG-u6-czE">
207-
<rect key="frame" x="33" y="71" width="364" height="17"/>
207+
<rect key="frame" x="33" y="69" width="364" height="16"/>
208208
<textFieldCell key="cell" selectable="YES" allowsUndo="NO" sendsActionOnEndEditing="YES" state="on" title="123" id="q1r-lC-AwV">
209209
<font key="font" metaFont="system"/>
210210
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
@@ -234,41 +234,41 @@ Gw
234234
</constraints>
235235
<point key="canvasLocation" x="617" y="442.5"/>
236236
</customView>
237-
<window title="Progress Information" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="BDY-mb-dVK">
237+
<window title="Progress Information" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="BDY-mb-dVK">
238238
<windowStyleMask key="styleMask" titled="YES"/>
239239
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
240240
<rect key="contentRect" x="283" y="305" width="350" height="166"/>
241-
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
241+
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1055"/>
242242
<value key="maxSize" type="size" width="400" height="166"/>
243243
<value key="maxFullScreenContentSize" type="size" width="400" height="166"/>
244244
<view key="contentView" id="Bxq-Qt-7kb">
245245
<rect key="frame" x="0.0" y="0.0" width="350" height="166"/>
246246
<autoresizingMask key="autoresizingMask"/>
247247
<subviews>
248248
<progressIndicator wantsLayer="YES" maxValue="100" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="AGS-8u-3Wh">
249-
<rect key="frame" x="20" y="102" width="311" height="20"/>
249+
<rect key="frame" x="20" y="100" width="311" height="23"/>
250250
</progressIndicator>
251251
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="nX1-K1-gUP">
252-
<rect key="frame" x="18" y="129" width="159" height="17"/>
252+
<rect key="frame" x="18" y="130" width="160" height="16"/>
253253
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Authenticating with %@" id="p8R-rI-ce6">
254254
<font key="font" metaFont="systemBold"/>
255255
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
256256
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
257257
</textFieldCell>
258258
</textField>
259259
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Exj-3q-muU">
260-
<rect key="frame" x="18" y="80" width="140" height="17"/>
260+
<rect key="frame" x="18" y="79" width="140" height="16"/>
261261
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Waiting for response…" id="f7h-6l-FRv">
262262
<font key="font" metaFont="system"/>
263263
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
264264
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
265265
</textFieldCell>
266266
</textField>
267267
<box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="dhx-Qx-8mj">
268-
<rect key="frame" x="30" y="59" width="290" height="5"/>
268+
<rect key="frame" x="30" y="58" width="290" height="5"/>
269269
</box>
270270
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Wv3-hV-pMb">
271-
<rect key="frame" x="277" y="13" width="59" height="32"/>
271+
<rect key="frame" x="284" y="13" width="53" height="32"/>
272272
<buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rRX-M1-xAB">
273273
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
274274
<font key="font" metaFont="system"/>
@@ -281,7 +281,7 @@ DQ
281281
</connections>
282282
</button>
283283
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="bWr-hU-EBt">
284-
<rect key="frame" x="195" y="13" width="82" height="32"/>
284+
<rect key="frame" x="210" y="13" width="76" height="32"/>
285285
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="5BA-BG-TEe">
286286
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
287287
<font key="font" metaFont="system"/>

0 commit comments

Comments
 (0)