diff --git a/Classes/Base.lproj/ChatRoomViewController.xib b/Classes/Base.lproj/ChatRoomViewController.xib
index 147925813..7bcc87e71 100644
--- a/Classes/Base.lproj/ChatRoomViewController.xib
+++ b/Classes/Base.lproj/ChatRoomViewController.xib
@@ -35,14 +35,17 @@
+
+
+
+
-
diff --git a/Classes/Base.lproj/ChatViewController.xib b/Classes/Base.lproj/ChatViewController.xib
index 9a4a3be0c..247ffdac9 100644
--- a/Classes/Base.lproj/ChatViewController.xib
+++ b/Classes/Base.lproj/ChatViewController.xib
@@ -28,16 +28,20 @@
-
-
+
+
+
+
+
+
-
+
@@ -50,7 +54,7 @@
-
+
@@ -58,22 +62,22 @@
-
+
-
+
-
+
-
+
@@ -81,17 +85,16 @@
-
+
-
+
-
@@ -106,7 +109,6 @@
-
diff --git a/Classes/Base.lproj/ContactDetailsLabelViewController.xib b/Classes/Base.lproj/ContactDetailsLabelViewController.xib
index 824c53ce1..137f12a87 100644
--- a/Classes/Base.lproj/ContactDetailsLabelViewController.xib
+++ b/Classes/Base.lproj/ContactDetailsLabelViewController.xib
@@ -20,41 +20,31 @@
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
-
-
-
-
+
-
-
+
@@ -73,10 +63,8 @@
-
-
-
-
+
+
diff --git a/Classes/Base.lproj/ContactDetailsViewController.xib b/Classes/Base.lproj/ContactDetailsViewController.xib
index 3496d0035..7d979c7c2 100644
--- a/Classes/Base.lproj/ContactDetailsViewController.xib
+++ b/Classes/Base.lproj/ContactDetailsViewController.xib
@@ -26,6 +26,10 @@
+
+
+
+
@@ -69,7 +73,6 @@
-
@@ -99,6 +102,7 @@
+
diff --git a/Classes/Base.lproj/ContactsViewController.xib b/Classes/Base.lproj/ContactsViewController.xib
index 423fb9663..50823136a 100644
--- a/Classes/Base.lproj/ContactsViewController.xib
+++ b/Classes/Base.lproj/ContactsViewController.xib
@@ -37,12 +37,16 @@
+
+
+
+
-
+
@@ -61,7 +65,7 @@
-
+
@@ -80,7 +84,7 @@
-
+
@@ -99,7 +103,7 @@
-
+
@@ -109,7 +113,7 @@
-
+
@@ -122,13 +126,12 @@
-
+
-
diff --git a/Classes/Base.lproj/DialerViewController.xib b/Classes/Base.lproj/DialerViewController.xib
index 38b8a2739..351f89005 100644
--- a/Classes/Base.lproj/DialerViewController.xib
+++ b/Classes/Base.lproj/DialerViewController.xib
@@ -42,6 +42,10 @@
+
+
+
+
@@ -66,7 +70,6 @@
-
diff --git a/Classes/Base.lproj/DialerViewController~ipad.xib b/Classes/Base.lproj/DialerViewController~ipad.xib
deleted file mode 100644
index a2a75db10..000000000
--- a/Classes/Base.lproj/DialerViewController~ipad.xib
+++ /dev/null
@@ -1,412 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Classes/Base.lproj/FirstLoginViewController.xib b/Classes/Base.lproj/FirstLoginViewController.xib
deleted file mode 100644
index 073ec166e..000000000
--- a/Classes/Base.lproj/FirstLoginViewController.xib
+++ /dev/null
@@ -1,107 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Classes/Base.lproj/HistoryDetailsViewController.xib b/Classes/Base.lproj/HistoryDetailsViewController.xib
index f5204aaae..c7c80de01 100644
--- a/Classes/Base.lproj/HistoryDetailsViewController.xib
+++ b/Classes/Base.lproj/HistoryDetailsViewController.xib
@@ -29,6 +29,10 @@
+
+
+
+
@@ -50,14 +54,13 @@
-
-
+
@@ -154,6 +157,7 @@
+
diff --git a/Classes/Base.lproj/HistoryViewController.xib b/Classes/Base.lproj/HistoryViewController.xib
index 9fa97a719..574286a6c 100644
--- a/Classes/Base.lproj/HistoryViewController.xib
+++ b/Classes/Base.lproj/HistoryViewController.xib
@@ -29,12 +29,16 @@
+
+
+
+
-
+
@@ -51,7 +55,7 @@
-
+
@@ -64,7 +68,7 @@
-
+
@@ -73,14 +77,13 @@
-
-
+
@@ -89,7 +92,6 @@
-
diff --git a/Classes/Base.lproj/ImageViewController.xib b/Classes/Base.lproj/ImageViewController.xib
index 4c7c3be2c..b77debdc4 100644
--- a/Classes/Base.lproj/ImageViewController.xib
+++ b/Classes/Base.lproj/ImageViewController.xib
@@ -7,7 +7,7 @@
-
+
@@ -21,36 +21,31 @@
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
-
-
-
-
+
-
-
+
@@ -63,9 +58,8 @@
-
-
-
+
+
diff --git a/Classes/Base.lproj/InCallViewController.xib b/Classes/Base.lproj/InCallViewController.xib
index 0c98a5549..dbfbcebad 100644
--- a/Classes/Base.lproj/InCallViewController.xib
+++ b/Classes/Base.lproj/InCallViewController.xib
@@ -67,7 +67,7 @@
-
+
@@ -227,6 +227,10 @@
+
+
+
+
@@ -279,12 +283,15 @@
-
+
+
+
+
@@ -321,102 +328,116 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
diff --git a/Classes/Base.lproj/IncomingCallViewController.xib b/Classes/Base.lproj/IncomingCallViewController.xib
index 994422954..7615542c4 100644
--- a/Classes/Base.lproj/IncomingCallViewController.xib
+++ b/Classes/Base.lproj/IncomingCallViewController.xib
@@ -23,15 +23,15 @@
-
+
+
+
+
+
@@ -102,6 +102,7 @@
+
diff --git a/Classes/Base.lproj/IncomingCallViewController~ipad.xib b/Classes/Base.lproj/IncomingCallViewController~ipad.xib
deleted file mode 100644
index c18514c0e..000000000
--- a/Classes/Base.lproj/IncomingCallViewController~ipad.xib
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Classes/Base.lproj/OutgoingCallViewController.xib b/Classes/Base.lproj/OutgoingCallViewController.xib
index df3cf32f1..06f1bff5a 100644
--- a/Classes/Base.lproj/OutgoingCallViewController.xib
+++ b/Classes/Base.lproj/OutgoingCallViewController.xib
@@ -23,15 +23,15 @@
-
+
+
+
+
+
@@ -58,12 +58,16 @@
+
+
+
+
-
+
@@ -73,7 +77,7 @@
-
+
diff --git a/Classes/Base.lproj/PhoneMainView.xib b/Classes/Base.lproj/PhoneMainView.xib
index a4b3cdfb4..fc4bcf35d 100644
--- a/Classes/Base.lproj/PhoneMainView.xib
+++ b/Classes/Base.lproj/PhoneMainView.xib
@@ -21,11 +21,11 @@
-
+
-
-
+
+
@@ -43,9 +43,6 @@
-
-
-
diff --git a/Classes/Base.lproj/WizardViewController.xib b/Classes/Base.lproj/WizardViewController.xib
index 66b04fb9d..47eabc16d 100644
--- a/Classes/Base.lproj/WizardViewController.xib
+++ b/Classes/Base.lproj/WizardViewController.xib
@@ -26,12 +26,16 @@
+
+
+
+
-
+
@@ -51,7 +55,7 @@
-
+
@@ -60,7 +64,6 @@
-
diff --git a/Classes/Base.lproj/WizardViewController~ipad.xib b/Classes/Base.lproj/WizardViewController~ipad.xib
deleted file mode 100644
index ab6d51252..000000000
--- a/Classes/Base.lproj/WizardViewController~ipad.xib
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Classes/FirstLoginViewController.h b/Classes/FirstLoginViewController.h
deleted file mode 100644
index 47894df39..000000000
--- a/Classes/FirstLoginViewController.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* FirstLoginViewController.h
- *
- * Copyright (C) 2011 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
-
-#import "UICompositeViewController.h"
-
-@interface FirstLoginViewController : UIViewController {
-}
-
-- (IBAction)onLoginClick:(id)sender;
-- (IBAction)onSiteClick:(id)sender;
-
-@property (nonatomic, strong) IBOutlet UIButton* loginButton;
-@property (nonatomic, strong) IBOutlet UIButton* siteButton;
-@property (nonatomic, strong) IBOutlet UITextField* usernameField;
-@property (nonatomic, strong) IBOutlet UITextField* passwordField;
-@property (nonatomic, strong) IBOutlet UIView* waitView;
-
-@end
diff --git a/Classes/FirstLoginViewController.m b/Classes/FirstLoginViewController.m
deleted file mode 100644
index ab4d97759..000000000
--- a/Classes/FirstLoginViewController.m
+++ /dev/null
@@ -1,192 +0,0 @@
-/* FirstLoginViewController.m
- *
- * Copyright (C) 2011 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 "LinphoneManager.h"
-#import "FirstLoginViewController.h"
-#import "LinphoneManager.h"
-#import "PhoneMainView.h"
-
-@implementation FirstLoginViewController
-
-@synthesize loginButton;
-@synthesize siteButton;
-@synthesize usernameField;
-@synthesize passwordField;
-@synthesize waitView;
-
-#pragma mark - Lifecycle Functions
-
-- (id)init {
- return [super initWithNibName:@"FirstLoginViewController" bundle:[NSBundle mainBundle]];
-}
-
-- (void)dealloc {
-
- // Remove all observer
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-}
-
-#pragma mark - UICompositeViewDelegate Functions
-
-static UICompositeViewDescription *compositeDescription = nil;
-
-+ (UICompositeViewDescription *)compositeViewDescription {
- if (compositeDescription == nil) {
- compositeDescription = [[UICompositeViewDescription alloc] init:@"FirstLogin"
- content:@"FirstLoginViewController"
- stateBar:@"UIStateBar"
- tabBar:nil
- fullscreen:false
- landscapeMode:false
- portraitMode:true];
- }
- return compositeDescription;
-}
-
-#pragma mark - ViewController Functions
-
-- (void)viewWillAppear:(BOOL)animated {
- [super viewWillAppear:animated];
- // Set observer
- [[NSNotificationCenter defaultCenter] addObserver:self
- selector:@selector(registrationUpdateEvent:)
- name:kLinphoneRegistrationUpdate
- object:nil];
-
- [usernameField setText:[[LinphoneManager instance] lpConfigStringForKey:@"wizard_username"]];
- [passwordField setText:[[LinphoneManager instance] lpConfigStringForKey:@"wizard_password"]];
-
- // Update on show
- const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]);
- if (list != NULL) {
- LinphoneProxyConfig *config = (LinphoneProxyConfig *)list->data;
- if (config) {
- [self registrationUpdate:linphone_proxy_config_get_state(config)];
- }
- }
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
- [super viewWillDisappear:animated];
-
- // Remove observer
- [[NSNotificationCenter defaultCenter] removeObserver:self name:kLinphoneRegistrationUpdate object:nil];
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
-
- NSString *siteUrl = [[LinphoneManager instance] lpConfigStringForKey:@"first_login_view_url"];
- if (siteUrl == nil) {
- siteUrl = @"http://www.linphone.org";
- }
- [siteButton setTitle:siteUrl forState:UIControlStateNormal];
-}
-
-#pragma mark - Event Functions
-
-- (void)registrationUpdateEvent:(NSNotification *)notif {
- [self registrationUpdate:[[notif.userInfo objectForKey:@"state"] intValue]];
-}
-
-#pragma mark -
-
-- (void)registrationUpdate:(LinphoneRegistrationState)state {
- switch (state) {
- case LinphoneRegistrationOk: {
- [[LinphoneManager instance] lpConfigSetBool:FALSE forKey:@"enable_first_login_view_preference"];
- [waitView setHidden:true];
- [[PhoneMainView instance] changeCurrentView:[DialerViewController compositeViewDescription]];
- break;
- }
- case LinphoneRegistrationNone:
- case LinphoneRegistrationCleared: {
- [waitView setHidden:true];
- break;
- }
- case LinphoneRegistrationFailed: {
- [waitView setHidden:true];
-
- // erase uername passwd
- [[LinphoneManager instance] lpConfigSetString:nil forKey:@"wizard_username"];
- [[LinphoneManager instance] lpConfigSetString:nil forKey:@"wizard_password"];
- break;
- }
- case LinphoneRegistrationProgress: {
- [waitView setHidden:false];
- break;
- }
- default:
- break;
- }
-}
-
-#pragma mark - Action Functions
-
-- (void)onSiteClick:(id)sender {
- NSURL *url = [NSURL URLWithString:siteButton.titleLabel.text];
- [[UIApplication sharedApplication] openURL:url];
- return;
-}
-
-- (void)onLoginClick:(id)sender {
- NSString *errorMessage = nil;
- if ([usernameField.text length] == 0) {
- errorMessage = NSLocalizedString(@"Enter your username", nil);
- } else if ([passwordField.text length] == 0) {
- errorMessage = NSLocalizedString(@"Enter your password", nil);
- }
-
- if (errorMessage != nil) {
- UIAlertView *error = nil;
- error = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"Alert", nil)
- message:errorMessage
- delegate:nil
- cancelButtonTitle:NSLocalizedString(@"Continue", nil)
- otherButtonTitles:nil];
- [error show];
- } else {
- linphone_core_clear_all_auth_info([LinphoneManager getLc]);
- linphone_core_clear_proxy_config([LinphoneManager getLc]);
- LinphoneProxyConfig *proxyCfg = linphone_core_create_proxy_config([LinphoneManager getLc]);
- /*default domain is supposed to be preset from linphonerc*/
- NSString *identity =
- [NSString stringWithFormat:@"sip:%@@%s", usernameField.text, linphone_proxy_config_get_addr(proxyCfg)];
- linphone_proxy_config_set_identity(proxyCfg, [identity UTF8String]);
- LinphoneAuthInfo *auth_info = linphone_auth_info_new(
- [usernameField.text UTF8String], [usernameField.text UTF8String], [passwordField.text UTF8String], NULL,
- NULL, linphone_proxy_config_get_domain(proxyCfg));
- linphone_core_add_auth_info([LinphoneManager getLc], auth_info);
- linphone_core_add_proxy_config([LinphoneManager getLc], proxyCfg);
- linphone_core_set_default_proxy_config([LinphoneManager getLc], proxyCfg);
- // reload address book to prepend proxy config domain to contacts' phone number
- [[[LinphoneManager instance] fastAddressBook] reload];
- [self.waitView setHidden:false];
- };
-}
-
-#pragma mark - UITextFieldDelegate Functions
-
-- (BOOL)textFieldShouldReturn:(UITextField *)theTextField {
- // When the user presses return, take focus away from the text field so that the keyboard is dismissed.
- [theTextField resignFirstResponder];
- return YES;
-}
-
-@end
diff --git a/Classes/LaunchScreen.xib b/Classes/LaunchScreen.xib
index 1be441a93..8b16ac5e4 100644
--- a/Classes/LaunchScreen.xib
+++ b/Classes/LaunchScreen.xib
@@ -13,7 +13,7 @@
-
+
diff --git a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
index 766863b97..12cac23ce 100644
--- a/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIMainBar.xib
@@ -25,11 +25,15 @@
+
+
+
+
-
+
@@ -53,7 +57,7 @@
-
+
@@ -118,7 +122,6 @@
-
diff --git a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
index 8fc156145..a70efa05c 100644
--- a/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
+++ b/Classes/LinphoneUI/Base.lproj/UIStateBar.xib
@@ -22,6 +22,10 @@
+
+
+
+
@@ -85,7 +89,6 @@
-
@@ -93,6 +96,7 @@
+
diff --git a/Classes/MainStoryboard.storyboard b/Classes/MainStoryboard.storyboard
index dc493538e..bf35d75a5 100644
--- a/Classes/MainStoryboard.storyboard
+++ b/Classes/MainStoryboard.storyboard
@@ -1,8 +1,8 @@
-
+
-
-
+
+
@@ -13,11 +13,11 @@
-
+
-
-
+
+
@@ -40,9 +40,6 @@
-
-
-
diff --git a/Classes/PhoneMainView.h b/Classes/PhoneMainView.h
index ea3787fe8..545f1bd30 100644
--- a/Classes/PhoneMainView.h
+++ b/Classes/PhoneMainView.h
@@ -25,7 +25,6 @@
/* These imports are here so that we can import PhoneMainView.h without bothering to import all the rest of the view headers */
#import "AboutViewController.h"
-#import "FirstLoginViewController.h"
#import "IncomingCallViewController.h"
#import "ChatRoomViewController.h"
#import "ChatViewController.h"
@@ -38,7 +37,6 @@
#import "HistoryDetailsViewController.h"
#import "InCallViewController.h"
#import "SettingsViewController.h"
-#import "FirstLoginViewController.h"
#import "WizardViewController.h"
#import "IncomingCallViewController.h"
#import "ImageViewController.h"
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index 49b73ad5e..67da5f67f 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -417,8 +417,7 @@ static RootViewManager *rootViewManagerInstance = nil;
if (linphone_core_get_global_state(core) != LinphoneGlobalOn) {
[self changeCurrentView:[DialerViewController compositeViewDescription]];
} else if ([[LinphoneManager instance] lpConfigBoolForKey:@"enable_first_login_view_preference"] == true) {
- // Change to fist login view
- [self changeCurrentView:[FirstLoginViewController compositeViewDescription]];
+ // TODO: Change to fist login view
} else {
// always start to dialer when testing
// Change to default view
diff --git a/Classes/SideMenuViewController.xib b/Classes/SideMenuViewController.xib
index 3e557ac1d..ad863af43 100644
--- a/Classes/SideMenuViewController.xib
+++ b/Classes/SideMenuViewController.xib
@@ -33,6 +33,10 @@
+
+
+
+
@@ -52,7 +56,6 @@
-
@@ -94,6 +97,7 @@
+
diff --git a/Classes/ar.lproj/DialerViewController~ipad.strings b/Classes/ar.lproj/DialerViewController~ipad.strings
deleted file mode 100644
index aaf670cba..000000000
Binary files a/Classes/ar.lproj/DialerViewController~ipad.strings and /dev/null differ
diff --git a/Classes/ar.lproj/FirstLoginViewController.strings b/Classes/ar.lproj/FirstLoginViewController.strings
deleted file mode 100644
index 2b995e5f4..000000000
Binary files a/Classes/ar.lproj/FirstLoginViewController.strings and /dev/null differ
diff --git a/Classes/ar.lproj/IncomingCallViewController~ipad.strings b/Classes/ar.lproj/IncomingCallViewController~ipad.strings
deleted file mode 100644
index f211f9974..000000000
Binary files a/Classes/ar.lproj/IncomingCallViewController~ipad.strings and /dev/null differ
diff --git a/Classes/ar.lproj/WizardViewController~ipad.strings b/Classes/ar.lproj/WizardViewController~ipad.strings
deleted file mode 100644
index 2dfe14ce3..000000000
Binary files a/Classes/ar.lproj/WizardViewController~ipad.strings and /dev/null differ
diff --git a/Classes/fr.lproj/DialerViewController~ipad.strings b/Classes/fr.lproj/DialerViewController~ipad.strings
deleted file mode 100644
index 87fdedcf5..000000000
Binary files a/Classes/fr.lproj/DialerViewController~ipad.strings and /dev/null differ
diff --git a/Classes/fr.lproj/FirstLoginViewController.strings b/Classes/fr.lproj/FirstLoginViewController.strings
deleted file mode 100644
index a47022a98..000000000
Binary files a/Classes/fr.lproj/FirstLoginViewController.strings and /dev/null differ
diff --git a/Classes/fr.lproj/IncomingCallViewController~ipad.strings b/Classes/fr.lproj/IncomingCallViewController~ipad.strings
deleted file mode 100644
index 4ed88b145..000000000
Binary files a/Classes/fr.lproj/IncomingCallViewController~ipad.strings and /dev/null differ
diff --git a/Classes/fr.lproj/WizardViewController~ipad.strings b/Classes/fr.lproj/WizardViewController~ipad.strings
deleted file mode 100644
index ba55f0245..000000000
Binary files a/Classes/fr.lproj/WizardViewController~ipad.strings and /dev/null differ
diff --git a/Classes/ru.lproj/DialerViewController~ipad.strings b/Classes/ru.lproj/DialerViewController~ipad.strings
deleted file mode 100644
index ad8ebdf51..000000000
Binary files a/Classes/ru.lproj/DialerViewController~ipad.strings and /dev/null differ
diff --git a/Classes/ru.lproj/FirstLoginViewController.strings b/Classes/ru.lproj/FirstLoginViewController.strings
deleted file mode 100644
index e0acddc53..000000000
Binary files a/Classes/ru.lproj/FirstLoginViewController.strings and /dev/null differ
diff --git a/Classes/ru.lproj/IncomingCallViewController~ipad.strings b/Classes/ru.lproj/IncomingCallViewController~ipad.strings
deleted file mode 100644
index d4d54bd22..000000000
Binary files a/Classes/ru.lproj/IncomingCallViewController~ipad.strings and /dev/null differ
diff --git a/Classes/ru.lproj/WizardViewController~ipad.strings b/Classes/ru.lproj/WizardViewController~ipad.strings
deleted file mode 100644
index 03cffaec0..000000000
Binary files a/Classes/ru.lproj/WizardViewController~ipad.strings and /dev/null differ
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index e65ba0b0a..ef77008cb 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -17,7 +17,6 @@
2214EB7A12F846B1002A5394 /* UICallButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB7912F846B1002A5394 /* UICallButton.m */; };
2214EB8912F84EBB002A5394 /* UIHangUpButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EB8812F84EBB002A5394 /* UIHangUpButton.m */; };
2214EBF312F86360002A5394 /* UIMicroButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2214EBF212F86360002A5394 /* UIMicroButton.m */; };
- 2218A92512FBE1340088A667 /* FirstLoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2218A92312FBE1340088A667 /* FirstLoginViewController.m */; };
22276E8713C73D8A00210156 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
22276E8913C73DC000210156 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
22405EEE1600B4E400B92522 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22405EED1600B4E400B92522 /* AssetsLibrary.framework */; };
@@ -375,8 +374,6 @@
D38187B915FE342200C3EDCA /* ContactDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187BC15FE342200C3EDCA /* ContactDetailsViewController.xib */; };
D38187BD15FE342800C3EDCA /* ContactsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187C015FE342800C3EDCA /* ContactsViewController.xib */; };
D38187C115FE345B00C3EDCA /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187C415FE345B00C3EDCA /* DialerViewController.xib */; };
- D38187C515FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187C815FE345F00C3EDCA /* DialerViewController~ipad.xib */; };
- D38187C915FE346400C3EDCA /* FirstLoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187CC15FE346400C3EDCA /* FirstLoginViewController.xib */; };
D38187CD15FE346700C3EDCA /* HistoryDetailsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187D015FE346700C3EDCA /* HistoryDetailsViewController.xib */; };
D38187D115FE346B00C3EDCA /* HistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187D415FE346B00C3EDCA /* HistoryViewController.xib */; };
D38187D915FE347700C3EDCA /* IncomingCallViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = D38187DC15FE347700C3EDCA /* IncomingCallViewController.xib */; };
@@ -389,8 +386,6 @@
D3A8BB7015A6C7D500F96BE5 /* UIChatRoomCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3A8BB6F15A6C7D500F96BE5 /* UIChatRoomCell.m */; };
D3C6526715AC1A8F0092A874 /* UIEditableTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3C6526615AC1A8F0092A874 /* UIEditableTableViewCell.m */; };
D3D5126C160B3A8E00946DF8 /* WizardViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126A160B3A8E00946DF8 /* WizardViews.xib */; };
- D3D51270160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */; };
- D3D52A731614480700DEB00A /* IncomingCallViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3D52A711614480700DEB00A /* IncomingCallViewController~ipad.xib */; };
D3EA53FD159850E80037DC6B /* LinphoneManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA53FC159850E80037DC6B /* LinphoneManager.m */; };
D3EA540D1598528B0037DC6B /* ChatTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA540C1598528B0037DC6B /* ChatTableViewController.m */; };
D3EA5411159853750037DC6B /* UIChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D3EA5410159853750037DC6B /* UIChatCell.m */; };
@@ -570,8 +565,6 @@
2214EB8812F84EBB002A5394 /* UIHangUpButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIHangUpButton.m; sourceTree = ""; };
2214EBF112F86360002A5394 /* UIMicroButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIMicroButton.h; sourceTree = ""; };
2214EBF212F86360002A5394 /* UIMicroButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIMicroButton.m; sourceTree = ""; };
- 2218A92212FBE1340088A667 /* FirstLoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FirstLoginViewController.h; sourceTree = ""; };
- 2218A92312FBE1340088A667 /* FirstLoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = FirstLoginViewController.m; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
22276E8013C73D3100210156 /* libavcodec.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavcodec.a; path = "liblinphone-sdk/apple-darwin/lib/libavcodec.a"; sourceTree = ""; };
22276E8113C73D3100210156 /* libavutil.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavutil.a; path = "liblinphone-sdk/apple-darwin/lib/libavutil.a"; sourceTree = ""; };
22276E8213C73D3100210156 /* libswscale.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libswscale.a; path = "liblinphone-sdk/apple-darwin/lib/libswscale.a"; sourceTree = ""; };
@@ -1071,19 +1064,15 @@
F095481B1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ContactDetailsViewController.xib; sourceTree = ""; };
F095481C1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ContactsViewController.xib; sourceTree = ""; };
F095481D1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/DialerViewController.xib; sourceTree = ""; };
- F095481E1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/DialerViewController~ipad.xib"; sourceTree = ""; };
- F095481F1883F15300E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/FirstLoginViewController.xib; sourceTree = ""; };
F09548201883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HistoryDetailsViewController.xib; sourceTree = ""; };
F09548211883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HistoryViewController.xib; sourceTree = ""; };
F09548221883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/ImageViewController.xib; sourceTree = ""; };
F09548231883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/InCallViewController.xib; sourceTree = ""; };
F09548241883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/IncomingCallViewController.xib; sourceTree = ""; };
- F09548251883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/IncomingCallViewController~ipad.xib"; sourceTree = ""; };
F09548281883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UICallCell.xib; sourceTree = ""; };
F09548291883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIConferenceHeader.xib; sourceTree = ""; };
F095482C1883F15400E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/UIMainBar.xib; sourceTree = ""; };
F095482E1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WizardViewController.xib; sourceTree = ""; };
- F095482F1883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = "Base.lproj/WizardViewController~ipad.xib"; sourceTree = ""; };
F09548301883F15500E8A69B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/WizardViews.xib; sourceTree = ""; };
F09548311883F1EB00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ChatRoomViewController.strings; sourceTree = ""; };
F09548321883F20A00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ChatRoomViewController.strings; sourceTree = ""; };
@@ -1097,10 +1086,6 @@
F095483A1883F2CA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/ContactsViewController.strings; sourceTree = ""; };
F095483B1883F2DE00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/DialerViewController.strings; sourceTree = ""; };
F095483C1883F2E300E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/DialerViewController.strings; sourceTree = ""; };
- F095483D1883F49E00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/DialerViewController~ipad.strings"; sourceTree = ""; };
- F095483E1883F4A200E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/DialerViewController~ipad.strings"; sourceTree = ""; };
- F095483F1883F4B700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/FirstLoginViewController.strings; sourceTree = ""; };
- F09548401883F4BC00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/FirstLoginViewController.strings; sourceTree = ""; };
F09548411883F51600E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/HistoryViewController.strings; sourceTree = ""; };
F09548421883F51B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/HistoryViewController.strings; sourceTree = ""; };
F09548431883F52600E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/ImageViewController.strings; sourceTree = ""; };
@@ -1109,16 +1094,12 @@
F09548461883F54200E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/InCallViewController.strings; sourceTree = ""; };
F09548471883F55300E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/IncomingCallViewController.strings; sourceTree = ""; };
F09548481883F55800E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/IncomingCallViewController.strings; sourceTree = ""; };
- F09548491883F56A00E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/IncomingCallViewController~ipad.strings"; sourceTree = ""; };
- F095484A1883F56E00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/IncomingCallViewController~ipad.strings"; sourceTree = ""; };
F095484F1883F5D500E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIConferenceHeader.strings; sourceTree = ""; };
F09548501883F5D900E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UIConferenceHeader.strings; sourceTree = ""; };
F09548551883F61300E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/UIMainBar.strings; sourceTree = ""; };
F09548561883F61600E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/UIMainBar.strings; sourceTree = ""; };
F09548591883F67800E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WizardViewController.strings; sourceTree = ""; };
F095485A1883F67B00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/WizardViewController.strings; sourceTree = ""; };
- F095485B1883F68500E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = "fr.lproj/WizardViewController~ipad.strings"; sourceTree = ""; };
- F095485C1883F68800E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = "ru.lproj/WizardViewController~ipad.strings"; sourceTree = ""; };
F095485D1883F6E700E8A69B /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/WizardViews.strings; sourceTree = ""; };
F095485E1883F6EA00E8A69B /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/WizardViews.strings; sourceTree = ""; };
F0AF06F01A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/AboutViewController.strings; sourceTree = ""; };
@@ -1128,14 +1109,11 @@
F0AF06F41A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ContactDetailsViewController.strings; sourceTree = ""; };
F0AF06F51A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ContactsViewController.strings; sourceTree = ""; };
F0AF06F61A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/DialerViewController.strings; sourceTree = ""; };
- F0AF06F71A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/DialerViewController~ipad.strings"; sourceTree = ""; };
- F0AF06F81A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/FirstLoginViewController.strings; sourceTree = ""; };
F0AF06F91A24BA760086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/HistoryDetailsViewController.strings; sourceTree = ""; };
F0AF06FA1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/HistoryViewController.strings; sourceTree = ""; };
F0AF06FB1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/ImageViewController.strings; sourceTree = ""; };
F0AF06FC1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/InCallViewController.strings; sourceTree = ""; };
F0AF06FD1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/IncomingCallViewController.strings; sourceTree = ""; };
- F0AF06FE1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/IncomingCallViewController~ipad.strings"; sourceTree = ""; };
F0AF07011A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UICallCell.strings; sourceTree = ""; };
F0AF07021A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UIChatCell.strings; sourceTree = ""; };
F0AF07031A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/UIChatRoomCell.strings; sourceTree = ""; };
@@ -1148,7 +1126,6 @@
F0AF070D1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/PhoneMainView.strings; sourceTree = ""; };
F0AF070E1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SettingsViewController.strings; sourceTree = ""; };
F0AF070F1A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/WizardViewController.strings; sourceTree = ""; };
- F0AF07101A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = "ar.lproj/WizardViewController~ipad.strings"; sourceTree = ""; };
F0AF07111A24BA770086C9C1 /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/WizardViews.strings; sourceTree = ""; };
F0B026F21AA710AF00FF49F7 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
F0B89C2118DC89E30050B60E /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
@@ -1332,10 +1309,6 @@
22F2508B107141E100AC9B3F /* DialerViewController.h */,
22F2508C107141E100AC9B3F /* DialerViewController.m */,
D38187C415FE345B00C3EDCA /* DialerViewController.xib */,
- D38187C815FE345F00C3EDCA /* DialerViewController~ipad.xib */,
- 2218A92212FBE1340088A667 /* FirstLoginViewController.h */,
- 2218A92312FBE1340088A667 /* FirstLoginViewController.m */,
- D38187CC15FE346400C3EDCA /* FirstLoginViewController.xib */,
635775231B6673EC00C8B704 /* HistoryDetailsTableViewController.h */,
635775241B6673EC00C8B704 /* HistoryDetailsTableViewController.m */,
C90FAA7615AF54E6002091CB /* HistoryDetailsViewController.h */,
@@ -1361,7 +1334,6 @@
D3F26BEE15986B71005F9CAB /* IncomingCallViewController.h */,
D3F26BEF15986B71005F9CAB /* IncomingCallViewController.m */,
D38187DC15FE347700C3EDCA /* IncomingCallViewController.xib */,
- D3D52A711614480700DEB00A /* IncomingCallViewController~ipad.xib */,
F0C1F8EA1A277ADA009402C9 /* LaunchScreen.xib */,
1D3623240D0F684500981E51 /* LinphoneAppDelegate.h */,
1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */,
@@ -1380,19 +1352,18 @@
D35E759C159460B50066B1C1 /* SettingsViewController.h */,
D35E759D159460B50066B1C1 /* SettingsViewController.m */,
636316D61A1DEC650009B839 /* SettingsViewController.xib */,
+ 633756371B67BAF400E21BAD /* SideMenuTableViewController.h */,
+ 633756381B67BAF400E21BAD /* SideMenuTableViewController.m */,
+ 633756421B67D2B100E21BAD /* SideMenuViewController.h */,
+ 633756431B67D2B100E21BAD /* SideMenuViewController.m */,
+ 633756441B67D2B100E21BAD /* SideMenuViewController.xib */,
D326483415887D4400930C67 /* Utils */,
34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */,
34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */,
D350F20B15A43BB100149E54 /* WizardViewController.h */,
D350F20C15A43BB100149E54 /* WizardViewController.m */,
D38187E015FE348A00C3EDCA /* WizardViewController.xib */,
- D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */,
D3D5126A160B3A8E00946DF8 /* WizardViews.xib */,
- 633756371B67BAF400E21BAD /* SideMenuTableViewController.h */,
- 633756381B67BAF400E21BAD /* SideMenuTableViewController.m */,
- 633756421B67D2B100E21BAD /* SideMenuViewController.h */,
- 633756431B67D2B100E21BAD /* SideMenuViewController.m */,
- 633756441B67D2B100E21BAD /* SideMenuViewController.xib */,
);
path = Classes;
sourceTree = "";
@@ -2286,7 +2257,6 @@
634CEDF11B6630DB00D7A921 /* options_default.png in Resources */,
634CEE141B6630DB00D7A921 /* status_disconnected_desktop.png in Resources */,
634CEDD41B6630DB00D7A921 /* history_all_selected.png in Resources */,
- D38187C915FE346400C3EDCA /* FirstLoginViewController.xib in Resources */,
63AADBFE1B6A0FF200AA16FD /* shortring.caf in Resources */,
634CEE051B6630DB00D7A921 /* security_pending.png in Resources */,
636316D91A1DECC90009B839 /* PhoneMainView.xib in Resources */,
@@ -2408,7 +2378,6 @@
F0642EF119DAC891009DB336 /* MainStoryboard.storyboard in Resources */,
634CEDBC1B6630DB00D7A921 /* chat_start_body_over.png in Resources */,
63AADC021B6A0FF200AA16FD /* wizard_remote.rc in Resources */,
- D38187C515FE345F00C3EDCA /* DialerViewController~ipad.xib in Resources */,
634CEE121B6630DB00D7A921 /* status_busy_phone.png in Resources */,
634CEDFB1B6630DB00D7A921 /* quit_default.png in Resources */,
63158FAD1B468E0E00969917 /* ImageOptim.sh in Resources */,
@@ -2448,7 +2417,6 @@
634CEDB31B6630DB00D7A921 /* chat_message_delivered.png in Resources */,
63AADBED1B6A0FF200AA16FD /* corner-left-top.png in Resources */,
634CEE131B6630DB00D7A921 /* status_disconnected.png in Resources */,
- D3D51270160B3AD400946DF8 /* WizardViewController~ipad.xib in Resources */,
634CEDB71B6630DB00D7A921 /* chat_picture_over.png in Resources */,
634CEDF91B6630DB00D7A921 /* pause_small_disabled.png in Resources */,
F0C1F8EB1A277ADA009402C9 /* LaunchScreen.xib in Resources */,
@@ -2471,7 +2439,6 @@
634CEDD71B6630DB00D7A921 /* history_missed_selected.png in Resources */,
634CED9C1B6630DB00D7A921 /* call_audio_start.png in Resources */,
634CEDCD1B6630DB00D7A921 /* edit.png in Resources */,
- D3D52A731614480700DEB00A /* IncomingCallViewController~ipad.xib in Resources */,
F0938159188E629800A55DFA /* iTunesArtwork in Resources */,
634CEDC11B6630DB00D7A921 /* conference_start.png in Resources */,
634CEDAD1B6630DB00D7A921 /* camera_selected.png in Resources */,
@@ -2591,7 +2558,6 @@
630CF5571AF7CE1500539F7A /* UITextField+DoneButton.m in Sources */,
2214EBF312F86360002A5394 /* UIMicroButton.m in Sources */,
22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */,
- 2218A92512FBE1340088A667 /* FirstLoginViewController.m in Sources */,
22C755601317E59C007BC101 /* UIBluetoothButton.m in Sources */,
22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */,
636BC9971B5F921B00C754CE /* UIIconButton.m in Sources */,
@@ -2962,28 +2928,6 @@
name = DialerViewController.xib;
sourceTree = "";
};
- D38187C815FE345F00C3EDCA /* DialerViewController~ipad.xib */ = {
- isa = PBXVariantGroup;
- children = (
- F095481E1883F15300E8A69B /* Base */,
- F095483D1883F49E00E8A69B /* fr */,
- F095483E1883F4A200E8A69B /* ru */,
- F0AF06F71A24BA760086C9C1 /* ar */,
- );
- name = "DialerViewController~ipad.xib";
- sourceTree = "";
- };
- D38187CC15FE346400C3EDCA /* FirstLoginViewController.xib */ = {
- isa = PBXVariantGroup;
- children = (
- F095481F1883F15300E8A69B /* Base */,
- F095483F1883F4B700E8A69B /* fr */,
- F09548401883F4BC00E8A69B /* ru */,
- F0AF06F81A24BA760086C9C1 /* ar */,
- );
- name = FirstLoginViewController.xib;
- sourceTree = "";
- };
D38187D015FE346700C3EDCA /* HistoryDetailsViewController.xib */ = {
isa = PBXVariantGroup;
children = (
@@ -3083,28 +3027,6 @@
name = WizardViews.xib;
sourceTree = "";
};
- D3D5126E160B3AD400946DF8 /* WizardViewController~ipad.xib */ = {
- isa = PBXVariantGroup;
- children = (
- F095482F1883F15500E8A69B /* Base */,
- F095485B1883F68500E8A69B /* fr */,
- F095485C1883F68800E8A69B /* ru */,
- F0AF07101A24BA770086C9C1 /* ar */,
- );
- name = "WizardViewController~ipad.xib";
- sourceTree = "";
- };
- D3D52A711614480700DEB00A /* IncomingCallViewController~ipad.xib */ = {
- isa = PBXVariantGroup;
- children = (
- F09548251883F15400E8A69B /* Base */,
- F09548491883F56A00E8A69B /* fr */,
- F095484A1883F56E00E8A69B /* ru */,
- F0AF06FE1A24BA770086C9C1 /* ar */,
- );
- name = "IncomingCallViewController~ipad.xib";
- sourceTree = "";
- };
F088488D19FF8C41007FFCF3 /* UIContactCell.xib */ = {
isa = PBXVariantGroup;
children = (