mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Call: fix pause buttons in call

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-10-20 15:41:11 +02:00
parent 9fdc8d6efa
commit 5c5416eb8f
5 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classes/CallView.m
View file

@ -232,11 +232,12 @@ static UICompositeViewDescription *compositeDescription = nil;
[_speakerButton update];
[_microButton update];
[_pauseButton setType:UIPauseButtonType_CurrentCall call:call];
[_pauseButton update];
[_videoButton update];
[_hangupButton update];
_optionsButton.enabled = !linphone_call_media_in_progress(call);
_optionsButton.enabled = (call && !linphone_call_media_in_progress(call));
// Show Pause/Conference button following call count
if (linphone_core_get_calls_nb(lc) > 1) {
@ -400,9 +401,6 @@ static UICompositeViewDescription *compositeDescription = nil;
[_videoGroup setAlpha:0.0];
[PhoneMainView.instance showTabBar:true];
// UIEdgeInsets insets = {10, 0, 25, 0};
// [_pausedCallsTableView.tableView setContentInset:insets];
// [_pausedCallsTableView.tableView setScrollIndicatorInsets:insets];
[_pausedCallsTable.tableView setAlpha:1.0];
[_videoCameraSwitch setHidden:TRUE];

1
Classes/LinphoneManager.m
View file

@ -1317,6 +1317,7 @@ static LinphoneCoreVTable linphonec_vtable = {.show = NULL,
const char *lRingBack = [[LinphoneManager bundleFile:@"ringback.wav"] UTF8String];
linphone_core_set_ringback(theLinphoneCore, lRingBack);
const char *lPlay = [[LinphoneManager bundleFile:@"hold.wav"] UTF8String];
lPlay = NULL;
linphone_core_set_play_file(theLinphoneCore, lPlay);
linphone_core_set_zrtp_secrets_file(theLinphoneCore, [zrtpSecretsFileName UTF8String]);

2
Classes/LinphoneUI/UICallPausedCell.h
View file

@ -8,12 +8,14 @@
#import "UIRoundedImageView.h"
#import "LinphoneManager.h"
#import "UIPauseButton.h"
@interface UICallPausedCell : UITableViewCell
@property(weak, nonatomic) IBOutlet UIRoundedImageView *avatarImage;
@property(weak, nonatomic) IBOutlet UILabel *nameLabel;
@property(weak, nonatomic) IBOutlet UILabel *durationLabel;
@property(weak, nonatomic) IBOutlet UIPauseButton *pauseButton;
- (id)initWithIdentifier:(NSString *)identifier;
- (void)setCall:(LinphoneCall *)call;

3
Classes/LinphoneUI/UICallPausedCell.m
View file

@ -33,6 +33,9 @@
return;
}
[_pauseButton setType:UIPauseButtonType_Call call:call];
[_pauseButton update];
const LinphoneAddress *addr = linphone_call_get_remote_address(call);
[ContactDisplay setDisplayNameLabel:_nameLabel forAddress:addr];

3
Classes/LinphoneUI/UICallPausedCell.xib
View file

@ -10,6 +10,7 @@
<outlet property="avatarImage" destination="NBJ-w0-Uvw" id="lGx-U6-4tn"/>
<outlet property="durationLabel" destination="tZi-KI-viq" id="TLb-yi-TBY"/>
<outlet property="nameLabel" destination="g3t-eS-m7B" id="dKD-7X-u2j"/>
<outlet property="pauseButton" destination="Izu-Zj-sHi" id="BEq-dn-lx2"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@ -51,7 +52,7 @@
</attributedString>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" tag="24" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Izu-Zj-sHi" userLabel="pauseButton" customClass="UIPauseButton">
<button opaque="NO" tag="24" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Izu-Zj-sHi" userLabel="pauseButton" customClass="UIPauseButton">
<rect key="frame" x="322" y="3" width="45" height="45"/>
<autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
<accessibility key="accessibilityConfiguration" label="Pause"/>