add a new CollectionViewCell type - Aside type

Author: pencil001

JSQMessages.xcodeproj/project.pbxproj

@@ -105,6 +105,8 @@
 		88A901B619F618B100F99777 /* JSQMediaItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A901B519F618B100F99777 /* JSQMediaItem.m */; };
 		88C4583019F5F7A0008FD427 /* JSQMessagesMediaViewBubbleImageMasker.m in Sources */ = {isa = PBXBuildFile; fileRef = 88C4582F19F5F7A0008FD427 /* JSQMessagesMediaViewBubbleImageMasker.m */; };
 		94A4FA20C2FBD0D62614D5A8 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 97E6750B77E8A7042BA0754B /* libPods.a */; };
+		BF94DB9C1A0A5B3B008E54F6 /* JSQMessagesCollectionViewCellAside.m in Sources */ = {isa = PBXBuildFile; fileRef = BF94DB9B1A0A5B3B008E54F6 /* JSQMessagesCollectionViewCellAside.m */; };
+		BF94DB9E1A0A5B79008E54F6 /* JSQMessagesCollectionViewCellAside.xib in Resources */ = {isa = PBXBuildFile; fileRef = BF94DB9D1A0A5B79008E54F6 /* JSQMessagesCollectionViewCellAside.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -279,6 +281,9 @@
 		88C4582E19F5F7A0008FD427 /* JSQMessagesMediaViewBubbleImageMasker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQMessagesMediaViewBubbleImageMasker.h; sourceTree = "<group>"; };
 		88C4582F19F5F7A0008FD427 /* JSQMessagesMediaViewBubbleImageMasker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQMessagesMediaViewBubbleImageMasker.m; sourceTree = "<group>"; };
 		97E6750B77E8A7042BA0754B /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		BF94DB9A1A0A5B3B008E54F6 /* JSQMessagesCollectionViewCellAside.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSQMessagesCollectionViewCellAside.h; sourceTree = "<group>"; };
+		BF94DB9B1A0A5B3B008E54F6 /* JSQMessagesCollectionViewCellAside.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JSQMessagesCollectionViewCellAside.m; sourceTree = "<group>"; };
+		BF94DB9D1A0A5B79008E54F6 /* JSQMessagesCollectionViewCellAside.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = JSQMessagesCollectionViewCellAside.xib; sourceTree = "<group>"; };
 		FC5C727E4CCDA2B95A7BA30C /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -356,8 +361,8 @@
 			children = (
 				886C33FE19F45E30006B4997 /* JSQMessagesViewController.podspec */,
 				88A25F3E19D8E01A00924534 /* JSQMessagesViewController */,
-				636A8663AEEE5C37B65C515D /* Frameworks */,
 				88A25F2B19D8DF2500924534 /* JSQMessagesDemo */,
+				636A8663AEEE5C37B65C515D /* Frameworks */,
 				88A25F1E19D8DEC500924534 /* JSQMessagesTests */,
 				2BBEF3CD91C31A49E5FF9E3C /* Pods */,
 				88A25F0319D8DEC400924534 /* Products */,
@@ -549,6 +554,9 @@
 				88A25F9119D8E01A00924534 /* JSQMessagesCollectionViewCellOutgoing.h */,
 				88A25F9219D8E01A00924534 /* JSQMessagesCollectionViewCellOutgoing.m */,
 				88A25F9319D8E01A00924534 /* JSQMessagesCollectionViewCellOutgoing.xib */,
+				BF94DB9A1A0A5B3B008E54F6 /* JSQMessagesCollectionViewCellAside.h */,
+				BF94DB9B1A0A5B3B008E54F6 /* JSQMessagesCollectionViewCellAside.m */,
+				BF94DB9D1A0A5B79008E54F6 /* JSQMessagesCollectionViewCellAside.xib */,
 				88A25F9419D8E01A00924534 /* JSQMessagesComposerTextView.h */,
 				88A25F9519D8E01A00924534 /* JSQMessagesComposerTextView.m */,
 				88A25F9619D8E01A00924534 /* JSQMessagesInputToolbar.h */,
@@ -745,6 +753,7 @@
 				88A25FBC19D8E01A00924534 /* JSQMessagesViewController.xib in Resources */,
 				88A25FD819D8E01A00924534 /* JSQMessagesTypingIndicatorFooterView.xib in Resources */,
 				88A25F3919D8DF2500924534 /* Main.storyboard in Resources */,
+				BF94DB9E1A0A5B79008E54F6 /* JSQMessagesCollectionViewCellAside.xib in Resources */,
 				88A25FD419D8E01A00924534 /* JSQMessagesLoadEarlierHeaderView.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -856,6 +865,7 @@
 				886FFD2E19E9A65D00EB8485 /* UIDevice+JSQMessages.m in Sources */,
 				88A25FB619D8E01A00924534 /* NSString+JSQMessages.m in Sources */,
 				88A901B619F618B100F99777 /* JSQMediaItem.m in Sources */,
+				BF94DB9C1A0A5B3B008E54F6 /* JSQMessagesCollectionViewCellAside.m in Sources */,
 				88A25FCC19D8E01A00924534 /* JSQMessagesCollectionViewCellIncoming.m in Sources */,
 				88A25FBE19D8E01A00924534 /* JSQMessagesBubbleImageFactory.m in Sources */,
 				88A25FDF19D8E0C400924534 /* DemoMessagesViewController.m in Sources */,

JSQMessagesDemo/DemoMessagesViewController.m

@@ -346,11 +346,15 @@ - (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSIn
 
     JSQMessage *message = [self.demoData.messages objectAtIndex:indexPath.item];
 
-    if ([message.senderId isEqualToString:self.senderId]) {
+    if ([message.senderId length] == 0) {
+        return nil;
+    }
+    else if ([message.senderId isEqualToString:self.senderId]) {
         return self.demoData.outgoingBubbleImageData;
     }
-
-    return self.demoData.incomingBubbleImageData;
+    else {
+        return self.demoData.incomingBubbleImageData;
+    }
 }
 
 - (id<JSQMessageAvatarImageDataSource>)collectionView:(JSQMessagesCollectionView *)collectionView avatarImageDataForItemAtIndexPath:(NSIndexPath *)indexPath
@@ -400,10 +404,10 @@ - (NSAttributedString *)collectionView:(JSQMessagesCollectionView *)collectionVi
      *
      *  Show a timestamp for every 3rd message
      */
-    if (indexPath.item % 3 == 0) {
-        JSQMessage *message = [self.demoData.messages objectAtIndex:indexPath.item];
-        return [[JSQMessagesTimestampFormatter sharedFormatter] attributedTimestampForDate:message.date];
-    }
+//    if (indexPath.item % 3 == 0) {
+//        JSQMessage *message = [self.demoData.messages objectAtIndex:indexPath.item];
+//        return [[JSQMessagesTimestampFormatter sharedFormatter] attributedTimestampForDate:message.date];
+//    }
 
     return nil;
 }
@@ -450,6 +454,9 @@ - (UICollectionViewCell *)collectionView:(JSQMessagesCollectionView *)collection
      *  Override point for customizing cells
      */
     JSQMessagesCollectionViewCell *cell = (JSQMessagesCollectionViewCell *)[super collectionView:collectionView cellForItemAtIndexPath:indexPath];
+    if ([cell isKindOfClass:[JSQMessagesCollectionViewCellAside class]]) {
+        cell.textView.backgroundColor = [UIColor blueColor];
+    }
 
     /**
      *  Configure almost *anything* on the cell

JSQMessagesDemo/DemoModelData.m

@@ -98,6 +98,11 @@ - (void)loadFakeMessages
      *
      *  You should have a mutable array or orderedSet, or something.
      */
+    JSQPhotoMediaItem *photoItem = [[JSQPhotoMediaItem alloc] initWithImage:[UIImage imageNamed:@"goldengate"]];
+    JSQMediaMessage *photoMessage = [JSQMediaMessage messageWithSenderId:@""
+                                                             displayName:@""
+                                                                   media:photoItem];
+    
     self.messages = [[NSMutableArray alloc] initWithObjects:
                      [[JSQTextMessage alloc] initWithSenderId:kJSQDemoAvatarIdSquires
                                             senderDisplayName:kJSQDemoAvatarDisplayNameSquires
@@ -128,6 +133,16 @@ - (void)loadFakeMessages
                                             senderDisplayName:kJSQDemoAvatarDisplayNameSquires
                                                          date:[NSDate date]
                                                          text:@"Now with media messages!"],
+                     
+                     [[JSQTextMessage alloc] initWithSenderId:@""
+                                            senderDisplayName:@""
+                                                         date:[NSDate date]
+                                                         text:@"This is an aside text!"],
+                     [[JSQTextMessage alloc] initWithSenderId:@""
+                                            senderDisplayName:@""
+                                                         date:[NSDate date]
+                                                         text:@"It is simple, elegant, and easy to use. There are super sweet default settings, but you can customize like crazy."],
+                     photoMessage,
                      nil];
 
     [self addPhotoMediaMessage];

JSQMessagesViewController/Controllers/JSQMessagesViewController.h

@@ -143,6 +143,42 @@
  */
 @property (copy, nonatomic) NSString *incomingMediaCellIdentifier;
 
+/**
+ *  The collection view cell identifier to use for dequeuing aside message collection view cells
+ *  in the collectionView for text messages.
+ *
+ *  @discussion This cell identifier is used for aside text message data items.
+ *  The default value is the string returned by `[JSQMessagesCollectionViewCellAside cellReuseIdentifier]`.
+ *  This value must not be `nil`.
+ *
+ *  @see JSQMessagesCollectionViewCellAside.
+ *
+ *  @warning Overriding this property's default value is *not* recommended.
+ *  You should only override this property's default value if you are proividing your own cell prototypes.
+ *  These prototypes must be registered with the collectionView for reuse and you are then responsible for
+ *  completely overriding many delegate and data source methods for the collectionView,
+ *  including `collectionView:cellForItemAtIndexPath:`.
+ */
+@property (copy, nonatomic) NSString *asideCellIdentifier;
+
+/**
+ *  The collection view cell identifier to use for dequeuing aside message collection view cells
+ *  in the collectionView for media messages.
+ *
+ *  @discussion This cell identifier is used for aside media message data items.
+ *  The default value is the string returned by `[JSQMessagesCollectionViewCellAside mediaCellReuseIdentifier]`.
+ *  This value must not be `nil`.
+ *
+ *  @see JSQMessagesCollectionViewCellAside.
+ *
+ *  @warning Overriding this property's default value is *not* recommended.
+ *  You should only override this property's default value if you are proividing your own cell prototypes.
+ *  These prototypes must be registered with the collectionView for reuse and you are then responsible for
+ *  completely overriding many delegate and data source methods for the collectionView,
+ *  including `collectionView:cellForItemAtIndexPath:`.
+ */
+@property (copy, nonatomic) NSString *asideMediaCellIdentifier;
+
 /**
  *  Specifies whether or not the view controller should show the typing indicator for an incoming message.
  *

JSQMessagesViewController/Controllers/JSQMessagesViewController.m

@@ -28,6 +28,7 @@
 
 #import "JSQMessagesCollectionViewCellIncoming.h"
 #import "JSQMessagesCollectionViewCellOutgoing.h"
+#import "JSQMessagesCollectionViewCellAside.h"
 
 #import "JSQMessagesTypingIndicatorFooterView.h"
 #import "JSQMessagesLoadEarlierHeaderView.h"
@@ -142,6 +143,9 @@ - (void)jsq_configureMessagesViewController
     self.incomingCellIdentifier = [JSQMessagesCollectionViewCellIncoming cellReuseIdentifier];
     self.incomingMediaCellIdentifier = [JSQMessagesCollectionViewCellIncoming mediaCellReuseIdentifier];
 
+    self.asideCellIdentifier = [JSQMessagesCollectionViewCellAside cellReuseIdentifier];
+    self.asideMediaCellIdentifier = [JSQMessagesCollectionViewCellAside mediaCellReuseIdentifier];
+    
     self.showTypingIndicator = NO;
 
     self.showLoadEarlierMessagesHeader = NO;
@@ -172,7 +176,11 @@ - (void)dealloc
     _senderId = nil;
     _senderDisplayName = nil;
     _outgoingCellIdentifier = nil;
+    _outgoingMediaCellIdentifier = nil;
     _incomingCellIdentifier = nil;
+    _incomingMediaCellIdentifier = nil;
+    _asideCellIdentifier = nil;
+    _asideMediaCellIdentifier = nil;
 
     [_keyboardController endListeningForKeyboard];
     _keyboardController = nil;
@@ -424,15 +432,20 @@ - (UICollectionViewCell *)collectionView:(JSQMessagesCollectionView *)collection
     NSString *messageSenderId = [messageItem senderId];
     NSParameterAssert(messageSenderId != nil);
 
+    BOOL isAsideMessage = [messageSenderId length] == 0;
     BOOL isOutgoingMessage = [messageSenderId isEqualToString:self.senderId];
     BOOL isMediaMessage = [messageItem isMediaMessage];
 
     NSString *cellIdentifier = nil;
     if (isMediaMessage) {
-        cellIdentifier = isOutgoingMessage ? self.outgoingMediaCellIdentifier : self.incomingMediaCellIdentifier;
+        cellIdentifier = isAsideMessage ? self.asideMediaCellIdentifier
+                                        : (isOutgoingMessage ? self.outgoingMediaCellIdentifier
+                                                             : self.incomingMediaCellIdentifier);
     }
     else {
-        cellIdentifier = isOutgoingMessage ? self.outgoingCellIdentifier : self.incomingCellIdentifier;
+        cellIdentifier = isAsideMessage ? self.asideCellIdentifier
+                                        : (isOutgoingMessage ? self.outgoingCellIdentifier
+                                                             : self.incomingCellIdentifier);
     }
 
     JSQMessagesCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:cellIdentifier forIndexPath:indexPath];
@@ -455,7 +468,10 @@ - (UICollectionViewCell *)collectionView:(JSQMessagesCollectionView *)collection
     }
 
     BOOL needsAvatar = YES;
-    if (isOutgoingMessage && CGSizeEqualToSize(collectionView.collectionViewLayout.outgoingAvatarViewSize, CGSizeZero)) {
+    if (isAsideMessage) {
+        needsAvatar = NO;
+    }
+    else if (isOutgoingMessage && CGSizeEqualToSize(collectionView.collectionViewLayout.outgoingAvatarViewSize, CGSizeZero)) {
         needsAvatar = NO;
     }
     else if (!isOutgoingMessage && CGSizeEqualToSize(collectionView.collectionViewLayout.incomingAvatarViewSize, CGSizeZero)) {
@@ -477,7 +493,10 @@ - (UICollectionViewCell *)collectionView:(JSQMessagesCollectionView *)collection
 
     CGFloat bubbleTopLabelInset = (avatarImageDataSource != nil) ? 60.0f : 15.0f;
 
-    if (isOutgoingMessage) {
+    if (isAsideMessage) {
+        cell.messageBubbleTopLabel.textInsets = UIEdgeInsetsMake(0.0f, bubbleTopLabelInset, 0.0f, bubbleTopLabelInset);
+    }
+    else if (isOutgoingMessage) {
         cell.messageBubbleTopLabel.textInsets = UIEdgeInsetsMake(0.0f, 0.0f, 0.0f, bubbleTopLabelInset);
     }
     else {

JSQMessagesViewController/JSQMessages.h

@@ -25,6 +25,7 @@
 #import "JSQMessagesCollectionView.h"
 #import "JSQMessagesCollectionViewCellIncoming.h"
 #import "JSQMessagesCollectionViewCellOutgoing.h"
+#import "JSQMessagesCollectionViewCellAside.h"
 #import "JSQMessagesTypingIndicatorFooterView.h"
 #import "JSQMessagesLoadEarlierHeaderView.h"
 

JSQMessagesViewController/Views/JSQMessagesCollectionView.m

@@ -21,6 +21,7 @@
 #import "JSQMessagesCollectionViewFlowLayout.h"
 #import "JSQMessagesCollectionViewCellIncoming.h"
 #import "JSQMessagesCollectionViewCellOutgoing.h"
+#import "JSQMessagesCollectionViewCellAside.h"
 
 #import "JSQMessagesTypingIndicatorFooterView.h"
 #import "JSQMessagesLoadEarlierHeaderView.h"
@@ -54,12 +55,18 @@ - (void)jsq_configureCollectionView
     [self registerNib:[JSQMessagesCollectionViewCellOutgoing nib]
           forCellWithReuseIdentifier:[JSQMessagesCollectionViewCellOutgoing cellReuseIdentifier]];
 
+    [self registerNib:[JSQMessagesCollectionViewCellAside nib]
+          forCellWithReuseIdentifier:[JSQMessagesCollectionViewCellAside cellReuseIdentifier]];
+    
     [self registerNib:[JSQMessagesCollectionViewCellIncoming nib]
           forCellWithReuseIdentifier:[JSQMessagesCollectionViewCellIncoming mediaCellReuseIdentifier]];
 
     [self registerNib:[JSQMessagesCollectionViewCellOutgoing nib]
           forCellWithReuseIdentifier:[JSQMessagesCollectionViewCellOutgoing mediaCellReuseIdentifier]];
 
+    [self registerNib:[JSQMessagesCollectionViewCellAside nib]
+          forCellWithReuseIdentifier:[JSQMessagesCollectionViewCellAside mediaCellReuseIdentifier]];
+    
     [self registerNib:[JSQMessagesTypingIndicatorFooterView nib]
           forSupplementaryViewOfKind:UICollectionElementKindSectionFooter
           withReuseIdentifier:[JSQMessagesTypingIndicatorFooterView footerReuseIdentifier]];

JSQMessagesViewController/Views/JSQMessagesCollectionViewCellAside.h

@@ -0,0 +1,17 @@
+//
+//  JSQMessagesCollectionViewCellAside.h
+//  JSQMessages
+//
+//  Created by Vincent on 14/11/5.
+//  Copyright (c) 2014年 Hexed Bits. All rights reserved.
+//
+
+#import "JSQMessagesCollectionViewCell.h"
+
+/**
+ *  A `JSQMessagesCollectionViewCellAside` object is a concrete instance
+ *  of `JSQMessagesCollectionViewCell` that represents an aside message data item.
+ */
+@interface JSQMessagesCollectionViewCellAside : JSQMessagesCollectionViewCell
+
+@end

JSQMessagesViewController/Views/JSQMessagesCollectionViewCellAside.m

@@ -0,0 +1,22 @@
+//
+//  JSQMessagesCollectionViewCellAside.m
+//  JSQMessages
+//
+//  Created by Vincent on 14/11/5.
+//  Copyright (c) 2014年 Hexed Bits. All rights reserved.
+//
+
+#import "JSQMessagesCollectionViewCellAside.h"
+
+@implementation JSQMessagesCollectionViewCellAside
+
+#pragma mark - Overrides
+
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    self.messageBubbleTopLabel.textAlignment = NSTextAlignmentLeft;
+    self.cellBottomLabel.textAlignment = NSTextAlignmentLeft;
+}
+
+@end