mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

simplify display

Browse source
This commit is contained in:
Benjamin Reis 2018-05-03 16:20:25 +02:00
parent 7c0e9382fb
commit c984a22f1d
3 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classes/ChatConversationView.h
View file

@ -36,7 +36,6 @@
OrderedDictionary *imageQualities;
BOOL scrollOnGrowingEnabled;
BOOL composingVisible;
BOOL isAppearing;
}
@property(nonatomic) LinphoneChatRoom *chatRoom;

10
Classes/ChatConversationView.m
View file

@ -38,7 +38,6 @@
[NSNumber numberWithFloat:0.5], NSLocalizedString(@"Average", nil),
[NSNumber numberWithFloat:0.0], NSLocalizedString(@"Minimum", nil), nil];
composingVisible = false;
isAppearing = false;
}
return self;
}
@ -123,8 +122,6 @@ static UICompositeViewDescription *compositeDescription = nil;
selector:@selector(callUpdateEvent:)
name:kLinphoneCallUpdate
object:nil];
[self configureForRoom:false];
isAppearing = true;
}
- (void)viewWillDisappear:(BOOL)animated {
@ -141,15 +138,12 @@ static UICompositeViewDescription *compositeDescription = nil;
[NSNotificationCenter.defaultCenter removeObserver:self];
PhoneMainView.instance.currentRoom = NULL;
isAppearing = FALSE;
}
- (void)didRotateFromInterfaceOrientation:(UIInterfaceOrientation)fromInterfaceOrientation {
[super didRotateFromInterfaceOrientation:fromInterfaceOrientation];
composingVisible = !composingVisible;
[self setComposingVisible:!composingVisible withDelay:0];
if (!isAppearing)
return; //no need to do all that stuff if the view isn't yet appeared.
// force offset recomputing
[_messageField refreshHeight];
@ -216,10 +210,6 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)applicationWillEnterForeground:(NSNotification *)notif {
if (_chatRoom != nil) {
[ChatConversationView markAsRead:_chatRoom];
TabBarView *tab = (TabBarView *)[PhoneMainView.instance.mainViewController
getCachedController:NSStringFromClass(TabBarView.class)];
[tab update:YES];
[PhoneMainView.instance updateApplicationBadgeNumber];
}
}

10
Classes/LinphoneUI/UIChatBubbleTextCell.m
View file

@ -166,15 +166,7 @@
[_statusInProgressSpinner stopAnimating];
}
if (outgoing) {
[_messageText setAccessibilityLabel:@"Outgoing message"];
} else {
[_messageText setAccessibilityLabel:@"Incoming message"];
if ([UIApplication sharedApplication].applicationState == UIApplicationStateActive) {
[ChatConversationView markAsRead:VIEW(ChatConversationView).chatRoom];
}
}
[_messageText setAccessibilityLabel:outgoing ? @"Outgoing message" : @"Incoming message"];
if (outgoing &&
(state == LinphoneChatMessageStateDeliveredToUser || state == LinphoneChatMessageStateDisplayed ||
state == LinphoneChatMessageStateNotDelivered || state == LinphoneChatMessageStateFileTransferError)) {