diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m index 3bb799007..51ec3e9ea 100644 --- a/Classes/ContactDetailsTableViewController.m +++ b/Classes/ContactDetailsTableViewController.m @@ -61,7 +61,11 @@ enum _ContactSections { ContactSections_MAX }; +/* MODIFICATION Toggle SIP/Number static const int contactSections[ContactSections_MAX] = {ContactSections_Number, ContactSections_Sip}; + */ +static const int contactSections[ContactSections_MAX] = {ContactSections_Sip, ContactSections_Number}; +/**/ @synthesize contact; diff --git a/Classes/LinphoneAppDelegate.h b/Classes/LinphoneAppDelegate.h index a17a464fd..bc83e5280 100644 --- a/Classes/LinphoneAppDelegate.h +++ b/Classes/LinphoneAppDelegate.h @@ -33,12 +33,6 @@ BOOL started; } -- (void)loadDefaultSettings:(NSDictionary *) appDefaults; -- (void)setupUI; -- (void)setupGSMInteraction; - -- (void)startApplication; - @property (nonatomic, retain) IBOutlet UIWindow *window; @property (assign) BOOL started; diff --git a/Classes/LinphoneAppDelegate.m b/Classes/LinphoneAppDelegate.m index 26c2ea0e3..a90420ab9 100644 --- a/Classes/LinphoneAppDelegate.m +++ b/Classes/LinphoneAppDelegate.m @@ -100,11 +100,7 @@ int __aeabi_idiv(int a, int b) { linphone_call_enable_camera(call, false); } -} -- (void)applicationDidEnterBackground:(UIApplication *)application { - if ([[LinphoneManager instance] settingsStore]!=Nil) - [[[LinphoneManager instance] settingsStore] synchronize]; - if (![[LinphoneManager instance] enterBackgroundMode]) { + if (![[LinphoneManager instance] resignActive]) { // destroying eventHandler if app cannot go in background. // Otherwise if a GSM call happen and Linphone is resumed, // the handler will be called before LinphoneCore is built. @@ -113,29 +109,14 @@ int __aeabi_idiv(int a, int b) { [callCenter release]; callCenter = nil; } -} -- (void)applicationDidBecomeActive:(UIApplication *)application { - if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] - && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground - && (![[NSUserDefaults standardUserDefaults] boolForKey:@"start_at_boot_preference"] || - ![[NSUserDefaults standardUserDefaults] boolForKey:@"backgroundmode_preference"])) { - // autoboot disabled, doing nothing - return; - } +} + +- (void)applicationDidBecomeActive:(UIApplication *)application { [self startApplication]; [[LinphoneManager instance] becomeActive]; - if (callCenter == nil) { - callCenter = [[CTCallCenter alloc] init]; - callCenter.callEventHandler = ^(CTCall* call) { - // post on main thread - [self performSelectorOnMainThread:@selector(handleGSMCallInteration:) - withObject:callCenter - waitUntilDone:YES]; - }; - } // check call state at startup [self handleGSMCallInteration:callCenter]; @@ -156,31 +137,6 @@ int __aeabi_idiv(int a, int b) { } } -- (void)loadDefaultSettings:(NSDictionary *) appDefaults { - for(NSString* key in appDefaults){ - [LinphoneLogger log:LinphoneLoggerLog format:@"Overload %@ to in app settings.", key]; - [[[LinphoneManager instance] settingsStore] setObject:[appDefaults objectForKey:key] forKey:key]; - } - [[[LinphoneManager instance] settingsStore] synchronize]; -} - -- (void)setupUI { - [[PhoneMainView instance] startUp]; - if ([[LinphoneManager instance].settingsStore boolForKey:@"enable_first_login_view_preference"] == true) { - // Change to fist login view - [[PhoneMainView instance] changeCurrentView: [FirstLoginViewController compositeViewDescription]]; - } else { - // Change to default view - /* MODIFICATION: Disable Wizard - const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]); - if(list != NULL) {*/ - [[PhoneMainView instance] changeCurrentView: [DialerViewController compositeViewDescription]]; - /*} else { - [[PhoneMainView instance] changeCurrentView: [WizardViewController compositeViewDescription]]; - }*/ - } - [UIDevice currentDevice].batteryMonitoringEnabled = YES; -} - (void)setupGSMInteraction { if (callCenter == nil) { @@ -194,36 +150,34 @@ int __aeabi_idiv(int a, int b) { } } -- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions{ - NSDictionary *appDefaults = [NSDictionary dictionaryWithObjectsAndKeys: nil]; - // Put your default NSUserDefaults settings in the dictionary above. +- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { + [[UIApplication sharedApplication] registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound]; - if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] - && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground + if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] + && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground && (![[NSUserDefaults standardUserDefaults] boolForKey:@"start_at_boot_preference"] || ![[NSUserDefaults standardUserDefaults] boolForKey:@"backgroundmode_preference"])) { - // autoboot disabled, doing nothing - } else { - [self startApplication]; - [self loadDefaultSettings: appDefaults]; - } - + // autoboot disabled, doing nothing + return YES; + } + + [self startApplication]; + return YES; } - (void)startApplication { - if(started) - return; - - started = TRUE; - - [[LinphoneManager instance] startLibLinphone]; - - [self setupUI]; - - [[UIApplication sharedApplication] registerForRemoteNotificationTypes:UIRemoteNotificationTypeAlert|UIRemoteNotificationTypeSound]; - + // Restart Linphone Core if needed + if(![LinphoneManager isLcReady]) { + [[LinphoneManager instance] startLibLinphone]; + } [self setupGSMInteraction]; + + // Only execute one time at application start + if(!started) { + started = TRUE; + [[PhoneMainView instance] startUp]; + } } @@ -231,7 +185,7 @@ int __aeabi_idiv(int a, int b) { } - (void)application:(UIApplication *)application didReceiveRemoteNotification:(NSDictionary *)userInfo { - //NSLog(@"%@", userInfo); + [LinphoneLogger log:LinphoneLoggerDebug format:@"PushNotification: Receive %@", userInfo]; } - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification { @@ -243,7 +197,8 @@ int __aeabi_idiv(int a, int b) { return; } linphone_core_accept_call([LinphoneManager getLc], call); - } /* else if([notification.userInfo objectForKey:@"chat"] != nil) { + } /* MODIFICATION: Remove chat + else if([notification.userInfo objectForKey:@"chat"] != nil) { NSString *remoteContact = (NSString*)[notification.userInfo objectForKey:@"chat"]; // Go to ChatRoom view ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController); @@ -258,7 +213,6 @@ int __aeabi_idiv(int a, int b) { - (void)application:(UIApplication*)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData*)deviceToken { [LinphoneLogger log:LinphoneLoggerDebug format:@"PushNotification: Token %@", deviceToken]; - //NSLog(@"%@", deviceToken); [[LinphoneManager instance] setPushNotificationToken:deviceToken]; } diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 79778f5d2..429a50a05 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -87,7 +87,7 @@ typedef struct _LinphoneCallAppData { - (void)startLibLinphone; - (void)destroyLibLinphone; -- (BOOL)enterBackgroundMode; +- (BOOL)resignActive; - (void)becomeActive; - (void)kickOffNetworkConnection; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 5b495e18d..e65aa9df0 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -673,7 +673,7 @@ static LinphoneCoreVTable linphonec_vtable = { if ([[UIDevice currentDevice] respondsToSelector:@selector(isMultitaskingSupported)] && [UIApplication sharedApplication].applicationState == UIApplicationStateBackground) { //go directly to bg mode - [self enterBackgroundMode]; + [self resignActive]; } } @@ -694,6 +694,12 @@ static LinphoneCoreVTable linphonec_vtable = { } } +- (BOOL)resignActive { + if ([[LinphoneManager instance] settingsStore] != Nil) + [[[LinphoneManager instance] settingsStore] synchronize]; + return [self enterBackgroundMode]; +} + - (BOOL)enterBackgroundMode { LinphoneProxyConfig* proxyCfg; linphone_core_get_default_proxy(theLinphoneCore, &proxyCfg); diff --git a/Classes/LinphoneUI/UICallBar.m b/Classes/LinphoneUI/UICallBar.m index b6bd98700..d9ce40dc6 100644 --- a/Classes/LinphoneUI/UICallBar.m +++ b/Classes/LinphoneUI/UICallBar.m @@ -218,6 +218,8 @@ [option3Button.titleLabel setLineBreakMode:UILineBreakModeWordWrap]; [option3Button.titleLabel setTextAlignment:UITextAlignmentCenter]; + [optionsView setHidden:TRUE]; + [padView setHidden:TRUE]; [super viewDidLoad]; } diff --git a/Classes/LinphoneUI/UICompositeViewController.m b/Classes/LinphoneUI/UICompositeViewController.m index a27966eea..5483b3b71 100644 --- a/Classes/LinphoneUI/UICompositeViewController.m +++ b/Classes/LinphoneUI/UICompositeViewController.m @@ -356,13 +356,17 @@ // Animate only with a previous screen if(oldViewDescription != nil && viewTransition != nil) { - [contentView.layer addAnimation:viewTransition forKey:@"Transition"]; - if((oldViewDescription.stateBarEnabled == true && currentViewDescription.stateBarEnabled == false) || - (oldViewDescription.stateBarEnabled == false && currentViewDescription.stateBarEnabled == true)) { - [stateBarView.layer addAnimation:viewTransition forKey:@"Transition"]; + [contentView.layer removeAnimationForKey:@"transition"]; + [contentView.layer addAnimation:viewTransition forKey:@"transition"]; + if(oldViewDescription.stateBar != currentViewDescription.stateBar || + [stateBarView.layer animationForKey:@"transition"] != nil) { + [stateBarView.layer removeAnimationForKey:@"transition"]; + [stateBarView.layer addAnimation:viewTransition forKey:@"transition"]; } - if(oldViewDescription.tabBar != currentViewDescription.tabBar) { - [tabBarView.layer addAnimation:viewTransition forKey:@"Transition"]; + if(oldViewDescription.tabBar != currentViewDescription.tabBar || + [tabBarView.layer animationForKey:@"transition"] != nil) { + [tabBarView.layer removeAnimationForKey:@"transition"]; + [tabBarView.layer addAnimation:viewTransition forKey:@"transition"]; } } diff --git a/Classes/LinphoneUI/UIMainBar.m b/Classes/LinphoneUI/UIMainBar.m index 0be5c6658..e32cd2ea8 100644 --- a/Classes/LinphoneUI/UIMainBar.m +++ b/Classes/LinphoneUI/UIMainBar.m @@ -208,19 +208,19 @@ if([chatNotificationView isHidden]) { [chatNotificationView setHidden:FALSE]; if(appear) { - [self appearAnimation:@"Appear" target:chatNotificationView completion:^(BOOL finished){ - [self startBounceAnimation:@"Bounce" target:chatNotificationView]; + [self appearAnimation:@"appear" target:chatNotificationView completion:^(BOOL finished){ + [self startBounceAnimation:@"bounce" target:chatNotificationView]; }]; } else { - [self startBounceAnimation:@"Bounce" target:chatNotificationView]; + [self startBounceAnimation:@"bounce" target:chatNotificationView]; } } [chatNotificationLabel setText:[NSString stringWithFormat:@"%i", unreadMessage]]; } else { if(![chatNotificationView isHidden]) { - [self stopBounceAnimation:@"Bounce" target:chatNotificationView]; + [self stopBounceAnimation:@"bounce" target:chatNotificationView]; if(appear) { - [self disappearAnimation:@"Disappear" target:chatNotificationView completion:^(BOOL finished){ + [self disappearAnimation:@"disappear" target:chatNotificationView completion:^(BOOL finished){ [chatNotificationView setHidden:TRUE]; }]; } else { @@ -236,19 +236,19 @@ if([historyNotificationView isHidden]) { [historyNotificationView setHidden:FALSE]; if(appear) { - [self appearAnimation:@"Appear" target:historyNotificationView completion:^(BOOL finished){ - [self startBounceAnimation:@"Bounce" target:historyNotificationView]; + [self appearAnimation:@"appear" target:historyNotificationView completion:^(BOOL finished){ + [self startBounceAnimation:@"bounce" target:historyNotificationView]; }]; } else { - [self startBounceAnimation:@"Bounce" target:historyNotificationView]; + [self startBounceAnimation:@"bounce" target:historyNotificationView]; } } [historyNotificationLabel setText:[NSString stringWithFormat:@"%i", missedCall]]; } else { if(![historyNotificationView isHidden]) { - [self stopBounceAnimation:@"Bounce" target:historyNotificationView]; + [self stopBounceAnimation:@"bounce" target:historyNotificationView]; if(appear) { - [self disappearAnimation:@"Disappear" target:historyNotificationView completion:^(BOOL finished){ + [self disappearAnimation:@"disappear" target:historyNotificationView completion:^(BOOL finished){ }]; } else { diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m index 095c8cfcc..21d9b8559 100644 --- a/Classes/PhoneMainView.m +++ b/Classes/PhoneMainView.m @@ -118,6 +118,7 @@ static PhoneMainView* phoneMainViewInstance=nil; selector:@selector(batteryLevelChanged:) name:UIDeviceBatteryLevelDidChangeNotification object:nil]; + [[UIDevice currentDevice] setBatteryMonitoringEnabled:YES]; } - (void)viewWillDisappear:(BOOL)animated { @@ -142,6 +143,7 @@ static PhoneMainView* phoneMainViewInstance=nil; [[NSNotificationCenter defaultCenter] removeObserver:self name:UIDeviceBatteryLevelDidChangeNotification object:nil]; + [[UIDevice currentDevice] setBatteryMonitoringEnabled:NO]; } - (void)viewDidAppear:(BOOL)animated { @@ -357,7 +359,21 @@ static PhoneMainView* phoneMainViewInstance=nil; #pragma mark - -- (void)startUp { +- (void)startUp { + if ([[LinphoneManager instance].settingsStore boolForKey:@"enable_first_login_view_preference"] == true) { + // Change to fist login view + [self changeCurrentView: [FirstLoginViewController compositeViewDescription]]; + } else { + // Change to default view + /* MODIFICATION disable wizard + const MSList *list = linphone_core_get_proxy_config_list([LinphoneManager getLc]); + if(list != NULL) {*/ + [self changeCurrentView: [DialerViewController compositeViewDescription]]; + /*} else { + [self changeCurrentView: [WizardViewController compositeViewDescription]]; + }*/ + } + [self updateApplicationBadgeNumber]; // Update Badge at startup } @@ -429,15 +445,15 @@ static PhoneMainView* phoneMainViewInstance=nil; return phoneMainViewInstance; } -- (void) showTabBar:(BOOL) show { +- (void) showTabBar:(BOOL)show { [mainViewController setToolBarHidden:!show]; } -- (void) showStateBar:(BOOL) show { +- (void) showStateBar:(BOOL)show { [mainViewController setStateBarHidden:!show]; } -- (void)fullScreen:(BOOL) enabled { +- (void)fullScreen:(BOOL)enabled { [mainViewController setFullScreen:enabled]; } diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 6469e7649..edb5d1084 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -509,17 +509,6 @@ D34BD6F315C13DB70070C209 /* settings_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327EF1580FE3A00FA0D23 /* settings_default.png */; }; D34BD6F415C13DB70070C209 /* settings_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327FE158100E400FA0D23 /* settings_over.png */; }; D34BD6F515C13DB70070C209 /* settings_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = D38327F01580FE3A00FA0D23 /* settings_selected.png */; }; - D34BD6F615C13DB70070C209 /* setup_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21315A43D3400149E54 /* setup_back_default.png */; }; - D34BD6F715C13DB70070C209 /* setup_back_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7815A6CC3200F96BE5 /* setup_back_disabled.png */; }; - D34BD6F815C13DB70070C209 /* setup_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21415A43D3400149E54 /* setup_back_over.png */; }; - D34BD6F915C13DB70070C209 /* setup_cancel_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21515A43D3400149E54 /* setup_cancel_default.png */; }; - D34BD6FA15C13DB70070C209 /* setup_cancel_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7915A6CC3200F96BE5 /* setup_cancel_disabled.png */; }; - D34BD6FB15C13DB70070C209 /* setup_cancel_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21615A43D3400149E54 /* setup_cancel_over.png */; }; - D34BD6FC15C13DB70070C209 /* setup_start_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21815A43D3400149E54 /* setup_start_default.png */; }; - D34BD6FD15C13DB70070C209 /* setup_start_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7A15A6CC3200F96BE5 /* setup_start_disabled.png */; }; - D34BD6FE15C13DB70070C209 /* setup_start_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21915A43D3400149E54 /* setup_start_over.png */; }; - D34BD6FF15C13DB70070C209 /* setup_title_assistant.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21A15A43D3400149E54 /* setup_title_assistant.png */; }; - D34BD70015C13DB70070C209 /* setup_welcome_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21B15A43D3400149E54 /* setup_welcome_logo.png */; }; D34BD70115C13DB70070C209 /* speaker_off_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3F83EFC158205A100336684 /* speaker_off_default.png */; }; D34BD70215C13DB70070C209 /* speaker_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = D3C31A2315BD8DED008ED271 /* speaker_off_default_landscape.png */; }; D34BD70315C13DB70070C209 /* speaker_off_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D365AA7915A2DE7500CAFE3F /* speaker_off_disabled.png */; }; @@ -581,15 +570,7 @@ D34BD74115C13E250070C209 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 2214783B1386A2030020F8B8 /* Localizable.strings */; }; D34BD74315C13ED70070C209 /* DialerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22F2508D107141E100AC9B3F /* DialerViewController.xib */; }; D34F6F9E1594D3FB0095705B /* InAppSettings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D34F6F9D1594D3FB0095705B /* InAppSettings.bundle */; }; - D350F21C15A43D3400149E54 /* setup_back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21315A43D3400149E54 /* setup_back_default.png */; }; - D350F21E15A43D3400149E54 /* setup_back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21415A43D3400149E54 /* setup_back_over.png */; }; - D350F22015A43D3400149E54 /* setup_cancel_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21515A43D3400149E54 /* setup_cancel_default.png */; }; - D350F22215A43D3400149E54 /* setup_cancel_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21615A43D3400149E54 /* setup_cancel_over.png */; }; D350F22415A43D3400149E54 /* field_background.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21715A43D3400149E54 /* field_background.png */; }; - D350F22615A43D3400149E54 /* setup_start_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21815A43D3400149E54 /* setup_start_default.png */; }; - D350F22815A43D3400149E54 /* setup_start_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21915A43D3400149E54 /* setup_start_over.png */; }; - D350F22A15A43D3400149E54 /* setup_title_assistant.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21A15A43D3400149E54 /* setup_title_assistant.png */; }; - D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = D350F21B15A43D3400149E54 /* setup_welcome_logo.png */; }; D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F515A47E9E007E7E81 /* button_background_default.png */; }; D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D35406F615A47E9E007E7E81 /* button_background_over.png */; }; D35497FE15875372000081D8 /* ContactsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D35497FC15875372000081D8 /* ContactsViewController.m */; }; @@ -876,9 +857,6 @@ D3A74F5915C69392001500B9 /* video_on_over~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A74EB115C69392001500B9 /* video_on_over~ipad.png */; }; D3A74F6115C6B03C001500B9 /* DialerViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A74F6015C6B03B001500B9 /* DialerViewController~ipad.xib */; }; D3A74F6215C6B03C001500B9 /* DialerViewController~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3A74F6015C6B03B001500B9 /* DialerViewController~ipad.xib */; }; - D3A8BB7F15A6CC3200F96BE5 /* setup_back_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7815A6CC3200F96BE5 /* setup_back_disabled.png */; }; - D3A8BB8115A6CC3200F96BE5 /* setup_cancel_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7915A6CC3200F96BE5 /* setup_cancel_disabled.png */; }; - D3A8BB8315A6CC3200F96BE5 /* setup_start_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3A8BB7A15A6CC3200F96BE5 /* setup_start_disabled.png */; }; D3ACB09715C6D0F700E15894 /* UICallBar~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ACB09615C6D0F700E15894 /* UICallBar~ipad.xib */; }; D3ACB09815C6D0F700E15894 /* UICallBar~ipad.xib in Resources */ = {isa = PBXBuildFile; fileRef = D3ACB09615C6D0F700E15894 /* UICallBar~ipad.xib */; }; D3ACB09B15C6D59500E15894 /* dialer_alt_back_default~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = D3ACB09915C6D59500E15894 /* dialer_alt_back_default~ipad.png */; }; @@ -3443,21 +3421,10 @@ D3196D3615A321E3007FEEBA /* options_add_over.png in Resources */, D3196D3815A321E3007FEEBA /* options_transfer_default.png in Resources */, D3196D3A15A321E3007FEEBA /* options_transfer_over.png in Resources */, - D350F21C15A43D3400149E54 /* setup_back_default.png in Resources */, - D350F21E15A43D3400149E54 /* setup_back_over.png in Resources */, - D350F22015A43D3400149E54 /* setup_cancel_default.png in Resources */, - D350F22215A43D3400149E54 /* setup_cancel_over.png in Resources */, D350F22415A43D3400149E54 /* field_background.png in Resources */, - D350F22615A43D3400149E54 /* setup_start_default.png in Resources */, - D350F22815A43D3400149E54 /* setup_start_over.png in Resources */, - D350F22A15A43D3400149E54 /* setup_title_assistant.png in Resources */, - D350F22C15A43D3400149E54 /* setup_welcome_logo.png in Resources */, D35406F715A47E9E007E7E81 /* button_background_default.png in Resources */, D35406F915A47E9E007E7E81 /* button_background_over.png in Resources */, D32B6E2C15A5C0800033019F /* database.sqlite in Resources */, - D3A8BB7F15A6CC3200F96BE5 /* setup_back_disabled.png in Resources */, - D3A8BB8115A6CC3200F96BE5 /* setup_cancel_disabled.png in Resources */, - D3A8BB8315A6CC3200F96BE5 /* setup_start_disabled.png in Resources */, D3D14E7C15A711700074A527 /* avatar_shadow_small.png in Resources */, D3128FE315AABC7E00A2147A /* ContactDetailsViewController.xib in Resources */, D3128FEF15AABE4E00A2147A /* contact_back_default.png in Resources */, @@ -3898,17 +3865,6 @@ D34BD6F315C13DB70070C209 /* settings_default.png in Resources */, D34BD6F415C13DB70070C209 /* settings_over.png in Resources */, D34BD6F515C13DB70070C209 /* settings_selected.png in Resources */, - D34BD6F615C13DB70070C209 /* setup_back_default.png in Resources */, - D34BD6F715C13DB70070C209 /* setup_back_disabled.png in Resources */, - D34BD6F815C13DB70070C209 /* setup_back_over.png in Resources */, - D34BD6F915C13DB70070C209 /* setup_cancel_default.png in Resources */, - D34BD6FA15C13DB70070C209 /* setup_cancel_disabled.png in Resources */, - D34BD6FB15C13DB70070C209 /* setup_cancel_over.png in Resources */, - D34BD6FC15C13DB70070C209 /* setup_start_default.png in Resources */, - D34BD6FD15C13DB70070C209 /* setup_start_disabled.png in Resources */, - D34BD6FE15C13DB70070C209 /* setup_start_over.png in Resources */, - D34BD6FF15C13DB70070C209 /* setup_title_assistant.png in Resources */, - D34BD70015C13DB70070C209 /* setup_welcome_logo.png in Resources */, D34BD70115C13DB70070C209 /* speaker_off_default.png in Resources */, D34BD70215C13DB70070C209 /* speaker_off_default_landscape.png in Resources */, D34BD70315C13DB70070C209 /* speaker_off_disabled.png in Resources */,