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

Chat: display call buttons correctly

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-12-10 10:37:59 +01:00
parent 8afb26c9da
commit 43cda13f4c
6 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classes/Base.lproj/ChatConversationView.xib
View file

@ -112,6 +112,7 @@
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onBackToCallClick:" destination="-2" eventType="touchUpInside" id="bOG-ra-UpM"/>
<outlet property="tableView" destination="8" id="w1i-Px-Wdf"/>
</connections>
</button>
<button hidden="YES" opaque="NO" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Wag-Nx-kd6" userLabel="deleteButton" customClass="UIIconButton">

1
Classes/Base.lproj/ChatsListView.xib
View file

@ -74,6 +74,7 @@
<state key="highlighted" backgroundImage="color_E.png"/>
<connections>
<action selector="onBackToCallClick:" destination="-2" eventType="touchUpInside" id="eUD-Gk-qji"/>
<outlet property="tableView" destination="6" id="ePS-cV-S6m"/>
</connections>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" reversesTitleShadowWhenHighlighted="YES" showsTouchWhenHighlighted="YES" lineBreakMode="middleTruncation" id="uqG-2T-VOa" userLabel="toggleSelectionButton" customClass="UIIconButton">

5
Classes/ChatConversationView.m
View file

@ -169,7 +169,8 @@ static UICompositeViewDescription *compositeDescription = nil;
}
- (void)callUpdateEvent:(NSNotification *)notif {
_callButton.hidden = (linphone_core_get_current_call([LinphoneManager getLc]) != NULL);
_callButton.hidden =
(_tableController.isEditing || linphone_core_get_current_call([LinphoneManager getLc]) != NULL);
}
- (void)update {
@ -499,7 +500,7 @@ static UICompositeViewDescription *compositeDescription = nil;
- (IBAction)onEditionChangeClick:(id)sender {
_backButton.hidden = _callButton.hidden = _tableController.isEditing;
_backToCallButton.hidden |= _tableController.isEditing;
[_backToCallButton update];
}
- (IBAction)onCallClick:(id)sender {

3
Classes/ChatsListView.m
View file

@ -76,7 +76,8 @@ static UICompositeViewDescription *compositeDescription = nil;
}
- (IBAction)onEditionChangeClick:(id)sender {
_addButton.hidden = _backToCallButton.hidden = self.tableController.isEditing;
_addButton.hidden = self.tableController.isEditing;
[_backToCallButton update];
}
- (IBAction)onDeleteClick:(id)sender {

1
Classes/LinphoneUI/UIBackToCallButton.h
View file

@ -13,4 +13,5 @@
- (IBAction)onBackToCallClick:(id)sender;
- (void)update;
@property(assign, nonatomic) IBOutlet UITableView *tableView;
@end

2
Classes/LinphoneUI/UIBackToCallButton.m
View file

@ -31,7 +31,7 @@
}
- (void)update {
self.hidden |= (linphone_core_get_current_call([LinphoneManager getLc]) == NULL);
self.hidden = (_tableView.isEditing || linphone_core_get_current_call([LinphoneManager getLc]) == NULL);
}
- (IBAction)onBackToCallClick:(id)sender {