oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make sure we're laying out contact cell after assigning avatar 

// FREEBIE
This commit is contained in:
Michael Kirk 2016-11-22 15:19:49 -05:00
parent 2bac3e4280
commit 7120ca1192
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Podfile
View File

@ -3,7 +3,7 @@ source 'https://github.com/CocoaPods/Specs.git'
target 'Signal' do target 'Signal' do
pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git' pod 'SocketRocket', :git => 'https://github.com/facebook/SocketRocket.git'
pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git', branch: 'mkirk/ignore-unknown-message-types' pod 'SignalServiceKit', git: 'https://github.com/WhisperSystems/SignalServiceKit.git'
#pod 'SignalServiceKit', path: '../SignalServiceKit' #pod 'SignalServiceKit', path: '../SignalServiceKit'
pod 'OpenSSL' pod 'OpenSSL'
pod 'PastelogKit', '~> 1.3' pod 'PastelogKit', '~> 1.3'

5
Podfile.lock
View File

@ -122,13 +122,12 @@ DEPENDENCIES:
- OpenSSL - OpenSSL
- PastelogKit (~> 1.3) - PastelogKit (~> 1.3)
- SCWaveformView (~> 1.0) - SCWaveformView (~> 1.0)
- SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`, branch `mkirk/ignore-unknown-message-types`) - SignalServiceKit (from `https://github.com/WhisperSystems/SignalServiceKit.git`)
- SocketRocket (from `https://github.com/facebook/SocketRocket.git`) - SocketRocket (from `https://github.com/facebook/SocketRocket.git`)
- ZXingObjC - ZXingObjC
EXTERNAL SOURCES: EXTERNAL SOURCES:
SignalServiceKit: SignalServiceKit:
:branch: mkirk/ignore-unknown-message-types
:git: https://github.com/WhisperSystems/SignalServiceKit.git :git: https://github.com/WhisperSystems/SignalServiceKit.git
SocketRocket: SocketRocket:
:git: https://github.com/facebook/SocketRocket.git :git: https://github.com/facebook/SocketRocket.git
@ -167,6 +166,6 @@ SPEC CHECKSUMS:
YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f YapDatabase: b1e43555a34a5298e23a045be96817a5ef0da58f
ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a ZXingObjC: bf15b3814f7a105b6d99f47da2333c93a063650a
PODFILE CHECKSUM: a4bcdf4d0f3b2a1c27c670c3182806fc11309d9e PODFILE CHECKSUM: 93ccdbbb243044904d772ee53e00154890a9f82f
COCOAPODS: 1.0.1 COCOAPODS: 1.0.1

2
Signal/Signal-Info.plist
View File

@ -38,7 +38,7 @@
</dict> </dict>
</array> </array>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>2.6.6.1</string> <string>2.6.6.4</string>
<key>ITSAppUsesNonExemptEncryption</key> <key>ITSAppUsesNonExemptEncryption</key>
<false/> <false/>
<key>LOGS_EMAIL</key> <key>LOGS_EMAIL</key>

10
Signal/src/Storyboard/Main.storyboard
View File

@ -1403,7 +1403,7 @@
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="11n-jp-FCg"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="empty-group-avatar" translatesAutoresizingMaskIntoConstraints="NO" id="11n-jp-FCg">
<rect key="frame" x="16" y="4" width="39.5" height="39.5"/> <rect key="frame" x="16" y="4" width="39.5" height="39.5"/>
<constraints> <constraints>
<constraint firstAttribute="width" secondItem="11n-jp-FCg" secondAttribute="height" multiplier="1:1" id="CMp-Im-YMw"/> <constraint firstAttribute="width" secondItem="11n-jp-FCg" secondAttribute="height" multiplier="1:1" id="CMp-Im-YMw"/>
@ -1484,11 +1484,11 @@
<viewControllerLayoutGuide type="bottom" id="kH6-9L-pzh"/> <viewControllerLayoutGuide type="bottom" id="kH6-9L-pzh"/>
</layoutGuides> </layoutGuides>
<view key="view" contentMode="scaleToFill" id="P0X-AM-Yjw"> <view key="view" contentMode="scaleToFill" id="P0X-AM-Yjw">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="64" width="375" height="603"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukg-om-VX3" userLabel="Group Details"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ukg-om-VX3" userLabel="Group Details">
<rect key="frame" x="0.0" y="20" width="375" height="100"/> <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ul8-NY-i4c"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ul8-NY-i4c">
<rect key="frame" x="8" y="20" width="60" height="60"/> <rect key="frame" x="8" y="20" width="60" height="60"/>
@ -1523,7 +1523,7 @@
</constraints> </constraints>
</view> </view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsMultipleSelection="YES" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="cFo-AT-Srf"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsMultipleSelection="YES" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="cFo-AT-Srf">
<rect key="frame" x="0.0" y="128" width="375" height="539"/> <rect key="frame" x="0.0" y="108" width="375" height="495"/>
<color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<view key="tableHeaderView" contentMode="scaleToFill" id="ekO-kw-iHV" userLabel="Header View"> <view key="tableHeaderView" contentMode="scaleToFill" id="ekO-kw-iHV" userLabel="Header View">
<rect key="frame" x="0.0" y="0.0" width="375" height="40"/> <rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
@ -1660,7 +1660,7 @@
<simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/> <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
</simulatedMetricsContainer> </simulatedMetricsContainer>
<inferredMetricsTieBreakers> <inferredMetricsTieBreakers>
<segue reference="E8S-Yc-X7E"/>
<segue reference="wgA-Oo-kKq"/> <segue reference="wgA-Oo-kKq"/>
<segue reference="D0d-4f-lcI"/>
</inferredMetricsTieBreakers> </inferredMetricsTieBreakers>
</document> </document>

15
Signal/src/views/ContactTableViewCell.m
View File

@ -5,6 +5,8 @@
#import "PhoneManager.h" #import "PhoneManager.h"
#import "UIUtil.h" #import "UIUtil.h"
NS_ASSUME_NONNULL_BEGIN
@interface ContactTableViewCell () @interface ContactTableViewCell ()
@property (nonatomic) IBOutlet UILabel *nameLabel; @property (nonatomic) IBOutlet UILabel *nameLabel;
@ -14,12 +16,8 @@
@implementation ContactTableViewCell @implementation ContactTableViewCell
- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier { - (nullable NSString *)reuseIdentifier
self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]; {
return self;
}
- (NSString *)reuseIdentifier {
return NSStringFromClass(self.class); return NSStringFromClass(self.class);
} }
@ -30,6 +28,9 @@
[[[OWSContactAvatarBuilder alloc] initWithContactId:contact.textSecureIdentifiers.firstObject [[[OWSContactAvatarBuilder alloc] initWithContactId:contact.textSecureIdentifiers.firstObject
name:contact.fullName name:contact.fullName
contactsManager:contactsManager] build]; contactsManager:contactsManager] build];
// Force layout, since imageView isn't being initally rendered on App Store optimized build.
[self layoutSubviews];
} }
- (void)layoutSubviews - (void)layoutSubviews
@ -75,3 +76,5 @@
} }
@end @end
NS_ASSUME_NONNULL_END