瀏覽代碼

add OPTION_DISABLE_INTRO

Marino Faggiana 8 年之前
父節點
當前提交
d65164428d

+ 5 - 0
iOSClient/Login/CCLogin.m

@@ -112,6 +112,11 @@
 
 
 - (void)showIntro
 - (void)showIntro
 {
 {
+    
+#ifdef OPTION_DISABLE_INTRO
+    [CCUtility setIntro:@"1.0"];
+#endif
+    
     if ([CCUtility getIntro:@"1.0"] == NO) {
     if ([CCUtility getIntro:@"1.0"] == NO) {
         
         
         _intro = [[CCIntro alloc] initWithDelegate:self delegateView:self.view];
         _intro = [[CCIntro alloc] initWithDelegate:self delegateView:self.view];

+ 1 - 3
iOSClient/Main/CCSplit.h

@@ -23,13 +23,11 @@
 
 
 #import <UIKit/UIKit.h>
 #import <UIKit/UIKit.h>
 
 
-#import "CCIntro.h"
 #import "CCLogin.h"
 #import "CCLogin.h"
 #import "CCDetail.h"
 #import "CCDetail.h"
 
 
-@interface CCSplit : UISplitViewController <UISplitViewControllerDelegate, CCIntroDelegate, CCLoginDelegate>
+@interface CCSplit : UISplitViewController <UISplitViewControllerDelegate, CCLoginDelegate>
 
 
-@property (nonatomic, strong) CCIntro *intro;
 @property (nonatomic, strong) NSString *version;
 @property (nonatomic, strong) NSString *version;
 
 
 @end
 @end

+ 0 - 27
iOSClient/Main/CCSplit.m

@@ -95,37 +95,10 @@
     //  setting version
     //  setting version
     self.version = [CCUtility setVersionCryptoCloud];
     self.version = [CCUtility setVersionCryptoCloud];
     
     
-    // view how to if exists
-    //[self showIntro];
-    
     // init home
     // init home
     [[NSNotificationCenter defaultCenter] postNotificationName:@"initializeMain" object:nil];
     [[NSNotificationCenter defaultCenter] postNotificationName:@"initializeMain" object:nil];
 }
 }
 
 
-#pragma --------------------------------------------------------------------------------------------
-#pragma mark ===== Intro =====
-#pragma --------------------------------------------------------------------------------------------
-
-- (void)showIntro
-{
-    BOOL isIntro = [CCUtility getIntro:self.version];
-    
-    // test
-    if (app.activeAccount.length > 0  && isIntro == NO) {
-        
-        //[self bannerHide];
-        
-        self.intro = [[CCIntro alloc] initWithDelegate:self delegateView:self.view];
-        
-        //[self.intro showIntroVersion:self.version duration:1.0 review:NO];
-    }
-}
-
-- (void)introDidFinish:(EAIntroView *)introView wasSkipped:(BOOL)wasSkipped
-{
-    [CCUtility setIntro:[CCUtility getVersionCryptoCloud]];
-}
-
 #pragma --------------------------------------------------------------------------------------------
 #pragma --------------------------------------------------------------------------------------------
 #pragma mark ===== newAccount =====
 #pragma mark ===== newAccount =====
 #pragma --------------------------------------------------------------------------------------------
 #pragma --------------------------------------------------------------------------------------------

+ 2 - 0
iOSClient/Settings/CCManageAccount.m

@@ -70,6 +70,7 @@
     if (listAccount.count == 0) row.disabled = @YES;
     if (listAccount.count == 0) row.disabled = @YES;
     [section addFormRow:row];
     [section addFormRow:row];
 
 
+#ifndef OPTION_MULTIUSER_DISABLE
     // New Account nextcloud
     // New Account nextcloud
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"addAccountNextcloud" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_add_nextcloud_", nil)];
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"addAccountNextcloud" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_add_nextcloud_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
@@ -78,6 +79,7 @@
     [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
     [row.cellConfig setObject:COLOR_BRAND forKey:@"textLabel.textColor"];
     row.action.formSelector = @selector(addAccount:);
     row.action.formSelector = @selector(addAccount:);
     [section addFormRow:row];
     [section addFormRow:row];
+#endif
     
     
     // delete Account
     // delete Account
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"delAccount" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_delete_account_", nil)];
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"delAccount" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_delete_account_", nil)];

+ 0 - 2
iOSClient/Settings/CCSettings.m

@@ -102,14 +102,12 @@
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"detailTextLabel.font"];
     [section addFormRow:row];
     [section addFormRow:row];
     
     
-#ifndef OPTION_MULTIUSER_DISABLE
     // Change Account
     // Change Account
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"changecredentials" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_change_credentials_", nil)];
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"changecredentials" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_change_credentials_", nil)];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsCredentials] forKey:@"imageView.image"];
     [row.cellConfig setObject:[UIImage imageNamed:image_settingsCredentials] forKey:@"imageView.image"];
     row.action.formSegueIdentifier = @"CCManageAccountSegue";
     row.action.formSegueIdentifier = @"CCManageAccountSegue";
     [section addFormRow:row];
     [section addFormRow:row];
-#endif
     
     
     // quota
     // quota
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"quota" rowType:XLFormRowDescriptorTypeButton title:@""];
     row = [XLFormRowDescriptor formRowDescriptorWithTag:@"quota" rowType:XLFormRowDescriptorTypeButton title:@""];