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

Fix accept call button

Browse source 
Add gesture for switch camera
This commit is contained in:
Yann Diorcet 2012-11-12 11:59:38 +01:00
parent b8835bf11b
commit d02fdbc4cc
10 changed files with 263 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Classes/BuschJaegerCallView.h
View file

@ -27,7 +27,7 @@
#import "UIToggleButton.h"
#import "VideoZoomHandler.h"
@interface BuschJaegerCallView : UIViewController {
@interface BuschJaegerCallView : UIViewController<UIGestureRecognizerDelegate> {
@private
LinphoneChatRoom *chatRoom;
LinphoneCall *currentCall;
@ -44,6 +44,8 @@
@property (nonatomic, retain) IBOutlet UIDigitButton* lightsButton;
@property (nonatomic, retain) IBOutlet UIDigitButton* openDoorButton;
@property (nonatomic, retain) IBOutlet UIButton* snapshotButton;
@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *cameraLeftSwipeGestureRecognizer;
@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *cameraRightSwipeGestureRecognizer;
- (IBAction)takeCall:(id)sender;
- (IBAction)onSnapshotClick:(id)sender;

39
Classes/BuschJaegerCallView.m
View file

@ -35,6 +35,8 @@
@synthesize lightsButton;
@synthesize openDoorButton;
@synthesize snapshotButton;
@synthesize cameraLeftSwipeGestureRecognizer;
@synthesize cameraRightSwipeGestureRecognizer;
#pragma mark - View lifecycle
@ -77,6 +79,8 @@
[lightsButton release];
[openDoorButton release];
[snapshotButton release];
[cameraLeftSwipeGestureRecognizer release];
[cameraRightSwipeGestureRecognizer release];
// Remove all observer
[[NSNotificationCenter defaultCenter] removeObserver:self];
@ -111,7 +115,7 @@
UIColor* col1 = BUSCHJAEGER_GREEN_COLOR;
UIColor* col2 = BUSCHJAEGER_GREEN_COLOR;
[BuschJaegerUtils createGradientForView:takeCallButton withTopColor:col1 bottomColor:col2];
[BuschJaegerUtils createGradientForButton:takeCallButton withTopColor:col1 bottomColor:col2];
}
linphone_core_set_native_video_window_id([LinphoneManager getLc], (unsigned long)videoView);
@ -119,6 +123,16 @@
videoZoomHandler = [[VideoZoomHandler alloc] init];
[videoZoomHandler setup:videoView];
cameraRightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doCameraSwipe:)];
[cameraRightSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionLeft];
[cameraRightSwipeGestureRecognizer setDelegate:self];
[videoView addGestureRecognizer:cameraRightSwipeGestureRecognizer];
cameraLeftSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doCameraSwipe:)];
[cameraLeftSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionRight];
[cameraLeftSwipeGestureRecognizer setDelegate:self];
[videoView addGestureRecognizer:cameraLeftSwipeGestureRecognizer];
}
- (void)viewDidUnload {
@ -354,8 +368,31 @@
}
}
#pragma mark - Actions Functions
- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
return YES;
}
- (IBAction)doCameraSwipe:(UISwipeGestureRecognizer *)sender {
if(videoZoomHandler.zoomLevel == 1) {
char digit = 0;
if (sender.direction == UISwipeGestureRecognizerDirectionLeft) {
digit = '7';
} else if (sender.direction == UISwipeGestureRecognizerDirectionRight) {
digit = '8';
}
if(digit != 0) {
if(chatRoom == NULL) {
linphone_core_send_dtmf([LinphoneManager getLc], digit);
} else {
linphone_chat_room_send_message(chatRoom, [[NSString stringWithFormat:@"%c", digit] UTF8String]);
}
}
}
}
- (IBAction)takeCall:(id)sender {
const MSList* calls = linphone_core_get_calls([LinphoneManager getLc]);

157
Classes/BuschJaegerCallView.xib
View file

@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">11G56</string>
<string key="IBDocument.SystemVersion">11G63</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
@ -41,6 +41,7 @@
<int key="NSvFlags">-2147483374</int>
<string key="NSFrameSize">{320, 480}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="935863454"/>
<string key="NSReuseIdentifierKey">_NS:196</string>
<object class="NSColor" key="IBUIBackgroundColor" id="732745065">
@ -54,6 +55,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{266, 20}, {34, 34}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="903884486"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
@ -95,6 +97,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrameSize">{73, 58}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="842436331"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<object class="NSColor" key="IBUIBackgroundColor" id="666829842">
@ -119,6 +122,7 @@
<int key="NSvFlags">-2147483356</int>
<string key="NSFrameSize">{73, 58}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1031602630"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
@ -140,6 +144,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{207, 0}, {73, 58}}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="33985418"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
@ -166,6 +171,8 @@
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{207, 0}, {73, 58}}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
<bool key="IBUIOpaque">NO</bool>
@ -187,6 +194,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{73, 0}, {67, 58}}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="762727327"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
@ -213,6 +221,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{140, 0}, {67, 58}}</string>
<reference key="NSSuperview" ref="903884486"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="889522260"/>
<string key="NSReuseIdentifierKey">_NS:225</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
@ -242,6 +251,7 @@
</array>
<string key="NSFrame">{{20, 399}, {280, 58}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="910162139"/>
<string key="NSReuseIdentifierKey">_NS:196</string>
<reference key="IBUIBackgroundColor" ref="666829842"/>
@ -256,6 +266,7 @@
<int key="NSvFlags">274</int>
<string key="NSFrameSize">{320, 42}</string>
<reference key="NSSuperview" ref="935863454"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="317702958"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
@ -288,6 +299,7 @@
</array>
<string key="NSFrameSize">{320, 42}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="810603278"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
@ -299,6 +311,7 @@
</array>
<string key="NSFrame">{{0, 20}, {320, 480}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1051556672"/>
<reference key="IBUIBackgroundColor" ref="732745065"/>
<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@ -564,7 +577,147 @@
<nil key="sourceID"/>
<int key="maxID">91</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">BuschJaegerCallView</string>
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="onSnapshotClick:">id</string>
<string key="takeCall:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="onSnapshotClick:">
<string key="name">onSnapshotClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="takeCall:">
<string key="name">takeCall:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="cameraLeftSwipeGestureRecognizer">UISwipeGestureRecognizer</string>
<string key="cameraRightSwipeGestureRecognizer">UISwipeGestureRecognizer</string>
<string key="contactLabel">UILabel</string>
<string key="declineButton">UIHangUpButton</string>
<string key="endOrRejectCallButton">UIHangUpButton</string>
<string key="incomingView">UIView</string>
<string key="lightsButton">UIDigitButton</string>
<string key="microButton">UIToggleButton</string>
<string key="openDoorButton">UIDigitButton</string>
<string key="snapshotButton">UIButton</string>
<string key="takeCallButton">UIButton</string>
<string key="videoView">UIView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="cameraLeftSwipeGestureRecognizer">
<string key="name">cameraLeftSwipeGestureRecognizer</string>
<string key="candidateClassName">UISwipeGestureRecognizer</string>
</object>
<object class="IBToOneOutletInfo" key="cameraRightSwipeGestureRecognizer">
<string key="name">cameraRightSwipeGestureRecognizer</string>
<string key="candidateClassName">UISwipeGestureRecognizer</string>
</object>
<object class="IBToOneOutletInfo" key="contactLabel">
<string key="name">contactLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo" key="declineButton">
<string key="name">declineButton</string>
<string key="candidateClassName">UIHangUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="endOrRejectCallButton">
<string key="name">endOrRejectCallButton</string>
<string key="candidateClassName">UIHangUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="incomingView">
<string key="name">incomingView</string>
<string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo" key="lightsButton">
<string key="name">lightsButton</string>
<string key="candidateClassName">UIDigitButton</string>
</object>
<object class="IBToOneOutletInfo" key="microButton">
<string key="name">microButton</string>
<string key="candidateClassName">UIToggleButton</string>
</object>
<object class="IBToOneOutletInfo" key="openDoorButton">
<string key="name">openDoorButton</string>
<string key="candidateClassName">UIDigitButton</string>
</object>
<object class="IBToOneOutletInfo" key="snapshotButton">
<string key="name">snapshotButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="takeCallButton">
<string key="name">takeCallButton</string>
<string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo" key="videoView">
<string key="name">videoView</string>
<string key="candidateClassName">UIView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/BuschJaegerCallView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIDigitButton</string>
<string key="superclassName">UILongTouchButton</string>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">addressField</string>
<string key="NS.object.0">UITextField</string>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<string key="NS.key.0">addressField</string>
<object class="IBToOneOutletInfo" key="NS.object.0">
<string key="name">addressField</string>
<string key="candidateClassName">UITextField</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIDigitButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIHangUpButton</string>
<string key="superclassName">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIHangUpButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UILongTouchButton</string>
<string key="superclassName">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UILongTouchButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIMicroButton</string>
<string key="superclassName">UIToggleButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIMicroButton.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">UIToggleButton</string>
<string key="superclassName">UIButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/UIToggleButton.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">

3
Classes/BuschJaegerConfiguration.m
View file

@ -509,6 +509,9 @@
SecTrustResultType trustResult;
err = SecTrustEvaluate(newTrust, &trustResult);
BOOL trusted = (err == noErr) && ((trustResult == kSecTrustResultProceed) || (trustResult == kSecTrustResultUnspecified));
#ifdef DEBUG
trusted = TRUE;
#endif
NSURLCredential* credential = nil;
if (trusted)

5
Classes/BuschJaegerHistoryDetailsView.h
View file

@ -37,11 +37,12 @@
@property (nonatomic, retain) IBOutlet UIView *fullscreenView;
@property (nonatomic, retain) IBOutlet UIButton *saveButton;
@property (nonatomic, retain) IBOutlet UIRemoteImageView *imageView;
@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *detailsLeftSwipeGestureRecognizer;
@property (nonatomic, retain) IBOutlet UISwipeGestureRecognizer *detailsRightSwipeGestureRecognizer;
@property (nonatomic, retain) IBOutlet UITapGestureRecognizer *detailsTapGestureRecognizer;
- (IBAction)onBackClick:(id)sender;
- (IBAction)onDeleteClick:(id)sender;
- (IBAction)nextImage:(id)sender;
- (IBAction)previousImage:(id)sender;
- (IBAction)hideImage:(id)sender;
- (IBAction)saveImage:(id)sender;

43
Classes/BuschJaegerHistoryDetailsView.m
View file

@ -33,6 +33,9 @@
@synthesize imageView;
@synthesize saveButton;
@synthesize fullscreenView;
@synthesize detailsLeftSwipeGestureRecognizer;
@synthesize detailsRightSwipeGestureRecognizer;
@synthesize detailsTapGestureRecognizer;
#pragma mark - Lifecycle Functions
@ -77,6 +80,9 @@
[fullscreenView release];
[imageView release];
[saveButton release];
[detailsLeftSwipeGestureRecognizer release];
[detailsRightSwipeGestureRecognizer release];
[detailsTapGestureRecognizer release];
[dateFormatter release];
@ -97,6 +103,19 @@
[BuschJaegerUtils createGradientForView:backButton withTopColor:col1 bottomColor:col2 cornerRadius:BUSCHJAEGER_DEFAULT_CORNER_RADIUS];
}
detailsRightSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doDetailsSwipe:)];
[detailsRightSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionLeft];
[imageView addGestureRecognizer:detailsRightSwipeGestureRecognizer];
detailsLeftSwipeGestureRecognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(doDetailsSwipe:)];
[detailsLeftSwipeGestureRecognizer setDirection:UISwipeGestureRecognizerDirectionRight];
[imageView addGestureRecognizer:detailsLeftSwipeGestureRecognizer];
detailsTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hideImage:)];
[detailsTapGestureRecognizer setNumberOfTapsRequired:1];
[detailsTapGestureRecognizer setNumberOfTouchesRequired:1];
[imageView addGestureRecognizer:detailsTapGestureRecognizer];
}
- (void)viewWillAppear:(BOOL)animated {
@ -144,18 +163,18 @@
[[LinphoneManager instance].configuration removeHistory:BuschJaegerConfigurationRequestType_Local history:history delegate:self];
}
- (IBAction)nextImage:(id)sender {
if([history.images count]) {
currentIndex = (currentIndex - 1);
if(currentIndex < 0) currentIndex = [history.images count] - 1;
[imageView loadImage:[[LinphoneManager instance].configuration getImageUrl:BuschJaegerConfigurationRequestType_Local image:[history.images objectAtIndex:currentIndex]]];
}
}
- (IBAction)previousImage:(id)sender {
if([history.images count]) {
currentIndex = (currentIndex + 1) % [history.images count];
[imageView loadImage:[[LinphoneManager instance].configuration getImageUrl:BuschJaegerConfigurationRequestType_Local image:[history.images objectAtIndex:currentIndex]]];
- (IBAction)doDetailsSwipe:(UISwipeGestureRecognizer *)sender {
if (sender.direction == UISwipeGestureRecognizerDirectionRight) {
if([history.images count]) {
currentIndex = (currentIndex - 1);
if(currentIndex < 0) currentIndex = [history.images count] - 1;
[imageView loadImage:[[LinphoneManager instance].configuration getImageUrl:BuschJaegerConfigurationRequestType_Local image:[history.images objectAtIndex:currentIndex]]];
}
} else if (sender.direction == UISwipeGestureRecognizerDirectionLeft) {
if([history.images count]) {
currentIndex = (currentIndex + 1) % [history.images count];
[imageView loadImage:[[LinphoneManager instance].configuration getImageUrl:BuschJaegerConfigurationRequestType_Local image:[history.images objectAtIndex:currentIndex]]];
}
}
}

118
Classes/BuschJaegerHistoryDetailsView.xib
View file

@ -2,23 +2,21 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1536</int>
<string key="IBDocument.SystemVersion">12C60</string>
<string key="IBDocument.InterfaceBuilderVersion">2843</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<string key="IBDocument.SystemVersion">11G63</string>
<string key="IBDocument.InterfaceBuilderVersion">2840</string>
<string key="IBDocument.AppKitVersion">1138.51</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">1929</string>
<string key="NS.object.0">1926</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBProxyObject</string>
<string>IBUIButton</string>
<string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBUISwipeGestureRecognizer</string>
<string>IBUITableView</string>
<string>IBUITableViewController</string>
<string>IBUITapGestureRecognizer</string>
<string>IBUIView</string>
</array>
<array key="IBDocument.PluginDependencies">
@ -297,11 +295,6 @@
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBUIHorizontal">NO</bool>
</object>
<object class="IBUITapGestureRecognizer" id="309092053"/>
<object class="IBUISwipeGestureRecognizer" id="217364971"/>
<object class="IBUISwipeGestureRecognizer" id="504152559">
<int key="IBUIDirection">2</int>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
@ -394,60 +387,6 @@
</object>
<int key="connectionID">16</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletCollectionConnection" key="connection">
<string key="label">gestureRecognizers</string>
<reference key="source" ref="322407382"/>
<reference key="destination" ref="504152559"/>
<string key="cachedDesigntimeCollectionClassName">NSArray</string>
<bool key="addsContentToExistingCollection">YES</bool>
</object>
<int key="connectionID">31</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletCollectionConnection" key="connection">
<string key="label">gestureRecognizers</string>
<reference key="source" ref="322407382"/>
<reference key="destination" ref="309092053"/>
<string key="cachedDesigntimeCollectionClassName">NSArray</string>
<bool key="addsContentToExistingCollection">YES</bool>
</object>
<int key="connectionID">25</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletCollectionConnection" key="connection">
<string key="label">gestureRecognizers</string>
<reference key="source" ref="322407382"/>
<reference key="destination" ref="217364971"/>
<string key="cachedDesigntimeCollectionClassName">NSArray</string>
<bool key="addsContentToExistingCollection">YES</bool>
</object>
<int key="connectionID">30</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">hideImage:</string>
<reference key="source" ref="309092053"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">33</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">nextImage:</string>
<reference key="source" ref="217364971"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">34</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">previousImage:</string>
<reference key="source" ref="504152559"/>
<reference key="destination" ref="372490531"/>
</object>
<int key="connectionID">35</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">onDeleteClick:</string>
@ -542,23 +481,6 @@
<reference key="object" ref="390128791"/>
<reference key="parent" ref="794939656"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">23</int>
<reference key="object" ref="309092053"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">28</int>
<reference key="object" ref="217364971"/>
<reference key="parent" ref="0"/>
<string key="objectName">Right Swipe Gesture Recognizer</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">29</int>
<reference key="object" ref="504152559"/>
<reference key="parent" ref="0"/>
<string key="objectName">Left Swipe Gesture Recognizer</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">36</int>
<reference key="object" ref="1041038771"/>
@ -600,9 +522,6 @@
<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="21.CustomClassName">UIRemoteImageView</string>
<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<real value="2" key="36.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
<real value="0.0" key="36.IBUIButtonInspectorSelectedStateConfigurationMetadataKey"/>
@ -626,10 +545,8 @@
<string key="superclassName">UIViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="hideImage:">id</string>
<string key="nextImage:">id</string>
<string key="onBackClick:">id</string>
<string key="onDeleteClick:">id</string>
<string key="previousImage:">id</string>
<string key="saveImage:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
@ -637,10 +554,6 @@
<string key="name">hideImage:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="nextImage:">
<string key="name">nextImage:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="onBackClick:">
<string key="name">onBackClick:</string>
<string key="candidateClassName">id</string>
@ -649,10 +562,6 @@
<string key="name">onDeleteClick:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="previousImage:">
<string key="name">previousImage:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="saveImage:">
<string key="name">saveImage:</string>
<string key="candidateClassName">id</string>
@ -661,6 +570,9 @@
<dictionary class="NSMutableDictionary" key="outlets">
<string key="backButton">UIView</string>
<string key="dateLabel">UILabel</string>
<string key="detailsLeftSwipeGestureRecognizer">UISwipeGestureRecognizer</string>
<string key="detailsRightSwipeGestureRecognizer">UISwipeGestureRecognizer</string>
<string key="detailsTapGestureRecognizer">UITapGestureRecognizer</string>
<string key="fullscreenView">UIView</string>
<string key="imageView">UIRemoteImageView</string>
<string key="saveButton">UIButton</string>
@ -676,6 +588,18 @@
<string key="name">dateLabel</string>
<string key="candidateClassName">UILabel</string>
</object>
<object class="IBToOneOutletInfo" key="detailsLeftSwipeGestureRecognizer">
<string key="name">detailsLeftSwipeGestureRecognizer</string>
<string key="candidateClassName">UISwipeGestureRecognizer</string>
</object>
<object class="IBToOneOutletInfo" key="detailsRightSwipeGestureRecognizer">
<string key="name">detailsRightSwipeGestureRecognizer</string>
<string key="candidateClassName">UISwipeGestureRecognizer</string>
</object>
<object class="IBToOneOutletInfo" key="detailsTapGestureRecognizer">
<string key="name">detailsTapGestureRecognizer</string>
<string key="candidateClassName">UITapGestureRecognizer</string>
</object>
<object class="IBToOneOutletInfo" key="fullscreenView">
<string key="name">fullscreenView</string>
<string key="candidateClassName">UIView</string>
@ -724,6 +648,6 @@
<string key="bj_save.png">{34, 35}</string>
<string key="trash.png">{26, 26}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">1929</string>
<string key="IBCocoaTouchPluginVersion">1926</string>
</data>
</archive>

3
Classes/LinphoneUI/VideoZoomHandler.h
View file

@ -24,6 +24,9 @@
UIView* videoView;
}
@property (readonly) float zoomLevel;
@property (readonly) float cx;
@property (readonly) float cy;
- (void) setup: (UIView*) videoView;
- (void) resetZoom;

4
Classes/LinphoneUI/VideoZoomHandler.m
View file

@ -23,6 +23,10 @@
@implementation VideoZoomHandler
@synthesize zoomLevel;
@synthesize cx;
@synthesize cy;
- (void)zoomInOut:(UITapGestureRecognizer*) reco {
if (zoomLevel != 1)
zoomLevel = 1;

4
linphone.xcodeproj/project.pbxproj
View file

@ -2268,7 +2268,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
CODE_SIGN_IDENTITY = "iPhone Developer: jehan monnier (E8MYPN2NXL)";
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@ -2276,7 +2276,7 @@
HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
LIBRARY_SEARCH_PATHS = "";
PROVISIONING_PROFILE = "062BF030-2ECE-4F23-A951-AB1CB31784F9";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
TARGETED_DEVICE_FAMILY = "1,2";