From bfa794d3573889b9940e83096a50aedb5f3ff3d6 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 Jun 2012 10:40:52 +0200 Subject: [PATCH] Add Chat and Settings views --- Classes/ChatViewController.h | 26 +++++ Classes/ChatViewController.m | 24 +++++ Classes/ChatViewController.xib | 122 ++++++++++++++++++++++ Classes/ConferenceCallDetailView.m | 11 +- Classes/DialerViewController.xib | 157 ++++++++++++++--------------- Classes/InCallViewController.h | 1 - Classes/InCallViewController.m | 21 ++-- Classes/LinphoneUI/UICallBar.xib | 52 ++-------- Classes/LinphoneUI/UIHistoryCell.m | 10 +- Classes/PhoneMainView.m | 32 ++++++ Classes/SettingsViewController.h | 26 +++++ Classes/SettingsViewController.m | 24 +++++ Classes/SettingsViewController.xib | 123 ++++++++++++++++++++++ linphone.xcodeproj/project.pbxproj | 38 ++++++- 14 files changed, 520 insertions(+), 147 deletions(-) create mode 100644 Classes/ChatViewController.h create mode 100644 Classes/ChatViewController.m create mode 100644 Classes/ChatViewController.xib create mode 100644 Classes/SettingsViewController.h create mode 100644 Classes/SettingsViewController.m create mode 100644 Classes/SettingsViewController.xib diff --git a/Classes/ChatViewController.h b/Classes/ChatViewController.h new file mode 100644 index 000000000..9635763e4 --- /dev/null +++ b/Classes/ChatViewController.h @@ -0,0 +1,26 @@ +/* ChatViewController.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import + +@interface ChatViewController : UIViewController { + +} + +@end diff --git a/Classes/ChatViewController.m b/Classes/ChatViewController.m new file mode 100644 index 000000000..8d5de8916 --- /dev/null +++ b/Classes/ChatViewController.m @@ -0,0 +1,24 @@ +/* ChatViewController.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "ChatViewController.h" + +@implementation ChatViewController + +@end diff --git a/Classes/ChatViewController.xib b/Classes/ChatViewController.xib new file mode 100644 index 000000000..e9c5b872e --- /dev/null +++ b/Classes/ChatViewController.xib @@ -0,0 +1,122 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBProxyObject + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + {{0, 20}, {320, 460}} + + + + 3 + MQA + + 2 + + + + IBCocoaTouchFramework + + + + + + + view + + + + 3 + + + + + + 0 + + + + + + 1 + + + + + -1 + + + File's Owner + + + -2 + + + + + + + ChatViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 3 + + + + + ChatViewController + UIViewController + + IBProjectSource + ./Classes/ChatViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 1181 + + diff --git a/Classes/ConferenceCallDetailView.m b/Classes/ConferenceCallDetailView.m index bb7df42dd..17769f2e7 100644 --- a/Classes/ConferenceCallDetailView.m +++ b/Classes/ConferenceCallDetailView.m @@ -132,14 +132,15 @@ NSTimer *callQualityRefresher; cell = conferenceDetailCell; self.conferenceDetailCell = nil; } - + //TODO /* retrieve cell's fields using tags */ - UIImageView* image = (UIImageView*) [cell viewWithTag:1]; - UILabel* label = (UILabel*) [cell viewWithTag:2]; + //UIImageView* image = (UIImageView*) [cell viewWithTag:1]; + //UILabel* label = (UILabel*) [cell viewWithTag:2]; /* update cell content */ - LinphoneCall* call = [InCallViewController retrieveCallAtIndex:indexPath.row inConference:YES]; - [InCallViewController updateCellImageView:image Label:label DetailLabel:nil AndAccessoryView:nil withCall:call]; + //LinphoneCall* call = [InCallViewController retrieveCallAtIndex:indexPath.row inConference:YES]; + + //[InCallViewController updateCellImageView:image Label:label DetailLabel:nil AndAccessoryView:nil withCall:call]; cell.accessoryType = UITableViewCellAccessoryNone; if (cell.accessoryView == nil) { diff --git a/Classes/DialerViewController.xib b/Classes/DialerViewController.xib index 943859e1e..e05e78d72 100644 --- a/Classes/DialerViewController.xib +++ b/Classes/DialerViewController.xib @@ -41,83 +41,6 @@ 292 YES - - - 288 - - YES - - - 292 - {320, 80} - - - - _NS:9 - NO - IBCocoaTouchFramework - - NSImage - champ-saisie-numero.png - - - - - 292 - {320, 60} - - - - - 3 - MSAwAA - - NO - NO - IBCocoaTouchFramework - 0 - - sip: - - 3 - MQA - - YES - 15 - - 1 - 3 - IBCocoaTouchFramework - - 1 - - Helvetica - Helvetica - 0 - 36 - - - Helvetica - 36 - 16 - - - - {320, 80} - - - - _NS:9 - - 3 - MSAwAA - - 2 - - - YES - IBCocoaTouchFramework - 288 @@ -157,7 +80,10 @@ IBCocoaTouchFramework 0 0 - + + 3 + MQA + 1 MC4xOTYwNzg0MyAwLjMwOTgwMzkzIDAuNTIxNTY4NjYAA @@ -510,8 +436,82 @@ 3 MQA + + 2 + + + IBCocoaTouchFramework + + + + 288 + + YES + + + 292 + {320, 80} + + + + _NS:9 + NO + IBCocoaTouchFramework + + NSImage + champ-saisie-numero.png + + + + + 292 + {320, 60} + + + + + 3 + MSAwAA + + NO + NO + IBCocoaTouchFramework + 0 + + sip: + + YES + 15 + + 1 + 3 + IBCocoaTouchFramework + + 1 + + Helvetica + Helvetica + 0 + 36 + + + Helvetica + 36 + 16 + + + + {320, 80} + + + + _NS:9 + + 3 + MSAwAA + YES IBCocoaTouchFramework @@ -590,7 +590,6 @@ {{214, 0}, {106, 69}} - _NS:9 NO IBCocoaTouchFramework diff --git a/Classes/InCallViewController.h b/Classes/InCallViewController.h index 8d737f00e..8234edf1a 100644 --- a/Classes/InCallViewController.h +++ b/Classes/InCallViewController.h @@ -57,7 +57,6 @@ ConferenceCallDetailView* conferenceDetail; BOOL mVideoShown; BOOL mVideoIsPending; - BOOL mIncallViewIsReady; UIImage* verified, *unverified; UIActionSheet* visibleActionSheet; diff --git a/Classes/InCallViewController.m b/Classes/InCallViewController.m index 0a1f4ba45..ea6dc59cd 100644 --- a/Classes/InCallViewController.m +++ b/Classes/InCallViewController.m @@ -134,6 +134,7 @@ void addAnimationFadeTransition(UIView* view, float duration) { [hideControlsTimer invalidate]; hideControlsTimer = nil; } + // show controls [UIView beginAnimations:nil context:nil]; [UIView setAnimationDuration:0.3]; @@ -157,9 +158,14 @@ void addAnimationFadeTransition(UIView* view, float duration) { [UIView setAnimationDuration:0.3]; [videoCameraSwitch setAlpha:0.0]; [UIView commitAnimations]; - [[LinphoneManager instance] showTabBar: false]; - hideControlsTimer = nil; + if([[LinphoneManager instance] currentView] == PhoneView_InCall) + [[LinphoneManager instance] showTabBar: false]; + + if (hideControlsTimer) { + [hideControlsTimer invalidate]; + hideControlsTimer = nil; + } } #ifdef TEST_VIDEO_VIEW_CHANGE @@ -327,7 +333,6 @@ void addAnimationFadeTransition(UIView* view, float duration) { videoGroup.alpha = 0; mVideoShown=FALSE; - mIncallViewIsReady=FALSE; mVideoIsPending=FALSE; //selectedCall = nil; @@ -434,7 +439,6 @@ void addAnimationFadeTransition(UIView* view, float duration) { userInfo:nil repeats:YES]; glow = 0; - mIncallViewIsReady=TRUE; if (mVideoIsPending) { mVideoIsPending=FALSE; [self enableVideoDisplay: FALSE]; @@ -455,23 +459,22 @@ void addAnimationFadeTransition(UIView* view, float duration) { if (visibleActionSheet != nil) { [visibleActionSheet dismissWithClickedButtonIndex:visibleActionSheet.cancelButtonIndex animated:NO]; } -} - -- (void)viewDidDisappear:(BOOL)animated { if (hideControlsTimer != nil) { [hideControlsTimer invalidate]; hideControlsTimer = nil; } if (durationRefreasher != nil) { [durationRefreasher invalidate]; - durationRefreasher=nil; + durationRefreasher = nil; } if (glowingTimer != nil) { [glowingTimer invalidate]; glowingTimer = nil; } +} + +- (void)viewDidDisappear:(BOOL)animated { if (!mVideoShown) [[UIApplication sharedApplication] setIdleTimerDisabled:false]; - mIncallViewIsReady=FALSE; } - (void)viewDidUnload { diff --git a/Classes/LinphoneUI/UICallBar.xib b/Classes/LinphoneUI/UICallBar.xib index eb2bdafd0..644ab0de9 100644 --- a/Classes/LinphoneUI/UICallBar.xib +++ b/Classes/LinphoneUI/UICallBar.xib @@ -74,14 +74,6 @@ 0 NO NO - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - 3 MC41AA @@ -128,11 +120,6 @@ 0 0 NO - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - NSImage @@ -165,11 +152,6 @@ 0 0 NO - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - NSImage @@ -202,11 +184,6 @@ 0 0 NO - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - NSImage @@ -268,21 +245,15 @@ 0 0 NO - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - + NSImage raccrocher-over.png - + NSImage raccrocher-actif.png - @@ -302,11 +273,6 @@ 0 0 NO - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - NSImage @@ -469,26 +435,26 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIMicroButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIVideoButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIHangUpButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UIPauseButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + UISpeakerButton com.apple.InterfaceBuilder.IBCocoaTouchPlugin - + diff --git a/Classes/LinphoneUI/UIHistoryCell.m b/Classes/LinphoneUI/UIHistoryCell.m index 755871c23..f62e35bc6 100644 --- a/Classes/LinphoneUI/UIHistoryCell.m +++ b/Classes/LinphoneUI/UIHistoryCell.m @@ -44,22 +44,22 @@ - (void)update:(LinphoneCallLog*) callLogs { // Set up the cell... LinphoneAddress* partyToDisplay; - NSString *path; + NSString *name; if (callLogs->dir == LinphoneCallIncoming) { if (callLogs->status == LinphoneCallSuccess) { - path = [[NSBundle mainBundle] pathForResource:callLogs->video_enabled?@"appel-entrant":@"appel-entrant" ofType:@"png"]; + name = callLogs->video_enabled?@"appel-entrant.png":@"appel-entrant.png"; } else { //missed call - path = [[NSBundle mainBundle] pathForResource:@"appel-manque" ofType:@"png"]; + name = @"appel-manque.png"; } partyToDisplay=callLogs->from; } else { - path = [[NSBundle mainBundle] pathForResource:callLogs->video_enabled?@"appel-sortant":@"appel-sortant" ofType:@"png"]; + name = callLogs->video_enabled?@"appel-sortant.png":@"appel-sortant.png"; partyToDisplay=callLogs->to; } - UIImage *image = [UIImage imageWithContentsOfFile:path]; + UIImage *image = [UIImage imageNamed:name]; const char* username = linphone_address_get_username(partyToDisplay)!=0?linphone_address_get_username(partyToDisplay):""; diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 25677f8c3..184be86ae 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -24,6 +24,8 @@ #import "HistoryViewController.h" #import "ContactsViewController.h" #import "InCallViewController.h" +#import "SettingsViewController.h" +#import "ChatViewController.h" @implementation ViewsDescription @@ -290,6 +292,36 @@ [viewDescriptions setObject:inCallDescription forKey:[NSNumber numberWithInt: PhoneView_InCall]]; + // + // Settings View + // + SettingsViewController* mySettingsViewController = [[SettingsViewController alloc] + initWithNibName:@"SettingsViewController" + bundle:[NSBundle mainBundle]]; + //[myHistoryController loadView]; + ViewsDescription *settingsDescription = [ViewsDescription alloc]; + settingsDescription->content = mySettingsViewController; + settingsDescription->tabBar = mainTabBarController; + settingsDescription->statusEnabled = true; + settingsDescription->fullscreen = false; + settingsDescription->tabBarEnabled = true; + [viewDescriptions setObject:settingsDescription forKey:[NSNumber numberWithInt: PhoneView_Settings]]; + + // + // Chat View + // + ChatViewController* myChatViewController = [[ChatViewController alloc] + initWithNibName:@"ChatViewController" + bundle:[NSBundle mainBundle]]; + //[myHistoryController loadView]; + ViewsDescription *chatDescription = [ViewsDescription alloc]; + chatDescription->content = myChatViewController; + chatDescription->tabBar = mainTabBarController; + chatDescription->statusEnabled = true; + chatDescription->fullscreen = false; + chatDescription->tabBarEnabled = true; + [viewDescriptions setObject:settingsDescription forKey:[NSNumber numberWithInt: PhoneView_Chat]]; + // Set observers [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeView:) diff --git a/Classes/SettingsViewController.h b/Classes/SettingsViewController.h new file mode 100644 index 000000000..0641988c3 --- /dev/null +++ b/Classes/SettingsViewController.h @@ -0,0 +1,26 @@ +/* SettingsViewController.h + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import + +@interface SettingsViewController : UIViewController { + +} + +@end diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m new file mode 100644 index 000000000..693186477 --- /dev/null +++ b/Classes/SettingsViewController.m @@ -0,0 +1,24 @@ +/* SettingsViewController.m + * + * Copyright (C) 2012 Belledonne Comunications, Grenoble, France + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#import "SettingsViewController.h" + +@implementation SettingsViewController + +@end diff --git a/Classes/SettingsViewController.xib b/Classes/SettingsViewController.xib new file mode 100644 index 000000000..61ae418cc --- /dev/null +++ b/Classes/SettingsViewController.xib @@ -0,0 +1,123 @@ + + + + 1296 + 11E53 + 2182 + 1138.47 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1181 + + + IBProxyObject + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + {{0, 20}, {320, 460}} + + + + + 3 + MQA + + 2 + + + + IBCocoaTouchFramework + + + + + + + view + + + + 3 + + + + + + 0 + + + + + + 1 + + + + + -1 + + + File's Owner + + + -2 + + + + + + + SettingsViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 3 + + + + + SettingsViewController + UIViewController + + IBProjectSource + ./Classes/SettingsViewController.h + + + + + 0 + IBCocoaTouchFramework + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + YES + 3 + 1181 + + diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 8aa4fdf96..561b95780 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -265,6 +265,14 @@ D35E758A15932DE60066B1C1 /* backspace-disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E758815932DE60066B1C1 /* backspace-disabled.png */; }; D35E758D15934F360066B1C1 /* appeler-disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E758C15934F360066B1C1 /* appeler-disabled.png */; }; D35E758E15934F360066B1C1 /* appeler-disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D35E758C15934F360066B1C1 /* appeler-disabled.png */; }; + D35E7597159460580066B1C1 /* ChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E7595159460560066B1C1 /* ChatViewController.m */; }; + D35E7598159460580066B1C1 /* ChatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E7595159460560066B1C1 /* ChatViewController.m */; }; + D35E7599159460580066B1C1 /* ChatViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35E7596159460570066B1C1 /* ChatViewController.xib */; }; + D35E759A159460580066B1C1 /* ChatViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35E7596159460570066B1C1 /* ChatViewController.xib */; }; + D35E759F159460B70066B1C1 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E759D159460B50066B1C1 /* SettingsViewController.m */; }; + D35E75A0159460B70066B1C1 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35E759D159460B50066B1C1 /* SettingsViewController.m */; }; + D35E75A1159460B70066B1C1 /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35E759E159460B60066B1C1 /* SettingsViewController.xib */; }; + D35E75A2159460B70066B1C1 /* SettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D35E759E159460B60066B1C1 /* SettingsViewController.xib */; }; D36C43C6158F2E5A0048BA40 /* UICallCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D36C43C5158F2E5A0048BA40 /* UICallCell.m */; }; D36C43C7158F2E5A0048BA40 /* UICallCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D36C43C5158F2E5A0048BA40 /* UICallCell.m */; }; D36C43CA158F2EE50048BA40 /* UICallCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D36C43C9158F2EE50048BA40 /* UICallCell.xib */; }; @@ -849,6 +857,12 @@ D35E7580159328EB0066B1C1 /* UIAddressTextField.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIAddressTextField.m; sourceTree = ""; }; D35E758815932DE60066B1C1 /* backspace-disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "backspace-disabled.png"; path = "Resources/backspace-disabled.png"; sourceTree = ""; }; D35E758C15934F360066B1C1 /* appeler-disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "appeler-disabled.png"; path = "Resources/appeler-disabled.png"; sourceTree = ""; }; + D35E7594159460560066B1C1 /* ChatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatViewController.h; sourceTree = ""; }; + D35E7595159460560066B1C1 /* ChatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatViewController.m; sourceTree = ""; }; + D35E7596159460570066B1C1 /* ChatViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ChatViewController.xib; sourceTree = ""; }; + D35E759C159460B50066B1C1 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = ""; }; + D35E759D159460B50066B1C1 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = ""; }; + D35E759E159460B60066B1C1 /* SettingsViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SettingsViewController.xib; sourceTree = ""; }; D36C43C4158F2E5A0048BA40 /* UICallCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UICallCell.h; sourceTree = ""; }; D36C43C5158F2E5A0048BA40 /* UICallCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UICallCell.m; sourceTree = ""; }; D36C43C9158F2EE50048BA40 /* UICallCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UICallCell.xib; sourceTree = ""; }; @@ -1069,6 +1083,9 @@ children = ( 340751E4150E4D0200B89C47 /* CallDelegate.h */, 2211DBBB14769C8200DEE054 /* CallDelegate.m */, + D35E7594159460560066B1C1 /* ChatViewController.h */, + D35E7595159460560066B1C1 /* ChatViewController.m */, + D35E7596159460570066B1C1 /* ChatViewController.xib */, 344ABD79147FD32B007420B6 /* ConferenceCallDetailCell.xib */, 340A75AF14C0670A006AA708 /* ConferenceCallDetailView-ipad.xib */, 344ABD75147FCB68007420B6 /* ConferenceCallDetailView.h */, @@ -1082,14 +1099,17 @@ D35497FD15875372000081D8 /* ContactsViewController.xib */, D3549814158761CF000081D8 /* ContactTableViewController.h */, D3549815158761D0000081D8 /* ContactTableViewController.m */, + 22F2508B107141E100AC9B3F /* DialerViewController.h */, + 22F2508C107141E100AC9B3F /* DialerViewController.m */, + 22F2508D107141E100AC9B3F /* DialerViewController.xib */, 2218A92212FBE1340088A667 /* FirstLoginViewController.h */, 2218A92312FBE1340088A667 /* FirstLoginViewController.m */, 2218A92412FBE1340088A667 /* FirstLoginViewController.xib */, + D3ED3EA41587334B006C0DE4 /* HistoryTableViewController.h */, + D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */, D3ED3EB515873928006C0DE4 /* HistoryViewController.h */, D3ED3EB615873929006C0DE4 /* HistoryViewController.m */, D3ED3EB2158738FA006C0DE4 /* HistoryViewController.xib */, - D3ED3EA41587334B006C0DE4 /* HistoryTableViewController.h */, - D3ED3EA51587334C006C0DE4 /* HistoryTableViewController.m */, 3422AA4F14975EC9000D4E8A /* InCallViewController-ipad.xib */, D3F83EE91582021700336684 /* InCallViewController.h */, D3F83EEA1582021700336684 /* InCallViewController.m */, @@ -1108,9 +1128,9 @@ D3F83F8D15822ABD00336684 /* PhoneMainView.m */, D34734791580DDF1003C7B8C /* PhoneMainView.xib */, 3422AA5214978352000D4E8A /* PhoneViewController-ipad.xib */, - 22F2508B107141E100AC9B3F /* DialerViewController.h */, - 22F2508C107141E100AC9B3F /* DialerViewController.m */, - 22F2508D107141E100AC9B3F /* DialerViewController.xib */, + D35E759C159460B50066B1C1 /* SettingsViewController.h */, + D35E759D159460B50066B1C1 /* SettingsViewController.m */, + D35E759E159460B60066B1C1 /* SettingsViewController.xib */, D326483415887D4400930C67 /* Utils */, 34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */, 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */, @@ -1928,6 +1948,8 @@ D35E757A15931E5D0066B1C1 /* switch_camera_over.png in Resources */, D35E758915932DE60066B1C1 /* backspace-disabled.png in Resources */, D35E758D15934F360066B1C1 /* appeler-disabled.png in Resources */, + D35E7599159460580066B1C1 /* ChatViewController.xib in Resources */, + D35E75A1159460B70066B1C1 /* SettingsViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2079,6 +2101,8 @@ D35E757B15931E5D0066B1C1 /* switch_camera_over.png in Resources */, D35E758A15932DE60066B1C1 /* backspace-disabled.png in Resources */, D35E758E15934F360066B1C1 /* appeler-disabled.png in Resources */, + D35E759A159460580066B1C1 /* ChatViewController.xib in Resources */, + D35E75A2159460B70066B1C1 /* SettingsViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2128,6 +2152,8 @@ D32409C3158B49A600C8C119 /* UILongTouchButton.m in Sources */, D36C43C6158F2E5A0048BA40 /* UICallCell.m in Sources */, D35E7581159328EB0066B1C1 /* UIAddressTextField.m in Sources */, + D35E7597159460580066B1C1 /* ChatViewController.m in Sources */, + D35E759F159460B70066B1C1 /* SettingsViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2174,6 +2200,8 @@ D32409C4158B49A600C8C119 /* UILongTouchButton.m in Sources */, D36C43C7158F2E5A0048BA40 /* UICallCell.m in Sources */, D35E7582159328EB0066B1C1 /* UIAddressTextField.m in Sources */, + D35E7598159460580066B1C1 /* ChatViewController.m in Sources */, + D35E75A0159460B70066B1C1 /* SettingsViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };