Commit ab2cfbe1 authored by Gautier Pelloux-Prayer's avatar Gautier Pelloux-Prayer
Browse files

rename wizard -> assistant

parent bb92accc
/* WizardViewController.h
/* AssistantViewController.h
*
* Copyright (C) 2012 Belledonne Comunications, Grenoble, France
*
......@@ -22,32 +22,28 @@
#import "UICompositeViewController.h"
#import "TPKeyboardAvoidingScrollView.h"
@interface WizardViewController : TPMultiLayoutViewController
<UITextFieldDelegate,
UICompositeViewDelegate,
XMLRPCConnectionDelegate,
UIGestureRecognizerDelegate,
UIAlertViewDelegate>
{
@private
UITextField *activeTextField;
UIView *currentView;
UIView *nextView;
NSMutableArray *historyViews;
@interface AssistantViewController
: TPMultiLayoutViewController <UITextFieldDelegate, UICompositeViewDelegate, XMLRPCConnectionDelegate,
UIGestureRecognizerDelegate, UIAlertViewDelegate> {
@private
UITextField *activeTextField;
UIView *currentView;
UIView *nextView;
NSMutableArray *historyViews;
}
@property(nonatomic, strong) IBOutlet TPKeyboardAvoidingScrollView *contentView;
@property (nonatomic, strong) IBOutlet UIView *choiceView;
@property (nonatomic, strong) IBOutlet UIView *createAccountView;
@property (nonatomic, strong) IBOutlet UIView *connectAccountView;
@property (nonatomic, strong) IBOutlet UIView *externalAccountView;
@property (nonatomic, strong) IBOutlet UIView *validateAccountView;
@property (strong, nonatomic) IBOutlet UIView *provisionedAccountView;
@property(nonatomic, strong) IBOutlet UIView *choiceView;
@property(nonatomic, strong) IBOutlet UIView *createAccountView;
@property(nonatomic, strong) IBOutlet UIView *connectAccountView;
@property(nonatomic, strong) IBOutlet UIView *externalAccountView;
@property(nonatomic, strong) IBOutlet UIView *validateAccountView;
@property(strong, nonatomic) IBOutlet UIView *provisionedAccountView;
@property (nonatomic, strong) IBOutlet UIView *waitView;
@property(nonatomic, strong) IBOutlet UIView *waitView;
@property (nonatomic, strong) IBOutlet UIButton *backButton;
@property(nonatomic, strong) IBOutlet UIButton *backButton;
@property(nonatomic, strong) IBOutlet UIButton *createChoiceButton;
@property(nonatomic, strong) IBOutlet UIButton *connectChoiceButton;
@property(nonatomic, strong) IBOutlet UIButton *externalChoiceButton;
......@@ -60,12 +56,12 @@
@property(strong, nonatomic) IBOutlet UIButton *createAccountButton;
@property (strong, nonatomic) IBOutlet UITextField *provisionedUsername;
@property (strong, nonatomic) IBOutlet UITextField *provisionedPassword;
@property (strong, nonatomic) IBOutlet UITextField *provisionedDomain;
@property(strong, nonatomic) IBOutlet UITextField *provisionedUsername;
@property(strong, nonatomic) IBOutlet UITextField *provisionedPassword;
@property(strong, nonatomic) IBOutlet UITextField *provisionedDomain;
@property (nonatomic, strong) IBOutlet UIImageView *choiceViewLogoImageView;
@property (strong, nonatomic) IBOutlet UISegmentedControl *transportChooser;
@property(nonatomic, strong) IBOutlet UIImageView *choiceViewLogoImageView;
@property(strong, nonatomic) IBOutlet UISegmentedControl *transportChooser;
- (void)reset;
- (void)fillDefaultValues;
......
......@@ -5,7 +5,7 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WizardViewController">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AssistantViewController">
<connections>
<outlet property="contentView" destination="98" id="99"/>
<outlet property="portraitView" destination="12" id="117"/>
......
......@@ -5,7 +5,7 @@
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WizardViewController">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AssistantViewController">
<connections>
<outlet property="choiceView" destination="33" id="40"/>
<outlet property="connectAccountView" destination="52" id="71"/>
......
......@@ -1896,7 +1896,7 @@ static void audioRouteChangeListenerCallback(void *inUserData, // 1
}
if ([[LinphoneManager instance] lpConfigBoolForKey:@"override_domain_with_default_one"]) {
linphone_address_set_domain(
addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"wizard"]
addr, [[[LinphoneManager instance] lpConfigStringForKey:@"domain" forSection:@"assistant"]
cStringUsingEncoding:[NSString defaultCStringEncoding]]);
}
......
......@@ -35,7 +35,7 @@
#import "OutgoingCallViewController.h"
#import "SettingsViewController.h"
#import "SideMenuViewController.h"
#import "WizardViewController.h"
#import "AssistantViewController.h"
#import "DTAlertView.h"
#import "DTActionSheet.h"
......
......@@ -295,9 +295,9 @@ static RootViewManager *rootViewManagerInstance = nil;
linphone_core_get_default_proxy([LinphoneManager getLc], &conf);
if ([[LinphoneManager instance] lpConfigBoolForKey:@"show_login_view" forSection:@"app"] && conf == NULL) {
already_shown = TRUE;
WizardViewController *controller = DYNAMIC_CAST(
[[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]],
WizardViewController);
AssistantViewController *controller = DYNAMIC_CAST(
[[PhoneMainView instance] changeCurrentView:[AssistantViewController compositeViewDescription]],
AssistantViewController);
if (controller != nil) {
[controller fillDefaultValues];
}
......@@ -420,12 +420,12 @@ static RootViewManager *rootViewManagerInstance = nil;
// always start to dialer when testing
// Change to default view
const MSList *list = linphone_core_get_proxy_config_list(core);
if (list != NULL || ([lm lpConfigBoolForKey:@"hide_wizard_preference"] == true) || lm.isTesting) {
if (list != NULL || ([lm lpConfigBoolForKey:@"hide_assistant_preference"] == true) || lm.isTesting) {
[self changeCurrentView:[DialerViewController compositeViewDescription]];
} else {
WizardViewController *controller = DYNAMIC_CAST(
[[PhoneMainView instance] changeCurrentView:[WizardViewController compositeViewDescription]],
WizardViewController);
AssistantViewController *controller = DYNAMIC_CAST(
[[PhoneMainView instance] changeCurrentView:[AssistantViewController compositeViewDescription]],
AssistantViewController);
if (controller != nil) {
[controller reset];
}
......
......@@ -651,7 +651,7 @@ static UICompositeViewDescription *compositeDescription = nil;
[hiddenKeys addObject:@"preview_preference"];
}
if ([lm lpConfigBoolForKey:@"hide_run_assistant_preference"]) {
[hiddenKeys addObject:@"wizard_button"];
[hiddenKeys addObject:@"assistant_button"];
}
if (!linphone_core_tunnel_available()) {
......@@ -701,8 +701,8 @@ static UICompositeViewDescription *compositeDescription = nil;
object:self];
}
#endif
if ([key isEqual:@"wizard_button"]) {
[PhoneMainView.instance changeCurrentView:WizardViewController.compositeViewDescription];
if ([key isEqual:@"assistant_button"]) {
[PhoneMainView.instance changeCurrentView:AssistantViewController.compositeViewDescription];
return;
} else if ([key isEqual:@"clear_proxy_button"]) {
if (linphone_core_get_default_proxy_config(lc) == NULL) {
......
......@@ -41,7 +41,7 @@
addObject:[[SideMenuEntry alloc] initWithTitle:NSLocalizedString(@"Assistant", nil)
tapBlock:^() {
[PhoneMainView.instance
changeCurrentView:WizardViewController.compositeViewDescription
changeCurrentView:AssistantViewController.compositeViewDescription
push:NO
animated:NO];
}]];
......
......@@ -123,7 +123,7 @@ MainStoryboard
#--> tabBar
When the application is started, the phoneMainView gets asked to transition to the Dialer view or the Wizard view.
When the application is started, the phoneMainView gets asked to transition to the Dialer view or the Assistant view.
PhoneMainView exposes the -changeCurrentView: method, which will setup its
Any Linphone view is actually presented in the UICompositeViewController, with or without a stateBar and tabBar.
......
B/* No comment provided by engineer. */
......
B/* No comment provided by engineer. */
......
B/* No comment provided by engineer. */
......
B/* No comment provided by engineer. */
......
B/* No comment provided by engineer. */
......
......@@ -62,8 +62,8 @@ enable_log_collect=0
[default_values]
reg_expires=600
[wizard]
service_url=https://www.linphone.org/wizard.php
[assistant]
service_url=https://www.linphone.org/assistant.php
domain=sip.linphone.org
proxy=sip.linphone.org
password_length=6
......
......@@ -62,8 +62,8 @@ enable_log_collect=0
[default_values]
reg_expires=600
[wizard]
service_url=https://www.linphone.org/wizard.php
[assistant]
service_url=https://www.linphone.org/assistant.php
domain=sip.linphone.org
proxy=sip.linphone.org
password_length=6
......
B/* No comment provided by engineer. */
......
B/* No comment provided by engineer. */
......
B/* No comment provided by engineer. */
......
......@@ -12,7 +12,7 @@
</dict>
<dict>
<key>Key</key>
<string>wizard_button</string>
<string>assistant_button</string>
<key>Title</key>
<string>Run assistant</string>
<key>Type</key>
......
//
// WizardTester.h
// AssistantTester.h
// linphone
//
// Created by Guillaume on 17/01/2015.
......@@ -8,6 +8,6 @@
#import "LinphoneTestCase.h"
@interface WizardTester : LinphoneTestCase
@interface AssistantTester : LinphoneTestCase
@end
\ No newline at end of file
@end
//
// WizardTester.m
// AssistantTester.m
// linphone
//
// Created by Guillaume on 17/01/2015.
//
//
#import "WizardTester.h"
#import "AssistantTester.h"
#import <KIF/KIF.h>
@implementation WizardTester
@implementation AssistantTester
- (void)beforeEach {
[super beforeEach];
......@@ -18,8 +18,8 @@
[tester tapViewWithAccessibilityLabel:@"Settings"];
[tester tapViewWithAccessibilityLabel:@"Run assistant"];
[tester waitForTimeInterval:0.5];
if ([tester tryFindingViewWithAccessibilityLabel:@"Launch Wizard" error:nil]) {
[tester tapViewWithAccessibilityLabel:@"Launch Wizard"];
if ([tester tryFindingViewWithAccessibilityLabel:@"Launch Assistant" error:nil]) {
[tester tapViewWithAccessibilityLabel:@"Launch Assistant"];
[tester waitForTimeInterval:0.5];
}
}
......@@ -122,7 +122,7 @@
[tester fail];
} else {
[tester tapViewWithAccessibilityLabel:@"OK"]; // alertview
[tester tapViewWithAccessibilityLabel:@"Cancel"]; // cancel wizard
[tester tapViewWithAccessibilityLabel:@"Cancel"]; // cancel assistant
}
} else {
[tester fail];
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment