Merge pull request jessesquires#35 from zhigang1992/master

Combined PullRequest.

Author: jessesquires

JSMessagesTableViewController/JSBubbleMessageCell.h

@@ -36,17 +36,22 @@
 #import <UIKit/UIKit.h>
 #import "JSBubbleView.h"
 
-#define DATE_LABEL_HEIGHT 12.0f
+#define DATE_LABEL_HEIGHT   12.0f
+#define PHOTO_EDGE_INSET    (UIEdgeInsets){2,4,2,4}
+#define PHOTO_SIZE          (CGSize){40,40}
 
 @interface JSBubbleMessageCell : UITableViewCell
 
 #pragma mark - Initialization
 - (id)initWithBubbleStyle:(JSBubbleMessageStyle)style
              hasTimestamp:(BOOL)hasTimestamp
+                hasAvatar:(BOOL)hasAvatar
           reuseIdentifier:(NSString *)reuseIdentifier;
 
 #pragma mark - Message Cell
 - (void)setMessage:(NSString *)msg;
 - (void)setTimestamp:(NSDate *)date;
 
+@property (strong, nonatomic) UIImageView *photoView;
+
 @end

JSMessagesTableViewController/JSBubbleMessageCell.m

@@ -43,7 +43,7 @@ @interface JSBubbleMessageCell()
 
 - (void)setup;
 - (void)configureTimestampLabel;
-- (void)configureWithStyle:(JSBubbleMessageStyle)style timestamp:(BOOL)hasTimestamp;
+- (void)configureWithStyle:(JSBubbleMessageStyle)style timestamp:(BOOL)hasTimestamp avatar:(BOOL)hasAvatar;
 
 @end
 
@@ -65,6 +65,11 @@ - (void)setup
     self.textLabel.hidden = YES;
     self.detailTextLabel.text = nil;
     self.detailTextLabel.hidden = YES;
+    
+    UILongPressGestureRecognizer *recognizer =
+    [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(handleLongPress:)];
+    [recognizer setMinimumPressDuration:0.5];
+    [self addGestureRecognizer:recognizer];
 }
 
 - (void)configureTimestampLabel
@@ -85,7 +90,7 @@ - (void)configureTimestampLabel
     [self.contentView bringSubviewToFront:self.timestampLabel];
 }
 
-- (void)configureWithStyle:(JSBubbleMessageStyle)style timestamp:(BOOL)hasTimestamp
+- (void)configureWithStyle:(JSBubbleMessageStyle)style timestamp:(BOOL)hasTimestamp avatar:(BOOL)hasAvatar
 {
     CGFloat bubbleY = 0.0f;
 
@@ -94,9 +99,28 @@ - (void)configureWithStyle:(JSBubbleMessageStyle)style timestamp:(BOOL)hasTimest
         bubbleY = 14.0f;
     }
 
-    CGRect frame = CGRectMake(0.0f,
+    CGFloat rightOffsetX=0.0f;
+    CGFloat leftOffsetX=0.0f;
+    
+    
+    
+    if(hasAvatar){
+        
+        if(style==JSBubbleMessageStyleIncomingDefault||style==JSBubbleMessageStyleIncomingSquare){
+            rightOffsetX=PHOTO_EDGE_INSET.left+PHOTO_SIZE.width+PHOTO_EDGE_INSET.right;
+            self.photoView=[[UIImageView alloc] initWithFrame:(CGRect){PHOTO_EDGE_INSET.left,self.contentView.frame.size.height-PHOTO_EDGE_INSET.bottom-PHOTO_SIZE.height,PHOTO_SIZE}];
+        }else{
+            leftOffsetX=PHOTO_EDGE_INSET.left+PHOTO_SIZE.width+PHOTO_EDGE_INSET.right;
+            self.photoView=[[UIImageView alloc] initWithFrame:(CGRect){self.contentView.frame.size.width-PHOTO_EDGE_INSET.right-PHOTO_SIZE.width,self.contentView.frame.size.height-PHOTO_EDGE_INSET.bottom-PHOTO_SIZE.height,PHOTO_SIZE}];
+        }
+        [self.contentView addSubview:self.photoView];
+        self.photoView.autoresizingMask= (UIViewAutoresizingFlexibleTopMargin|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin);
+    }
+    
+    
+    CGRect frame = CGRectMake(rightOffsetX,
                               bubbleY,
-                              self.contentView.frame.size.width,
+                              self.contentView.frame.size.width-rightOffsetX-leftOffsetX,
                               self.contentView.frame.size.height - self.timestampLabel.frame.size.height);
 
     self.bubbleView = [[JSBubbleView alloc] initWithFrame:frame
@@ -108,12 +132,12 @@ - (void)configureWithStyle:(JSBubbleMessageStyle)style timestamp:(BOOL)hasTimest
     [self.contentView sendSubviewToBack:self.bubbleView];
 }
 
-- (id)initWithBubbleStyle:(JSBubbleMessageStyle)style hasTimestamp:(BOOL)hasTimestamp reuseIdentifier:(NSString *)reuseIdentifier
+- (id)initWithBubbleStyle:(JSBubbleMessageStyle)style hasTimestamp:(BOOL)hasTimestamp hasAvatar:(BOOL)hasAvatar reuseIdentifier:(NSString *)reuseIdentifier
 {
     self = [super initWithStyle:UITableViewCellStyleDefault reuseIdentifier:reuseIdentifier];
     if(self) {
         [self setup];
-        [self configureWithStyle:style timestamp:hasTimestamp];
+        [self configureWithStyle:style timestamp:hasTimestamp avatar:hasAvatar];
     }
     return self;
 }
@@ -139,4 +163,78 @@ - (void)setTimestamp:(NSDate *)date
                                                               timeStyle:NSDateFormatterShortStyle];
 }
 
+#pragma mark - Implement Copy
+- (BOOL) canBecomeFirstResponder
+{
+    return YES;
+}
+
+- (BOOL) becomeFirstResponder
+{
+    return [super becomeFirstResponder];
+}
+
+- (BOOL) canPerformAction:(SEL)action withSender:(id)sender
+{
+    if (action == @selector(copy:))
+        return YES;
+    
+    return [super canPerformAction:action withSender:sender];
+}
+
+- (void)copy:(id)sender {
+    [[UIPasteboard generalPasteboard] setString:self.bubbleView.text];
+    [self resignFirstResponder];
+}
+
+- (void) handleLongPress:(UILongPressGestureRecognizer *)longPressRecognizer
+{
+    if (longPressRecognizer.state != UIGestureRecognizerStateBegan)
+        return;
+    
+    if ([self becomeFirstResponder] == NO)
+        return;
+    
+    UIMenuController *menu = [UIMenuController sharedMenuController];
+    [menu setTargetRect:CGRectInset([self.bubbleView bubbleFrame], 0, 4.f) inView:self];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(menuWillShow:)
+                                                 name:UIMenuControllerWillShowMenuNotification
+                                               object:nil];
+    [menu setMenuVisible:YES animated:YES];
+}
+
+- (void) touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    [super touchesEnded:touches withEvent:event];
+    if ([self isFirstResponder] == NO)
+        return;
+    
+    UIMenuController *menu = [UIMenuController sharedMenuController];
+    [menu setMenuVisible:NO animated:YES];
+    [menu update];
+    [self resignFirstResponder];
+}
+
+- (void) menuWillHide:(NSNotification *)notification
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIMenuControllerWillHideMenuNotification object:nil];
+    self.bubbleView.selectedToShowCopyMenu = NO;
+}
+
+- (void) menuWillShow:(NSNotification *)notification
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIMenuControllerWillShowMenuNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(menuWillHide:)
+                                                 name:UIMenuControllerWillHideMenuNotification
+                                               object:nil];
+    self.bubbleView.selectedToShowCopyMenu = YES;
+}
+
+- (void)dealloc{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 @end

JSMessagesTableViewController/JSBubbleView.h

@@ -40,7 +40,7 @@ typedef enum {
     JSBubbleMessageStyleIncomingSquare,
     JSBubbleMessageStyleOutgoingDefault,
 	JSBubbleMessageStyleOutgoingDefaultGreen,
-    JSBubbleMessageStyleOutgoingSquare
+    JSBubbleMessageStyleOutgoingSquare,
 } JSBubbleMessageStyle;
 
 
@@ -53,6 +53,9 @@ typedef enum {
 #pragma mark - Initialization
 - (id)initWithFrame:(CGRect)frame bubbleStyle:(JSBubbleMessageStyle)bubbleStyle;
 
+- (CGRect)bubbleFrame;
+@property (nonatomic) BOOL selectedToShowCopyMenu;
+
 #pragma mark - Bubble view
 + (UIImage *)bubbleImageForStyle:(JSBubbleMessageStyle)style;
 + (UIFont *)font;

JSMessagesTableViewController/JSBubbleView.m

@@ -86,16 +86,36 @@ - (void)setText:(NSString *)newText
     [self setNeedsDisplay];
 }
 
+- (void)setSelectedToShowCopyMenu:(BOOL)selectedToShowCopyMenu{
+    _selectedToShowCopyMenu = selectedToShowCopyMenu;
+    [self setNeedsDisplay];
+}
+
 #pragma mark - Drawing
-- (void)drawRect:(CGRect)frame
-{
-	UIImage *image = [JSBubbleView bubbleImageForStyle:self.style];
+
+- (CGRect)bubbleFrame{
     CGSize bubbleSize = [JSBubbleView bubbleSizeForText:self.text];
 	CGRect bubbleFrame = CGRectMake(([self styleIsOutgoing] ? self.frame.size.width - bubbleSize.width : 0.0f),
                                     kMarginTop,
                                     bubbleSize.width,
                                     bubbleSize.height);
-    
+    return bubbleFrame;
+}
+
+- (void)drawRect:(CGRect)frame
+{
+	UIImage *image = nil;
+    if (self.selectedToShowCopyMenu) {
+        if ([self styleIsOutgoing]) {
+            image = [[UIImage imageNamed:@"messageBubbleHighlighted"] stretchableImageWithLeftCapWidth:15 topCapHeight:15];
+        } else {
+            image = [[UIImage imageNamed:@"messageBubbleSelected"] stretchableImageWithLeftCapWidth:23 topCapHeight:15];
+        }
+    } else {
+        image = [JSBubbleView bubbleImageForStyle:self.style];
+    }
+    [JSBubbleView bubbleImageForStyle:self.style];
+    CGRect bubbleFrame = [self bubbleFrame];
 	[image drawInRect:bubbleFrame];
 
 	CGSize textSize = [JSBubbleView textSizeForText:self.text];

JSMessagesTableViewController/JSMADismissiveTextView.h

@@ -0,0 +1,25 @@
+//
+//  MADismissiveTextView.h
+//  MADismissiveTextView
+//
+//  Created by Mike Ahmarani on 12-02-18.
+//  Copyright (c) 2012 Mike Ahmarani. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@protocol MADismissiveKeyboardDelegate <NSObject>
+
+@optional
+- (void)keyboardDidShow;
+- (void)keyboardDidScroll:(CGPoint)keyboardOrigin;
+- (void)keyboardWillBeDismissed;
+- (void)keyboardWillSnapBackTo:(CGPoint)keyboardOrigin;
+@end
+
+@interface JSMADismissiveTextView : UITextView
+
+@property (nonatomic, weak) id <MADismissiveKeyboardDelegate> keyboardDelegate;
+@property (nonatomic, strong) UIPanGestureRecognizer *dismissivePanGestureRecognizer;
+
+@end

JSMessagesTableViewController/JSMADismissiveTextView.m

@@ -0,0 +1,126 @@
+//
+//  MADismissiveTextView.m
+//  MADismissiveTextView
+//
+//  Created by Mike Ahmarani on 12-02-18.
+//  Copyright (c) 2012 Mike Ahmarani. All rights reserved.
+//
+
+#import "JSMADismissiveTextView.h"
+
+@interface JSMADismissiveTextView ()
+
+@property (nonatomic, strong) UIView *keyboard;
+@property (nonatomic, readwrite) float originalKeyboardY; 
+
+- (void)keyboardWillShow;
+- (void)keyboardDidShow;
+- (void)panning:(UIPanGestureRecognizer *)pan;
+
+@end
+
+@implementation JSMADismissiveTextView
+
+@synthesize keyboard, dismissivePanGestureRecognizer, originalKeyboardY, keyboardDelegate;
+
+- (void)dealloc{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];    
+    [self.dismissivePanGestureRecognizer removeTarget:self action:@selector(panning:)];
+    self.dismissivePanGestureRecognizer = nil;    
+    self.keyboardDelegate = nil;    
+}
+
+- (id)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        self.editable = YES;
+        self.inputAccessoryView = [[UIView alloc] init]; //Empty view, used to get a handle on the keyboard when it appears.       
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow) name:@"UIKeyboardWillShowNotification" object:nil];                
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidShow) name:@"UIKeyboardDidShowNotification" object:nil];
+        
+    }
+    return self;
+}
+
+- (void)setDismissivePanGestureRecognizer:(UIPanGestureRecognizer *)panGestureRecognizer{
+    dismissivePanGestureRecognizer = panGestureRecognizer;
+    [dismissivePanGestureRecognizer addTarget:self action:@selector(panning:)];
+}
+
+- (void)keyboardWillShow{
+    self.keyboard.hidden = NO;
+}
+
+- (void)keyboardDidShow{
+    self.keyboard = self.inputAccessoryView.superview;
+    if(self.keyboardDelegate && [self.keyboardDelegate respondsToSelector:@selector(keyboardDidShow)]){
+        [self.keyboardDelegate keyboardDidShow];
+    }
+}
+
+- (void)panning:(UIPanGestureRecognizer *)pan{
+    
+    if(self.keyboard && !self.keyboard.hidden){
+        
+        CGRect screenRect = [[UIScreen mainScreen] bounds];
+        CGFloat screenHeight = screenRect.size.height;
+        
+        
+        UIWindow *panWindow = [[UIApplication sharedApplication] keyWindow];
+        CGPoint location = [pan locationInView:panWindow];
+        CGPoint velocity = [pan velocityInView:panWindow];
+        
+        if(pan.state == UIGestureRecognizerStateBegan){ //Gesture begining, grab origin of keyboard frame.
+            
+            self.originalKeyboardY = self.keyboard.frame.origin.y;
+            
+        }else if(pan.state == UIGestureRecognizerStateEnded){ //Gesture ending, complete animation of keyboard
+            
+            if(velocity.y > 0 && self.keyboard.frame.origin.y > self.originalKeyboardY){ //Gesture ended with a flick downwards, dismiss keyboard.
+                
+                [UIView animateWithDuration:0.3 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+                    self.keyboard.frame = CGRectMake(0, screenHeight, self.keyboard.frame.size.width, self.keyboard.frame.size.height);
+                    if(self.keyboardDelegate && [self.keyboardDelegate respondsToSelector:@selector(keyboardWillBeDismissed)]){
+                        [self.keyboardDelegate keyboardWillBeDismissed];
+                    }
+                }completion:^(BOOL finished){
+                    self.keyboard.hidden = YES;
+                    self.keyboard.frame = CGRectMake(0, self.originalKeyboardY, self.keyboard.frame.size.width, self.keyboard.frame.size.height);
+                    [self resignFirstResponder];                          
+                }];
+                
+            }else{ //Gesture ended with no flick or a flick upwards, snap keyboard back to original position.
+                
+                [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+                    if(self.keyboardDelegate && [self.keyboardDelegate respondsToSelector:@selector(keyboardWillSnapBackTo:)]){
+                        [self.keyboardDelegate keyboardWillSnapBackTo:CGPointMake(0, self.originalKeyboardY)];
+                    }
+                    self.keyboard.frame = CGRectMake(0, self.originalKeyboardY, self.keyboard.frame.size.width, self.keyboard.frame.size.height);
+                } completion:^(BOOL finished){
+                }];
+                
+            }
+            
+        }else{ //Gesture is currently panning, match keyboard y to touch y.
+            
+            if(location.y > self.keyboard.frame.origin.y || self.keyboard.frame.origin.y != self.originalKeyboardY){
+                
+                float newKeyboardY = self.originalKeyboardY + (location.y-self.originalKeyboardY);
+                newKeyboardY = newKeyboardY < self.originalKeyboardY ? self.originalKeyboardY:newKeyboardY;
+                newKeyboardY = newKeyboardY > screenHeight ? screenHeight :newKeyboardY;
+            
+                self.keyboard.frame = CGRectMake(0, newKeyboardY, self.keyboard.frame.size.width, self.keyboard.frame.size.height);
+                
+                if(self.keyboardDelegate && [self.keyboardDelegate respondsToSelector:@selector(keyboardDidScroll:)]){
+                    [self.keyboardDelegate keyboardDidScroll:CGPointMake(0, newKeyboardY)];
+                }
+                
+            }
+            
+        }
+    }
+}
+
+@end