Update AppRTCDemo UI.
- Removed log box. Debug logs still available through lldb.
- Remote video displayed in aspect fill format.
- Provide a hangup button.
- Added Default-568.png so we display properly on iPhone5+.
BUG=
R=jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/34669004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8081 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.h b/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.h
deleted file mode 100644
index 5b10199..0000000
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * libjingle
- * Copyright 2013, Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <UIKit/UIKit.h>
-
-// The view controller that is displayed when AppRTCDemo is loaded.
-@interface APPRTCViewController : UIViewController<UITextFieldDelegate>
-
-@property(weak, nonatomic) IBOutlet UITextField* roomInput;
-@property(weak, nonatomic) IBOutlet UITextView* instructionsView;
-@property(weak, nonatomic) IBOutlet UITextView* logView;
-@property(weak, nonatomic) IBOutlet UIView* blackView;
-
-- (void)applicationWillResignActive:(UIApplication*)application;
-
-@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m b/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m
deleted file mode 100644
index e6e19b0..0000000
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * libjingle
- * Copyright 2013, Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#if !defined(__has_feature) || !__has_feature(objc_arc)
-#error "This file requires ARC support."
-#endif
-
-#import "APPRTCViewController.h"
-
-#import <AVFoundation/AVFoundation.h>
-#import "ARDAppClient.h"
-#import "RTCEAGLVideoView.h"
-#import "RTCVideoTrack.h"
-
-// Padding space for local video view with its parent.
-static CGFloat const kLocalViewPadding = 20;
-
-@interface APPRTCViewController () <ARDAppClientDelegate,
- RTCEAGLVideoViewDelegate>
-@property(nonatomic, assign) UIInterfaceOrientation statusBarOrientation;
-@property(nonatomic, strong) RTCEAGLVideoView* localVideoView;
-@property(nonatomic, strong) RTCEAGLVideoView* remoteVideoView;
-@end
-
-@implementation APPRTCViewController {
- ARDAppClient *_client;
- RTCVideoTrack* _localVideoTrack;
- RTCVideoTrack* _remoteVideoTrack;
- CGSize _localVideoSize;
- CGSize _remoteVideoSize;
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
- self.remoteVideoView =
- [[RTCEAGLVideoView alloc] initWithFrame:self.blackView.bounds];
- self.remoteVideoView.delegate = self;
- self.remoteVideoView.transform = CGAffineTransformMakeScale(-1, 1);
- [self.blackView addSubview:self.remoteVideoView];
-
- self.localVideoView =
- [[RTCEAGLVideoView alloc] initWithFrame:self.blackView.bounds];
- self.localVideoView.delegate = self;
- [self.blackView addSubview:self.localVideoView];
-
- self.statusBarOrientation =
- [UIApplication sharedApplication].statusBarOrientation;
- self.roomInput.delegate = self;
- [self.roomInput becomeFirstResponder];
-}
-
-- (void)viewDidLayoutSubviews {
- if (self.statusBarOrientation !=
- [UIApplication sharedApplication].statusBarOrientation) {
- self.statusBarOrientation =
- [UIApplication sharedApplication].statusBarOrientation;
- [[NSNotificationCenter defaultCenter]
- postNotificationName:@"StatusBarOrientationDidChange"
- object:nil];
- }
-}
-
-- (void)applicationWillResignActive:(UIApplication*)application {
- [self disconnect];
-}
-
-#pragma mark - ARDAppClientDelegate
-
-- (void)appClient:(ARDAppClient *)client
- didChangeState:(ARDAppClientState)state {
- switch (state) {
- case kARDAppClientStateConnected:
- NSLog(@"Client connected.");
- break;
- case kARDAppClientStateConnecting:
- NSLog(@"Client connecting.");
- break;
- case kARDAppClientStateDisconnected:
- NSLog(@"Client disconnected.");
- [self resetUI];
- break;
- }
-}
-
-- (void)appClient:(ARDAppClient *)client
- didChangeConnectionState:(RTCICEConnectionState)state {
-}
-
-- (void)appClient:(ARDAppClient *)client
- didReceiveLocalVideoTrack:(RTCVideoTrack *)localVideoTrack {
- _localVideoTrack = localVideoTrack;
- [_localVideoTrack addRenderer:self.localVideoView];
- self.localVideoView.hidden = NO;
-}
-
-- (void)appClient:(ARDAppClient *)client
- didReceiveRemoteVideoTrack:(RTCVideoTrack *)remoteVideoTrack {
- _remoteVideoTrack = remoteVideoTrack;
- [_remoteVideoTrack addRenderer:self.remoteVideoView];
-}
-
-- (void)appClient:(ARDAppClient *)client
- didError:(NSError *)error {
- [self showAlertWithMessage:[NSString stringWithFormat:@"%@", error]];
- [self disconnect];
-}
-
-#pragma mark - RTCEAGLVideoViewDelegate
-
-- (void)videoView:(RTCEAGLVideoView*)videoView
- didChangeVideoSize:(CGSize)size {
- if (videoView == self.localVideoView) {
- _localVideoSize = size;
- } else if (videoView == self.remoteVideoView) {
- _remoteVideoSize = size;
- } else {
- NSParameterAssert(NO);
- }
- [self updateVideoViewLayout];
-}
-
-#pragma mark - UITextFieldDelegate
-
-- (void)textFieldDidEndEditing:(UITextField*)textField {
- NSString* room = textField.text;
- if ([room length] == 0) {
- return;
- }
- textField.hidden = YES;
- self.instructionsView.hidden = YES;
- self.logView.hidden = NO;
- [_client disconnect];
- // TODO(tkchin): support reusing the same client object.
- _client = [[ARDAppClient alloc] initWithDelegate:self];
- [_client connectToRoomWithId:room options:nil];
- [self setupCaptureSession];
-}
-
-- (BOOL)textFieldShouldReturn:(UITextField*)textField {
- // There is no other control that can take focus, so manually resign focus
- // when return (Join) is pressed to trigger |textFieldDidEndEditing|.
- [textField resignFirstResponder];
- return YES;
-}
-
-#pragma mark - Private
-
-- (void)disconnect {
- [self resetUI];
- [_client disconnect];
-}
-
-- (void)showAlertWithMessage:(NSString*)message {
- UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:nil
- message:message
- delegate:nil
- cancelButtonTitle:@"OK"
- otherButtonTitles:nil];
- [alertView show];
-}
-
-- (void)resetUI {
- [self.roomInput resignFirstResponder];
- self.roomInput.text = nil;
- self.roomInput.hidden = NO;
- self.instructionsView.hidden = NO;
- self.logView.hidden = YES;
- self.logView.text = nil;
- if (_localVideoTrack) {
- [_localVideoTrack removeRenderer:self.localVideoView];
- _localVideoTrack = nil;
- [self.localVideoView renderFrame:nil];
- }
- if (_remoteVideoTrack) {
- [_remoteVideoTrack removeRenderer:self.remoteVideoView];
- _remoteVideoTrack = nil;
- [self.remoteVideoView renderFrame:nil];
- }
- self.blackView.hidden = YES;
-}
-
-- (void)setupCaptureSession {
- self.blackView.hidden = NO;
- [self updateVideoViewLayout];
-}
-
-- (void)updateVideoViewLayout {
- // TODO(tkchin): handle rotation.
- CGSize defaultAspectRatio = CGSizeMake(4, 3);
- CGSize localAspectRatio = CGSizeEqualToSize(_localVideoSize, CGSizeZero) ?
- defaultAspectRatio : _localVideoSize;
- CGSize remoteAspectRatio = CGSizeEqualToSize(_remoteVideoSize, CGSizeZero) ?
- defaultAspectRatio : _remoteVideoSize;
-
- CGRect remoteVideoFrame =
- AVMakeRectWithAspectRatioInsideRect(remoteAspectRatio,
- self.blackView.bounds);
- self.remoteVideoView.frame = remoteVideoFrame;
-
- CGRect localVideoFrame =
- AVMakeRectWithAspectRatioInsideRect(localAspectRatio,
- self.blackView.bounds);
- localVideoFrame.size.width = localVideoFrame.size.width / 3;
- localVideoFrame.size.height = localVideoFrame.size.height / 3;
- localVideoFrame.origin.x = CGRectGetMaxX(self.blackView.bounds)
- - localVideoFrame.size.width - kLocalViewPadding;
- localVideoFrame.origin.y = CGRectGetMaxY(self.blackView.bounds)
- - localVideoFrame.size.height - kLocalViewPadding;
- self.localVideoView.frame = localVideoFrame;
-}
-
-@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h b/talk/examples/objc/AppRTCDemo/ios/ARDAppDelegate.h
similarity index 96%
rename from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
rename to talk/examples/objc/AppRTCDemo/ios/ARDAppDelegate.h
index 196b39f..9357425 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDAppDelegate.h
@@ -30,5 +30,5 @@
// The main application class of the AppRTCDemo iOS app demonstrating
// interoperability between the Objective C implementation of PeerConnection
// and the apprtc.appspot.com demo webapp.
-@interface APPRTCAppDelegate : NSObject<UIApplicationDelegate>
+@interface ARDAppDelegate : NSObject <UIApplicationDelegate>
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.m b/talk/examples/objc/AppRTCDemo/ios/ARDAppDelegate.m
similarity index 71%
rename from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.m
rename to talk/examples/objc/AppRTCDemo/ios/ARDAppDelegate.m
index 58963d5..4705a63 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.m
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDAppDelegate.m
@@ -25,41 +25,35 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "APPRTCAppDelegate.h"
+#import "ARDAppDelegate.h"
-#import "APPRTCViewController.h"
+#import "ARDMainViewController.h"
#import "RTCPeerConnectionFactory.h"
-@implementation APPRTCAppDelegate {
- UIWindow* _window;
+@implementation ARDAppDelegate {
+ UIWindow *_window;
}
#pragma mark - UIApplicationDelegate methods
-- (BOOL)application:(UIApplication*)application
- didFinishLaunchingWithOptions:(NSDictionary*)launchOptions {
+- (BOOL)application:(UIApplication *)application
+ didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
[RTCPeerConnectionFactory initializeSSL];
_window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
- APPRTCViewController* viewController =
- [[APPRTCViewController alloc] initWithNibName:@"APPRTCViewController"
- bundle:nil];
- _window.rootViewController = viewController;
[_window makeKeyAndVisible];
+ ARDMainViewController *viewController = [[ARDMainViewController alloc] init];
+ _window.rootViewController = viewController;
return YES;
}
-- (void)applicationWillResignActive:(UIApplication*)application {
- [[self appRTCViewController] applicationWillResignActive:application];
+- (void)applicationWillResignActive:(UIApplication *)application {
+ ARDMainViewController *viewController =
+ (ARDMainViewController *)_window.rootViewController;
+ [viewController applicationWillResignActive:application];
}
-- (void)applicationWillTerminate:(UIApplication*)application {
+- (void)applicationWillTerminate:(UIApplication *)application {
[RTCPeerConnectionFactory deinitializeSSL];
}
-#pragma mark - Private
-
-- (APPRTCViewController*)appRTCViewController {
- return (APPRTCViewController*)_window.rootViewController;
-}
-
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h b/talk/examples/objc/AppRTCDemo/ios/ARDMainView.h
similarity index 79%
copy from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
copy to talk/examples/objc/AppRTCDemo/ios/ARDMainView.h
index 196b39f..da77602 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDMainView.h
@@ -1,6 +1,6 @@
/*
* libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2015, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -27,8 +27,18 @@
#import <UIKit/UIKit.h>
-// The main application class of the AppRTCDemo iOS app demonstrating
-// interoperability between the Objective C implementation of PeerConnection
-// and the apprtc.appspot.com demo webapp.
-@interface APPRTCAppDelegate : NSObject<UIApplicationDelegate>
+@class ARDMainView;
+
+@protocol ARDMainViewDelegate <NSObject>
+
+- (void)mainView:(ARDMainView *)mainView didInputRoom:(NSString *)room;
+
+@end
+
+// The main view of AppRTCDemo. It contains an input field for entering a room
+// name on apprtc to connect to.
+@interface ARDMainView : UIView
+
+@property(nonatomic, weak) id<ARDMainViewDelegate> delegate;
+
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/ARDMainView.m b/talk/examples/objc/AppRTCDemo/ios/ARDMainView.m
new file mode 100644
index 0000000..9fa0df0
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDMainView.m
@@ -0,0 +1,185 @@
+/*
+ * libjingle
+ * Copyright 2015, Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "ARDMainView.h"
+
+#import "UIImage+ARDUtilities.h"
+
+// TODO(tkchin): retrieve status bar height dynamically.
+static CGFloat const kStatusBarHeight = 20;
+
+static CGFloat const kRoomTextButtonSize = 40;
+static CGFloat const kRoomTextFieldHeight = 40;
+static CGFloat const kRoomTextFieldMargin = 8;
+static CGFloat const kAppLabelHeight = 20;
+
+@class ARDRoomTextField;
+@protocol ARDRoomTextFieldDelegate <NSObject>
+- (void)roomTextField:(ARDRoomTextField *)roomTextField
+ didInputRoom:(NSString *)room;
+@end
+
+// Helper view that contains a text field and a clear button.
+@interface ARDRoomTextField : UIView <UITextFieldDelegate>
+@property(nonatomic, weak) id<ARDRoomTextFieldDelegate> delegate;
+@end
+
+@implementation ARDRoomTextField {
+ UITextField *_roomText;
+ UIButton *_clearButton;
+}
+
+@synthesize delegate = _delegate;
+
+- (instancetype)initWithFrame:(CGRect)frame {
+ if (self = [super initWithFrame:frame]) {
+ _roomText = [[UITextField alloc] initWithFrame:CGRectZero];
+ _roomText.borderStyle = UITextBorderStyleNone;
+ _roomText.font = [UIFont fontWithName:@"Roboto" size:12];
+ _roomText.placeholder = @"Room name";
+ _roomText.delegate = self;
+ [_roomText addTarget:self
+ action:@selector(textFieldDidChange:)
+ forControlEvents:UIControlEventEditingChanged];
+ [self addSubview:_roomText];
+
+ _clearButton = [UIButton buttonWithType:UIButtonTypeCustom];
+ UIImage *image = [UIImage imageForName:@"ic_clear_black_24dp.png"
+ color:[UIColor colorWithWhite:0 alpha:.4]];
+
+ [_clearButton setImage:image forState:UIControlStateNormal];
+ [_clearButton addTarget:self
+ action:@selector(onClear:)
+ forControlEvents:UIControlEventTouchUpInside];
+ _clearButton.hidden = YES;
+ [self addSubview:_clearButton];
+
+ // Give rounded corners and a light gray border.
+ self.layer.borderWidth = 1;
+ self.layer.borderColor = [[UIColor lightGrayColor] CGColor];
+ self.layer.cornerRadius = 2;
+ }
+ return self;
+}
+
+- (void)layoutSubviews {
+ CGRect bounds = self.bounds;
+ _clearButton.frame = CGRectMake(CGRectGetMaxX(bounds) - kRoomTextButtonSize,
+ CGRectGetMinY(bounds),
+ kRoomTextButtonSize,
+ kRoomTextButtonSize);
+ _roomText.frame = CGRectMake(
+ CGRectGetMinX(bounds) + kRoomTextFieldMargin,
+ CGRectGetMinY(bounds),
+ CGRectGetMinX(_clearButton.frame) - CGRectGetMinX(bounds) -
+ kRoomTextFieldMargin,
+ kRoomTextFieldHeight);
+}
+
+- (CGSize)sizeThatFits:(CGSize)size {
+ size.height = kRoomTextFieldHeight;
+ return size;
+}
+
+#pragma mark - UITextFieldDelegate
+
+- (void)textFieldDidEndEditing:(UITextField *)textField {
+ [_delegate roomTextField:self didInputRoom:textField.text];
+}
+
+- (BOOL)textFieldShouldReturn:(UITextField *)textField {
+ // There is no other control that can take focus, so manually resign focus
+ // when return (Join) is pressed to trigger |textFieldDidEndEditing|.
+ [textField resignFirstResponder];
+ return YES;
+}
+
+#pragma mark - Private
+
+- (void)textFieldDidChange:(id)sender {
+ [self updateClearButton];
+}
+
+- (void)onClear:(id)sender {
+ _roomText.text = @"";
+ [self updateClearButton];
+ [_roomText resignFirstResponder];
+}
+
+- (void)updateClearButton {
+ _clearButton.hidden = _roomText.text.length == 0;
+}
+
+@end
+
+@interface ARDMainView () <ARDRoomTextFieldDelegate>
+@end
+
+@implementation ARDMainView {
+ UILabel *_appLabel;
+ ARDRoomTextField *_roomText;
+}
+
+@synthesize delegate = _delegate;
+
+- (instancetype)initWithFrame:(CGRect)frame {
+ if (self = [super initWithFrame:frame]) {
+ _appLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+ _appLabel.text = @"AppRTCDemo";
+ _appLabel.font = [UIFont fontWithName:@"Roboto" size:34];
+ _appLabel.textColor = [UIColor colorWithWhite:0 alpha:.2];
+ [_appLabel sizeToFit];
+ [self addSubview:_appLabel];
+
+ _roomText = [[ARDRoomTextField alloc] initWithFrame:CGRectZero];
+ _roomText.delegate = self;
+ [self addSubview:_roomText];
+
+ self.backgroundColor = [UIColor whiteColor];
+ }
+ return self;
+}
+
+- (void)layoutSubviews {
+ CGRect bounds = self.bounds;
+ CGFloat roomTextWidth = bounds.size.width - 2 * kRoomTextFieldMargin;
+ CGFloat roomTextHeight = [_roomText sizeThatFits:bounds.size].height;
+ _roomText.frame = CGRectMake(kRoomTextFieldMargin,
+ kStatusBarHeight + kRoomTextFieldMargin,
+ roomTextWidth,
+ roomTextHeight);
+ _appLabel.center = CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds));
+}
+
+#pragma mark - ARDRoomTextFieldDelegate
+
+- (void)roomTextField:(ARDRoomTextField *)roomTextField
+ didInputRoom:(NSString *)room {
+ [_delegate mainView:self didInputRoom:room];
+}
+
+@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h b/talk/examples/objc/AppRTCDemo/ios/ARDMainViewController.h
similarity index 83%
copy from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
copy to talk/examples/objc/AppRTCDemo/ios/ARDMainViewController.h
index 196b39f..244058b 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDMainViewController.h
@@ -1,6 +1,6 @@
/*
* libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2015, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -27,8 +27,8 @@
#import <UIKit/UIKit.h>
-// The main application class of the AppRTCDemo iOS app demonstrating
-// interoperability between the Objective C implementation of PeerConnection
-// and the apprtc.appspot.com demo webapp.
-@interface APPRTCAppDelegate : NSObject<UIApplicationDelegate>
+@interface ARDMainViewController : UIViewController
+
+- (void)applicationWillResignActive:(UIApplication *)application;
+
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/ARDMainViewController.m b/talk/examples/objc/AppRTCDemo/ios/ARDMainViewController.m
new file mode 100644
index 0000000..c53d91c
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDMainViewController.m
@@ -0,0 +1,102 @@
+/*
+ * libjingle
+ * Copyright 2015, Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "ARDMainViewController.h"
+
+#import "ARDAppClient.h"
+#import "ARDMainView.h"
+#import "ARDVideoCallViewController.h"
+
+@interface ARDMainViewController () <ARDMainViewDelegate>
+@end
+
+@implementation ARDMainViewController
+
+- (void)loadView {
+ ARDMainView *mainView = [[ARDMainView alloc] initWithFrame:CGRectZero];
+ mainView.delegate = self;
+ self.view = mainView;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+ // Terminate any calls when we aren't active.
+ [self dismissViewControllerAnimated:NO completion:nil];
+}
+
+#pragma mark - ARDMainViewDelegate
+
+- (void)mainView:(ARDMainView *)mainView didInputRoom:(NSString *)room {
+ if (!room.length) {
+ return;
+ }
+ // Trim whitespaces.
+ NSCharacterSet *whitespaceSet = [NSCharacterSet whitespaceCharacterSet];
+ NSString *trimmedRoom = [room stringByTrimmingCharactersInSet:whitespaceSet];
+
+ // Check that room name is valid.
+ NSError *error = nil;
+ NSRegularExpressionOptions options = NSRegularExpressionCaseInsensitive;
+ NSRegularExpression *regex =
+ [NSRegularExpression regularExpressionWithPattern:@"\\w+"
+ options:options
+ error:&error];
+ if (error) {
+ [self showAlertWithMessage:error.localizedDescription];
+ return;
+ }
+ NSRange matchRange =
+ [regex rangeOfFirstMatchInString:trimmedRoom
+ options:0
+ range:NSMakeRange(0, trimmedRoom.length)];
+ if (matchRange.location == NSNotFound ||
+ matchRange.length != trimmedRoom.length) {
+ [self showAlertWithMessage:@"Invalid room name."];
+ return;
+ }
+
+ // Kick off the video call.
+ ARDVideoCallViewController *videoCallViewController =
+ [[ARDVideoCallViewController alloc] initForRoom:trimmedRoom];
+ videoCallViewController.modalTransitionStyle =
+ UIModalTransitionStyleCrossDissolve;
+ [self presentViewController:videoCallViewController
+ animated:YES
+ completion:nil];
+}
+
+#pragma mark - Private
+
+- (void)showAlertWithMessage:(NSString*)message {
+ UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:nil
+ message:message
+ delegate:nil
+ cancelButtonTitle:@"OK"
+ otherButtonTitles:nil];
+ [alertView show];
+}
+
+@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallView.h
similarity index 69%
copy from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
copy to talk/examples/objc/AppRTCDemo/ios/ARDVideoCallView.h
index 196b39f..98ef0e3 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallView.h
@@ -1,6 +1,6 @@
/*
* libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2015, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -27,8 +27,23 @@
#import <UIKit/UIKit.h>
-// The main application class of the AppRTCDemo iOS app demonstrating
-// interoperability between the Objective C implementation of PeerConnection
-// and the apprtc.appspot.com demo webapp.
-@interface APPRTCAppDelegate : NSObject<UIApplicationDelegate>
+#import "RTCEAGLVideoView.h"
+
+@class ARDVideoCallView;
+@protocol ARDVideoCallViewDelegate <NSObject>
+
+// Called when the hangup button is pressed.
+- (void)videoCallViewDidHangup:(ARDVideoCallView *)view;
+
+@end
+
+// Video call view that shows local and remote video, provides a label to
+// display status, and also a hangup button.
+@interface ARDVideoCallView : UIView
+
+@property(nonatomic, readonly) UILabel *statusLabel;
+@property(nonatomic, readonly) RTCEAGLVideoView *localVideoView;
+@property(nonatomic, readonly) RTCEAGLVideoView *remoteVideoView;
+@property(nonatomic, weak) id<ARDVideoCallViewDelegate> delegate;
+
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallView.m b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallView.m
new file mode 100644
index 0000000..3510d4f
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallView.m
@@ -0,0 +1,145 @@
+/*
+ * libjingle
+ * Copyright 2015, Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "ARDVideoCallView.h"
+
+#import <AVFoundation/AVFoundation.h>
+#import "UIImage+ARDUtilities.h"
+
+static CGFloat const kHangupButtonPadding = 16;
+static CGFloat const kHangupButtonSize = 48;
+static CGFloat const kLocalVideoViewWidth = 90;
+static CGFloat const kLocalVideoViewHeight = 120;
+static CGFloat const kLocalVideoViewPadding = 8;
+
+@interface ARDVideoCallView () <RTCEAGLVideoViewDelegate>
+@end
+
+@implementation ARDVideoCallView {
+ UIButton *_hangupButton;
+ CGSize _localVideoSize;
+ CGSize _remoteVideoSize;
+}
+
+@synthesize statusLabel = _statusLabel;
+@synthesize localVideoView = _localVideoView;
+@synthesize remoteVideoView = _remoteVideoView;
+@synthesize delegate = _delegate;
+
+- (instancetype)initWithFrame:(CGRect)frame {
+ if (self = [super initWithFrame:frame]) {
+ _remoteVideoView = [[RTCEAGLVideoView alloc] initWithFrame:CGRectZero];
+ _remoteVideoView.delegate = self;
+ [self addSubview:_remoteVideoView];
+
+ _localVideoView = [[RTCEAGLVideoView alloc] initWithFrame:CGRectZero];
+ _localVideoView.transform = CGAffineTransformMakeScale(-1, 1);
+ _localVideoView.delegate = self;
+ [self addSubview:_localVideoView];
+
+ _hangupButton = [UIButton buttonWithType:UIButtonTypeCustom];
+ _hangupButton.backgroundColor = [UIColor redColor];
+ _hangupButton.layer.cornerRadius = kHangupButtonSize / 2;
+ _hangupButton.layer.masksToBounds = YES;
+ UIImage *image = [UIImage imageForName:@"ic_call_end_black_24dp.png"
+ color:[UIColor whiteColor]];
+ [_hangupButton setImage:image forState:UIControlStateNormal];
+ [_hangupButton addTarget:self
+ action:@selector(onHangup:)
+ forControlEvents:UIControlEventTouchUpInside];
+ [self addSubview:_hangupButton];
+
+ _statusLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+ _statusLabel.font = [UIFont fontWithName:@"Roboto" size:16];
+ _statusLabel.textColor = [UIColor whiteColor];
+ [self addSubview:_statusLabel];
+ }
+ return self;
+}
+
+- (void)layoutSubviews {
+ CGRect bounds = self.bounds;
+ if (_remoteVideoSize.width > 0 && _remoteVideoSize.height > 0) {
+ // Aspect fill remote video into bounds.
+ CGRect remoteVideoFrame =
+ AVMakeRectWithAspectRatioInsideRect(_remoteVideoSize, bounds);
+ CGFloat scale = 1;
+ if (remoteVideoFrame.size.width > remoteVideoFrame.size.height) {
+ // Scale by height.
+ scale = bounds.size.height / remoteVideoFrame.size.height;
+ } else {
+ // Scale by width.
+ scale = bounds.size.width / remoteVideoFrame.size.width;
+ }
+ remoteVideoFrame.size.height *= scale;
+ remoteVideoFrame.size.width *= scale;
+ _remoteVideoView.frame = remoteVideoFrame;
+ _remoteVideoView.center =
+ CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds));
+ } else {
+ _remoteVideoView.frame = bounds;
+ }
+
+ CGRect localVideoFrame = CGRectZero;
+ localVideoFrame.origin.x =
+ CGRectGetMaxX(bounds) - kLocalVideoViewWidth - kLocalVideoViewPadding;
+ localVideoFrame.origin.y =
+ CGRectGetMaxY(bounds) - kLocalVideoViewHeight - kLocalVideoViewPadding;
+ localVideoFrame.size.width = kLocalVideoViewWidth;
+ localVideoFrame.size.height = kLocalVideoViewHeight;
+ _localVideoView.frame = localVideoFrame;
+
+ _hangupButton.frame =
+ CGRectMake(CGRectGetMinX(bounds) + kHangupButtonPadding,
+ CGRectGetMaxY(bounds) - kHangupButtonPadding -
+ kHangupButtonSize,
+ kHangupButtonSize,
+ kHangupButtonSize);
+
+ [_statusLabel sizeToFit];
+ _statusLabel.center =
+ CGPointMake(CGRectGetMidX(bounds), CGRectGetMidY(bounds));
+}
+
+#pragma mark - RTCEAGLVideoViewDelegate
+
+- (void)videoView:(RTCEAGLVideoView*)videoView didChangeVideoSize:(CGSize)size {
+ if (videoView == _localVideoView) {
+ _localVideoSize = size;
+ } else if (videoView == _remoteVideoView) {
+ _remoteVideoSize = size;
+ }
+ [self setNeedsLayout];
+}
+
+#pragma mark - Private
+
+- (void)onHangup:(id)sender {
+ [_delegate videoCallViewDidHangup:self];
+}
+
+@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h
similarity index 83%
copy from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
copy to talk/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h
index 196b39f..5f3dfc4 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.h
@@ -1,6 +1,6 @@
/*
* libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2015, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -27,8 +27,8 @@
#import <UIKit/UIKit.h>
-// The main application class of the AppRTCDemo iOS app demonstrating
-// interoperability between the Objective C implementation of PeerConnection
-// and the apprtc.appspot.com demo webapp.
-@interface APPRTCAppDelegate : NSObject<UIApplicationDelegate>
+@interface ARDVideoCallViewController : UIViewController
+
+- (instancetype)initForRoom:(NSString *)room;
+
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m
new file mode 100644
index 0000000..352cb43
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/ARDVideoCallViewController.m
@@ -0,0 +1,163 @@
+/*
+ * libjingle
+ * Copyright 2015, Google Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "ARDVideoCallViewController.h"
+
+#import "ARDAppClient.h"
+#import "ARDVideoCallView.h"
+
+@interface ARDVideoCallViewController () <ARDAppClientDelegate,
+ ARDVideoCallViewDelegate>
+@property(nonatomic, readonly) ARDVideoCallView *videoCallView;
+@end
+
+@implementation ARDVideoCallViewController {
+ ARDAppClient *_client;
+ RTCVideoTrack *_remoteVideoTrack;
+ RTCVideoTrack *_localVideoTrack;
+}
+
+@synthesize videoCallView = _videoCallView;
+
+- (instancetype)initForRoom:(NSString *)room {
+ if (self = [super init]) {
+ _client = [[ARDAppClient alloc] initWithDelegate:self];
+ [_client connectToRoomWithId:room options:nil];
+ }
+ return self;
+}
+
+- (void)loadView {
+ _videoCallView = [[ARDVideoCallView alloc] initWithFrame:CGRectZero];
+ _videoCallView.delegate = self;
+ _videoCallView.statusLabel.text =
+ [self statusTextForState:RTCICEConnectionNew];
+ self.view = _videoCallView;
+}
+
+#pragma mark - ARDAppClientDelegate
+
+- (void)appClient:(ARDAppClient *)client
+ didChangeState:(ARDAppClientState)state {
+ switch (state) {
+ case kARDAppClientStateConnected:
+ NSLog(@"Client connected.");
+ break;
+ case kARDAppClientStateConnecting:
+ NSLog(@"Client connecting.");
+ break;
+ case kARDAppClientStateDisconnected:
+ NSLog(@"Client disconnected.");
+ [self hangup];
+ break;
+ }
+}
+
+- (void)appClient:(ARDAppClient *)client
+ didChangeConnectionState:(RTCICEConnectionState)state {
+ NSLog(@"ICE state changed: %d", state);
+ __weak ARDVideoCallViewController *weakSelf = self;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ ARDVideoCallViewController *strongSelf = weakSelf;
+ strongSelf.videoCallView.statusLabel.text =
+ [strongSelf statusTextForState:state];
+ });
+}
+
+- (void)appClient:(ARDAppClient *)client
+ didReceiveLocalVideoTrack:(RTCVideoTrack *)localVideoTrack {
+ if (!_localVideoTrack) {
+ _localVideoTrack = localVideoTrack;
+ [_localVideoTrack addRenderer:_videoCallView.localVideoView];
+ }
+}
+
+- (void)appClient:(ARDAppClient *)client
+ didReceiveRemoteVideoTrack:(RTCVideoTrack *)remoteVideoTrack {
+ if (!_remoteVideoTrack) {
+ _remoteVideoTrack = remoteVideoTrack;
+ [_remoteVideoTrack addRenderer:_videoCallView.remoteVideoView];
+ _videoCallView.statusLabel.hidden = YES;
+ }
+}
+
+- (void)appClient:(ARDAppClient *)client
+ didError:(NSError *)error {
+ NSString *message =
+ [NSString stringWithFormat:@"%@", error.localizedDescription];
+ [self showAlertWithMessage:message];
+ [self hangup];
+}
+
+#pragma mark - ARDVideoCallViewDelegate
+
+- (void)videoCallViewDidHangup:(ARDVideoCallView *)view {
+ [self hangup];
+}
+
+#pragma mark - Private
+
+- (void)hangup {
+ if (_remoteVideoTrack) {
+ [_remoteVideoTrack removeRenderer:_videoCallView.remoteVideoView];
+ _remoteVideoTrack = nil;
+ [_videoCallView.remoteVideoView renderFrame:nil];
+ }
+ if (_localVideoTrack) {
+ [_localVideoTrack removeRenderer:_videoCallView.localVideoView];
+ _localVideoTrack = nil;
+ [_videoCallView.localVideoView renderFrame:nil];
+ }
+ [_client disconnect];
+ [self.presentingViewController dismissViewControllerAnimated:YES
+ completion:nil];
+}
+
+- (NSString *)statusTextForState:(RTCICEConnectionState)state {
+ switch (state) {
+ case RTCICEConnectionNew:
+ case RTCICEConnectionChecking:
+ return @"Connecting...";
+ case RTCICEConnectionConnected:
+ case RTCICEConnectionCompleted:
+ case RTCICEConnectionFailed:
+ case RTCICEConnectionDisconnected:
+ case RTCICEConnectionClosed:
+ return nil;
+ }
+}
+
+- (void)showAlertWithMessage:(NSString*)message {
+ UIAlertView* alertView = [[UIAlertView alloc] initWithTitle:nil
+ message:message
+ delegate:nil
+ cancelButtonTitle:@"OK"
+ otherButtonTitles:nil];
+ [alertView show];
+}
+
+@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/Default.png b/talk/examples/objc/AppRTCDemo/ios/Default.png
deleted file mode 100644
index 4c8ca6f6..0000000
--- a/talk/examples/objc/AppRTCDemo/ios/Default.png
+++ /dev/null
Binary files differ
diff --git a/talk/examples/objc/AppRTCDemo/ios/Info.plist b/talk/examples/objc/AppRTCDemo/ios/Info.plist
index b616480..0b66b1c 100644
--- a/talk/examples/objc/AppRTCDemo/ios/Info.plist
+++ b/talk/examples/objc/AppRTCDemo/ios/Info.plist
@@ -58,5 +58,13 @@
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
+ <key>UIAppFonts</key>
+ <array>
+ <string>Roboto-Regular.ttf</string>
+ </array>
+ <key>UIBackgroundModes</key>
+ <array>
+ <string>voip</string>
+ </array>
</dict>
</plist>
diff --git a/talk/examples/objc/AppRTCDemo/ios/ResourceRules.plist b/talk/examples/objc/AppRTCDemo/ios/ResourceRules.plist
deleted file mode 100644
index e7ec329..0000000
--- a/talk/examples/objc/AppRTCDemo/ios/ResourceRules.plist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>rules</key>
- <dict>
- <key>.*</key>
- <true/>
- <key>Info.plist</key>
- <dict>
- <key>omit</key>
- <true/>
- <key>weight</key>
- <real>10</real>
- </dict>
- <key>ResourceRules.plist</key>
- <dict>
- <key>omit</key>
- <true/>
- <key>weight</key>
- <real>100</real>
- </dict>
- </dict>
-</dict>
-</plist>
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h b/talk/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h
similarity index 83%
copy from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
copy to talk/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h
index 196b39f..0b7ce5c 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
+++ b/talk/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.h
@@ -1,6 +1,6 @@
/*
* libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2015, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -27,8 +27,9 @@
#import <UIKit/UIKit.h>
-// The main application class of the AppRTCDemo iOS app demonstrating
-// interoperability between the Objective C implementation of PeerConnection
-// and the apprtc.appspot.com demo webapp.
-@interface APPRTCAppDelegate : NSObject<UIApplicationDelegate>
+@interface UIImage (ARDUtilities)
+
+// Returns an color tinted version for the given image resource.
++ (UIImage *)imageForName:(NSString *)name color:(UIColor *)color;
+
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h b/talk/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m
similarity index 69%
copy from talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
copy to talk/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m
index 196b39f..d6094f5 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCAppDelegate.h
+++ b/talk/examples/objc/AppRTCDemo/ios/UIImage+ARDUtilities.m
@@ -1,6 +1,6 @@
/*
* libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2015, Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@ -25,10 +25,24 @@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import <UIKit/UIKit.h>
+#import "UIImage+ARDUtilities.h"
-// The main application class of the AppRTCDemo iOS app demonstrating
-// interoperability between the Objective C implementation of PeerConnection
-// and the apprtc.appspot.com demo webapp.
-@interface APPRTCAppDelegate : NSObject<UIApplicationDelegate>
+@implementation UIImage (ARDUtilities)
+
++ (UIImage *)imageForName:(NSString *)name color:(UIColor *)color {
+ UIImage *image = [UIImage imageNamed:name];
+ if (!image) {
+ return nil;
+ }
+ UIGraphicsBeginImageContextWithOptions(image.size, NO, 0.0f);
+ [color setFill];
+ CGRect bounds = CGRectMake(0, 0, image.size.width, image.size.height);
+ UIRectFill(bounds);
+ [image drawInRect:bounds blendMode:kCGBlendModeDestinationIn alpha:1.0f];
+ UIImage *coloredImage = UIGraphicsGetImageFromCurrentImageContext();
+ UIGraphicsEndImageContext();
+
+ return coloredImage;
+}
+
@end
diff --git a/talk/examples/objc/AppRTCDemo/ios/en.lproj/APPRTCViewController.xib b/talk/examples/objc/AppRTCDemo/ios/en.lproj/APPRTCViewController.xib
deleted file mode 100644
index cb2dc83..0000000
--- a/talk/examples/objc/AppRTCDemo/ios/en.lproj/APPRTCViewController.xib
+++ /dev/null
@@ -1,716 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
- <data>
- <int key="IBDocument.SystemTarget">1536</int>
- <string key="IBDocument.SystemVersion">13B42</string>
- <string key="IBDocument.InterfaceBuilderVersion">4514</string>
- <string key="IBDocument.AppKitVersion">1265</string>
- <string key="IBDocument.HIToolboxVersion">696.00</string>
- <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
- <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="NS.object.0">3747</string>
- </object>
- <array key="IBDocument.IntegratedClassDependencies">
- <string>IBNSLayoutConstraint</string>
- <string>IBProxyObject</string>
- <string>IBUITextField</string>
- <string>IBUITextView</string>
- <string>IBUIView</string>
- </array>
- <array key="IBDocument.PluginDependencies">
- <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </array>
- <object class="NSMutableDictionary" key="IBDocument.Metadata">
- <string key="NS.key.0">PluginDependencyRecalculationVersion</string>
- <integer value="1" key="NS.object.0"/>
- </object>
- <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
- <object class="IBProxyObject" id="372490531">
- <string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBProxyObject" id="843779117">
- <string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIView" id="774585933">
- <reference key="NSNextResponder"/>
- <int key="NSvFlags">274</int>
- <array class="NSMutableArray" key="NSSubviews">
- <object class="IBUITextView" id="176994284">
- <reference key="NSNextResponder" ref="774585933"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 20}, {280, 141}}</string>
- <reference key="NSSuperview" ref="774585933"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="634862110"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <object class="NSColor" key="IBUIBackgroundColor" id="621995359">
- <int key="NSColorSpace">1</int>
- <bytes key="NSRGB">MSAxIDEAA</bytes>
- </object>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIUserInteractionEnabled">NO</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <string key="IBUIText">Enter the room below to connect to apprtc.</string>
- <object class="IBUITextInputTraits" key="IBUITextInputTraits">
- <int key="IBUIAutocapitalizationType">2</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <object class="IBUIFontDescription" key="IBUIFontDescription" id="166497611">
- <int key="type">1</int>
- <double key="pointSize">14</double>
- </object>
- <object class="NSFont" key="IBUIFont" id="144501234">
- <string key="NSName">HelveticaNeue</string>
- <double key="NSSize">14</double>
- <int key="NSfFlags">16</int>
- </object>
- </object>
- <object class="IBUITextField" id="546385578">
- <reference key="NSNextResponder" ref="774585933"/>
- <int key="NSvFlags">292</int>
- <string key="NSFrame">{{20, 180}, {280, 30}}</string>
- <reference key="NSSuperview" ref="774585933"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="261050959"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <bool key="IBUIOpaque">NO</bool>
- <bool key="IBUIClipsSubviews">YES</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <int key="IBUIContentVerticalAlignment">0</int>
- <string key="IBUIText"/>
- <int key="IBUIBorderStyle">3</int>
- <string key="IBUIPlaceholder">apprtc room</string>
- <object class="NSColor" key="IBUITextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- <object class="NSColorSpace" key="NSCustomColorSpace" id="14071810">
- <int key="NSID">2</int>
- </object>
- </object>
- <bool key="IBUIAdjustsFontSizeToFit">YES</bool>
- <float key="IBUIMinimumFontSize">17</float>
- <object class="IBUITextInputTraits" key="IBUITextInputTraits">
- <int key="IBUIKeyboardType">2</int>
- <int key="IBUIReturnKeyType">3</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <reference key="IBUIFontDescription" ref="166497611"/>
- <reference key="IBUIFont" ref="144501234"/>
- </object>
- <object class="IBUITextView" id="634862110">
- <reference key="NSNextResponder" ref="774585933"/>
- <int key="NSvFlags">-2147483356</int>
- <string key="NSFrame">{{20, 20}, {280, 190}}</string>
- <reference key="NSSuperview" ref="774585933"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="546385578"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <reference key="IBUIBackgroundColor" ref="621995359"/>
- <bool key="IBUIClipsSubviews">YES</bool>
- <bool key="IBUIMultipleTouchEnabled">YES</bool>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool key="IBUIEditable">NO</bool>
- <string key="IBUIText"/>
- <object class="IBUITextInputTraits" key="IBUITextInputTraits">
- <int key="IBUIAutocapitalizationType">2</int>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- <reference key="IBUIFontDescription" ref="166497611"/>
- <reference key="IBUIFont" ref="144501234"/>
- </object>
- <object class="IBUIView" id="261050959">
- <reference key="NSNextResponder" ref="774585933"/>
- <int key="NSvFlags">-2147483356</int>
- <string key="NSFrame">{{20, 228}, {280, 300}}</string>
- <reference key="NSSuperview" ref="774585933"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
- <string key="NSReuseIdentifierKey">_NS:9</string>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </array>
- <string key="NSFrame">{{0, 20}, {320, 548}}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="176994284"/>
- <object class="NSColor" key="IBUIBackgroundColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC43NQA</bytes>
- <reference key="NSCustomColorSpace" ref="14071810"/>
- </object>
- <bool key="IBUIClearsContextBeforeDrawing">NO</bool>
- <object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
- <object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
- <string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
- <object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <array key="dict.sortedKeys">
- <integer value="1"/>
- <integer value="3"/>
- </array>
- <array key="dict.values">
- <string>{320, 568}</string>
- <string>{568, 320}</string>
- </array>
- </object>
- <string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
- <string key="IBUIDisplayName">Retina 4-inch Full Screen</string>
- <int key="IBUIType">2</int>
- </object>
- <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
- </object>
- </array>
- <object class="IBObjectContainer" key="IBDocument.Objects">
- <array class="NSMutableArray" key="connectionRecords">
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">view</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="774585933"/>
- </object>
- <int key="connectionID">7</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">roomInput</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="546385578"/>
- </object>
- <int key="connectionID">108</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">instructionsView</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="176994284"/>
- </object>
- <int key="connectionID">127</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">logView</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="634862110"/>
- </object>
- <int key="connectionID">138</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">blackView</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="261050959"/>
- </object>
- <int key="connectionID">151</int>
- </object>
- </array>
- <object class="IBMutableOrderedSet" key="objectRecords">
- <array key="orderedObjects">
- <object class="IBObjectRecord">
- <int key="objectID">0</int>
- <array key="object" id="0"/>
- <reference key="children" ref="1000"/>
- <nil key="parent"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-1</int>
- <reference key="object" ref="372490531"/>
- <reference key="parent" ref="0"/>
- <string key="objectName">File's Owner</string>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">-2</int>
- <reference key="object" ref="843779117"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">6</int>
- <reference key="object" ref="774585933"/>
- <array class="NSMutableArray" key="children">
- <object class="IBNSLayoutConstraint" id="933872207">
- <reference key="firstItem" ref="774585933"/>
- <int key="firstAttribute">4</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="261050959"/>
- <int key="secondAttribute">4</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">23</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="863471211">
- <reference key="firstItem" ref="261050959"/>
- <int key="firstAttribute">3</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="774585933"/>
- <int key="secondAttribute">3</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">228</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="590654550">
- <reference key="firstItem" ref="546385578"/>
- <int key="firstAttribute">5</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="261050959"/>
- <int key="secondAttribute">5</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">0.0</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">6</int>
- <float key="scoringTypeFloat">24</float>
- <int key="contentType">2</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="734153049">
- <reference key="firstItem" ref="546385578"/>
- <int key="firstAttribute">6</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="261050959"/>
- <int key="secondAttribute">6</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">0.0</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">6</int>
- <float key="scoringTypeFloat">24</float>
- <int key="contentType">2</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="117610664">
- <reference key="firstItem" ref="774585933"/>
- <int key="firstAttribute">6</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="546385578"/>
- <int key="secondAttribute">6</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="860801955">
- <reference key="firstItem" ref="546385578"/>
- <int key="firstAttribute">5</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="774585933"/>
- <int key="secondAttribute">5</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="544488581">
- <reference key="firstItem" ref="634862110"/>
- <int key="firstAttribute">4</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="546385578"/>
- <int key="secondAttribute">4</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">0.0</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">6</int>
- <float key="scoringTypeFloat">24</float>
- <int key="contentType">2</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="19985792">
- <reference key="firstItem" ref="634862110"/>
- <int key="firstAttribute">3</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="774585933"/>
- <int key="secondAttribute">3</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="1001701893">
- <reference key="firstItem" ref="774585933"/>
- <int key="firstAttribute">6</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="634862110"/>
- <int key="secondAttribute">6</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="858545289">
- <reference key="firstItem" ref="634862110"/>
- <int key="firstAttribute">5</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="774585933"/>
- <int key="secondAttribute">5</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="1039342825">
- <reference key="firstItem" ref="774585933"/>
- <int key="firstAttribute">6</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="176994284"/>
- <int key="secondAttribute">6</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="663764352">
- <reference key="firstItem" ref="176994284"/>
- <int key="firstAttribute">3</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="774585933"/>
- <int key="secondAttribute">3</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <object class="IBNSLayoutConstraint" id="46028745">
- <reference key="firstItem" ref="176994284"/>
- <int key="firstAttribute">5</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="774585933"/>
- <int key="secondAttribute">5</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="774585933"/>
- <int key="scoringType">0</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <bool key="placeholder">NO</bool>
- </object>
- <reference ref="176994284"/>
- <reference ref="546385578"/>
- <reference ref="634862110"/>
- <reference ref="261050959"/>
- </array>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">57</int>
- <reference key="object" ref="176994284"/>
- <array class="NSMutableArray" key="children">
- <object class="IBNSLayoutConstraint" id="234302232">
- <reference key="firstItem" ref="176994284"/>
- <int key="firstAttribute">8</int>
- <int key="relation">0</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">141</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="176994284"/>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">1</int>
- <bool key="placeholder">NO</bool>
- </object>
- </array>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">62</int>
- <reference key="object" ref="46028745"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">63</int>
- <reference key="object" ref="663764352"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">66</int>
- <reference key="object" ref="1039342825"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">104</int>
- <reference key="object" ref="546385578"/>
- <array class="NSMutableArray" key="children"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">107</int>
- <reference key="object" ref="860801955"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">123</int>
- <reference key="object" ref="234302232"/>
- <reference key="parent" ref="176994284"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">126</int>
- <reference key="object" ref="117610664"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">128</int>
- <reference key="object" ref="634862110"/>
- <array class="NSMutableArray" key="children">
- <object class="IBNSLayoutConstraint" id="988159807">
- <reference key="firstItem" ref="634862110"/>
- <int key="firstAttribute">8</int>
- <int key="relation">0</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">190</double>
- </object>
- <float key="priority">1000</float>
- <reference key="containingView" ref="634862110"/>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">1</int>
- <bool key="placeholder">NO</bool>
- </object>
- </array>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">133</int>
- <reference key="object" ref="858545289"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">137</int>
- <reference key="object" ref="1001701893"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">139</int>
- <reference key="object" ref="19985792"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">141</int>
- <reference key="object" ref="988159807"/>
- <reference key="parent" ref="634862110"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">142</int>
- <reference key="object" ref="261050959"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">148</int>
- <reference key="object" ref="734153049"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">149</int>
- <reference key="object" ref="590654550"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">153</int>
- <reference key="object" ref="863471211"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">154</int>
- <reference key="object" ref="933872207"/>
- <reference key="parent" ref="774585933"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">155</int>
- <reference key="object" ref="544488581"/>
- <reference key="parent" ref="774585933"/>
- </object>
- </array>
- </object>
- <dictionary class="NSMutableDictionary" key="flattenedProperties">
- <string key="-1.CustomClassName">APPRTCViewController</string>
- <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="-2.CustomClassName">UIResponder</string>
- <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="104.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <boolean value="NO" key="104.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="107.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="123.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="126.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="128.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <array key="128.IBViewMetadataConstraints">
- <reference ref="988159807"/>
- </array>
- <boolean value="NO" key="128.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="133.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="137.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="139.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="141.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="142.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <boolean value="NO" key="142.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="148.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="149.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="153.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="154.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="155.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="57.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <array class="NSMutableArray" key="57.IBViewMetadataConstraints">
- <reference ref="234302232"/>
- </array>
- <boolean value="NO" key="57.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <array class="NSMutableArray" key="6.IBViewMetadataConstraints">
- <reference ref="46028745"/>
- <reference ref="663764352"/>
- <reference ref="1039342825"/>
- <reference ref="858545289"/>
- <reference ref="1001701893"/>
- <reference ref="19985792"/>
- <reference ref="544488581"/>
- <reference ref="860801955"/>
- <reference ref="117610664"/>
- <reference ref="734153049"/>
- <reference ref="590654550"/>
- <reference ref="863471211"/>
- <reference ref="933872207"/>
- </array>
- <string key="62.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="63.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- <string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
- <nil key="activeLocalization"/>
- <dictionary class="NSMutableDictionary" key="localizations"/>
- <nil key="sourceID"/>
- <int key="maxID">155</int>
- </object>
- <object class="IBClassDescriber" key="IBDocument.Classes">
- <array class="NSMutableArray" key="referencedPartialClassDescriptions">
- <object class="IBPartialClassDescription">
- <string key="className">APPRTCViewController</string>
- <string key="superclassName">UIViewController</string>
- <dictionary class="NSMutableDictionary" key="outlets">
- <string key="blackView">UIView</string>
- <string key="roomInput">UITextField</string>
- <string key="instructionsView">UITextView</string>
- <string key="logView">UITextView</string>
- </dictionary>
- <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
- <object class="IBToOneOutletInfo" key="blackView">
- <string key="name">blackView</string>
- <string key="candidateClassName">UIView</string>
- </object>
- <object class="IBToOneOutletInfo" key="roomInput">
- <string key="name">roomInput</string>
- <string key="candidateClassName">UITextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="instructionsView">
- <string key="name">instructionsView</string>
- <string key="candidateClassName">UITextView</string>
- </object>
- <object class="IBToOneOutletInfo" key="logView">
- <string key="name">logView</string>
- <string key="candidateClassName">UITextView</string>
- </object>
- </dictionary>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/APPRTCViewController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
- <string key="className">NSLayoutConstraint</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/NSLayoutConstraint.h</string>
- </object>
- </object>
- </array>
- </object>
- <int key="IBDocument.localizationMode">0</int>
- <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
- <bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">YES</bool>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS</string>
- <real value="1536" key="NS.object.0"/>
- </object>
- <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
- <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3</string>
- <integer value="4600" key="NS.object.0"/>
- </object>
- <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
- <int key="IBDocument.defaultPropertyAccessControl">3</int>
- <bool key="IBDocument.UseAutolayout">YES</bool>
- <string key="IBCocoaTouchPluginVersion">3747</string>
- </data>
-</archive>
diff --git a/talk/examples/objc/AppRTCDemo/ios/main.m b/talk/examples/objc/AppRTCDemo/ios/main.m
index e9a1f63..17a008d 100644
--- a/talk/examples/objc/AppRTCDemo/ios/main.m
+++ b/talk/examples/objc/AppRTCDemo/ios/main.m
@@ -27,11 +27,11 @@
#import <UIKit/UIKit.h>
-#import "APPRTCAppDelegate.h"
+#import "ARDAppDelegate.h"
int main(int argc, char* argv[]) {
@autoreleasepool {
return UIApplicationMain(
- argc, argv, nil, NSStringFromClass([APPRTCAppDelegate class]));
+ argc, argv, nil, NSStringFromClass([ARDAppDelegate class]));
}
}
diff --git a/talk/examples/objc/AppRTCDemo/ios/resources/Default-568h.png b/talk/examples/objc/AppRTCDemo/ios/resources/Default-568h.png
new file mode 100644
index 0000000..2735148
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/resources/Default-568h.png
Binary files differ
diff --git a/talk/examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf b/talk/examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf
new file mode 100644
index 0000000..0e58508
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/resources/Roboto-Regular.ttf
Binary files differ
diff --git a/talk/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png b/talk/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png
new file mode 100755
index 0000000..531cb0f
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp.png
Binary files differ
diff --git a/talk/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png b/talk/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png
new file mode 100755
index 0000000..03dd381
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/resources/ic_call_end_black_24dp@2x.png
Binary files differ
diff --git a/talk/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png b/talk/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png
new file mode 100755
index 0000000..4ebf8a2
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp.png
Binary files differ
diff --git a/talk/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png b/talk/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png
new file mode 100755
index 0000000..ed2b252
--- /dev/null
+++ b/talk/examples/objc/AppRTCDemo/ios/resources/ic_clear_black_24dp@2x.png
Binary files differ
