witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Better user compose detection

Browse source
This commit is contained in:
Guillaume BIENKOWSKI 2014-03-06 14:33:23 +01:00
parent b17d5a2d46
commit b4bfdb2e7e
2 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Classes/ChatRoomViewController.m
View file

@ -263,9 +263,17 @@ static UICompositeViewDescription *compositeDescription = nil;
linphone_address_destroy(linphoneAddress);
}
[messageField setText:@""];
if( chatRoom != NULL ){
linphone_chat_room_destroy(chatRoom);
chatRoom = NULL;
}
chatRoom = linphone_core_get_or_create_chat_room([LinphoneManager getLc], [remoteAddress cStringUsingEncoding:[NSString defaultCStringEncoding]]);
[self update];
[tableController setRemoteAddress: remoteAddress];
[ChatModel readConversation:remoteAddress];
[self checkComposeForRoom:chatRoom];
[[NSNotificationCenter defaultCenter] postNotificationName:kLinphoneTextReceived object:self];
}
@ -434,6 +442,21 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
});
}
- (void)checkComposeForRoom:(LinphoneChatRoom*)room {
if( room && room == chatRoom ){
BOOL composing = linphone_chat_room_is_remote_composing(room);
if( composing ){
[composeLabel setText:[NSString stringWithFormat:NSLocalizedString(@"%@ is composing...", @""), [addressLabel text]]];
[composeLabel setAlpha:0];
[composeLabel setHidden:FALSE];
[UIView animateWithDuration:0.3 animations:^{ composeLabel.alpha = 1.0; }];
} else {
[UIView animateWithDuration:0.3 animations:^{ composeLabel.alpha = 0.0; } completion:^(BOOL f) { [composeLabel setHidden:TRUE]; }];
}
}
}
#pragma mark - Event Functions
@ -471,26 +494,9 @@ static void message_status(LinphoneChatMessage* msg,LinphoneChatMessageState sta
- (void)textComposeEvent:(NSNotification*)notif {
LinphoneChatRoom* room = [[[notif userInfo] objectForKey:@"room"] pointerValue];
if( room ){
const LinphoneAddress* remote_peer = linphone_chat_room_get_peer_address(room);
LinphoneAddress* current_peer= linphone_address_new([remoteAddress cStringUsingEncoding:[NSString defaultCStringEncoding]]);
BOOL composing = linphone_chat_room_is_remote_composing(room);
if( composing && linphone_address_weak_equal(remote_peer, current_peer) ){
[composeLabel setText:[NSString stringWithFormat:NSLocalizedString(@"%@ is composing...", @""), [addressLabel text]]];
[composeLabel setAlpha:0];
[composeLabel setHidden:FALSE];
[UIView animateWithDuration:0.3 animations:^{ composeLabel.alpha = 1.0; }];
} else {
[UIView animateWithDuration:0.3 animations:^{ composeLabel.alpha = 0.0; } completion:^(BOOL f) { [composeLabel setHidden:TRUE]; }];
}
linphone_address_destroy(current_peer);
}
[self checkComposeForRoom:room];
}
#pragma mark - UITextFieldDelegate Functions
- (BOOL)growingTextViewShouldBeginEditing:(HPGrowingTextView *)growingTextView {

5
Classes/Utils/GrowingTextView/HPGrowingTextView.m
View file

@ -233,6 +233,8 @@
- (void)textViewDidChange:(UITextView *)textView
{
[self refreshHeight];
if( [delegate respondsToSelector:@selector(growingTextChanged:text:)])
[delegate growingTextChanged:self text:[textView text]];
}
- (void)refreshHeight
@ -627,9 +629,6 @@
//weird 1 pixel bug when clicking backspace when textView is empty
if(![textView hasText] && [atext isEqualToString:@""]) return NO;
if( [delegate respondsToSelector:@selector(growingTextChanged:text:)])
[delegate growingTextChanged:self text:atext];
//Added by bretdabaker: sometimes we want to handle this ourselves
if ([delegate respondsToSelector:@selector(growingTextView:shouldChangeTextInRange:replacementText:)])
return [delegate growingTextView:self shouldChangeTextInRange:range replacementText:atext];