diff options
| author |  Vitaly Takmazov | 2013-12-11 03:25:26 +0400 |
|---|---|---|
| committer | Vitaly Takmazov | 2013-12-11 03:25:26 +0400 |
| commit | ea49ada0ce84245896f78cfc9026b84df06f707c (patch) | |
| tree | e1d7905777ec35c3e8df574ecb6b383fa513f0cd | |
| parent | 78d6e25f674d083466e32051c26e8ee5ea840afe (diff) | |
fix layout
| -rw-r--r-- | Juick.xcodeproj/project.pbxproj | 9 | ||||
| -rw-r--r-- | Juick/MessagesViewController.m | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj index f5ba7d9..58a5eaf 100644 --- a/Juick.xcodeproj/project.pbxproj +++ b/Juick.xcodeproj/project.pbxproj @@ -273,6 +273,9 @@ LastUpgradeCheck = 0510; ORGANIZATIONNAME = com.juick; TargetAttributes = { + 77317BA7181BBE8500D60005 = { + DevelopmentTeam = KH4MX79ZK7; + }; 77317BCB181BBE8500D60005 = { TestTargetID = 77317BA7181BBE8500D60005; }; @@ -488,6 +491,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "/Users/vt/Downloads/STV\\ 3.3.0\\ Lite/Static\\ Frameworks", @@ -495,7 +499,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Juick/Juick-Prefix.pch"; INFOPLIST_FILE = "Juick/Juick-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; @@ -508,6 +512,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; + CODE_SIGN_IDENTITY = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "/Users/vt/Downloads/STV\\ 3.3.0\\ Lite/Static\\ Frameworks", @@ -515,7 +520,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "Juick/Juick-Prefix.pch"; INFOPLIST_FILE = "Juick/Juick-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 6.1; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; PRODUCT_NAME = "$(TARGET_NAME)"; TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; diff --git a/Juick/MessagesViewController.m b/Juick/MessagesViewController.m index 4beeb1c..92d4183 100644 --- a/Juick/MessagesViewController.m +++ b/Juick/MessagesViewController.m @@ -160,13 +160,15 @@ static NSString *CellIdentifier = @"MessageCell"; [cell bind:msg]; - cell.bodyLabel.preferredMaxLayoutWidth = tableView.bounds.size.width - (kLabelHorizontalInsets * 2.0f); - [cell setNeedsUpdateConstraints]; [cell updateConstraintsIfNeeded]; + [cell.contentView setNeedsLayout]; [cell.contentView layoutIfNeeded]; + cell.bodyLabel.preferredMaxLayoutWidth = CGRectGetWidth(cell.bodyLabel.frame); + [cell.contentView layoutIfNeeded]; + CGFloat height = [cell.contentView systemLayoutSizeFittingSize:UILayoutFittingCompressedSize].height; return height; @@ -174,6 +176,9 @@ static NSString *CellIdentifier = @"MessageCell"; - (CGFloat)tableView:(UITableView *)tableView estimatedHeightForRowAtIndexPath:(NSIndexPath *)indexPath { + if (self.dataLoading) { + return [self tableView:tableView heightForRowAtIndexPath:indexPath]; + } return 500.0f; } |