contact request: ui for pending list
This commit changes UI for pending contact request list. It adds
peer photo, peer name and message for contact request. (for now it shows
default message)
Tuleap: #1553
Change-Id: I22f58456eb583eefe04f9288ab926c93247b17d9
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbc7bb2..f965801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -196,7 +196,9 @@
src/views/IMTableCellView.h
src/views/IMTableCellView.mm
src/views/AccountMenuItemView.h
- src/views/AccountMenuItemView.mm)
+ src/views/AccountMenuItemView.mm
+ src/views/ContactRequestCellView.h
+ src/views/ContactRequestCellView.mm)
SET(ringclient_OTHERS
src/main.mm
diff --git a/src/ContactRequestsListVC.mm b/src/ContactRequestsListVC.mm
index 9bdbded..09ac4a5 100644
--- a/src/ContactRequestsListVC.mm
+++ b/src/ContactRequestsListVC.mm
@@ -19,15 +19,22 @@
//Qt
#import <QItemSelectionModel>
+#import <QSize>
+#import <QtMacExtras/qmacfunctions.h>
+#import <QPixmap>
//LRC
#import <account.h>
#import <availableAccountModel.h>
#import <contactRequest.h>
#import <pendingContactRequestModel.h>
+#import <globalinstances.h>
+#import <contactmethod.h>
#import "ContactRequestsListVC.h"
#import "QNSTreeController.h"
+#import <interfaces/pixmapmanipulatori.h>
+#import "views/ContactRequestCellView.h"
@interface ContactRequestsListVC ()
@@ -50,6 +57,10 @@
NSInteger const TAG_NAME = 100;
NSInteger const TAG_RINGID = 200;
+NSInteger const TAG_PHOTO = 300;
+
+NSString* defaultMsg = @"Hello, I would like invite you";
+
- (void)awakeFromNib
{
@@ -62,6 +73,7 @@
[contactRequestView bind:@"content" toObject:requestsTreeController withKeyPath:@"arrangedObjects" options:nil];
[contactRequestView bind:@"sortDescriptors" toObject:requestsTreeController withKeyPath:@"sortDescriptors" options:nil];
[contactRequestView bind:@"selectionIndexPaths" toObject:requestsTreeController withKeyPath:@"selectionIndexPaths" options:nil];
+ contactRequestView.selectionHighlightStyle = NSTableViewSelectionHighlightStyleNone;
[noRequestsLabel setHidden:[contactRequestView numberOfRows]>0];
}
@@ -118,20 +130,47 @@
- (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item
{
- NSTableView* result = [outlineView makeViewWithIdentifier:@"ContactRequestView" owner:self];
+ ContactRequestCellView* result;
+ result = [outlineView makeViewWithIdentifier:@"ContactRequestView" owner:self];
QModelIndex qIdx = [self.requestsTreeController toQIdx:((NSTreeNode*)item)];
if(!qIdx.isValid()) {
return result;
}
- Account* chosenAccount = [self chosenAccount];
+
+ [result setup];
NSTextField* nameLabel = [result viewWithTag:TAG_NAME];
NSTextField* ringIDLabel = [result viewWithTag:TAG_RINGID];
+ NSImageView* photoView = [result viewWithTag:TAG_PHOTO];
- NSString* ringID = chosenAccount->pendingContactRequestModel()->data(qIdx,Qt::DisplayRole).toString().toNSString();
+ NSString* localizedTitle = [NSString stringWithFormat:
+ NSLocalizedString(@"Hi %@. Please add me to your contact list.", @"Default contact request msg"), [self nameForAccount:[self chosenAccount]]];
+ [result.msgView setString:localizedTitle];
- [nameLabel setStringValue:ringID];
- [ringIDLabel setStringValue:ringID];
+ ContactRequest* contactRequest = qvariant_cast<ContactRequest*>(qIdx.data((int)Ring::Role::Object));
+ Person* person = contactRequest->peer();
+ if(!person) {
+ Account* chosenAccount = [self chosenAccount];
+ NSString* ringID = chosenAccount->pendingContactRequestModel()->data(qIdx,Qt::DisplayRole).toString().toNSString();
+ [nameLabel setStringValue:ringID];
+ return result;
+ }
+
+ QVariant photo = GlobalInstances::pixmapManipulator().contactPhoto(person, {100,100});
+ [photoView setImage:QtMac::toNSImage(qvariant_cast<QPixmap>(photo))];
+
+ NSString* idString = person->phoneNumbers()[0]->getBestId().toNSString();
+ if(person->formattedName() != nil && person->formattedName().length()>0) {
+ NSString* name = person->formattedName().toNSString();
+ [nameLabel setStringValue:name];
+ if(![person->formattedName().toNSString() isEqualToString:idString]){
+ NSString* formattedID = [NSString stringWithFormat:@"%@%@%@",@"(",idString, @")"];
+ [ringIDLabel setStringValue:formattedID];
+ }
+ return result;
+ }
+ [nameLabel setStringValue:idString];
+
return result;
}
@@ -141,4 +180,15 @@
return index.data(static_cast<int>(Account::Role::Object)).value<Account*>();
}
+-(NSString*) nameForAccount:(Account*) account {
+ auto name = account->registeredName();
+ NSString* userNameString = nullptr;
+ if (!name.isNull() && !name.isEmpty()) {
+ userNameString = name.toNSString();
+ } else {
+ userNameString = account->username().toNSString();
+ }
+ return userNameString;
+}
+
@end
diff --git a/src/views/ContactRequestCellView.h b/src/views/ContactRequestCellView.h
new file mode 100644
index 0000000..e2fd903
--- /dev/null
+++ b/src/views/ContactRequestCellView.h
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2015-2017 Savoir-faire Linux Inc.
+ * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@interface ContactRequestCellView : NSTableCellView
+
+@property (nonatomic, strong) IBOutlet NSTextView* msgView;
+
+- (void) setup;
+
+@end
diff --git a/src/views/ContactRequestCellView.mm b/src/views/ContactRequestCellView.mm
new file mode 100644
index 0000000..4f4dc2a
--- /dev/null
+++ b/src/views/ContactRequestCellView.mm
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2015-2017 Savoir-faire Linux Inc.
+ * Author: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#import "ContactRequestCellView.h"
+
+@implementation ContactRequestCellView
+
+@synthesize msgView;
+
+- (void) setup
+{
+ [self.msgView setWantsLayer:YES];
+ self.msgView.layer.cornerRadius = 5.0f;
+}
+
+@end
diff --git a/ui/Base.lproj/ContactRequestList.xib b/ui/Base.lproj/ContactRequestList.xib
index 241bf22..6299a3c 100644
--- a/ui/Base.lproj/ContactRequestList.xib
+++ b/ui/Base.lproj/ContactRequestList.xib
@@ -29,66 +29,69 @@
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="84" horizontalPageScroll="10" verticalLineScroll="84" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gxk-zX-eFt">
+ <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="136" horizontalPageScroll="10" verticalLineScroll="136" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gxk-zX-eFt">
<rect key="frame" x="0.0" y="0.0" width="415" height="272"/>
<clipView key="contentView" drawsBackground="NO" copiesOnScroll="NO" id="af8-Yh-6rG">
<rect key="frame" x="0.0" y="0.0" width="415" height="272"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" autosaveColumns="NO" rowHeight="82" rowSizeStyle="automatic" viewBased="YES" outlineTableColumn="gQB-z6-2iR" id="u9m-Hp-VFu">
+ <outlineView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" enabled="NO" rowHeight="134" rowSizeStyle="automatic" viewBased="YES" outlineTableColumn="gQB-z6-2iR" id="u9m-Hp-VFu">
<rect key="frame" x="1" y="0.0" width="415" height="272"/>
<autoresizingMask key="autoresizingMask"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
- <tableColumn width="412" minWidth="40" maxWidth="1000" id="gQB-z6-2iR">
- <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border">
+ <tableColumn editable="NO" width="412" minWidth="40" maxWidth="1000" id="gQB-z6-2iR">
+ <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" enabled="NO" borderStyle="border">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
</tableHeaderCell>
- <textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" id="5Et-4o-ndc">
+ <textFieldCell key="dataCell" lineBreakMode="truncatingTail" enabled="NO" drawsBackground="YES" id="5Et-4o-ndc">
<font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
+ <color key="textColor" name="secondarySelectedControlColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
- <tableCellView identifier="ContactRequestView" id="auA-QD-eI4">
- <rect key="frame" x="1" y="1" width="412" height="82"/>
+ <tableCellView identifier="ContactRequestView" id="auA-QD-eI4" customClass="ContactRequestCellView">
+ <rect key="frame" x="1" y="1" width="412" height="134"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="100" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8C-93-gRy">
- <rect key="frame" x="51" y="55" width="357" height="20"/>
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="100" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z8C-93-gRy" userLabel="Name">
+ <rect key="frame" x="45" y="104" width="4" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="NjU-ft-QmJ"/>
</constraints>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="Name" drawsBackground="YES" id="YeG-VB-Nkx">
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="" drawsBackground="YES" id="YeG-VB-Nkx">
<font key="font" metaFont="system" size="15"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</textFieldCell>
</textField>
- <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8H3-LL-pKv">
- <rect key="frame" x="3" y="35" width="40" height="40"/>
+ <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" tag="300" translatesAutoresizingMaskIntoConstraints="NO" id="8H3-LL-pKv">
+ <rect key="frame" x="3" y="87" width="40" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="OqR-zi-5xv"/>
<constraint firstAttribute="width" constant="40" id="TIc-Wq-1i3"/>
</constraints>
- <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="default_user_icon" id="gm5-Ch-3WC"/>
+ <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="gm5-Ch-3WC"/>
</imageView>
- <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="200" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I1j-wy-Idd">
- <rect key="frame" x="51" y="35" width="358" height="17"/>
- <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="RingID" drawsBackground="YES" id="eyK-YI-g07">
+ <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" tag="200" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I1j-wy-Idd" userLabel="Id">
+ <rect key="frame" x="54" y="107" width="4" height="14"/>
+ <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="" drawsBackground="YES" id="eyK-YI-g07">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</textFieldCell>
</textField>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="GFf-Vw-dow">
- <rect key="frame" x="292" y="8" width="54" height="19"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GFf-Vw-dow">
+ <rect key="frame" x="279" y="16" width="54" height="19"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="18" id="Q5H-td-wnI"/>
+ <constraint firstAttribute="width" constant="54" id="Wu9-2p-6mM"/>
+ </constraints>
<buttonCell key="cell" type="roundRect" title="Refuse" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="gAq-hc-8QM">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -97,20 +100,12 @@
<action selector="refuseContactRequest:" target="-2" id="YKi-X5-7RL"/>
</connections>
</button>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="DB4-cs-hpp">
- <rect key="frame" x="354" y="8" width="46" height="19"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
- <buttonCell key="cell" type="roundRect" title="Block" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="z5Y-lM-TJk">
- <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="cellTitle"/>
- </buttonCell>
- <connections>
- <action selector="blockContactRequest:" target="-2" id="ngM-Ww-4nY"/>
- </connections>
- </button>
- <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="pzN-en-gvs">
- <rect key="frame" x="230" y="8" width="54" height="19"/>
- <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pzN-en-gvs">
+ <rect key="frame" x="210" y="16" width="54" height="19"/>
+ <constraints>
+ <constraint firstAttribute="width" constant="54" id="XYg-tK-1bu"/>
+ <constraint firstAttribute="height" constant="18" id="srd-a1-rGT"/>
+ </constraints>
<buttonCell key="cell" type="roundRect" title="Accept" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="8iO-M4-UGd">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="cellTitle"/>
@@ -119,18 +114,91 @@
<action selector="acceptContactRequest:" target="-2" id="Vsu-ZS-chh"/>
</connections>
</button>
+ <box verticalHuggingPriority="750" boxType="separator" translatesAutoresizingMaskIntoConstraints="NO" id="lwB-Po-Omx">
+ <rect key="frame" x="14" y="9" width="395" height="5"/>
+ </box>
+ <scrollView wantsLayer="YES" borderType="none" horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" hasVerticalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" findBarPosition="belowContent" translatesAutoresizingMaskIntoConstraints="NO" id="Vgg-xb-RNp">
+ <rect key="frame" x="103" y="44" width="299" height="53"/>
+ <clipView key="contentView" id="9Ny-tl-rSO">
+ <rect key="frame" x="0.0" y="0.0" width="299" height="53"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <textView editable="NO" importsGraphics="NO" usesFontPanel="YES" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="izN-no-Boc">
+ <rect key="frame" x="0.0" y="-1" width="299" height="53"/>
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+ <size key="minSize" width="299" height="53"/>
+ <size key="maxSize" width="463" height="10000000"/>
+ <attributedString key="textStorage">
+ <fragment content="Hello">
+ <attributes>
+ <color key="NSColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ <font key="NSFont" metaFont="system"/>
+ <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" tighteningFactorForTruncation="0.0"/>
+ </attributes>
+ </fragment>
+ </attributedString>
+ <color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+ </textView>
+ </subviews>
+ <color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
+ </clipView>
+ <constraints>
+ <constraint firstAttribute="height" constant="53" id="aww-KT-ghR"/>
+ </constraints>
+ <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="WVx-xB-4e9">
+ <rect key="frame" x="-100" y="-100" width="87" height="18"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ <scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="0.5" horizontal="NO" id="HTa-Cj-3VH">
+ <rect key="frame" x="-100" y="-100" width="16" height="53"/>
+ <autoresizingMask key="autoresizingMask"/>
+ </scroller>
+ </scrollView>
+ <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="DB4-cs-hpp">
+ <rect key="frame" x="348" y="16" width="54" height="19"/>
+ <constraints>
+ <constraint firstAttribute="height" constant="18" id="Sk2-9Y-oud"/>
+ <constraint firstAttribute="width" constant="54" id="p1i-i1-Nsx"/>
+ </constraints>
+ <buttonCell key="cell" type="roundRect" title="Block" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="z5Y-lM-TJk">
+ <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+ <font key="font" metaFont="cellTitle"/>
+ </buttonCell>
+ <connections>
+ <action selector="blockContactRequest:" target="-2" id="ngM-Ww-4nY"/>
+ </connections>
+ </button>
</subviews>
<constraints>
- <constraint firstItem="I1j-wy-Idd" firstAttribute="leading" secondItem="8H3-LL-pKv" secondAttribute="trailing" constant="8" id="0BN-7c-I6H"/>
- <constraint firstItem="z8C-93-gRy" firstAttribute="centerX" secondItem="I1j-wy-Idd" secondAttribute="centerX" id="6Rz-zp-eoN"/>
- <constraint firstAttribute="bottom" secondItem="I1j-wy-Idd" secondAttribute="bottom" constant="35" id="O31-yZ-HI7"/>
- <constraint firstItem="z8C-93-gRy" firstAttribute="leading" secondItem="I1j-wy-Idd" secondAttribute="leading" id="Ooe-kK-twL"/>
- <constraint firstItem="I1j-wy-Idd" firstAttribute="top" secondItem="z8C-93-gRy" secondAttribute="bottom" constant="3" id="Y0X-tz-FBW"/>
+ <constraint firstItem="I1j-wy-Idd" firstAttribute="leading" secondItem="z8C-93-gRy" secondAttribute="trailing" constant="5" id="1Rj-xl-bWd"/>
+ <constraint firstItem="Vgg-xb-RNp" firstAttribute="leading" secondItem="8H3-LL-pKv" secondAttribute="trailing" constant="60" id="3Se-u0-IiQ"/>
+ <constraint firstItem="GFf-Vw-dow" firstAttribute="top" secondItem="izN-no-Boc" secondAttribute="bottom" constant="10" id="5AQ-UQ-jtC"/>
+ <constraint firstItem="I1j-wy-Idd" firstAttribute="centerY" secondItem="z8C-93-gRy" secondAttribute="centerY" id="6Zw-yt-i92"/>
+ <constraint firstAttribute="trailing" secondItem="lwB-Po-Omx" secondAttribute="trailing" constant="3" id="7n8-ob-aJe"/>
+ <constraint firstAttribute="trailing" secondItem="DB4-cs-hpp" secondAttribute="trailing" constant="10" id="D0W-VU-ZXm"/>
+ <constraint firstItem="lwB-Po-Omx" firstAttribute="top" secondItem="DB4-cs-hpp" secondAttribute="bottom" constant="5" id="Iaq-Eq-7PP"/>
+ <constraint firstItem="DB4-cs-hpp" firstAttribute="centerY" secondItem="GFf-Vw-dow" secondAttribute="centerY" id="InQ-LZ-GMi"/>
+ <constraint firstItem="GFf-Vw-dow" firstAttribute="centerY" secondItem="pzN-en-gvs" secondAttribute="centerY" id="Q5R-xc-wqV"/>
+ <constraint firstItem="pzN-en-gvs" firstAttribute="top" secondItem="izN-no-Boc" secondAttribute="bottom" constant="10" id="WYf-Cw-5VK"/>
+ <constraint firstAttribute="bottom" secondItem="lwB-Po-Omx" secondAttribute="bottom" constant="11" id="bP0-ac-SO8"/>
+ <constraint firstItem="GFf-Vw-dow" firstAttribute="leading" secondItem="pzN-en-gvs" secondAttribute="trailing" constant="15" id="dZn-a1-XaA"/>
+ <constraint firstAttribute="trailing" secondItem="Vgg-xb-RNp" secondAttribute="trailing" constant="10" id="ePY-CE-umQ"/>
<constraint firstItem="8H3-LL-pKv" firstAttribute="leading" secondItem="auA-QD-eI4" secondAttribute="leading" constant="3" id="gct-ct-rbb"/>
- <constraint firstAttribute="trailing" secondItem="I1j-wy-Idd" secondAttribute="trailing" constant="3" id="pF8-GH-hD9"/>
- <constraint firstAttribute="bottom" secondItem="z8C-93-gRy" secondAttribute="bottom" constant="55" id="sgD-w5-vOv"/>
+ <constraint firstItem="z8C-93-gRy" firstAttribute="leading" secondItem="8H3-LL-pKv" secondAttribute="trailing" constant="2" id="gzR-7T-UyB"/>
+ <constraint firstItem="DB4-cs-hpp" firstAttribute="leading" secondItem="GFf-Vw-dow" secondAttribute="trailing" constant="15" id="m7B-Ip-1hz"/>
+ <constraint firstItem="lwB-Po-Omx" firstAttribute="leading" secondItem="auA-QD-eI4" secondAttribute="leading" constant="14" id="mBJ-fJ-sDu"/>
+ <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="I1j-wy-Idd" secondAttribute="trailing" constant="10" id="pF8-GH-hD9"/>
+ <constraint firstItem="z8C-93-gRy" firstAttribute="top" secondItem="auA-QD-eI4" secondAttribute="top" constant="10" id="qBN-Wl-ybY"/>
+ <constraint firstItem="DB4-cs-hpp" firstAttribute="top" secondItem="izN-no-Boc" secondAttribute="bottom" constant="10" id="qoj-5F-FoK"/>
+ <constraint firstItem="lwB-Po-Omx" firstAttribute="top" secondItem="GFf-Vw-dow" secondAttribute="bottom" constant="5" id="ssY-Uh-O4o"/>
+ <constraint firstItem="lwB-Po-Omx" firstAttribute="top" secondItem="pzN-en-gvs" secondAttribute="bottom" constant="5" id="uEt-xH-Gis"/>
<constraint firstItem="8H3-LL-pKv" firstAttribute="top" secondItem="auA-QD-eI4" secondAttribute="top" constant="7" id="umv-u5-XYK"/>
</constraints>
+ <connections>
+ <outlet property="msgView" destination="izN-no-Boc" id="Sx2-rs-lSp"/>
+ </connections>
</tableCellView>
</prototypeCellViews>
</tableColumn>
@@ -166,7 +234,4 @@
</customView>
<userDefaultsController representsSharedInstance="YES" id="wbg-Jx-tay"/>
</objects>
- <resources>
- <image name="default_user_icon" width="96" height="96"/>
- </resources>
</document>
diff --git a/ui/Base.lproj/Localizable.strings b/ui/Base.lproj/Localizable.strings
index b6f503e..f2c655b 100644
--- a/ui/Base.lproj/Localizable.strings
+++ b/ui/Base.lproj/Localizable.strings
@@ -151,3 +151,5 @@
/* Error shown to user */
"Could not find contact to send request" = "Could not find contact to send request";
+/* Default contact request msg*/
+"Hi %@. Please add me to your contact list." = "Hi %@. Please add me to your contact list.";