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

Conference: continuation

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2015-10-15 14:25:24 +02:00
parent 296924830c
commit a56ab71330
5 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Classes/Base.lproj/CallView.xib
View file

@ -156,7 +156,7 @@
</accessibility>
</view>
<view contentMode="scaleAspectFit" id="127" userLabel="preview">
<rect key="frame" x="254.00000029960563" y="354.99999967643191" width="113" height="140"/>
<rect key="frame" x="254" y="354.99999934763446" width="113" height="140"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" heightSizable="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</view>

2
Classes/CallIncomingView.m
View file

@ -82,7 +82,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[self dismiss];
} else if ([LinphoneManager.instance lpConfigBoolForKey:@"auto_answer"]) {
LinphoneCallState state = linphone_call_get_state(call);
if (state == LinphoneCallIncomingReceived || state == LinphoneCallIncomingEarlyMedia) {
if (state == LinphoneCallIncomingReceived) {
[self onAcceptClick:nil];
}
}

2
Classes/CallView.m
View file

@ -836,6 +836,7 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
target.frame = frame;
frame.origin.y = original_y;
target.hidden = NO;
[UIView animateWithDuration:0.5
delay:0.0
options:UIViewAnimationOptionCurveEaseOut
@ -843,6 +844,7 @@ static void hideSpinner(LinphoneCall *call, void *user_data) {
target.frame = frame;
}
completion:^(BOOL finished) {
target.frame = frame; // in case application did not finish
completion(finished);
}];
}

3
Classes/LinphoneUI/Base.lproj/UIContactCell.xib
View file

@ -113,9 +113,10 @@
<object class="IBUIImageView" id="647977481">
<reference key="NSNextResponder" ref="675878782"/>
<int key="NSvFlags">297</int>
<string key="NSFrame">{{314, 11}, {25, 22}}</string>
<string key="NSFrame">{{280, 11}, {25, 22}}</string>
<reference key="NSSuperview" ref="675878782"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>

3
Classes/LinphoneUI/UICheckBoxTVTableViewController.m
View file

@ -38,7 +38,8 @@
- (void)viewDidAppear:(BOOL)animated {
[super viewDidAppear:animated];
_editButton.enabled = [self tableView:self.tableView numberOfRowsInSection:0] != 0;
_editButton.enabled = (([self numberOfSectionsInTableView:self.tableView] > 0) &&
([self tableView:self.tableView numberOfRowsInSection:0] != 0));
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {