From 4a1f6ddacc9b508dbf8ee8d9414b8a7af8fba844 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 22 Dec 2015 14:09:15 +0100 Subject: [PATCH] UI: fix some minor icons --- Classes/AssistantView.m | 14 +- Classes/Base.lproj/CallView.xib | 4 +- Classes/Base.lproj/DialerView.xib | 2 +- Classes/Base.lproj/DialerView~ipad.xib | 10 +- Classes/CallSideMenuView.m | 2 - Classes/CallView.m | 1 - Classes/ChatConversationCreateTableView.m | 1 + Classes/ChatConversationCreateView.m | 1 + Classes/ContactDetailsTableView.m | 36 +- Classes/InAppProductsManager.m | 12 +- Classes/LinphoneCoreSettingsStore.m | 10 +- Classes/LinphoneManager.h | 18 +- Classes/LinphoneManager.m | 42 +- Classes/LinphoneUI/Base.lproj/TabBarView.xib | 4 +- Classes/LinphoneUI/UIChatBubbleTextCell.m | 1 + Classes/LinphoneUI/UIChatCell.m | 6 +- Classes/LinphoneUI/UICompositeView.m | 2 - Classes/LinphoneUI/UIRoundedImageView.m | 1 + Classes/PhoneMainView.m | 4 +- Classes/SideMenuTableView.m | 5 +- .../IASKAppSettingsWebViewController.m | 3 +- Classes/Utils/XMLRPCHelper.m | 4 +- Resources/images/chat_list_indicator.png | Bin 333 -> 0 bytes Resources/images/chat_list_indicator@2x.png | Bin 599 -> 0 bytes Resources/images/color_B.png | Bin 260 -> 0 bytes Resources/images/dialer_background.png | Bin 0 -> 2631 bytes Resources/images/dialer_background@2x.png | Bin 0 -> 5475 bytes linphone.xcodeproj/project.pbxproj | 2880 ++++++++--------- 28 files changed, 1522 insertions(+), 1541 deletions(-) delete mode 100644 Resources/images/chat_list_indicator.png delete mode 100644 Resources/images/chat_list_indicator@2x.png delete mode 100644 Resources/images/color_B.png create mode 100644 Resources/images/dialer_background.png create mode 100644 Resources/images/dialer_background@2x.png diff --git a/Classes/AssistantView.m b/Classes/AssistantView.m index 7b7fbdbdb..fb588d42c 100644 --- a/Classes/AssistantView.m +++ b/Classes/AssistantView.m @@ -134,9 +134,9 @@ static UICompositeViewDescription *compositeDescription = nil; } [[LinphoneManager instance] resetLinphoneCore]; account_creator = linphone_account_creator_new( - [LinphoneManager getLc], - [LinphoneManager.instance lpConfigStringForKey:@"xmlrpc_url" forSection:@"assistant" withDefault:@""] - .UTF8String); + [LinphoneManager getLc], + [LinphoneManager.instance lpConfigStringForKey:@"xmlrpc_url" inSection:@"assistant" withDefault:@""] + .UTF8String); linphone_account_creator_set_user_data(account_creator, (__bridge void *)(self)); linphone_account_creator_cbs_set_existence_tested(linphone_account_creator_get_callbacks(account_creator), assistant_existence_tested); @@ -148,7 +148,7 @@ static UICompositeViewDescription *compositeDescription = nil; - (void)loadAssistantConfig:(NSString *)rcFilename { NSString *fullPath = [@"file://" stringByAppendingString:[LinphoneManager bundleFile:rcFilename]]; linphone_core_set_provisioning_uri([LinphoneManager getLc], fullPath.UTF8String); - [[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" forSection:@"misc"]; + [[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" inSection:@"misc"]; [self resetLiblinphone]; } @@ -179,7 +179,7 @@ static UICompositeViewDescription *compositeDescription = nil; } + (NSString *)errorForStatus:(LinphoneAccountCreatorStatus)status { - BOOL usePhoneNumber = [[LinphoneManager instance] lpConfigBoolForKey:@"use_phone_number" forSection:@"assistant"]; + BOOL usePhoneNumber = [[LinphoneManager instance] lpConfigBoolForKey:@"use_phone_number" inSection:@"assistant"]; switch (status) { case LinphoneAccountCreatorEmailInvalid: return NSLocalizedString(@"Invalid email.", nil); @@ -685,7 +685,7 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun nextView = _remoteProvisioningView; [self loadAssistantConfig:@"assistant_remote.rc"]; [self findTextField:ViewElement_URL].text = - [[LinphoneManager instance] lpConfigStringForKey:@"config-uri" forSection:@"misc"]; + [[LinphoneManager instance] lpConfigStringForKey:@"config-uri" inSection:@"misc"]; } - (IBAction)onCreateAccountClick:(id)sender { @@ -710,7 +710,7 @@ void assistant_validation_tested(LinphoneAccountCreator *creator, LinphoneAccoun - (IBAction)onRemoteProvisioningLoginClick:(id)sender { _waitView.hidden = NO; - [[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" forSection:@"misc"]; + [[LinphoneManager instance] lpConfigSetInt:1 forKey:@"transient_provisioning" inSection:@"misc"]; [self configureProxyConfig]; } diff --git a/Classes/Base.lproj/CallView.xib b/Classes/Base.lproj/CallView.xib index 0919e44d9..f43d8dfd8 100644 --- a/Classes/Base.lproj/CallView.xib +++ b/Classes/Base.lproj/CallView.xib @@ -635,7 +635,7 @@