UI: refactor conversations
Change-Id: I27b6bceb6f15b470863aefc6317cab1c326a614a
diff --git a/src/ChooseAccountVC.mm b/src/ChooseAccountVC.mm
index f1a21ac..02912da 100644
--- a/src/ChooseAccountVC.mm
+++ b/src/ChooseAccountVC.mm
@@ -212,9 +212,12 @@
-(void) configureView: (AccountMenuItemView *) itemView forAccount:(const QString&) accountId forMenuItem:(NSMenuItem *) item {
auto& account = accMdl_->getAccountInfo(accountId);
item.attributedTitle = [self attributedItemTitleForAccount:account];
- [itemView.accountLabel setStringValue:account.profileInfo.alias.toNSString()];
- NSString* userNameString = [self nameForAccount: account];
- [itemView.userNameLabel setStringValue:userNameString];
+ auto profileName = bestNameForAccount(account);
+ auto registeredName = [self nameForAccount: account];
+ [itemView.accountLabel setStringValue: profileName];
+ if (![profileName isEqualTo:registeredName]) {
+ [itemView.userNameLabel setStringValue:registeredName];
+ }
@autoreleasepool {
NSData *imageData = [[NSData alloc] initWithBase64EncodedString:account.profileInfo.avatar.toNSString() options:NSDataBase64DecodingIgnoreUnknownCharacters];
NSImage *image = [[NSImage alloc] initWithData:imageData];
@@ -286,13 +289,13 @@
- (NSAttributedString*) attributedItemTitleForAccount:(const lrc::api::account::Info&) account {
NSString* alias = bestNameForAccount(account);
NSString* userNameString = [self nameForAccount: account];
- NSFont *fontAlias = [NSFont fontWithName:@"Helvetica Neue Light" size:16.0];
- NSFont *fontUserName = [NSFont fontWithName:@"Helvetica Neue Light" size:13.0];
- NSColor *colorAlias = [NSColor textColor];
+ NSFont *fontAlias = [NSFont systemFontOfSize: 18 weight: NSFontWeightMedium];
+ NSFont *fontUserName = [NSFont systemFontOfSize: 14 weight: NSFontWeightLight];
+ NSColor *colorAlias = [NSColor labelColor];
NSColor *colorAUserName = [NSColor labelColor];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
- paragraphStyle.lineSpacing = 3;
+ paragraphStyle.lineSpacing = 2;
NSDictionary *aliasAttrs = [NSDictionary dictionaryWithObjectsAndKeys:
fontAlias,NSFontAttributeName,
colorAlias,NSForegroundColorAttributeName,
diff --git a/src/MessagesVC.mm b/src/MessagesVC.mm
index 364617c..c21f4ca 100644
--- a/src/MessagesVC.mm
+++ b/src/MessagesVC.mm
@@ -464,7 +464,7 @@
if (name.length > 0) {
fileName = [name lastPathComponent];
}
- NSFont *nameFont = [NSFont userFontOfSize:14.0];
+ NSFont *nameFont = [NSFont systemFontOfSize: 12 weight: NSFontWeightLight];
NSColor *nameColor = [NSColor textColor];
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -954,8 +954,10 @@
- (NSMutableDictionary*) messageAttributes
{
NSMutableDictionary* attrs = [NSMutableDictionary dictionary];
+ NSFont *font = [NSFont systemFontOfSize: 12 weight: NSFontWeightLight];
attrs[NSForegroundColorAttributeName] = [NSColor labelColor];
attrs[NSParagraphStyleAttributeName] = [self paragraphStyle];
+ attrs[NSFontAttributeName] = font;
return attrs;
}
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index f83f404..b7bb3e6 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -73,6 +73,7 @@
__unsafe_unretained IBOutlet NSView* callView;
__unsafe_unretained IBOutlet NSTextField* ringIDLabel;
__unsafe_unretained IBOutlet NSTextField* explanationLabel;
+ __unsafe_unretained IBOutlet NSTextField* jamiLabel;
__unsafe_unretained IBOutlet NSButton* shareButton;
__unsafe_unretained IBOutlet NSImageView* qrcodeView;
@@ -220,6 +221,24 @@
NSResponder * viewNextResponder = [self nextResponder];
[self setNextResponder: [conversationVC getMessagesView]];
[[conversationVC getMessagesView] setNextResponder: viewNextResponder];
+ [self setWelcomeText];
+}
+
+-(void) setWelcomeText {
+ NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+ paragraphStyle.lineSpacing = 2;
+ paragraphStyle.alignment = NSCenterTextAlignment;
+ NSString* explanationText = explanationLabel.stringValue;
+ NSMutableAttributedString *explanationString = [[NSMutableAttributedString alloc] initWithString:explanationText];
+ [explanationString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, explanationText.length)];
+
+ explanationLabel.attributedStringValue = explanationString;
+
+ NSString* jamiText = jamiLabel.stringValue;
+ NSMutableAttributedString *jamiString = [[NSMutableAttributedString alloc] initWithString:jamiText];
+ [jamiString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, jamiText.length)];
+
+ jamiLabel.attributedStringValue = jamiString;
}
- (void) connect
diff --git a/src/SmartViewVC.mm b/src/SmartViewVC.mm
index 88cc45f..01587b5 100755
--- a/src/SmartViewVC.mm
+++ b/src/SmartViewVC.mm
@@ -81,7 +81,6 @@
NSInteger const IMAGE_TAG = 100;
NSInteger const DISPLAYNAME_TAG = 200;
NSInteger const NOTIFICATONS_TAG = 300;
-NSInteger const RING_ID_LABEL = 400;
NSInteger const PRESENCE_TAG = 500;
NSInteger const TOTALMSGS_TAG = 600;
NSInteger const TOTALINVITES_TAG = 700;
@@ -110,7 +109,16 @@
[smartView setDataSource: self];
currentFilterType = lrc::api::profile::Type::RING;
selectorIsPresent = true;
-
+ NSFont *searchBarFont = [NSFont systemFontOfSize: 12.0 weight: NSFontWeightLight];
+ NSColor *color = [NSColor secondaryLabelColor];
+ NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+ NSDictionary *searchBarAttrs = [NSDictionary dictionaryWithObjectsAndKeys:
+ searchBarFont, NSFontAttributeName,
+ style, NSParagraphStyleAttributeName,
+ color, NSForegroundColorAttributeName,
+ nil];
+ NSAttributedString* attributedName = [[NSAttributedString alloc] initWithString:NSLocalizedString(@"Search for new or existing contact", @"search bar placeholder") attributes: searchBarAttrs];
+ searchField.placeholderAttributedString = attributedName;
smartView.selectionHighlightStyle = NSTableViewSelectionHighlightStyleNone;
[searchResultsView setContextMenuDelegate:self];
@@ -482,11 +490,9 @@
[unreadCount setHidden:(conversation.unreadMessages == 0)];
[unreadCount setIntValue:conversation.unreadMessages];
NSTextField* displayName = [result viewWithTag:DISPLAYNAME_TAG];
- NSTextField* displayRingID = [result viewWithTag:RING_ID_LABEL];
NSTextField* lastInteractionDate = [result viewWithTag:DATE_TAG];
NSTextField* interactionSnippet = [result viewWithTag:SNIPPET_TAG];
[displayName setStringValue:@""];
- [displayRingID setStringValue:@""];
[lastInteractionDate setStringValue:@""];
[interactionSnippet setStringValue:@""];
NSImageView* photoView = [result viewWithTag:IMAGE_TAG];
@@ -494,12 +500,9 @@
NSString* displayIDString = bestIDForConversation(conversation, *convModel_);
if(displayNameString.length == 0 || [displayNameString isEqualToString:displayIDString]) {
[displayName setStringValue:displayIDString];
- [displayRingID setHidden:YES];
}
else {
[displayName setStringValue:displayNameString];
- [displayRingID setStringValue:displayIDString];
- [displayRingID setHidden:NO];
}
@autoreleasepool {
auto& imageManip = reinterpret_cast<Interfaces::ImageManipulationDelegate&>(GlobalInstances::pixmapManipulator());
diff --git a/ui/Base.lproj/AccountMenuItemView.xib b/ui/Base.lproj/AccountMenuItemView.xib
index 7ee5012..1df73cc 100644
--- a/ui/Base.lproj/AccountMenuItemView.xib
+++ b/ui/Base.lproj/AccountMenuItemView.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -43,19 +43,95 @@
<font key="font" metaFont="system"/>
</buttonCell>
</button>
- <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="V91-eS-dUh">
- <rect key="frame" x="50" y="30" width="44" height="20"/>
- <constraints>
- <constraint firstAttribute="height" constant="20" id="VWk-wM-WSB"/>
- </constraints>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Label" drawsBackground="YES" id="7sc-IE-yuO">
- <font key="font" metaFont="system" size="16"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jrf-Rv-9Yy">
+ <rect key="frame" x="60" y="10" width="210" height="41"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yBU-Lg-r5O">
+ <rect key="frame" x="0.0" y="24" width="178" height="17"/>
+ <subviews>
+ <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="V91-eS-dUh">
+ <rect key="frame" x="0.0" y="0.0" width="4" height="17"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" drawsBackground="YES" id="7sc-IE-yuO">
+ <font key="font" metaFont="systemMedium" size="14"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </textFieldCell>
+ </textField>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="990-Ph-U5H">
+ <rect key="frame" x="14" y="0.0" width="150" height="10"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="10" id="GzM-3m-AnL"/>
+ </constraints>
+ </customView>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0PP-Di-b7L">
+ <rect key="frame" x="174" y="0.0" width="4" height="15"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" drawsBackground="YES" id="gOS-aC-TGo">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="OdL-3b-ufT">
+ <rect key="frame" x="0.0" y="0.0" width="209" height="20"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tLn-uH-gZ6">
+ <rect key="frame" x="0.0" y="5" width="4" height="15"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" drawsBackground="YES" id="uPR-fc-nOP">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </textFieldCell>
+ </textField>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="tO2-4r-n7T">
+ <rect key="frame" x="14" y="10" width="160" height="10"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="10" id="5YK-dm-43R"/>
+ </constraints>
+ </customView>
+ <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kKO-1B-QJK">
+ <rect key="frame" x="184" y="0.0" width="25" height="20"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="25" id="VSP-HC-jbY"/>
+ <constraint firstAttribute="height" constant="20" id="Y1X-sD-SI8"/>
+ </constraints>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="VeT-DQ-gnU"/>
+ </imageView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="XKc-lc-K67">
- <rect key="frame" x="5" y="10" width="40" height="40"/>
+ <rect key="frame" x="10" y="10" width="40" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="2Pd-xj-eIf"/>
<constraint firstAttribute="width" constant="40" id="IEA-OA-uSx"/>
@@ -63,7 +139,7 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="right" imageScaling="proportionallyUpOrDown" id="B0y-e0-cVi"/>
</imageView>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="TdK-5g-ddU" userLabel="AccountState" customClass="RoundedTextField">
- <rect key="frame" x="34" y="10" width="13" height="14"/>
+ <rect key="frame" x="39" y="10" width="13" height="14"/>
<constraints>
<constraint firstAttribute="height" constant="13.5" id="Mj5-H6-ylc"/>
<constraint firstAttribute="width" constant="9.5" id="aYl-Xd-vky"/>
@@ -82,14 +158,6 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tLn-uH-gZ6">
- <rect key="frame" x="50" y="10" width="35" height="15"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" title="Label" drawsBackground="YES" id="uPR-fc-nOP">
- <font key="font" metaFont="label" size="12"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IyH-ia-I3z">
<rect key="frame" x="130" y="20" width="20" height="20"/>
<constraints>
@@ -99,51 +167,25 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="NSAddTemplate" id="9b9-Jo-NAF"/>
<color key="contentTintColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
</imageView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="0PP-Di-b7L">
- <rect key="frame" x="240" y="30" width="35" height="20"/>
- <constraints>
- <constraint firstAttribute="height" constant="20" id="8mL-jo-3Kb"/>
- </constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Label" drawsBackground="YES" id="gOS-aC-TGo">
- <font key="font" metaFont="label" size="12"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
- <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="kKO-1B-QJK">
- <rect key="frame" x="250" y="8" width="25" height="20"/>
- <constraints>
- <constraint firstAttribute="width" constant="25" id="VSP-HC-jbY"/>
- <constraint firstAttribute="height" constant="20" id="Y1X-sD-SI8"/>
- </constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="VeT-DQ-gnU"/>
- </imageView>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="BkF-b3-tzE" secondAttribute="trailing" id="4zr-zt-tNR"/>
<constraint firstItem="IyH-ia-I3z" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="6of-Nf-Di4"/>
+ <constraint firstItem="Jrf-Rv-9Yy" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="DO0-N1-lnh"/>
<constraint firstAttribute="bottom" secondItem="BkF-b3-tzE" secondAttribute="bottom" id="Erj-JK-1Jc"/>
- <constraint firstAttribute="trailing" secondItem="0PP-Di-b7L" secondAttribute="trailing" constant="5" id="GU6-yw-2Nu"/>
<constraint firstItem="BkF-b3-tzE" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="M0t-ie-V4X"/>
- <constraint firstAttribute="trailing" secondItem="kKO-1B-QJK" secondAttribute="trailing" constant="5" id="M5p-wX-3uG"/>
<constraint firstItem="TdK-5g-ddU" firstAttribute="trailing" secondItem="XKc-lc-K67" secondAttribute="trailing" id="NU8-DL-jhB"/>
- <constraint firstItem="0PP-Di-b7L" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="tLn-uH-gZ6" secondAttribute="trailing" constant="20" id="Nb4-Z8-9Ul"/>
+ <constraint firstAttribute="trailing" secondItem="Jrf-Rv-9Yy" secondAttribute="trailing" constant="10" id="Owa-BA-SOG"/>
<constraint firstItem="TdK-5g-ddU" firstAttribute="bottom" secondItem="XKc-lc-K67" secondAttribute="bottom" id="PGs-u9-1qr"/>
- <constraint firstAttribute="bottom" secondItem="tLn-uH-gZ6" secondAttribute="bottom" constant="10" id="QNf-aN-2HB"/>
<constraint firstAttribute="bottom" secondItem="ZIZ-jd-eLK" secondAttribute="bottom" id="RRa-dJ-Zbr"/>
<constraint firstItem="ZIZ-jd-eLK" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="Rl2-Z2-XC6"/>
<constraint firstAttribute="bottom" secondItem="XKc-lc-K67" secondAttribute="bottom" constant="10" id="SOc-zB-t6m"/>
- <constraint firstItem="V91-eS-dUh" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="10" id="SQI-pe-c4a"/>
- <constraint firstItem="XKc-lc-K67" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="5" id="TUF-fx-zE7"/>
- <constraint firstItem="tLn-uH-gZ6" firstAttribute="leading" secondItem="V91-eS-dUh" secondAttribute="leading" id="WcF-NN-pmz"/>
+ <constraint firstItem="XKc-lc-K67" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="10" id="TUF-fx-zE7"/>
<constraint firstItem="ZIZ-jd-eLK" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="X9L-7K-HGm"/>
- <constraint firstItem="kKO-1B-QJK" firstAttribute="centerY" secondItem="tLn-uH-gZ6" secondAttribute="centerY" id="Ya0-ML-RbE"/>
- <constraint firstItem="0PP-Di-b7L" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="V91-eS-dUh" secondAttribute="trailing" constant="20" id="ZH1-rk-GX6"/>
<constraint firstItem="IyH-ia-I3z" firstAttribute="centerY" secondItem="Hz6-mo-xeY" secondAttribute="centerY" id="hQd-Pw-y4Q"/>
<constraint firstItem="XKc-lc-K67" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="10" id="ipM-Ca-Man"/>
<constraint firstAttribute="trailing" secondItem="ZIZ-jd-eLK" secondAttribute="trailing" id="nIe-my-eAj"/>
- <constraint firstItem="V91-eS-dUh" firstAttribute="leading" secondItem="XKc-lc-K67" secondAttribute="trailing" constant="5" id="rBn-Ol-rkr"/>
- <constraint firstItem="0PP-Di-b7L" firstAttribute="top" secondItem="V91-eS-dUh" secondAttribute="top" id="yBS-XS-NWz"/>
+ <constraint firstItem="Jrf-Rv-9Yy" firstAttribute="leading" secondItem="XKc-lc-K67" secondAttribute="trailing" constant="10" id="vW4-jb-pxW"/>
<constraint firstItem="BkF-b3-tzE" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="yKW-iG-nvv"/>
</constraints>
<point key="canvasLocation" x="139" y="154"/>
diff --git a/ui/Base.lproj/CallInConferenceVC.xib b/ui/Base.lproj/CallInConferenceVC.xib
index 37872e4..7ec5a00 100644
--- a/ui/Base.lproj/CallInConferenceVC.xib
+++ b/ui/Base.lproj/CallInConferenceVC.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="17156" 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="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -15,32 +15,32 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="170" height="102"/>
+ <customView misplaced="YES" id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="170" height="99"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<box boxType="custom" borderWidth="0.0" cornerRadius="5" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="XkB-R1-Jz7">
- <rect key="frame" x="0.0" y="0.0" width="170" height="102"/>
+ <rect key="frame" x="0.0" y="0.0" width="170" height="100"/>
<view key="contentView" id="DVn-uM-94p">
- <rect key="frame" x="0.0" y="0.0" width="170" height="102"/>
+ <rect key="frame" x="0.0" y="0.0" width="170" height="100"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
</view>
<color key="fillColor" red="0.99999600649999998" green="1" blue="1" alpha="0.35846532534246578" colorSpace="custom" customColorSpace="sRGB"/>
</box>
<stackView distribution="fill" orientation="vertical" alignment="centerX" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NJR-wA-MJL">
- <rect key="frame" x="0.0" y="0.0" width="170" height="102"/>
+ <rect key="frame" x="0.0" y="0.0" width="170" height="100"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="l1c-Lf-7R2">
- <rect key="frame" x="85" y="101" width="1" height="1"/>
+ <rect key="frame" x="85" y="99" width="1" height="1"/>
<constraints>
<constraint firstAttribute="width" constant="1" id="VzI-Tn-FIB"/>
<constraint firstAttribute="height" constant="1" id="vxm-nR-dxO"/>
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="beR-Kp-sIl">
- <rect key="frame" x="55" y="77" width="61" height="16"/>
+ <rect key="frame" x="57" y="77" width="56" height="14"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Searching" id="ZOf-xw-eee">
- <font key="font" metaFont="systemThin" size="12"/>
+ <font key="font" metaFont="systemThin" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -48,7 +48,7 @@
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" textCompletion="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vOY-7r-Xx0">
<rect key="frame" x="58" y="52" width="54" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" usesSingleLineMode="YES" id="pXv-4x-nAB">
- <font key="font" metaFont="systemLight" size="13"/>
+ <font key="font" metaFont="systemLight" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -118,6 +118,7 @@
<constraint firstItem="XkB-R1-Jz7" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="kKi-JP-GhK"/>
<constraint firstAttribute="trailing" secondItem="NJR-wA-MJL" secondAttribute="trailing" id="uKU-u0-DGc"/>
</constraints>
+ <point key="canvasLocation" x="-55" y="136"/>
</customView>
</objects>
<resources>
diff --git a/ui/Base.lproj/ChooseContactVC.xib b/ui/Base.lproj/ChooseContactVC.xib
index aeac512..f3e38b0 100644
--- a/ui/Base.lproj/ChooseContactVC.xib
+++ b/ui/Base.lproj/ChooseContactVC.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="17156" 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="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -20,15 +20,15 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="Hz6-mo-xeY">
- <rect key="frame" x="0.0" y="0.0" width="250" height="360"/>
+ <customView misplaced="YES" id="Hz6-mo-xeY">
+ <rect key="frame" x="0.0" y="0.0" width="250" height="358"/>
<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="y8b-Oz-KzK">
- <rect key="frame" x="0.0" y="10" width="250" height="340"/>
+ <rect key="frame" x="0.0" y="10" width="250" height="336"/>
<subviews>
<searchField wantsLayer="YES" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="jhs-SW-hFj">
- <rect key="frame" x="10" y="310" width="230" height="30"/>
+ <rect key="frame" x="10" y="306" width="230" height="30"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="EdH-wc-qHz"/>
</constraints>
@@ -42,12 +42,12 @@
</connections>
</searchField>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tp4-1X-GbC">
- <rect key="frame" x="0.0" y="155" width="250" height="147"/>
+ <rect key="frame" x="0.0" y="153" width="250" height="145"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GvG-KN-9DW">
- <rect key="frame" x="8" y="128" width="37" height="19"/>
+ <rect key="frame" x="8" y="128" width="35" height="17"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Calls" id="Z0b-mA-2Qx">
- <font key="font" metaFont="systemLight" size="15"/>
+ <font key="font" metaFont="systemLight" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -60,14 +60,13 @@
<subviews>
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="8" outlineTableColumn="4RB-Ax-gYB" id="hoP-88-Muf" customClass="RingTableView">
<rect key="frame" x="0.0" y="0.0" width="250" height="120"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="0.0" colorSpace="deviceWhite"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="MainColumn" width="247" minWidth="40" maxWidth="1000" id="4RB-Ax-gYB">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- <font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
@@ -87,9 +86,9 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="P5e-F5-n01" userLabel="name">
- <rect key="frame" x="76" y="26" width="4" height="23"/>
+ <rect key="frame" x="76" y="32" width="4" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" drawsBackground="YES" id="auU-4Z-tOc">
- <font key="font" size="16" name="HelveticaNeue-Light"/>
+ <font key="font" metaFont="systemMedium" size="14"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
@@ -103,9 +102,9 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSUser" id="umT-rY-c6k"/>
</imageView>
<textField horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="XSb-5g-2ku" userLabel="ringId">
- <rect key="frame" x="76" y="11" width="4" height="20"/>
+ <rect key="frame" x="76" y="11" width="4" height="14"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="bGS-PL-mxc">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
+ <font key="font" metaFont="systemLight" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
@@ -186,12 +185,12 @@
</customSpacing>
</stackView>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="mDN-Cf-aNR">
- <rect key="frame" x="0.0" y="0.0" width="250" height="147"/>
+ <rect key="frame" x="0.0" y="0.0" width="250" height="145"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="s4o-r2-JCa">
- <rect key="frame" x="8" y="128" width="66" height="19"/>
+ <rect key="frame" x="8" y="128" width="62" height="17"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Contacts" id="fVY-44-Il2">
- <font key="font" metaFont="systemLight" size="15"/>
+ <font key="font" metaFont="systemLight" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -204,14 +203,13 @@
<subviews>
<outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="8" outlineTableColumn="Ruv-Mb-soi" id="rsk-7y-712" customClass="RingTableView">
<rect key="frame" x="0.0" y="0.0" width="250" height="120"/>
- <autoresizingMask key="autoresizingMask"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="0.0" colorSpace="deviceWhite"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="MainColumn" width="247" minWidth="40" maxWidth="1000" id="Ruv-Mb-soi">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
- <font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
@@ -227,9 +225,9 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="Yl6-CL-A45" userLabel="name">
- <rect key="frame" x="76" y="26" width="4" height="23"/>
+ <rect key="frame" x="76" y="32" width="4" height="17"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" drawsBackground="YES" id="jCG-W3-SGY">
- <font key="font" size="16" name="HelveticaNeue-Light"/>
+ <font key="font" metaFont="systemMedium" size="14"/>
<color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
@@ -243,9 +241,9 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSUser" id="CYR-cj-PBY"/>
</imageView>
<textField horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="xfZ-dm-SB2" userLabel="ringId">
- <rect key="frame" x="76" y="11" width="4" height="20"/>
+ <rect key="frame" x="76" y="11" width="4" height="14"/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="mbz-fr-mXg">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
+ <font key="font" metaFont="systemLight" size="11"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
@@ -357,6 +355,7 @@
<constraint firstAttribute="bottom" secondItem="y8b-Oz-KzK" secondAttribute="bottom" constant="10" id="fjI-HV-gjR"/>
<constraint firstAttribute="trailing" secondItem="y8b-Oz-KzK" secondAttribute="trailing" id="wG3-Ya-T9t"/>
</constraints>
+ <point key="canvasLocation" x="-55" y="136"/>
</customView>
</objects>
<resources>
diff --git a/ui/Base.lproj/Conversation.xib b/ui/Base.lproj/Conversation.xib
index a41b127..7c7dcb1 100644
--- a/ui/Base.lproj/Conversation.xib
+++ b/ui/Base.lproj/Conversation.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -11,8 +11,6 @@
<outlet property="conversationID" destination="SQT-Vf-Lhr" id="eab-vD-7X7"/>
<outlet property="conversationTitle" destination="ucx-6g-eJw" id="40T-pM-nix"/>
<outlet property="messagesViewVC" destination="iH6-17-JsM" id="uxH-Ra-lSr"/>
- <outlet property="titleCenteredConstraint" destination="uTp-kU-NmC" id="ccn-92-zaA"/>
- <outlet property="titleTopConstraint" destination="32s-Wp-DE1" id="fms-Yu-vrn"/>
<outlet property="view" destination="Hz6-mo-xeY" id="0bl-1N-x8E"/>
</connections>
</customObject>
@@ -72,13 +70,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="B6E-x2-crl">
- <rect key="frame" x="344" y="9" width="8" height="16"/>
+ <rect key="frame" x="344" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="w4C-8s-jzb"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="fO7-y7-Iz9">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -188,13 +186,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FC0-ft-pR6">
- <rect key="frame" x="345" y="9" width="8" height="16"/>
+ <rect key="frame" x="345" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="zFg-aY-OWW"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="E8q-bO-Ify">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -323,32 +321,32 @@
<outlet property="timeLabel" destination="FC0-ft-pR6" id="KpW-ed-esW"/>
</connections>
</tableCellView>
- <tableCellView identifier="GenericInteractionView" id="pNa-Do-cpO" userLabel="GenericInteractionView">
+ <tableCellView identifier="GenericInteractionView" misplaced="YES" id="pNa-Do-cpO" userLabel="GenericInteractionView">
<rect key="frame" x="1" y="181" width="697" height="57"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cNK-fF-Lpr">
- <rect key="frame" x="0.0" y="0.0" width="697" height="57"/>
+ <rect key="frame" x="0.0" y="0.0" width="697" height="55"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="vU3-4K-kQn">
- <rect key="frame" x="267" y="52" width="163" height="5"/>
+ <rect key="frame" x="267" y="50" width="163" height="5"/>
<constraints>
<constraint firstAttribute="height" constant="5" id="Epp-SP-a0x"/>
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="WSh-d6-EpR">
- <rect key="frame" x="345" y="31" width="8" height="16"/>
+ <rect key="frame" x="345" y="30" width="8" height="15"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="t8v-wm-DsX">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="35p-WS-DUv" userLabel="ContactInteractionLabel">
- <rect key="frame" x="322" y="10" width="54" height="16"/>
+ <rect key="frame" x="322" y="10" width="54" height="15"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="jRF-Jm-tK5">
- <font key="font" metaFont="systemLight" size="13"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -554,9 +552,9 @@
</connections>
</button>
<textField verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bsk-Gj-qQ2">
- <rect key="frame" x="106" y="22" width="520" height="16"/>
+ <rect key="frame" x="106" y="22" width="520" height="17"/>
<textFieldCell key="cell" lineBreakMode="charWrapping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" placeholderString="Type a message" id="Ilz-7v-2fr">
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="system" size="14"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -683,14 +681,35 @@
<constraint firstAttribute="bottom" secondItem="vd8-6U-eqB" secondAttribute="bottom" id="tod-bR-LQO"/>
</constraints>
</customView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ucx-6g-eJw">
- <rect key="frame" x="53" y="531" width="4" height="45"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" id="HnC-1N-RmR">
- <font key="font" metaFont="system" size="18"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mor-Vl-Fr5">
+ <rect key="frame" x="55" y="536" width="50" height="36"/>
+ <subviews>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ucx-6g-eJw">
+ <rect key="frame" x="-2" y="19" width="54" height="17"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" sendsActionOnEndEditing="YES" alignment="left" id="HnC-1N-RmR">
+ <font key="font" metaFont="systemMedium" size="14"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SQT-Vf-Lhr" userLabel="IdLabel">
+ <rect key="frame" x="-2" y="0.0" width="54" height="15"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="rW7-RD-TBM">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="6" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="s8t-r2-zdA">
<rect key="frame" x="675" y="526" width="108" height="55"/>
<subviews>
@@ -802,39 +821,28 @@
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SQT-Vf-Lhr" userLabel="IdLabel">
- <rect key="frame" x="53" y="536" width="4" height="15"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" id="rW7-RD-TBM">
- <font key="font" metaFont="systemLight" size="12"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
- </textFieldCell>
- </textField>
</subviews>
<constraints>
<constraint firstItem="ooq-vs-Xt1" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="10" id="1xM-Rt-OXn"/>
- <constraint firstItem="ucx-6g-eJw" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="5" id="32s-Wp-DE1"/>
- <constraint firstItem="ucx-6g-eJw" firstAttribute="leading" secondItem="ooq-vs-Xt1" secondAttribute="trailing" constant="10" id="60g-Mw-Wax"/>
+ <constraint firstItem="mor-Vl-Fr5" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="2Fg-cF-xMY"/>
<constraint firstItem="s8t-r2-zdA" firstAttribute="top" secondItem="fh9-Uo-8R1" secondAttribute="top" id="8pz-TS-qws"/>
<constraint firstAttribute="bottom" secondItem="Rth-di-Tls" secondAttribute="bottom" id="9nL-Hs-Oak"/>
<constraint firstItem="s8t-r2-zdA" firstAttribute="trailing" secondItem="fh9-Uo-8R1" secondAttribute="trailing" constant="-15" id="ATN-4X-HqG"/>
<constraint firstItem="s8t-r2-zdA" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="EYN-Be-aBV"/>
<constraint firstAttribute="trailing" secondItem="fh9-Uo-8R1" secondAttribute="trailing" id="EoD-2E-bhi"/>
<constraint firstAttribute="bottom" secondItem="EJD-f8-Xqd" secondAttribute="bottom" constant="60" id="EoS-be-aF2"/>
- <constraint firstItem="ucx-6g-eJw" firstAttribute="leading" secondItem="SQT-Vf-Lhr" secondAttribute="leading" id="IQc-hc-YRD"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="L79-xO-12P"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="55" id="XkO-FA-l3J"/>
<constraint firstItem="Sn1-dJ-QCw" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="55" id="aZT-2B-gv9"/>
<constraint firstItem="Rth-di-Tls" firstAttribute="trailing" secondItem="Ez2-Rf-DZN" secondAttribute="trailing" id="b6d-Ue-Zl5"/>
<constraint firstItem="EJD-f8-Xqd" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="bvr-Gv-Sgb"/>
+ <constraint firstItem="mor-Vl-Fr5" firstAttribute="leading" secondItem="ooq-vs-Xt1" secondAttribute="trailing" constant="10" id="cH2-Ig-fSg"/>
<constraint firstItem="Sn1-dJ-QCw" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="dtD-1T-QlG"/>
- <constraint firstItem="SQT-Vf-Lhr" firstAttribute="bottom" secondItem="ooq-vs-Xt1" secondAttribute="bottom" id="e8m-qq-0SV"/>
<constraint firstItem="fh9-Uo-8R1" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="giR-tF-lUI"/>
<constraint firstAttribute="trailing" secondItem="EJD-f8-Xqd" secondAttribute="trailing" id="hSZ-8v-sis"/>
<constraint firstAttribute="bottom" secondItem="fh9-Uo-8R1" secondAttribute="bottom" id="hvC-OR-Ct0"/>
<constraint firstItem="Rth-di-Tls" firstAttribute="leading" secondItem="Ez2-Rf-DZN" secondAttribute="leading" id="jyz-o7-MMh"/>
<constraint firstAttribute="trailing" secondItem="Sn1-dJ-QCw" secondAttribute="trailing" id="m05-gh-crH"/>
- <constraint firstItem="ucx-6g-eJw" firstAttribute="centerY" secondItem="ooq-vs-Xt1" secondAttribute="centerY" id="uTp-kU-NmC" userLabel="centeredTitle"/>
<constraint firstItem="fh9-Uo-8R1" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="wBu-2R-lEu"/>
</constraints>
<point key="canvasLocation" x="514" y="475"/>
diff --git a/ui/Base.lproj/CurrentCall.xib b/ui/Base.lproj/CurrentCall.xib
index 2612fe8..7bec520 100644
--- a/ui/Base.lproj/CurrentCall.xib
+++ b/ui/Base.lproj/CurrentCall.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -65,7 +65,7 @@
<color key="fillColor" red="0.120510533452034" green="0.12050692737102509" blue="0.12050899863243103" alpha="1" colorSpace="calibratedRGB"/>
</box>
<stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" translatesAutoresizingMaskIntoConstraints="NO" id="aLB-LA-yn0">
- <rect key="frame" x="302" y="532" width="142" height="305"/>
+ <rect key="frame" x="302" y="640" width="142" height="305"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="s4L-Ke-9Jm">
<rect key="frame" x="7" y="177" width="128" height="128"/>
@@ -647,13 +647,13 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" scrollerKnobStyle="dark" translatesAutoresizingMaskIntoConstraints="NO" id="o0i-7W-5fA">
- <rect key="frame" x="20" y="60" width="331" height="1306"/>
+ <rect key="frame" x="20" y="60" width="331" height="1522"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="H2i-4W-Gvt">
- <rect key="frame" x="0.0" y="0.0" width="331" height="1306"/>
+ <rect key="frame" x="0.0" y="0.0" width="331" height="1522"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" selectionHighlightStyle="none" autosaveColumns="NO" rowHeight="60" rowSizeStyle="automatic" usesAutomaticRowHeights="YES" viewBased="YES" id="ZOj-5b-rnp">
- <rect key="frame" x="0.0" y="0.0" width="331" height="1306"/>
+ <rect key="frame" x="0.0" y="0.0" width="331" height="1522"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="1" alpha="0.0" colorSpace="deviceWhite"/>
@@ -685,13 +685,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="IJm-DU-cs6">
- <rect key="frame" x="160" y="9" width="8" height="16"/>
+ <rect key="frame" x="160" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="HNl-gc-YBr"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="UrO-87-XKZ">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -801,13 +801,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="xkH-rw-k6w">
- <rect key="frame" x="160" y="9" width="8" height="16"/>
+ <rect key="frame" x="160" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="IIf-Z3-Q3T"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="f76-cI-oqW">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -881,38 +881,38 @@
<outlet property="timeLabel" destination="xkH-rw-k6w" id="WQc-BF-dSZ"/>
</connections>
</tableCellView>
- <tableCellView identifier="GenericInteractionView" misplaced="YES" id="0tt-a5-Dex" userLabel="GenericInteractionView">
+ <tableCellView identifier="GenericInteractionView" id="0tt-a5-Dex" userLabel="GenericInteractionView">
<rect key="frame" x="1" y="125" width="328" height="57"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lxe-bb-x9e">
- <rect key="frame" x="0.0" y="0.0" width="328" height="58"/>
+ <rect key="frame" x="0.0" y="0.0" width="328" height="57"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="fnF-0c-eAI">
- <rect key="frame" x="83" y="53" width="163" height="5"/>
+ <rect key="frame" x="83" y="52" width="163" height="5"/>
<constraints>
<constraint firstAttribute="height" constant="5" id="uDr-ZO-2so"/>
</constraints>
</customView>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="SMB-Vk-E06">
- <rect key="frame" x="160" y="32" width="8" height="16"/>
+ <rect key="frame" x="160" y="32" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="Wod-ib-NVj"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="ahn-Mr-638">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="Wyd-h8-NpR" userLabel="ContactInteractionLabel">
- <rect key="frame" x="146" y="10" width="37" height="17"/>
+ <rect key="frame" x="147" y="10" width="35" height="17"/>
<constraints>
<constraint firstAttribute="height" constant="17" id="blq-Kh-Y2Y"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Label" id="GBy-HF-JeP">
- <font key="font" metaFont="systemLight" size="13"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -970,7 +970,7 @@
<textField verticalCompressionResistancePriority="1000" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jei-Xj-lgm">
<rect key="frame" x="50" y="21" width="239" height="18"/>
<textFieldCell key="cell" lineBreakMode="charWrapping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" placeholderString="Send a message" id="d4g-hS-EMn">
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="system" size="14"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
diff --git a/ui/Base.lproj/LeaveMessageVC.xib b/ui/Base.lproj/LeaveMessageVC.xib
index fdc2124..b3222fc 100644
--- a/ui/Base.lproj/LeaveMessageVC.xib
+++ b/ui/Base.lproj/LeaveMessageVC.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="17156" 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="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -57,7 +57,7 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSUser" id="boQ-fa-nNO"/>
</imageView>
<textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="BFQ-Q6-8D6">
- <rect key="frame" x="135" y="48" width="293" height="24"/>
+ <rect key="frame" x="135" y="49" width="293" height="23"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" drawsBackground="YES" id="z57-wd-7By">
<font key="font" metaFont="systemLight" size="20"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -228,15 +228,15 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CvL-tU-YNA">
- <rect key="frame" x="60" y="57" width="66" height="17"/>
+ <rect key="frame" x="59" y="57" width="69" height="17"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="Recording" id="kIq-PG-Ymw">
- <font key="font" usesAppearanceFont="YES"/>
+ <font key="font" metaFont="systemLight" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="1k9-gR-Qgh">
- <rect key="frame" x="52" y="12" width="82" height="35"/>
+ <rect key="frame" x="51" y="13" width="84" height="34"/>
<textFieldCell key="cell" lineBreakMode="clipping" title="00:00" id="78U-cA-2f2">
<font key="font" metaFont="system" size="29"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -309,6 +309,7 @@
<constraint firstItem="HyU-cT-Xbw" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" id="yCi-te-I7S"/>
<constraint firstItem="HyU-cT-Xbw" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" id="zdN-wD-wW2"/>
</constraints>
+ <point key="canvasLocation" x="-55" y="136"/>
</customView>
</objects>
<resources>
diff --git a/ui/Base.lproj/Localizable.strings b/ui/Base.lproj/Localizable.strings
index 3d90de3..4aa94eb 100644
--- a/ui/Base.lproj/Localizable.strings
+++ b/ui/Base.lproj/Localizable.strings
@@ -231,3 +231,6 @@
/* Choose registered name for rendezvous */
"Choose a name for your rendezvous point" = "Choose a name for your rendezvous point";
+
+/* search bar placeholder */
+"Search for new or existing contact" = "Search for new or existing contact";
diff --git a/ui/Base.lproj/MessageCells.xib b/ui/Base.lproj/MessageCells.xib
index 4565fc5..8bedc99 100644
--- a/ui/Base.lproj/MessageCells.xib
+++ b/ui/Base.lproj/MessageCells.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16096" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16096"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -22,13 +22,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="EyK-S9-kZz">
- <rect key="frame" x="196" y="9" width="8" height="16"/>
+ <rect key="frame" x="196" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="h3Y-F2-Nvs"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="vn0-ue-s4d">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -60,7 +60,7 @@
<rect key="frame" x="20" y="0.0" width="210" height="90"/>
<subviews>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Fco-P1-jYX">
- <rect key="frame" x="0.0" y="40" width="114" height="50"/>
+ <rect key="frame" x="0.0" y="40" width="104" height="50"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="KEd-qS-Nsi">
<rect key="frame" x="0.0" y="15" width="30" height="20"/>
@@ -71,10 +71,10 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="Jpz-4x-jYM"/>
</imageView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZA5-7h-yNn">
- <rect key="frame" x="35" y="17" width="79" height="17"/>
+ <rect key="frame" x="35" y="18" width="69" height="15"/>
<buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="DmW-13-1QZ">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="menu" size="14"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -113,7 +113,7 @@
</constraints>
<buttonCell key="cell" type="roundRect" title="Accept" bezelStyle="roundedRect" image="ic_file_upload" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="tBq-Qe-bEm">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="label" size="12"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="rGw-yF-hxm">
@@ -123,7 +123,7 @@
</constraints>
<buttonCell key="cell" type="roundRect" title="Refuse" bezelStyle="roundedRect" image="ic_action_cancel" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="QGs-MO-mVi">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="label" size="12"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -223,13 +223,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JUf-er-n2R">
- <rect key="frame" x="128" y="9" width="8" height="16"/>
+ <rect key="frame" x="128" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="c90-0g-OVN"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="xYI-Og-qqV">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -264,7 +264,7 @@
<rect key="frame" x="20" y="0.0" width="210" height="90"/>
<subviews>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eWr-rt-cAZ">
- <rect key="frame" x="0.0" y="40" width="114" height="50"/>
+ <rect key="frame" x="0.0" y="40" width="104" height="50"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gXD-VF-3Sl">
<rect key="frame" x="0.0" y="15" width="30" height="20"/>
@@ -275,10 +275,10 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="yjj-R0-GLl"/>
</imageView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="NbG-jg-Rsk">
- <rect key="frame" x="35" y="17" width="79" height="17"/>
+ <rect key="frame" x="35" y="18" width="69" height="15"/>
<buttonCell key="cell" type="square" title="Round Rect" bezelStyle="shadowlessSquare" alignment="center" imageScaling="proportionallyDown" inset="2" id="8CE-a4-Ayu">
<behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="menu" size="14"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -309,7 +309,7 @@
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ldC-Xq-oV5">
<rect key="frame" x="-2" y="10" width="54" height="19"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="Mey-Zj-Gqc">
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="system" size="12"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -458,13 +458,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sRg-94-yH1">
- <rect key="frame" x="196" y="9" width="8" height="16"/>
+ <rect key="frame" x="196" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="mLV-uI-q6J"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="pfw-fC-4Xm">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -496,7 +496,7 @@
<rect key="frame" x="20" y="0.0" width="210" height="90"/>
<subviews>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fBX-Ap-tom">
- <rect key="frame" x="0.0" y="40" width="114" height="50"/>
+ <rect key="frame" x="0.0" y="40" width="104" height="50"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Wu8-Ho-MOI">
<rect key="frame" x="0.0" y="15" width="30" height="20"/>
@@ -507,10 +507,10 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="q2e-Jw-ifg"/>
</imageView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tUr-hG-Ef4">
- <rect key="frame" x="35" y="17" width="79" height="17"/>
+ <rect key="frame" x="35" y="18" width="69" height="15"/>
<buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="Oo1-gq-aPY">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="menu" size="14"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -556,7 +556,7 @@
</constraints>
<buttonCell key="cell" type="roundRect" title="Cancel" bezelStyle="roundedRect" image="ic_action_cancel" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="1c6-BK-hfV">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="label" size="12"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -658,13 +658,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2IY-Tt-uAF">
- <rect key="frame" x="196" y="9" width="8" height="16"/>
+ <rect key="frame" x="196" y="10" width="8" height="15"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="nTF-Xv-8ok"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="fU3-Ej-fOu">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -685,7 +685,7 @@
<rect key="frame" x="20" y="0.0" width="210" height="90"/>
<subviews>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Gfs-3T-2Z5">
- <rect key="frame" x="0.0" y="40" width="119" height="50"/>
+ <rect key="frame" x="0.0" y="40" width="109" height="50"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sUr-U8-vgf">
<rect key="frame" x="0.0" y="15" width="30" height="20"/>
@@ -696,10 +696,10 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="1qg-9v-1DA"/>
</imageView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="WnO-2x-32a">
- <rect key="frame" x="40" y="17" width="79" height="17"/>
+ <rect key="frame" x="40" y="18" width="69" height="15"/>
<buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="fu2-X7-GW8">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="menu" size="14"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -747,7 +747,7 @@
</constraints>
<buttonCell key="cell" type="roundRect" title="Cancel" bezelStyle="roundedRect" image="ic_action_cancel" imagePosition="left" alignment="center" borderStyle="border" imageScaling="proportionallyUpOrDown" inset="2" id="9Oq-TB-quZ">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="label" size="12"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -850,13 +850,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Od3-Cq-LmR">
- <rect key="frame" x="196" y="9" width="8" height="16"/>
+ <rect key="frame" x="196" y="9" width="8" height="17"/>
<constraints>
<constraint firstAttribute="width" priority="250" constant="20" id="RoH-7v-RcD"/>
</constraints>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="gyp-Xg-CZc">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemLight" size="14"/>
+ <color key="textColor" name="tertiaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -880,7 +880,7 @@
<rect key="frame" x="20" y="0.0" width="210" height="90"/>
<subviews>
<stackView distribution="fill" orientation="horizontal" alignment="centerY" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Bc0-ZM-Z54">
- <rect key="frame" x="0.0" y="40" width="119" height="50"/>
+ <rect key="frame" x="0.0" y="40" width="109" height="50"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gyB-QF-uEW">
<rect key="frame" x="0.0" y="15" width="30" height="20"/>
@@ -891,10 +891,10 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="ic_attachment" id="yAd-of-sXU"/>
</imageView>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jRP-c4-heJ">
- <rect key="frame" x="40" y="17" width="79" height="17"/>
+ <rect key="frame" x="40" y="18" width="69" height="15"/>
<buttonCell key="cell" type="roundRect" title="Round Rect" bezelStyle="roundedRect" alignment="center" imageScaling="proportionallyDown" inset="2" id="3i8-bi-EQN">
<behavior key="behavior" lightByContents="YES"/>
- <font key="font" metaFont="menu" size="14"/>
+ <font key="font" metaFont="systemLight" size="12"/>
</buttonCell>
</button>
</subviews>
@@ -926,7 +926,7 @@
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eHR-Hi-Zl2">
<rect key="frame" x="-2" y="10" width="54" height="19"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" id="vDa-rM-ULY">
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="system" size="12"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
diff --git a/ui/Base.lproj/RecordFileVC.xib b/ui/Base.lproj/RecordFileVC.xib
index 39bcf0f..b9fc4ea 100644
--- a/ui/Base.lproj/RecordFileVC.xib
+++ b/ui/Base.lproj/RecordFileVC.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="15705" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="15705"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -93,7 +93,7 @@
</connections>
</button>
<button hidden="YES" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="6Nv-0Z-3Lv">
- <rect key="frame" x="412" y="18" width="48" height="23"/>
+ <rect key="frame" x="410" y="18" width="50" height="23"/>
<buttonCell key="cell" type="square" title="Send" bezelStyle="shadowlessSquare" alignment="center" inset="2" id="UXO-l1-POf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system" size="20"/>
@@ -110,7 +110,7 @@
</constraints>
<buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_record" imagePosition="overlaps" alignment="center" transparent="YES" imageScaling="proportionallyDown" id="72Z-Ir-JoX">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" size="10" name=".HelveticaNeueDeskInterface-Regular"/>
+ <font key="font" metaFont="system" size="10"/>
</buttonCell>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
diff --git a/ui/Base.lproj/RingWindow.xib b/ui/Base.lproj/RingWindow.xib
index a9b405a..0a07917 100644
--- a/ui/Base.lproj/RingWindow.xib
+++ b/ui/Base.lproj/RingWindow.xib
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17156" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="16097.3"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17156"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -13,6 +13,7 @@
<outlet property="chooseAccountVC" destination="TbU-3l-q8n" id="3VE-q3-kc6"/>
<outlet property="currentView" destination="se5-gp-TjO" id="Sae-7F-MB3"/>
<outlet property="explanationLabel" destination="kFj-Sh-o5u" id="br5-P4-3yq"/>
+ <outlet property="jamiLabel" destination="VJ1-xk-v5e" id="Vfa-Lg-vf4"/>
<outlet property="qrcodeView" destination="dZR-JL-MY4" id="6Jf-42-qwY"/>
<outlet property="ringIDLabel" destination="JN3-vO-zcd" id="WHd-L7-6od"/>
<outlet property="shareButton" destination="Oac-o7-2Ge" id="b0D-xr-PCx"/>
@@ -29,8 +30,8 @@
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="1053" height="658"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
- <view key="contentView" autoresizesSubviews="NO" misplaced="YES" id="se5-gp-TjO">
- <rect key="frame" x="0.0" y="0.0" width="1053" height="658"/>
+ <view key="contentView" autoresizesSubviews="NO" id="se5-gp-TjO">
+ <rect key="frame" x="0.0" y="0.0" width="1053" height="618"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<customView wantsLayer="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YgH-CN-tkB" userLabel="Left Panel">
@@ -44,8 +45,8 @@
<constraints>
<constraint firstAttribute="height" constant="30" id="J1e-nJ-0oz"/>
</constraints>
- <searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Search for new or existing contact" usesSingleLineMode="YES" bezelStyle="round" id="vvE-nM-kSl">
- <font key="font" metaFont="system"/>
+ <searchFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Search for new or existing contact" bezelStyle="round" id="vvE-nM-kSl">
+ <font key="font" metaFont="system" size="12"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell>
@@ -59,7 +60,7 @@
<constraint firstAttribute="height" constant="18" id="6LE-6n-vaC"/>
</constraints>
<segmentedCell key="cell" borderStyle="border" alignment="left" style="roundRect" trackingMode="selectOne" id="6T7-ip-Pun">
- <font key="font" metaFont="label" size="12"/>
+ <font key="font" metaFont="cellTitle"/>
<segments>
<segment label="Conversations" width="153" selected="YES"/>
<segment label="Requests" width="140" tag="1"/>
@@ -127,7 +128,7 @@
<constraint firstAttribute="height" constant="30" id="3QP-qt-Rht"/>
</constraints>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" id="1ae-4I-KHh">
- <font key="font" metaFont="system" size="16"/>
+ <font key="font" metaFont="systemLight" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
@@ -139,9 +140,9 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lkU-c9-KTE">
- <rect key="frame" x="10" y="6" width="112" height="19"/>
+ <rect key="frame" x="10" y="7" width="103" height="17"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Search results" drawsBackground="YES" id="4zz-UH-bw6">
- <font key="font" metaFont="system" size="16"/>
+ <font key="font" metaFont="systemMedium" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
@@ -157,7 +158,7 @@
</constraints>
<color key="fillColor" name="quaternaryLabelColor" catalog="System" colorSpace="catalog"/>
</box>
- <scrollView focusRingType="none" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="250" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="hGB-QO-q3X">
+ <scrollView focusRingType="none" horizontalHuggingPriority="750" horizontalCompressionResistancePriority="250" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="hGB-QO-q3X">
<rect key="frame" x="0.0" y="201" width="324" height="171"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="RGe-lh-PKT">
<rect key="frame" x="0.0" y="0.0" width="324" height="171"/>
@@ -186,14 +187,35 @@
<rect key="frame" x="1" y="1" width="321" height="60"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="MOq-GN-Hlp" userLabel="name">
- <rect key="frame" x="76" y="31" width="4" height="18"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" drawsBackground="YES" id="NHb-G1-nc3">
- <font key="font" size="16" name="HelveticaNeue-Light"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rxq-o9-Kii">
+ <rect key="frame" x="74" y="12" width="237" height="36"/>
+ <subviews>
+ <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="MOq-GN-Hlp" userLabel="name">
+ <rect key="frame" x="0.0" y="19" width="4" height="17"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" drawsBackground="YES" id="NHb-G1-nc3">
+ <font key="font" metaFont="systemMedium" size="14"/>
+ <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </textFieldCell>
+ </textField>
+ <textField horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="WjG-uH-HXt" userLabel="ringId">
+ <rect key="frame" x="0.0" y="0.0" width="4" height="15"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="mb4-hl-nIX">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="c1O-fa-inf">
<rect key="frame" x="10" y="6" width="54" height="48"/>
<constraints>
@@ -202,14 +224,6 @@
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSUser" id="SI2-oT-KUL"/>
</imageView>
- <textField horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="WjG-uH-HXt" userLabel="ringId">
- <rect key="frame" x="76" y="11" width="4" height="16"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="mb4-hl-nIX">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="Dpz-4X-kOL" userLabel="PresenceIndicator" customClass="RoundedTextField">
<rect key="frame" x="51" y="6" width="14" height="14"/>
<constraints>
@@ -235,13 +249,12 @@
</textField>
</subviews>
<constraints>
- <constraint firstItem="MOq-GN-Hlp" firstAttribute="leading" secondItem="c1O-fa-inf" secondAttribute="trailing" constant="12" id="1Js-8q-QXQ"/>
- <constraint firstAttribute="bottom" secondItem="WjG-uH-HXt" secondAttribute="bottom" constant="11" id="Fyl-dd-0vm"/>
- <constraint firstItem="MOq-GN-Hlp" firstAttribute="top" secondItem="QBU-gV-YhS" secondAttribute="top" constant="11" id="Gre-jH-1jR"/>
+ <constraint firstItem="Rxq-o9-Kii" firstAttribute="leading" secondItem="c1O-fa-inf" secondAttribute="trailing" constant="10" id="7v8-QM-MCB"/>
+ <constraint firstItem="Rxq-o9-Kii" firstAttribute="centerY" secondItem="QBU-gV-YhS" secondAttribute="centerY" id="AHI-Qa-IPK"/>
<constraint firstAttribute="bottom" secondItem="c1O-fa-inf" secondAttribute="bottom" constant="6" id="Jg0-YP-urZ"/>
+ <constraint firstAttribute="trailing" secondItem="Rxq-o9-Kii" secondAttribute="trailing" constant="10" id="al5-Lp-6Tq"/>
<constraint firstItem="Dpz-4X-kOL" firstAttribute="bottom" secondItem="c1O-fa-inf" secondAttribute="bottom" id="cNk-re-Vka"/>
<constraint firstItem="c1O-fa-inf" firstAttribute="leading" secondItem="QBU-gV-YhS" secondAttribute="leading" constant="10" id="eZL-nd-HtD"/>
- <constraint firstItem="WjG-uH-HXt" firstAttribute="leading" secondItem="MOq-GN-Hlp" secondAttribute="leading" id="inz-jP-ItV"/>
<constraint firstItem="Dpz-4X-kOL" firstAttribute="trailing" secondItem="c1O-fa-inf" secondAttribute="trailing" constant="-1.5" id="jmb-d8-oSB"/>
<constraint firstItem="c1O-fa-inf" firstAttribute="top" secondItem="QBU-gV-YhS" secondAttribute="top" constant="6" id="wp6-LE-wsI"/>
</constraints>
@@ -251,20 +264,20 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BUY-T7-3oD">
- <rect key="frame" x="6" y="24" width="73" height="23"/>
+ <rect key="frame" x="6" y="24" width="69" height="23"/>
<constraints>
<constraint firstAttribute="height" constant="23" id="LqQ-2w-I2h"/>
</constraints>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Call name" id="DIu-oq-qQp">
- <font key="font" size="16" name="HelveticaNeue-Light"/>
+ <font key="font" metaFont="systemMedium" size="14"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="300" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="BhU-vF-uSZ">
- <rect key="frame" x="6" y="7" width="40" height="16"/>
+ <rect key="frame" x="6" y="8" width="41" height="15"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="Rnt-Z9-sZy">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
+ <font key="font" metaFont="systemLight" size="12"/>
<color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
@@ -299,7 +312,7 @@
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="NxW-Fq-fkg">
- <rect key="frame" x="225" y="17" width="15" height="102"/>
+ <rect key="frame" x="-100" y="-100" width="15" height="102"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
@@ -310,9 +323,9 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mBS-x1-m8f">
- <rect key="frame" x="10" y="6" width="74" height="19"/>
+ <rect key="frame" x="10" y="7" width="68" height="17"/>
<textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Contacts" drawsBackground="YES" id="Zdq-Zp-VU4">
- <font key="font" metaFont="system" size="16"/>
+ <font key="font" metaFont="systemMedium" size="14"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
@@ -328,13 +341,13 @@
</constraints>
<color key="fillColor" name="quaternaryLabelColor" catalog="System" colorSpace="catalog"/>
</box>
- <scrollView focusRingType="none" borderType="none" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="omo-Be-zok">
+ <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="62" horizontalPageScroll="10" verticalLineScroll="62" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" translatesAutoresizingMaskIntoConstraints="NO" id="omo-Be-zok">
<rect key="frame" x="0.0" y="0.0" width="324" height="171"/>
- <clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="vUu-vJ-ryG">
+ <clipView key="contentView" ambiguous="YES" drawsBackground="NO" copiesOnScroll="NO" id="vUu-vJ-ryG">
<rect key="frame" x="0.0" y="0.0" width="324" height="171"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <outlineView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="8" outlineTableColumn="3NN-k0-vDM" id="tcL-dy-Q3h" customClass="RingTableView">
+ <outlineView focusRingType="none" verticalHuggingPriority="750" ambiguous="YES" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="60" rowSizeStyle="automatic" viewBased="YES" indentationPerLevel="8" outlineTableColumn="3NN-k0-vDM" id="tcL-dy-Q3h" customClass="RingTableView">
<rect key="frame" x="0.0" y="0.0" width="324" height="171"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
@@ -353,18 +366,247 @@
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
- <tableCellView identifier="MainCell" id="Z6G-mQ-L3J" userLabel="MainCell" customClass="ContextualTableCellView">
- <rect key="frame" x="1" y="1" width="321" height="60"/>
+ <tableCellView identifier="CallCell" id="nvG-hU-lKg" userLabel="CallCell" customClass="ContextualTableCellView">
+ <rect key="frame" x="1" y="1" width="321" height="50"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" verticalCompressionResistancePriority="751" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="nGn-jy-Iaf" userLabel="name">
- <rect key="frame" x="76" y="31" width="4" height="18"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" drawsBackground="YES" id="1N9-Ii-83s">
- <font key="font" size="16" name="HelveticaNeue-Light"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfz-V3-QhK">
+ <rect key="frame" x="6" y="24" width="69" height="23"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="23" id="Knk-h9-HbW"/>
+ </constraints>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Call name" id="j0J-Xd-uth">
+ <font key="font" metaFont="systemMedium" size="14"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</textFieldCell>
</textField>
+ <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="300" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sm2-al-NU0">
+ <rect key="frame" x="6" y="8" width="41" height="15"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="mK5-kV-YOO">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <constraints>
+ <constraint firstItem="Sm2-al-NU0" firstAttribute="top" secondItem="sfz-V3-QhK" secondAttribute="bottom" constant="1" id="4ta-Gr-B5A"/>
+ <constraint firstItem="sfz-V3-QhK" firstAttribute="top" secondItem="nvG-hU-lKg" secondAttribute="top" constant="3" id="M4L-Af-Pfa"/>
+ <constraint firstItem="sfz-V3-QhK" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="O23-cp-x3m"/>
+ <constraint firstItem="Sm2-al-NU0" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="WJh-9X-RGV"/>
+ </constraints>
+ <connections>
+ <outlet property="textField" destination="sfz-V3-QhK" id="0Ka-vn-gAW"/>
+ </connections>
+ </tableCellView>
+ <tableCellView identifier="MainCell" id="Z6G-mQ-L3J" userLabel="MainCell" customClass="ContextualTableCellView">
+ <rect key="frame" x="1" y="53" width="321" height="60"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="4" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="WiM-zb-dGf">
+ <rect key="frame" x="74" y="5" width="273" height="51"/>
+ <subviews>
+ <stackView distribution="fill" orientation="horizontal" alignment="bottom" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="A9r-69-Gl2">
+ <rect key="frame" x="0.0" y="34" width="223" height="17"/>
+ <subviews>
+ <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" translatesAutoresizingMaskIntoConstraints="NO" id="C4e-Zv-Py0" userLabel="name">
+ <rect key="frame" x="-2" y="0.0" width="54" height="17"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="left" id="eUk-dr-opb">
+ <font key="font" metaFont="systemMedium" size="14"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="UM0-xz-fEQ">
+ <rect key="frame" x="60" y="0.0" width="163" height="10"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="10" id="f3F-q5-JrF"/>
+ </constraints>
+ </customView>
+ <textField hidden="YES" verticalHuggingPriority="750" tag="800" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="epi-ZP-as5" userLabel="Last Interaction Date">
+ <rect key="frame" x="-2" y="2" width="54" height="15"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="asz-gD-lug"/>
+ </constraints>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" id="BfK-c5-B1l">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" white="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="10" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vXA-kC-7Bv">
+ <rect key="frame" x="0.0" y="0.0" width="273" height="30"/>
+ <subviews>
+ <textField hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="3vQ-et-yIO" userLabel="jamiId">
+ <rect key="frame" x="-2" y="15" width="54" height="15"/>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="left" id="rzA-1C-XLH">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </textFieldCell>
+ </textField>
+ <textField hidden="YES" horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="900" translatesAutoresizingMaskIntoConstraints="NO" id="mic-52-RIa" userLabel="Last Interaction Snippet">
+ <rect key="frame" x="-2" y="15" width="144" height="15"/>
+ <constraints>
+ <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="W0d-p1-O4L"/>
+ </constraints>
+ <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="left" id="VBS-Iu-q1M">
+ <font key="font" metaFont="systemLight" size="12"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </textFieldCell>
+ </textField>
+ <customView translatesAutoresizingMaskIntoConstraints="NO" id="Zja-3v-Jpj">
+ <rect key="frame" x="0.0" y="20" width="163" height="10"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="10" id="QN8-Ef-J1V"/>
+ </constraints>
+ </customView>
+ <stackView distribution="fill" orientation="horizontal" alignment="top" spacing="5" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pQw-hO-kEK">
+ <rect key="frame" x="173" y="0.0" width="100" height="30"/>
+ <subviews>
+ <button toolTip="Accept Invitation" verticalHuggingPriority="750" tag="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Fc5-KS-cim" userLabel="Add Contact Button" customClass="HoverButton">
+ <rect key="frame" x="0.0" y="0.0" width="30" height="30"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="30" id="FjC-O1-DDc"/>
+ <constraint firstAttribute="height" constant="30" id="zM2-c1-5Es"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_person_add" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="tQv-pI-ot0">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+ <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ </button>
+ <button toolTip="Ignore invitation" verticalHuggingPriority="750" tag="1100" translatesAutoresizingMaskIntoConstraints="NO" id="ejM-H2-aJX" userLabel="Refuse Invitation Button" customClass="HoverButton">
+ <rect key="frame" x="35" y="0.0" width="30" height="30"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="30" id="MjJ-10-Auf"/>
+ <constraint firstAttribute="width" constant="30" id="iaV-AH-wjl"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="8ej-tV-bU4">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+ <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ </button>
+ <button toolTip="Block contact" verticalHuggingPriority="750" tag="1200" translatesAutoresizingMaskIntoConstraints="NO" id="xP1-ZW-WZ8" userLabel="Block Contact Button" customClass="HoverButton">
+ <rect key="frame" x="70" y="0.0" width="30" height="30"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="30" id="gac-rJ-t64"/>
+ <constraint firstAttribute="width" constant="30" id="gpN-gl-xBY"/>
+ </constraints>
+ <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_block" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="qze-fl-ch1">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
+ <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
+ <integer key="value" value="2"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
+ <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
+ <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </userDefinedRuntimeAttribute>
+ <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
+ <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
+ </userDefinedRuntimeAttribute>
+ </userDefinedRuntimeAttributes>
+ </button>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
+ </subviews>
+ <visibilityPriorities>
+ <integer value="1000"/>
+ <integer value="1000"/>
+ </visibilityPriorities>
+ <customSpacing>
+ <real value="3.4028234663852886e+38"/>
+ <real value="3.4028234663852886e+38"/>
+ </customSpacing>
+ </stackView>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" tag="100" translatesAutoresizingMaskIntoConstraints="NO" id="sHH-wj-oHs">
<rect key="frame" x="10" y="6" width="54" height="48"/>
<constraints>
@@ -393,14 +635,6 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
- <textField horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" verticalCompressionResistancePriority="751" tag="400" translatesAutoresizingMaskIntoConstraints="NO" id="bZ6-1S-zx2" userLabel="ringId">
- <rect key="frame" x="76" y="11" width="4" height="16"/>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" state="on" alignment="left" drawsBackground="YES" usesSingleLineMode="YES" id="zp2-mv-NHW">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
<textField horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="500" translatesAutoresizingMaskIntoConstraints="NO" id="YkV-D4-ddd" userLabel="PresenceIndicator" customClass="RoundedTextField">
<rect key="frame" x="51" y="6" width="14" height="14"/>
<constraints>
@@ -424,183 +658,20 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</textField>
- <textField hidden="YES" verticalHuggingPriority="750" tag="800" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="epi-ZP-as5" userLabel="Last Interaction Date">
- <rect key="frame" x="271" y="31" width="40" height="16"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="40" id="asz-gD-lug"/>
- </constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" drawsBackground="YES" id="BfK-c5-B1l">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
- <textField hidden="YES" horizontalHuggingPriority="999" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="900" translatesAutoresizingMaskIntoConstraints="NO" id="mic-52-RIa" userLabel="Last Interaction Snippet">
- <rect key="frame" x="171" y="11" width="140" height="16"/>
- <constraints>
- <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="140" id="W0d-p1-O4L"/>
- </constraints>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" drawsBackground="YES" id="VBS-Iu-q1M">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
- <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
- <button toolTip="Accept Invitation" verticalHuggingPriority="750" tag="1000" translatesAutoresizingMaskIntoConstraints="NO" id="Fc5-KS-cim" userLabel="Add Contact Button" customClass="HoverButton">
- <rect key="frame" x="209" y="6" width="30" height="30"/>
- <constraints>
- <constraint firstAttribute="width" constant="30" id="FjC-O1-DDc"/>
- <constraint firstAttribute="height" constant="30" id="zM2-c1-5Es"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_person_add" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="tQv-pI-ot0">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="2"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
- <integer key="value" value="2"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
- <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
- <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
- <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- </button>
- <button toolTip="Ignore invitation" verticalHuggingPriority="750" tag="1100" translatesAutoresizingMaskIntoConstraints="NO" id="ejM-H2-aJX" userLabel="Refuse Invitation Button" customClass="HoverButton">
- <rect key="frame" x="244" y="6" width="30" height="30"/>
- <constraints>
- <constraint firstAttribute="height" constant="30" id="MjJ-10-Auf"/>
- <constraint firstAttribute="width" constant="30" id="iaV-AH-wjl"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_cancel" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="8ej-tV-bU4">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="2"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
- <integer key="value" value="2"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
- <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
- <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
- <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- </button>
- <button toolTip="Block contact" verticalHuggingPriority="750" tag="1200" translatesAutoresizingMaskIntoConstraints="NO" id="xP1-ZW-WZ8" userLabel="Block Contact Button" customClass="HoverButton">
- <rect key="frame" x="279" y="6" width="30" height="30"/>
- <constraints>
- <constraint firstAttribute="height" constant="30" id="gac-rJ-t64"/>
- <constraint firstAttribute="width" constant="30" id="gpN-gl-xBY"/>
- </constraints>
- <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ic_action_block" imagePosition="overlaps" alignment="center" allowsMixedState="YES" transparent="YES" imageScaling="proportionallyDown" inset="2" id="qze-fl-ch1">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <userDefinedRuntimeAttributes>
- <userDefinedRuntimeAttribute type="color" keyPath="imageColor">
- <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageInsets">
- <integer key="value" value="2"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="number" keyPath="imageIncreaseOnHover">
- <integer key="value" value="2"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageHoverColor">
- <color key="value" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageHoverDarkColor">
- <color key="value" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- </userDefinedRuntimeAttribute>
- <userDefinedRuntimeAttribute type="color" keyPath="imageDarkColor">
- <color key="value" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
- </userDefinedRuntimeAttribute>
- </userDefinedRuntimeAttributes>
- </button>
</subviews>
<constraints>
- <constraint firstItem="Fc5-KS-cim" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="nGn-jy-Iaf" secondAttribute="trailing" constant="20" id="1o4-o6-O5A"/>
- <constraint firstItem="mic-52-RIa" firstAttribute="bottom" secondItem="bZ6-1S-zx2" secondAttribute="bottom" id="2Un-R4-P4v"/>
<constraint firstItem="sHH-wj-oHs" firstAttribute="leading" secondItem="Z6G-mQ-L3J" secondAttribute="leading" constant="10" id="CGt-hN-ulS"/>
- <constraint firstItem="ejM-H2-aJX" firstAttribute="leading" secondItem="Fc5-KS-cim" secondAttribute="trailing" constant="5" id="CqZ-iW-bob"/>
- <constraint firstItem="epi-ZP-as5" firstAttribute="bottom" secondItem="nGn-jy-Iaf" secondAttribute="bottom" id="HHQ-bo-vTi"/>
<constraint firstItem="YkV-D4-ddd" firstAttribute="trailing" secondItem="sHH-wj-oHs" secondAttribute="trailing" constant="-1.5" id="HSa-sm-3vp"/>
- <constraint firstAttribute="bottom" secondItem="xP1-ZW-WZ8" secondAttribute="bottom" constant="6" id="Jy0-tu-Huy"/>
<constraint firstItem="sHH-wj-oHs" firstAttribute="top" secondItem="Z6G-mQ-L3J" secondAttribute="top" constant="6" id="KMX-Ru-AEa"/>
+ <constraint firstAttribute="trailing" secondItem="WiM-zb-dGf" secondAttribute="trailing" constant="10" id="KSA-Ji-TJP"/>
<constraint firstItem="MYe-rn-qOP" firstAttribute="top" secondItem="sHH-wj-oHs" secondAttribute="top" id="Kub-qp-hhR"/>
<constraint firstItem="MYe-rn-qOP" firstAttribute="trailing" secondItem="sHH-wj-oHs" secondAttribute="trailing" id="Mv6-W1-pJW"/>
- <constraint firstItem="ejM-H2-aJX" firstAttribute="centerY" secondItem="Fc5-KS-cim" secondAttribute="centerY" id="QvI-kL-sx8"/>
- <constraint firstItem="bZ6-1S-zx2" firstAttribute="leading" secondItem="nGn-jy-Iaf" secondAttribute="leading" id="REo-ld-Jxd"/>
+ <constraint firstItem="WiM-zb-dGf" firstAttribute="leading" secondItem="sHH-wj-oHs" secondAttribute="trailing" constant="10" id="Pkw-xQ-qxp"/>
<constraint firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" constant="6" id="SJ6-9t-r0l"/>
<constraint firstItem="YkV-D4-ddd" firstAttribute="bottom" secondItem="sHH-wj-oHs" secondAttribute="bottom" id="TGB-Iw-hdK"/>
- <constraint firstItem="nGn-jy-Iaf" firstAttribute="leading" secondItem="sHH-wj-oHs" secondAttribute="trailing" constant="12" id="VlW-Wk-aeC"/>
- <constraint firstAttribute="trailing" secondItem="epi-ZP-as5" secondAttribute="trailing" constant="10" id="XEf-2m-loK"/>
- <constraint firstItem="nGn-jy-Iaf" firstAttribute="top" secondItem="Z6G-mQ-L3J" secondAttribute="top" constant="11" id="b6T-Jb-wdK"/>
- <constraint firstItem="xP1-ZW-WZ8" firstAttribute="leading" secondItem="ejM-H2-aJX" secondAttribute="trailing" constant="5" id="d5E-z8-brF"/>
- <constraint firstAttribute="bottom" secondItem="bZ6-1S-zx2" secondAttribute="bottom" constant="11" id="heC-Eb-J2U"/>
- <constraint firstAttribute="trailing" secondItem="xP1-ZW-WZ8" secondAttribute="trailing" constant="12" id="jjq-30-NU1"/>
- <constraint firstItem="mic-52-RIa" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bZ6-1S-zx2" secondAttribute="trailing" constant="10" id="kHp-c8-vEc"/>
- <constraint firstAttribute="trailing" secondItem="mic-52-RIa" secondAttribute="trailing" constant="10" id="l5e-5o-lAk"/>
- <constraint firstItem="Fc5-KS-cim" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bZ6-1S-zx2" secondAttribute="trailing" constant="10" id="n2W-6I-lDK"/>
- <constraint firstItem="xP1-ZW-WZ8" firstAttribute="centerY" secondItem="Fc5-KS-cim" secondAttribute="centerY" id="pPs-eg-ffp"/>
+ <constraint firstItem="WiM-zb-dGf" firstAttribute="centerY" secondItem="Z6G-mQ-L3J" secondAttribute="centerY" id="VHc-va-Fle"/>
</constraints>
</tableCellView>
- <tableCellView identifier="CallCell" id="nvG-hU-lKg" userLabel="CallCell" customClass="ContextualTableCellView">
- <rect key="frame" x="1" y="63" width="321" height="50"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="200" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sfz-V3-QhK">
- <rect key="frame" x="6" y="24" width="73" height="23"/>
- <constraints>
- <constraint firstAttribute="height" constant="23" id="Knk-h9-HbW"/>
- </constraints>
- <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" placeholderString="Call name" id="j0J-Xd-uth">
- <font key="font" size="16" name="HelveticaNeue-Light"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
- <textField horizontalHuggingPriority="750" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" tag="300" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Sm2-al-NU0">
- <rect key="frame" x="6" y="7" width="40" height="16"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="details" id="mK5-kV-YOO">
- <font key="font" size="13" name="HelveticaNeue-Light"/>
- <color key="textColor" name="windowFrameColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
- </textFieldCell>
- </textField>
- </subviews>
- <constraints>
- <constraint firstItem="Sm2-al-NU0" firstAttribute="top" secondItem="sfz-V3-QhK" secondAttribute="bottom" constant="1" id="4ta-Gr-B5A"/>
- <constraint firstItem="sfz-V3-QhK" firstAttribute="top" secondItem="nvG-hU-lKg" secondAttribute="top" constant="3" id="M4L-Af-Pfa"/>
- <constraint firstItem="sfz-V3-QhK" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="O23-cp-x3m"/>
- <constraint firstItem="Sm2-al-NU0" firstAttribute="leading" secondItem="nvG-hU-lKg" secondAttribute="leading" constant="8" id="WJh-9X-RGV"/>
- </constraints>
- <connections>
- <outlet property="textField" destination="sfz-V3-QhK" id="0Ka-vn-gAW"/>
- </connections>
- </tableCellView>
<customView identifier="HoverRowView" id="f78-Ki-IyO" customClass="HoverTableRowView">
<rect key="frame" x="1" y="115" width="321" height="55"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
@@ -618,8 +689,8 @@
<rect key="frame" x="1" y="119" width="224" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
- <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="obv-Hw-mDJ">
- <rect key="frame" x="308" y="0.0" width="16" height="171"/>
+ <scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="obv-Hw-mDJ">
+ <rect key="frame" x="-100" y="-100" width="16" height="171"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
</scrollView>
@@ -707,7 +778,7 @@
<rect key="frame" x="81" y="26" width="15" height="23"/>
<popUpButtonCell key="cell" type="check" bezelStyle="regularSquare" imagePosition="left" lineBreakMode="truncatingTail" state="on" transparent="YES" inset="2" arrowPosition="noArrow" selectedItem="6VL-DN-Xpm" id="lsj-R0-ZSF">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
+ <font key="font" metaFont="menu"/>
<menu key="menu" id="ITi-wC-nfo">
<items>
<menuItem state="on" id="6VL-DN-Xpm">
@@ -862,15 +933,15 @@
</userDefinedRuntimeAttributes>
</imageView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="D6e-KX-8gC">
- <rect key="frame" x="105" y="164" width="520" height="290"/>
+ <rect key="frame" x="105" y="149" width="520" height="320"/>
<subviews>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kFj-Sh-o5u">
- <rect key="frame" x="153" y="114" width="214" height="30"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="center" id="Xb9-UT-M2F">
- <font key="font" size="13" name="HelveticaNeue"/>
+ <rect key="frame" x="143" y="97" width="233" height="34"/>
+ <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" id="Xb9-UT-M2F">
+ <font key="font" metaFont="systemLight" size="14"/>
<string key="title">This is your ID.
Copy and share it with your friends!</string>
- <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
@@ -878,15 +949,15 @@
</connections>
</textField>
<textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JN3-vO-zcd" userLabel="Ring ID">
- <rect key="frame" x="256" y="88" width="8" height="18"/>
+ <rect key="frame" x="256" y="60" width="8" height="17"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" refusesFirstResponder="YES" sendsActionOnEndEditing="YES" alignment="center" id="qCF-Zf-vZg">
- <font key="font" size="15" name="HelveticaNeue-Light"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <font key="font" metaFont="systemMedium" size="14"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f62-JV-dgr">
- <rect key="frame" x="147" y="195" width="225" height="75"/>
+ <rect key="frame" x="147" y="225" width="225" height="75"/>
<constraints>
<constraint firstAttribute="height" constant="75" id="mWM-v0-n2w"/>
<constraint firstAttribute="width" constant="225" id="paw-4z-Zbv"/>
@@ -894,7 +965,7 @@
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="symbol_name" id="9ti-Q4-TAv"/>
</imageView>
<button toolTip="Share account info" translatesAutoresizingMaskIntoConstraints="NO" id="Oac-o7-2Ge" customClass="HoverButton">
- <rect key="frame" x="264" y="38" width="30" height="38"/>
+ <rect key="frame" x="264" y="5" width="30" height="38"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="fnM-Dp-xQa"/>
<constraint firstAttribute="height" constant="38" id="jXA-ZW-tFp"/>
@@ -929,7 +1000,7 @@
</connections>
</button>
<button toolTip="Show QRcode" translatesAutoresizingMaskIntoConstraints="NO" id="eXV-BT-B6J" customClass="HoverButton">
- <rect key="frame" x="224" y="41" width="32" height="32"/>
+ <rect key="frame" x="224" y="8" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="FrZ-2C-m7y"/>
<constraint firstAttribute="height" constant="32" id="tSo-l1-mnZ"/>
@@ -964,10 +1035,10 @@
</connections>
</button>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" setsMaxLayoutWidthAtFirstLayout="YES" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="VJ1-xk-v5e">
- <rect key="frame" x="74" y="159" width="371" height="36"/>
- <textFieldCell key="cell" sendsActionOnEndEditing="YES" alignment="center" title="Jami is free software for universal communication which respects the freedoms and privacy of its users." id="eln-Vm-t0d">
- <font key="font" size="15" name="HelveticaNeue-Light"/>
- <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+ <rect key="frame" x="70" y="151" width="379" height="34"/>
+ <textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" alignment="center" title="Jami is free software for universal communication which respects the freedoms and privacy of its users." id="eln-Vm-t0d">
+ <font key="font" metaFont="systemMedium" size="14"/>
+ <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
@@ -976,17 +1047,17 @@
<constraint firstItem="f62-JV-dgr" firstAttribute="top" secondItem="D6e-KX-8gC" secondAttribute="top" constant="20" id="0b6-u8-yQg"/>
<constraint firstItem="eXV-BT-B6J" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" constant="-20" id="GCY-if-25J"/>
<constraint firstItem="VJ1-xk-v5e" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="ID9-YU-lFv"/>
- <constraint firstAttribute="height" constant="290" id="PLl-IK-oQA"/>
- <constraint firstItem="eXV-BT-B6J" firstAttribute="top" secondItem="JN3-vO-zcd" secondAttribute="bottom" constant="15" id="S1e-It-dha"/>
+ <constraint firstAttribute="height" constant="320" id="PLl-IK-oQA"/>
+ <constraint firstItem="eXV-BT-B6J" firstAttribute="top" secondItem="JN3-vO-zcd" secondAttribute="bottom" constant="20" id="S1e-It-dha"/>
<constraint firstItem="f62-JV-dgr" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="VTp-M2-i33"/>
- <constraint firstItem="JN3-vO-zcd" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="8" id="WdR-8q-Lkl"/>
+ <constraint firstItem="JN3-vO-zcd" firstAttribute="top" secondItem="kFj-Sh-o5u" secondAttribute="bottom" constant="20" id="WdR-8q-Lkl"/>
<constraint firstItem="kFj-Sh-o5u" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="X8P-ae-ug3"/>
<constraint firstItem="Oac-o7-2Ge" firstAttribute="leading" secondItem="eXV-BT-B6J" secondAttribute="trailing" constant="8" id="eN6-s3-z6X"/>
<constraint firstItem="Oac-o7-2Ge" firstAttribute="centerY" secondItem="eXV-BT-B6J" secondAttribute="centerY" id="luh-LH-oXu"/>
<constraint firstAttribute="width" constant="520" id="nXn-Wh-VAi"/>
- <constraint firstItem="kFj-Sh-o5u" firstAttribute="top" secondItem="VJ1-xk-v5e" secondAttribute="bottom" constant="15" id="wQ0-UB-Yo2"/>
+ <constraint firstItem="kFj-Sh-o5u" firstAttribute="top" secondItem="VJ1-xk-v5e" secondAttribute="bottom" constant="20" id="wQ0-UB-Yo2"/>
<constraint firstItem="JN3-vO-zcd" firstAttribute="centerX" secondItem="D6e-KX-8gC" secondAttribute="centerX" id="zBy-e3-F7X"/>
- <constraint firstItem="VJ1-xk-v5e" firstAttribute="top" secondItem="f62-JV-dgr" secondAttribute="bottom" id="zNb-f8-m6q"/>
+ <constraint firstItem="VJ1-xk-v5e" firstAttribute="top" secondItem="f62-JV-dgr" secondAttribute="bottom" constant="40" id="zNb-f8-m6q"/>
</constraints>
</customView>
<customView focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="tSW-YT-asL">