Fixes

FredericJacobs · Dec 4, 2014 · 0b6f683 · 0b6f683
1 parent adc2b54
commit 0b6f683
Show file tree

Hide file tree

Showing 28 changed files with 14,072 additions and 14,113 deletions.
diff --git a/JSQMessagesViewController/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -492,7 +492,7 @@ - (UICollectionViewCell *)collectionView:(JSQMessagesCollectionView *)collection
         JSQDisplayedMessageCollectionViewCell * errorCell = [collectionView dequeueReusableCellWithReuseIdentifier:cellIdentifier forIndexPath:indexPath];
         errorCell.cellLabel.text = [errorMessage text];
         errorCell.cellLabel.textColor = [UIColor darkGrayColor];
-        errorCell.cellLabel.layer.borderColor = [[UIColor colorWithRed:195.f/255.f green:0 blue:22.f/255.f alpha:1.f] CGColor];
+        errorCell.cellLabel.layer.borderColor = [[UIColor colorWithRed:195.f/255.f green:0 blue:22.f/255.f alpha:1.0f] CGColor];
         errorCell.headerImageView.image = [UIImage imageNamed:@"error_white"];
         errorCell.layer.shouldRasterize = YES;
         errorCell.layer.rasterizationScale = [UIScreen mainScreen].scale;

diff --git a/...sagesViewController/JSQMessagesViewController/Factories/JSQMessagesToolbarButtonFactory.h b/...sagesViewController/JSQMessagesViewController/Factories/JSQMessagesToolbarButtonFactory.h
@@ -41,7 +41,4 @@
  */
 + (UIButton *)defaultSendButtonItem;
 
-
-+ (UIButton *)signalCallButtonItem;
-
 @end
diff --git a/...sagesViewController/JSQMessagesViewController/Factories/JSQMessagesToolbarButtonFactory.m b/...sagesViewController/JSQMessagesViewController/Factories/JSQMessagesToolbarButtonFactory.m
@@ -73,25 +73,4 @@ + (UIButton *)defaultSendButtonItem
     return sendButton;
 }
 
-+ (UIButton *)signalCallButtonItem
-{
-    NSString * sendTitle = NSLocalizedStringFromTable(@"Call", @"JSQMessages", @"Text for the send button on the messages view toolbar");
-
-    UIButton *sendButton = [[UIButton alloc] initWithFrame:CGRectZero];
-    [sendButton setTitle:sendTitle forState:UIControlStateNormal];
-    [sendButton setTitleColor:[UIColor jsq_messageBubbleBlueColor] forState:UIControlStateNormal];
-    [sendButton setTitleColor:[[UIColor jsq_messageBubbleBlueColor] jsq_colorByDarkeningColorWithValue:0.1f] forState:UIControlStateHighlighted];
-    [sendButton setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];
-
-    sendButton.titleLabel.font = [UIFont fontWithName:@"HelveticaNeue-Thin" size:17.0f];
-    sendButton.titleLabel.adjustsFontSizeToFitWidth = YES;
-    sendButton.titleLabel.minimumScaleFactor = 0.85f;
-    sendButton.contentMode = UIViewContentModeCenter;
-    sendButton.backgroundColor = [UIColor clearColor];
-    sendButton.tintColor = [UIColor jsq_messageBubbleBlueColor];
-
-    return sendButton;
-
-}
-
 @end
diff --git a/...sViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib b/...sViewController/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14C68k" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>

diff --git a/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesInputToolbar.m b/JSQMessagesViewController/JSQMessagesViewController/Views/JSQMessagesInputToolbar.m
@@ -95,31 +95,14 @@ - (void)jsq_rightBarButtonPressed:(UIButton *)sender
 
 - (void)toggleSendButtonEnabled
 {
-    /* Signal Override
-     * @warning
-     *
-     * Override default to allow actions on empty text
-     */
     BOOL hasText = [self.contentView.textView hasText];
-//
-//    if (self.sendButtonOnRight) {
-//        self.contentView.rightBarButtonItem.enabled = hasText;
-//    }
-//    else {
-//        self.contentView.leftBarButtonItem.enabled = hasText;
-//    }
-
-    if (hasText)
-    {
-        self.contentView.rightBarButtonItem.enabled = YES;
-    } else if ([self.contentView.rightBarButtonItem.titleLabel.text isEqualToString:@"Send"]) {
-        self.contentView.rightBarButtonItem.enabled = NO;
-    } else {
-        self.contentView.rightBarButtonItem.enabled = YES;
-    }
 
-
-
+    if (self.sendButtonOnRight) {
+        self.contentView.rightBarButtonItem.enabled = hasText;
+    }
+    else {
+        self.contentView.leftBarButtonItem.enabled = hasText;
+    }
 }
 
 #pragma mark - Key-value observing

diff --git a/Manifest.lock b/Manifest.lock
@@ -83,7 +83,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   JSQMessagesViewController:
-    :commit: 7c2cec63f9e05ac7859df786e6ca31af2f0dc583
+    :commit: 82482a1fc560fb4f716babbe49a20cf9c0bc7fc3
     :git: https://github.com/dtsbourg/JSQMessagesViewController
   SocketRocket:
     :commit: d0585af165