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

Fix backToCallButton in chatConversation and chatsList views

Browse source
This commit is contained in:
REIS Benjamin 2016-10-18 11:22:06 +02:00
parent eef416b91d
commit 110c31fcbe
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/ChatConversationView.m
View file

@ -118,6 +118,7 @@ static UICompositeViewDescription *compositeDescription = nil;
object:nil];
[_backToCallButton update];
_callButton.hidden = !_backToCallButton.hidden;
if (_tableController.isEditing) {
[_tableController setEditing:NO];
@ -149,6 +150,7 @@ static UICompositeViewDescription *compositeDescription = nil;
composingVisible = !composingVisible;
[self setComposingVisible:!composingVisible withDelay:0];
[_backToCallButton update];
self.callButton.hidden = !self.backToCallButton.hidden;
[_tableController scrollToBottom:true];
}
@ -185,6 +187,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (void)callUpdateEvent:(NSNotification *)notif {
_callButton.hidden = (_tableController.isEditing || linphone_core_get_current_call(LC) != NULL);
_backToCallButton.hidden = !_callButton.hidden;
}
- (void)update {
@ -525,6 +528,9 @@ static UICompositeViewDescription *compositeDescription = nil;
- (IBAction)onEditionChangeClick:(id)sender {
_backButton.hidden = _callButton.hidden = _tableController.isEditing;
[_backToCallButton update];
if (!_backToCallButton.hidden) {
_callButton.hidden = TRUE;
}
}
- (IBAction)onCallClick:(id)sender {

8
Classes/ChatsListView.m
View file

@ -31,6 +31,10 @@
selector:@selector(textReceivedEvent:)
name:kLinphoneMessageReceived
object:nil];
[NSNotificationCenter.defaultCenter addObserver:self
selector:@selector(callUpdateEvent:)
name:kLinphoneCallUpdate
object:nil];
[_backToCallButton update];
[self setEditing:NO];
}
@ -47,6 +51,10 @@
[_tableController loadData];
}
- (void)callUpdateEvent:(NSNotification *)notif {
[_backToCallButton update];
}
#pragma mark - UICompositeViewDelegate Functions
static UICompositeViewDescription *compositeDescription = nil;