remove old variable/string

iOSClient/CCGlobal.h

@@ -49,93 +49,50 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #endif
 
 // Version Protocol plist
-#define k_versionProtocolPlist      @"1.3"
+#define k_versionProtocolPlist                          @"1.3"
 
 // UUID
-#define k_UUID_SIM                  @"4BACFE4A-61A6-44B1-9A85-13FD167565AB"
+#define k_UUID_SIM                                      @"4BACFE4A-61A6-44B1-9A85-13FD167565AB"
 
 // Capabilities Group & Service Key Share
-#define k_capabilitiesGroups        @"group.it.twsweb.Crypto-Cloud"
-#define k_serviceShareKeyChain      @"Crypto Cloud"
+#define k_capabilitiesGroups                            @"group.it.twsweb.Crypto-Cloud"
+#define k_serviceShareKeyChain                          @"Crypto Cloud"
 
 // BRAND
-#ifdef CC
-
-#define _brand_                     @"Crypto Cloud"
-#define _mail_me_                   @"cryptocloud@twsweb.it"
-#endif
-
 #ifdef NC
-
-#define _brand_                     @"Nextcloud"
-#define _mail_me_                   @"ios@nextcloud.com"
-
-#endif
-
-// COLOR
-
-#ifdef CC // CRYPTOCLOUD ORANGE
-
-#define COLOR_BRAND               [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]         // #F15A22 - A 1.0
-#define COLOR_BRAND_MESSAGE       [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:0.90]        // #F15A22 - A 1.0
-#define COLOR_SELECT_BACKGROUND   [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:0.1]         // #F15A22 - A 0.1
-#define COLOR_TRANSFER_BACKGROUND [UIColor colorWithRed:252.0/255.0 green:242.0/255.0 blue:238.0/255.0 alpha:0.5]       // Arancio chiarissimo
-#define COLOR_GROUPBY_BAR         [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:0.2]         // #F15A22 - A 0.2
-#define COLOR_GROUPBY_BAR_NO_BLUR [UIColor colorWithRed:255.0/255.0 green:153.0/255.0 blue:102.0/255.0 alpha:0.3]       // #FF9966
-
-#endif
-
-#ifdef NC // NEXTCLOUD BLUE
-
-#define COLOR_BRAND               [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
-#define COLOR_BRAND_MESSAGE       [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.90]
-#define COLOR_SELECT_BACKGROUND   [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.1]
-#define COLOR_TRANSFER_BACKGROUND [UIColor colorWithRed:178.0/255.0 green:244.0/255.0 blue:258.0/255.0 alpha:0.1]       // Blu chiarissimo
-#define COLOR_GROUPBY_BAR         [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.2]
-#define COLOR_GROUPBY_BAR_NO_BLUR [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.3]
-
+#define _brand_                                         @"Nextcloud"
+#define _mail_me_                                       @"ios@nextcloud.com"
 #endif
 
-#define COLOR_CRYPTOCLOUD         [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]         // Arancio
-#define COLOR_NEXTCLOUD           [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]         // Blue #0082c9
-
-#define COLOR_ENCRYPTED [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]                   // #F15A22 - A 1.0
-#define COLOR_GRAY [UIColor colorWithRed:65.0/255.0 green:64.0/255.0 blue:66.0/255.0 alpha:1.0]                         // #414042 - A 1.0
-#define COLOR_CLEAR [UIColor colorWithRed:65.0/255.0 green:64.0/255.0 blue:66.0/255.0 alpha:1.0]
-#define COLOR_BAR [UIColor colorWithRed:(248.0f/255.0f) green:(248.0f/255.0f) blue:(248.0f/255.0f) alpha:1.0]
-#define COLOR_SEPARATOR_TABLE [UIColor colorWithRed:246.0/255.0 green:246.0/255.0 blue:246.0/255.0 alpha:1]           // Grigio chiaro
-#define COLOR_NO_CONNECTION [UIColor colorWithRed:204.0/255.0 green:204.0/255.0 blue:204.0/255.0 alpha:1.0]
-#define COLOR_NAVBAR_IOS7 [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1.0]
-
-#define k_dismissAfterSecond                    4
+#define k_dismissAfterSecond                            4
 
-#define k_MaxDimensionUpload                    524288000       // 500 MB
+#define k_MaxDimensionUpload                            524288000       // 500 MB
 
-#define k_dayForceReadFolder                    3
+#define k_dayForceReadFolder                            3
 
-#define k_MaxGroupBySessionUploadDatasource     50
-#define k_MaxGroupBySessionDownloadDatasource   50
+#define k_MaxGroupBySessionUploadDatasource             50
+#define k_MaxGroupBySessionDownloadDatasource           50
 
-#define k_returnCreateFolderPlain               0
-#define k_returnCreateFotoVideoPlain            1
-#define k_returnCreateFilePlain                 2
-#define k_returnCreateFolderEncrypted           3
-#define k_returnCreateFotoVideoEncrypted        4
-#define k_returnCreateFileEncrypted             5
-#define k_returnCartaDiCredito                  6
-#define k_returnBancomat                        7
-#define k_returnContoCorrente                   8
-#define k_returnAccountWeb                      9
-#define k_returnNote                            10
-#define k_returnPatenteGuida                    11
-#define k_returnCartaIdentita                   12
-#define k_returnPassaporto                      13
+#define k_returnCreateFolderPlain                       0
+#define k_returnCreateFotoVideoPlain                    1
+#define k_returnCreateFilePlain                         2
+#define k_returnCreateFolderEncrypted                   3
+#define k_returnCreateFotoVideoEncrypted                4
+#define k_returnCreateFileEncrypted                     5
+#define k_returnCartaDiCredito                          6
+#define k_returnBancomat                                7
+#define k_returnContoCorrente                           8
+#define k_returnAccountWeb                              9
+#define k_returnNote                                    10
+#define k_returnPatenteGuida                            11
+#define k_returnCartaIdentita                           12
+#define k_returnPassaporto                              13
 
 // File Name Const
-#define k_folderDefaultCameraUpload             @"Photos"
+#define k_folderDefaultCameraUpload                     @"Photos"
 
 // Picker select image
-#define k_pickerControllerMax                   100.0
+#define k_pickerControllerMax                           100.0
 
 // define ownCloud IOS
 #define server_version_with_new_shared_schema 8
@@ -143,164 +100,194 @@ extern NSString *const BKPasscodeKeychainServiceName;
 #define k_share_link_middle_part_url_after_version_8    @"index.php/s/"
 
 // Constants to identify the different permissions of a file
-#define k_permission_shared                     @"S"
-#define k_permission_can_share                  @"R"
-#define k_permission_mounted                    @"M"
-#define k_permission_file_can_write             @"W"
-#define k_permission_can_create_file            @"C"
-#define k_permission_can_create_folder          @"K"
-#define k_permission_can_delete                 @"D"
-#define k_permission_can_rename                 @"N"
-#define k_permission_can_move                   @"V"
+#define k_permission_shared                             @"S"
+#define k_permission_can_share                          @"R"
+#define k_permission_mounted                            @"M"
+#define k_permission_file_can_write                     @"W"
+#define k_permission_can_create_file                    @"C"
+#define k_permission_can_create_folder                  @"K"
+#define k_permission_can_delete                         @"D"
+#define k_permission_can_rename                         @"N"
+#define k_permission_can_move                           @"V"
 
 // Session
-#define k_download_session                      @"it.twsweb.download.session"
-#define k_download_session_foreground           @"it.twsweb.download.sessionforeground"
-#define k_download_session_wwan                 @"it.twsweb.download.sessionwwan"
+#define k_download_session                              @"it.twsweb.download.session"
+#define k_download_session_foreground                   @"it.twsweb.download.sessionforeground"
+#define k_download_session_wwan                         @"it.twsweb.download.sessionwwan"
 
-#define k_upload_session                        @"it.twsweb.upload.session"
-#define k_upload_session_foreground             @"it.twsweb.upload.sessionforeground"
-#define k_upload_session_wwan                   @"it.twsweb.upload.sessionwwan"
+#define k_upload_session                                @"it.twsweb.upload.session"
+#define k_upload_session_foreground                     @"it.twsweb.upload.sessionforeground"
+#define k_upload_session_wwan                           @"it.twsweb.upload.sessionwwan"
 
-#define k_networkingSessionNotification         @"networkingSessionNotification"
+#define k_networkingSessionNotification                 @"networkingSessionNotification"
 
 // TaskIdentifier
-#define k_taskIdentifierDone                    -1
-#define k_taskIdentifierStop                    -2
-#define k_taskIdentifierError                   -99999
-#define k_taskIdentifierNULL                    99999
+#define k_taskIdentifierDone                            -1
+#define k_taskIdentifierStop                            -2
+#define k_taskIdentifierError                           -99999
+#define k_taskIdentifierNULL                            99999
 
 // TaskStatus
-#define k_taskStatusNone                        0
-#define k_taskStatusCancel                      -1
-#define k_taskStatusResume                      -2
-#define k_taskStatusSuspend                     -3
+#define k_taskStatusNone                                0
+#define k_taskStatusCancel                              -1
+#define k_taskStatusResume                              -2
+#define k_taskStatusSuspend                             -3
 
-#define k_timerVerifySession                    15.0
+#define k_timerVerifySession                            15.0
 
 // OperationQueue
-#define k_netQueueName                          @"it.twsweb.cryptocloud.queue"
-#define k_netQueueDownloadName                  @"it.twsweb.cryptocloud.queueDownload"
-#define k_netQueueDownloadWWanName              @"it.twsweb.cryptocloud.queueDownloadWWan"
-#define k_netQueueUploadName                    @"it.twsweb.cryptocloud.queueUpload"
-#define k_netQueueUploadWWanName                @"it.twsweb.cryptocloud.queueUploadWWan"
+#define k_netQueueName                                  @"it.twsweb.cryptocloud.queue"
+#define k_netQueueDownloadName                          @"it.twsweb.cryptocloud.queueDownload"
+#define k_netQueueDownloadWWanName                      @"it.twsweb.cryptocloud.queueDownloadWWan"
+#define k_netQueueUploadName                            @"it.twsweb.cryptocloud.queueUpload"
+#define k_netQueueUploadWWanName                        @"it.twsweb.cryptocloud.queueUploadWWan"
 
-#define k_maxConcurrentOperation                10
-#define k_maxConcurrentOperationDownloadUpload  10
+#define k_maxConcurrentOperation                        10
+#define k_maxConcurrentOperationDownloadUpload          10
 
 // Error
-#define k_CCErrorTaskNil                        -9999
-#define k_CCErrorTaskDownloadNotFound           -9998
-#define k_CCErrorFileUploadNotFound             -9997
-#define k_CCErrorInternalError                  -9996
+#define k_CCErrorTaskNil                                -9999
+#define k_CCErrorTaskDownloadNotFound                   -9998
+#define k_CCErrorFileUploadNotFound                     -9997
+#define k_CCErrorInternalError                          -9996
 
 // Metadata ed ID
-#define k_uploadSessionID                   @"ID_UPLOAD_"
+#define k_uploadSessionID                               @"ID_UPLOAD_"
 
 // Metadata.Net SELECTOR
-#define selectorAddOffline                  @"addOffline"
-#define selectorAddLocal                    @"addLocal"
-#define selectorCreateFolder                @"createFolder"
-#define selectorDecryptFile                 @"decryptFile"
-#define selectorDelete                      @"delete"
-#define selectorDeleteCrypto                @"deleteCrypto"
-#define selectorDeletePlist                 @"deletePlist"
-#define selectorDownloadThumbnail           @"downloadThumbnail"
-#define selectorDownloadOffline             @"downloadOffline"
-#define selectorEncryptFile                 @"encryptFile"
-#define selectorGetUserAndGroup             @"getUserAndGroup"
-#define selectorLoadFileView                @"loadFileView"
-#define selectorLoadModelView               @"loadModelView"
-#define selectorLoadPlist                   @"loadPlist"
-#define selectorLoadViewImage               @"loadViewImage"
-#define selectorLoadCopy                    @"loadCopy"
-#define selectorMove                        @"move"
-#define selectorMoveCrypto                  @"moveCrypto"
-#define selectorMovePlist                   @"movePlist"
-#define selectorOpenIn                      @"openIn"
-#define selectorOpenWindowShare             @"openWindowShare"
-#define selectorReadFile                    @"readFile"
-#define selectorReadFileOffline             @"readFileOffline"
-#define selectorReadFileFolder              @"readFileFolder"
-#define selectorReadFileUploadFile          @"readFileUploadFile"
-#define selectorReadFileVerifyUpload        @"readFileVerifyUpload"
-#define selectorReadFileQuota               @"readFileQuota"
-#define selectorReadFolder                  @"readFolder"
-#define selectorReadFolderForced            @"readFolderForced"
-#define selectorReadShare                   @"readShare"
-#define selectorReload                      @"reload"
-#define selectorRename                      @"rename"
-#define selectorSave                        @"save"
-#define selectorShare                       @"share"
-#define selectorSearch                      @"search"
-#define selectorUnshare                     @"unshare"
-#define selectorUpdateShare                 @"updateShare"
-#define selectorUploadAutomatic             @"uploadAutomatic"
-#define selectorUploadAutomaticAll          @"uploadAutomaticAll"
-#define selectorUploadFile                  @"uploadFile"
-#define selectorUploadFileCrypto            @"uploadFileCrypto"
-#define selectorUploadFilePlist             @"uploadFilePlist"
-#define selectorUploadRemovePhoto           @"uploadRemovePhoto"
+#define selectorAddOffline                              @"addOffline"
+#define selectorAddLocal                                @"addLocal"
+#define selectorCreateFolder                            @"createFolder"
+#define selectorDecryptFile                             @"decryptFile"
+#define selectorDelete                                  @"delete"
+#define selectorDeleteCrypto                            @"deleteCrypto"
+#define selectorDeletePlist                             @"deletePlist"
+#define selectorDownloadThumbnail                       @"downloadThumbnail"
+#define selectorDownloadOffline                         @"downloadOffline"
+#define selectorEncryptFile                             @"encryptFile"
+#define selectorGetUserAndGroup                         @"getUserAndGroup"
+#define selectorLoadFileView                            @"loadFileView"
+#define selectorLoadModelView                           @"loadModelView"
+#define selectorLoadPlist                               @"loadPlist"
+#define selectorLoadViewImage                           @"loadViewImage"
+#define selectorLoadCopy                                @"loadCopy"
+#define selectorMove                                    @"move"
+#define selectorMoveCrypto                              @"moveCrypto"
+#define selectorMovePlist                               @"movePlist"
+#define selectorOpenIn                                  @"openIn"
+#define selectorOpenWindowShare                         @"openWindowShare"
+#define selectorReadFile                                @"readFile"
+#define selectorReadFileOffline                         @"readFileOffline"
+#define selectorReadFileFolder                          @"readFileFolder"
+#define selectorReadFileUploadFile                      @"readFileUploadFile"
+#define selectorReadFileVerifyUpload                    @"readFileVerifyUpload"
+#define selectorReadFileQuota                           @"readFileQuota"
+#define selectorReadFolder                              @"readFolder"
+#define selectorReadFolderForced                        @"readFolderForced"
+#define selectorReadShare                               @"readShare"
+#define selectorReload                                  @"reload"
+#define selectorRename                                  @"rename"
+#define selectorSave                                    @"save"
+#define selectorShare                                   @"share"
+#define selectorSearch                                  @"search"
+#define selectorUnshare                                 @"unshare"
+#define selectorUpdateShare                             @"updateShare"
+#define selectorUploadAutomatic                         @"uploadAutomatic"
+#define selectorUploadAutomaticAll                      @"uploadAutomaticAll"
+#define selectorUploadFile                              @"uploadFile"
+#define selectorUploadFileCrypto                        @"uploadFileCrypto"
+#define selectorUploadFilePlist                         @"uploadFilePlist"
+#define selectorUploadRemovePhoto                       @"uploadRemovePhoto"
 
 // Metadata.Net ACTION
-#define actionCreateFolder                  @"createFolder"
-#define actionDeleteFileDirectory           @"deleteFileOrFolder"
-#define actionDownloadFile                  @"downloadFile"
-#define actionDownloadThumbnail             @"downloadThumbnail"
-#define actionGetCapabilities               @"getCapabilitiesOfServer"
-#define actionGetFeaturesSuppServer         @"getFeaturesSupportedByServer"
-#define actionGetUserAndGroup               @"getUserAndGroup"
-#define actionGetNotificationsOfServer      @"getNotificationsOfServer"
-#define actionSetNotificationServer         @"setNotificationServer"
-#define actionMoveFileOrFolder              @"moveFileOrFolder"
-#define actionReadFile                      @"readFile"
-#define actionReadFolder                    @"readFolder"
-#define actionReadShareServer               @"readShareServer"
-#define actionSearch                        @"search"
-#define actionShare                         @"share"
-#define actionShareWith                     @"shareWith"
-#define actionUnShare                       @"unShare"
-#define actionUpdateShare                   @"updateShare"
-#define actionUploadFile                    @"uploadFile"
-#define actionUploadAsset                   @"uploadAsset"
-#define actionUploadTemplate                @"uploadTemplate"
-#define actionUploadOnlyPlist               @"uploadOnlyPlist"
+#define actionCreateFolder                              @"createFolder"
+#define actionDeleteFileDirectory                       @"deleteFileOrFolder"
+#define actionDownloadFile                              @"downloadFile"
+#define actionDownloadThumbnail                         @"downloadThumbnail"
+#define actionGetCapabilities                           @"getCapabilitiesOfServer"
+#define actionGetFeaturesSuppServer                     @"getFeaturesSupportedByServer"
+#define actionGetUserAndGroup                           @"getUserAndGroup"
+#define actionGetNotificationsOfServer                  @"getNotificationsOfServer"
+#define actionSetNotificationServer                     @"setNotificationServer"
+#define actionMoveFileOrFolder                          @"moveFileOrFolder"
+#define actionReadFile                                  @"readFile"
+#define actionReadFolder                                @"readFolder"
+#define actionReadShareServer                           @"readShareServer"
+#define actionSearch                                    @"search"
+#define actionShare                                     @"share"
+#define actionShareWith                                 @"shareWith"
+#define actionUnShare                                   @"unShare"
+#define actionUpdateShare                               @"updateShare"
+#define actionUploadFile                                @"uploadFile"
+#define actionUploadAsset                               @"uploadAsset"
+#define actionUploadTemplate                            @"uploadTemplate"
+#define actionUploadOnlyPlist                           @"uploadOnlyPlist"
 
 // Metadata : FileType
-#define k_metadataTypeFile_audio            @"audio"
-#define k_metadataTypeFile_compress         @"compress"
-#define k_metadataTypeFile_directory        @"directory"
-#define k_metadataTypeFile_document         @"document"
-#define k_metadataTypeFile_image            @"image"
-#define k_metadataTypeFile_template         @"template"
-#define k_metadataTypeFile_unknown          @"unknow"
-#define k_metadataTypeFile_video            @"video"
+#define k_metadataTypeFile_audio                        @"audio"
+#define k_metadataTypeFile_compress                     @"compress"
+#define k_metadataTypeFile_directory                    @"directory"
+#define k_metadataTypeFile_document                     @"document"
+#define k_metadataTypeFile_image                        @"image"
+#define k_metadataTypeFile_template                     @"template"
+#define k_metadataTypeFile_unknown                      @"unknow"
+#define k_metadataTypeFile_video                        @"video"
 
 // Metadata : Type
-#define k_metadataType_file                 @"file"
-#define k_metadataType_template             @"model"
-#define k_metadataType_local                @"local"
+#define k_metadataType_file                             @"file"
+#define k_metadataType_template                         @"model"
+#define k_metadataType_local                            @"local"
 
 // Metadata : Filename Type
-#define k_metadataTypeFilenamePlain         0
-#define k_metadataTypeFilenamePlist         1
-#define k_metadataTypeFilenameCrypto        2
+#define k_metadataTypeFilenamePlain                     0
+#define k_metadataTypeFilenamePlist                     1
+#define k_metadataTypeFilenameCrypto                    2
 
-#define k_tabBarApplicationIndexFile        0
-#define k_tabBarApplicationIndexOffline     1
-#define k_tabBarApplicationIndexHide        2
-#define k_tabBarApplicationIndexPhotos      3
-#define k_tabBarApplicationIndexSettings    4
+#define k_tabBarApplicationIndexFile                    0
+#define k_tabBarApplicationIndexOffline                 1
+#define k_tabBarApplicationIndexHide                    2
+#define k_tabBarApplicationIndexPhotos                  3
+#define k_tabBarApplicationIndexSettings                4
 
-#define k_keyFileNameMask                   @"fileNameMask"
-#define k_keyFileNameMaskAutomaticPhotos    @"fileNameMaskAutomaticPhotos"
+#define k_keyFileNameMask                               @"fileNameMask"
+#define k_keyFileNameMaskAutomaticPhotos                @"fileNameMaskAutomaticPhotos"
 
 // Type of page Offline
-#define k_pageOfflineOffline                @"Offline"
-#define k_pageOfflineLocal                  @"Local"
+#define k_pageOfflineOffline                            @"Offline"
+#define k_pageOfflineLocal                              @"Local"
 
 // Search
-#define k_minCharsSearch                    3
+#define k_minCharsSearch                                3
+
+// -----------------------------------------------------------------------------------------------------------
+// COLOR
+// -----------------------------------------------------------------------------------------------------------
+
+// NEXTCLOUD COLOR
+#ifdef NC
+#define COLOR_BRAND               [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]
+#define COLOR_BRAND_MESSAGE       [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.90]
+#define COLOR_SELECT_BACKGROUND   [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.1]
+#define COLOR_TRANSFER_BACKGROUND [UIColor colorWithRed:178.0/255.0 green:244.0/255.0 blue:258.0/255.0 alpha:0.1]       // Blu chiarissimo
+#define COLOR_GROUPBY_BAR         [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.2]
+#define COLOR_GROUPBY_BAR_NO_BLUR [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:0.3]
+#endif
+
+// GENERAL COLOR
+#define COLOR_CRYPTOCLOUD         [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]         // Arancio
+#define COLOR_NEXTCLOUD           [UIColor colorWithRed:0.0/255.0 green:130.0/255.0 blue:201.0/255.0 alpha:1.0]         // Blue #0082c9
+
+#define COLOR_ENCRYPTED [UIColor colorWithRed:241.0/255.0 green:90.0/255.0 blue:34.0/255.0 alpha:1.0]                   // #F15A22 - A 1.0
+#define COLOR_GRAY [UIColor colorWithRed:65.0/255.0 green:64.0/255.0 blue:66.0/255.0 alpha:1.0]                         // #414042 - A 1.0
+#define COLOR_CLEAR [UIColor colorWithRed:65.0/255.0 green:64.0/255.0 blue:66.0/255.0 alpha:1.0]
+#define COLOR_BAR [UIColor colorWithRed:(248.0f/255.0f) green:(248.0f/255.0f) blue:(248.0f/255.0f) alpha:1.0]
+#define COLOR_SEPARATOR_TABLE [UIColor colorWithRed:246.0/255.0 green:246.0/255.0 blue:246.0/255.0 alpha:1]           // Grigio chiaro
+#define COLOR_NO_CONNECTION [UIColor colorWithRed:204.0/255.0 green:204.0/255.0 blue:204.0/255.0 alpha:1.0]
+#define COLOR_NAVBAR_IOS7 [UIColor colorWithRed:247.0/255.0 green:247.0/255.0 blue:247.0/255.0 alpha:1.0]
+
+// -----------------------------------------------------------------------------------------------------------
+// -----------------------------------------------------------------------------------------------------------
+
 
 @interface CCAspect : NSObject
 

iOSClient/Intro/CCIntro.h

@@ -36,7 +36,6 @@
 @property (nonatomic, strong) UIView *rootView;
 
 - (void)showIntroCryptoCloud:(CGFloat)duration;
-- (void)showIntroVersion:(NSString *)version duration:(CGFloat)duration review:(BOOL)review;
 
 @end
 

iOSClient/Intro/CCIntro.m

@@ -68,14 +68,8 @@
     page1.descPositionY = descPositionY;
     page1.descColor = COLOR_GRAY;
     page1.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro1"]];
-    page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-#endif
-#ifdef NC
     page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro1Nextcloud"]];
     page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-#endif
     page1.titleIconPositionY = titleIconPositionY;
     page1.showTitleView = NO;
     
@@ -86,18 +80,10 @@
     page2.desc = [CCUtility localizableBrand:@"_intro_04_" table:@"Intro"];
     page2.descPositionY = descPositionY;
     page2.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro2"]];
-    page2.bgImage = [UIImage imageNamed:@"bggrigio"];
-    page2.titleColor = [UIColor whiteColor];
-    page2.descColor = [UIColor whiteColor];
-#endif
-#ifdef NC
     page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro2Nextcloud"]];
     page2.bgImage = [UIImage imageNamed:@"bgbianco"];
     page2.titleColor = COLOR_GRAY;
     page2.descColor = COLOR_GRAY;
-#endif
     page2.titleIconPositionY = titleIconPositionY;
     page2.showTitleView = NO;
     
@@ -107,20 +93,11 @@
     page3.titleFont = [UIFont systemFontOfSize:20];
     page3.descPositionY = descPositionY;
     page3.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro3"]];
-    page3.bgImage = [UIImage imageNamed:@"bgarancio"];
-    page3.titleColor = [UIColor whiteColor];
-    page3.descColor = [UIColor whiteColor];
-    page3.desc = [CCUtility localizableBrand:@"_intro_06_" table:@"Intro"];
-#endif
-#ifdef NC
     page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro3Nextcloud"]];
     page3.bgImage = [UIImage imageNamed:@"bgbianco"];
     page3.titleColor = COLOR_GRAY;
     page3.descColor = COLOR_GRAY;
-    page3.desc = [CCUtility localizableBrand:@"_intro_06_Nextcloud_" table:@"Intro"];
-#endif
+    page3.desc = [CCUtility localizableBrand:@"_intro_06_" table:@"Intro"];
     page3.titleIconPositionY = titleIconPositionY;
     page3.showTitleView = NO;
     
@@ -133,14 +110,8 @@
     page4.descPositionY = descPositionY;
     page4.descColor = COLOR_GRAY;
     page4.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro4"]];
-    page4.bgImage = [UIImage imageNamed:@"bgbianco"];
-#endif
-#ifdef NC
     page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro4Nextcloud"]];
     page4.bgImage = [UIImage imageNamed:@"bgbianco"];
-#endif
     page4.titleIconPositionY = titleIconPositionY;
     page4.showTitleView = NO;
     
@@ -151,18 +122,10 @@
     page5.desc = [CCUtility localizableBrand:@"_intro_10_" table:@"Intro"];
     page5.descPositionY = descPositionY;
     page5.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro5"]];
-    page5.bgImage = [UIImage imageNamed:@"bgarancio"];
-    page5.titleColor = [UIColor whiteColor];
-    page5.descColor = [UIColor whiteColor];
-#endif
-#ifdef NC
     page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro5Nextcloud"]];
     page5.bgImage = [UIImage imageNamed:@"bgbianco"];
     page5.titleColor = COLOR_GRAY;
     page5.descColor = COLOR_GRAY;
-#endif
     page5.titleIconPositionY = titleIconPositionY;
     page5.showTitleView = NO;
     
@@ -173,18 +136,10 @@
     page6.desc = [CCUtility localizableBrand:@"_intro_12_" table:@"Intro"];
     page6.descPositionY = descPositionY;
     page6.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page6.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro6"]];
-    page6.bgImage = [UIImage imageNamed:@"bggrigio"];
-    page6.titleColor = [UIColor whiteColor];
-    page6.descColor = [UIColor whiteColor];
-#endif
-#ifdef NC
     page6.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro6Nextcloud"]];
     page6.bgImage = [UIImage imageNamed:@"bgbianco"];
     page6.titleColor = COLOR_GRAY;
     page6.descColor = COLOR_GRAY;
-#endif
     page6.titleIconPositionY = titleIconPositionY;
     page6.showTitleView = NO;
     
@@ -197,14 +152,8 @@
     page7.descPositionY = descPositionY;
     page7.descColor = COLOR_GRAY;
     page7.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page7.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro7"]];
-    page7.bgImage = [UIImage imageNamed:@"bgbianco"];
-#endif
-#ifdef NC
     page7.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro7Nextcloud"]];
     page7.bgImage = [UIImage imageNamed:@"bgbianco"];
-#endif
     page7.titleIconPositionY = titleIconPositionY;
     page7.showTitleView = NO;
     
@@ -215,18 +164,10 @@
     page8.desc = [CCUtility localizableBrand:@"_intro_16_" table:@"Intro"];
     page8.descPositionY = descPositionY;
     page8.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page8.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro8"]];
-    page8.bgImage = [UIImage imageNamed:@"bgarancio"];
-    page8.titleColor = [UIColor whiteColor];
-    page8.descColor = [UIColor whiteColor];
-#endif
-#ifdef NC
     page8.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro8Nextcloud"]];
     page8.bgImage = [UIImage imageNamed:@"bgbianco"];
     page8.titleColor = COLOR_GRAY;
     page8.descColor = COLOR_GRAY;
-#endif
     page8.titleIconPositionY = titleIconPositionY;
     page8.showTitleView = NO;
     
@@ -237,18 +178,10 @@
     page9.desc = [CCUtility localizableBrand:@"_intro_18_" table:@"Intro"];
     page9.descPositionY = descPositionY;
     page9.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page9.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro9"]];
-    page9.bgImage = [UIImage imageNamed:@"bggrigio"];
-    page9.titleColor = [UIColor whiteColor];
-    page9.descColor = [UIColor whiteColor];
-#endif
-#ifdef NC
     page9.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro9Nextcloud"]];
     page9.bgImage = [UIImage imageNamed:@"bgbianco"];
     page9.titleColor = COLOR_GRAY;
     page9.descColor = COLOR_GRAY;
-#endif
     page9.titleIconPositionY = titleIconPositionY;
     page9.showTitleView = NO;
     
@@ -260,16 +193,9 @@
     page10.descPositionY = descPositionY;
     page10.descColor = COLOR_GRAY;
     page10.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-    page10.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro10"]];
-    page10.bgImage = [UIImage imageNamed:@"bgbianco"];
-    page10.desc = [CCUtility localizableBrand:@"_intro_20_" table:@"Intro"];
-#endif
-#ifdef NC
     page10.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro10Nextcloud"]];
     page10.bgImage = [UIImage imageNamed:@"bgbianco"];
-    page10.desc = [CCUtility localizableBrand:@"_intro_20_Nextcloud_" table:@"Intro"];
-#endif
+    page10.desc = [CCUtility localizableBrand:@"_intro_20_" table:@"Intro"];
     page10.titleIconPositionY = titleIconPositionY;
     page10.showTitleView = NO;
     
@@ -285,877 +211,4 @@
     [intro showInView:self.rootView animateDuration:duration];
 }
 
-- (void)showIntroVersion:(NSString *)version duration:(CGFloat)duration review:(BOOL)review
-{
-    CGFloat height = self.rootView.bounds.size.height;
-    EAIntroView *intro;
-    
-    if ([version isEqualToString:@"1.90"]) {
-        
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-        
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_190_00_" table:@"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-        
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_190_01_" table:@"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_190_02_" table:@"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-1"]];
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *page2 = [EAIntroPage page];
-        page2.title = [CCUtility localizableBrand:@"_intro_190_03_" table: @"Intro"]; //
-        page2.titlePositionY = titlePositionY;
-        page2.titleColor = COLOR_GRAY;
-        page2.titleFont = [UIFont systemFontOfSize:20];
-        page2.desc = [CCUtility localizableBrand:@"_intro_190_04_" table: @"Intro"];
-        page2.descPositionY = descPositionY;
-        page2.descColor = COLOR_GRAY;
-        page2.descFont = [UIFont systemFontOfSize:14];
-        page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-2"]];
-        page2.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page2.titleIconPositionY = titleIconPositionY;
-        page2.showTitleView = NO;
-
-        EAIntroPage *page3 = [EAIntroPage page];
-        page3.title = [CCUtility localizableBrand:@"_intro_190_05_" table: @"Intro"]; //
-        page3.titlePositionY = titlePositionY;
-        page3.titleColor = COLOR_GRAY;
-        page3.titleFont = [UIFont systemFontOfSize:20];
-        page3.desc = [CCUtility localizableBrand:@"_intro_190_06_" table: @"Intro"];
-        page3.descPositionY = descPositionY;
-        page3.descColor = COLOR_GRAY;
-        page3.descFont = [UIFont systemFontOfSize:14];
-        page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-3"]];
-        page3.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page3.titleIconPositionY = titleIconPositionY;
-        page3.showTitleView = NO;
-
-        EAIntroPage *page4 = [EAIntroPage page];
-        page4.title = [CCUtility localizableBrand:@"_intro_190_07_" table: @"Intro"]; //
-        page4.titlePositionY = titlePositionY;
-        page4.titleColor = COLOR_GRAY;
-        page4.titleFont = [UIFont systemFontOfSize:20];
-        page4.desc = [CCUtility localizableBrand:@"_intro_190_08_" table: @"Intro"];
-        page4.descPositionY = descPositionY;
-        page4.descColor = COLOR_GRAY;
-        page4.descFont = [UIFont systemFontOfSize:14];
-        page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-4"]];
-        page4.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page4.titleIconPositionY = titleIconPositionY;
-        page4.showTitleView = NO;
-
-        EAIntroPage *page5 = [EAIntroPage page];
-        page5.title = [CCUtility localizableBrand:@"_intro_190_09_" table: @"Intro"]; //
-        page5.titlePositionY = titlePositionY;
-        page5.titleColor = COLOR_GRAY;
-        page5.titleFont = [UIFont systemFontOfSize:20];
-        page5.desc = [CCUtility localizableBrand:@"_intro_190_10_" table: @"Intro"];
-        page5.descPositionY = descPositionY;
-        page5.descColor = COLOR_GRAY;
-        page5.descFont = [UIFont systemFontOfSize:14];
-        page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-5"]];
-        page5.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page5.titleIconPositionY = titleIconPositionY;
-        page5.showTitleView = NO;
-
-        EAIntroPage *page6 = [EAIntroPage page];
-        page6.title = [CCUtility localizableBrand:@"_intro_190_11_" table: @"Intro"]; //
-        page6.titlePositionY = titlePositionY;
-        page6.titleColor = COLOR_GRAY;
-        page6.titleFont = [UIFont systemFontOfSize:20];
-        page6.desc = [CCUtility localizableBrand:@"_intro_190_12_" table: @"Intro"];
-        page6.descPositionY = descPositionY;
-        page6.descColor = COLOR_GRAY;
-        page6.descFont = [UIFont systemFontOfSize:14];
-        page6.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro190-6"]];
-        page6.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page6.titleIconPositionY = titleIconPositionY;
-        page6.showTitleView = NO;
-
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-        
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2, page3, page4, page5, page6]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, page2, page3, page4, page5, page6, pageEnd]];
-        
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-    }
-    
-    else if ([version isEqualToString:@"1.91"]) {
-        
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-        
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_191_00_" table: @"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-        
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_191_01_" table: @"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_191_02_" table: @"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-1"]];
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *page2 = [EAIntroPage page];
-        page2.title = [CCUtility localizableBrand:@"_intro_191_03_" table: @"Intro"]; //
-        page2.titlePositionY = titlePositionY;
-        page2.titleColor = COLOR_GRAY;
-        page2.titleFont = [UIFont systemFontOfSize:20];
-        page2.desc = [CCUtility localizableBrand:@"_intro_191_04_" table: @"Intro"];
-        page2.descPositionY = descPositionY;
-        page2.descColor = COLOR_GRAY;
-        page2.descFont = [UIFont systemFontOfSize:14];
-        page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-2"]];
-        page2.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page2.titleIconPositionY = titleIconPositionY;
-        page2.showTitleView = NO;
-        
-        EAIntroPage *page3 = [EAIntroPage page];
-        page3.title = [CCUtility localizableBrand:@"_intro_191_05_" table: @"Intro"]; //
-        page3.titlePositionY = titlePositionY;
-        page3.titleColor = COLOR_GRAY;
-        page3.titleFont = [UIFont systemFontOfSize:20];
-        page3.desc = [CCUtility localizableBrand:@"_intro_191_06_" table: @"Intro"];
-        page3.descPositionY = descPositionY;
-        page3.descColor = COLOR_GRAY;
-        page3.descFont = [UIFont systemFontOfSize:14];
-        page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-3"]];
-        page3.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page3.titleIconPositionY = titleIconPositionY;
-        page3.showTitleView = NO;
-        
-        EAIntroPage *page4 = [EAIntroPage page];
-        page4.title = [CCUtility localizableBrand:@"_intro_191_07_" table:@"Intro"]; //
-        page4.titlePositionY = titlePositionY;
-        page4.titleColor = COLOR_GRAY;
-        page4.titleFont = [UIFont systemFontOfSize:20];
-        page4.desc = [CCUtility localizableBrand:@"_intro_191_08_" table: @"Intro"];
-        page4.descPositionY = descPositionY;
-        page4.descColor = COLOR_GRAY;
-        page4.descFont = [UIFont systemFontOfSize:14];
-        page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro191-4"]];
-        page4.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page4.titleIconPositionY = titleIconPositionY;
-        page4.showTitleView = NO;
-        
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-        
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2, page3, page4]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, page2, page3, page4, pageEnd]];
-        
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-    }
-
-    else if ([version isEqualToString:@"1.94"]) {
-        
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-        
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_194_00_"table: @"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-        
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_194_01_" table:@"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_194_02_" table: @"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-1"]];
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *page2 = [EAIntroPage page];
-        page2.title = [CCUtility localizableBrand:@"_intro_194_03_" table: @"Intro"]; //
-        page2.titlePositionY = titlePositionY;
-        page2.titleColor = COLOR_GRAY;
-        page2.titleFont = [UIFont systemFontOfSize:20];
-        page2.desc = [CCUtility localizableBrand:@"_intro_194_04_" table: @"Intro"];
-        page2.descPositionY = descPositionY;
-        page2.descColor = COLOR_GRAY;
-        page2.descFont = [UIFont systemFontOfSize:14];
-        page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-2"]];
-        page2.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page2.titleIconPositionY = titleIconPositionY;
-        page2.showTitleView = NO;
-        
-        EAIntroPage *page3 = [EAIntroPage page];
-        page3.title = [CCUtility localizableBrand:@"_intro_194_05_" table: @"Intro"]; //
-        page3.titlePositionY = titlePositionY;
-        page3.titleColor = COLOR_GRAY;
-        page3.titleFont = [UIFont systemFontOfSize:20];
-        page3.desc = [CCUtility localizableBrand:@"_intro_194_06_" table: @"Intro"];
-        page3.descPositionY = descPositionY;
-        page3.descColor = COLOR_GRAY;
-        page3.descFont = [UIFont systemFontOfSize:14];
-        page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-3"]];
-        page3.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page3.titleIconPositionY = titleIconPositionY;
-        page3.showTitleView = NO;
-        
-        EAIntroPage *page4 = [EAIntroPage page];
-        page4.title = [CCUtility localizableBrand:@"_intro_194_07_" table: @"Intro"]; //
-        page4.titlePositionY = titlePositionY;
-        page4.titleColor = COLOR_GRAY;
-        page4.titleFont = [UIFont systemFontOfSize:20];
-        page4.desc = [CCUtility localizableBrand:@"_intro_194_08_" table: @"Intro"];
-        page4.descPositionY = descPositionY;
-        page4.descColor = COLOR_GRAY;
-        page4.descFont = [UIFont systemFontOfSize:14];
-        page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro194-4"]];
-        page4.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page4.titleIconPositionY = titleIconPositionY;
-        page4.showTitleView = NO;
-
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-        
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2, page3, page4]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, page2, page3, page4, pageEnd]];
-        
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-    }
-    
-    else if ([version isEqualToString:@"1.96"]) {
-        
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-        
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_196_00_" table: @"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-        
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_196_01_" table: @"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_196_02_" table: @"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-1"]];
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *page2 = [EAIntroPage page];
-        page2.title = [CCUtility localizableBrand:@"_intro_196_03_" table: @"Intro"]; //
-        page2.titlePositionY = titlePositionY;
-        page2.titleColor = COLOR_GRAY;
-        page2.titleFont = [UIFont systemFontOfSize:20];
-        page2.desc = [CCUtility localizableBrand:@"_intro_196_04_" table: @"Intro"];
-        page2.descPositionY = descPositionY;
-        page2.descColor = COLOR_GRAY;
-        page2.descFont = [UIFont systemFontOfSize:14];
-        page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-2"]];
-        page2.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page2.titleIconPositionY = titleIconPositionY;
-        page2.showTitleView = NO;
-        
-        EAIntroPage *page3 = [EAIntroPage page];
-        page3.title = [CCUtility localizableBrand:@"_intro_196_05_" table: @"Intro"]; //
-        page3.titlePositionY = titlePositionY;
-        page3.titleColor = COLOR_GRAY;
-        page3.titleFont = [UIFont systemFontOfSize:20];
-        page3.desc = [CCUtility localizableBrand:@"_intro_196_06_" table: @"Intro"];
-        page3.descPositionY = descPositionY;
-        page3.descColor = COLOR_GRAY;
-        page3.descFont = [UIFont systemFontOfSize:14];
-        page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-3"]];
-        page3.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page3.titleIconPositionY = titleIconPositionY;
-        page3.showTitleView = NO;
-        
-        EAIntroPage *page4 = [EAIntroPage page];
-        page4.title = [CCUtility localizableBrand:@"_intro_196_07_" table: @"Intro"]; //
-        page4.titlePositionY = titlePositionY;
-        page4.titleColor = COLOR_GRAY;
-        page4.titleFont = [UIFont systemFontOfSize:20];
-        page4.desc = [CCUtility localizableBrand:@"_intro_196_08_" table: @"Intro"];
-        page4.descPositionY = descPositionY;
-        page4.descColor = COLOR_GRAY;
-        page4.descFont = [UIFont systemFontOfSize:14];
-        page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-4"]];
-        page4.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page4.titleIconPositionY = titleIconPositionY;
-        page4.showTitleView = NO;
-        
-        EAIntroPage *page5 = [EAIntroPage page];
-        page5.title = [CCUtility localizableBrand:@"_intro_196_09_" table: @"Intro"]; //
-        page5.titlePositionY = titlePositionY;
-        page5.titleColor = COLOR_GRAY;
-        page5.titleFont = [UIFont systemFontOfSize:20];
-        page5.desc = [CCUtility localizableBrand:@"_intro_196_10_" table: @"Intro"];
-        page5.descPositionY = descPositionY;
-        page5.descColor = COLOR_GRAY;
-        page5.descFont = [UIFont systemFontOfSize:14];
-        page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-5"]];
-        page5.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page5.titleIconPositionY = titleIconPositionY;
-        page5.showTitleView = NO;
-        
-        EAIntroPage *page6 = [EAIntroPage page];
-        page6.title = [CCUtility localizableBrand:@"_intro_196_11_" table: @"Intro"]; //
-        page6.titlePositionY = titlePositionY;
-        page6.titleColor = COLOR_GRAY;
-        page6.titleFont = [UIFont systemFontOfSize:20];
-        page6.desc = [CCUtility localizableBrand:@"_intro_196_12_" table: @"Intro"];
-        page6.descPositionY = descPositionY;
-        page6.descColor = COLOR_GRAY;
-        page6.descFont = [UIFont systemFontOfSize:14];
-        page6.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-6"]];
-        page6.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page6.titleIconPositionY = titleIconPositionY;
-        page6.showTitleView = NO;
-        
-        EAIntroPage *page7 = [EAIntroPage page];
-        page7.title = [CCUtility localizableBrand:@"_intro_196_13_" table: @"Intro"]; //
-        page7.titlePositionY = titlePositionY;
-        page7.titleColor = COLOR_GRAY;
-        page7.titleFont = [UIFont systemFontOfSize:20];
-        page7.desc = [CCUtility localizableBrand:@"_intro_196_14_" table: @"Intro"];
-        page7.descPositionY = descPositionY;
-        page7.descColor = COLOR_GRAY;
-        page7.descFont = [UIFont systemFontOfSize:14];
-        page7.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-7"]];
-        page7.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page7.titleIconPositionY = titleIconPositionY;
-        page7.showTitleView = NO;
-
-        EAIntroPage *page8 = [EAIntroPage page];
-        page8.title = [CCUtility localizableBrand:@"_intro_196_17_" table: @"Intro"]; //
-        page8.titlePositionY = titlePositionY;
-        page8.titleColor = COLOR_GRAY;
-        page8.titleFont = [UIFont systemFontOfSize:20];
-        page8.desc = [CCUtility localizableBrand:@"_intro_196_18_" table: @"Intro"];
-        page8.descPositionY = descPositionY;
-        page8.descColor = COLOR_GRAY;
-        page8.descFont = [UIFont systemFontOfSize:14];
-        page8.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-9"]];
-        page8.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page8.titleIconPositionY = titleIconPositionY;
-        page8.showTitleView = NO;
-
-        EAIntroPage *page9 = [EAIntroPage page];
-        page9.title = [CCUtility localizableBrand:@"_intro_196_19_" table: @"Intro"]; //
-        page9.titlePositionY = titlePositionY;
-        page9.titleColor = COLOR_GRAY;
-        page9.titleFont = [UIFont systemFontOfSize:20];
-        page9.desc = [CCUtility localizableBrand:@"_intro_196_20_" table: @"Intro"];
-        page9.descPositionY = descPositionY;
-        page9.descColor = COLOR_GRAY;
-        page9.descFont = [UIFont systemFontOfSize:14];
-        page9.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-10"]];
-        page9.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page9.titleIconPositionY = titleIconPositionY;
-        page9.showTitleView = NO;
-
-        EAIntroPage *page10 = [EAIntroPage page];
-        page10.title = [CCUtility localizableBrand:@"_intro_196_21_" table: @"Intro"]; //
-        page10.titlePositionY = titlePositionY;
-        page10.titleColor = COLOR_GRAY;
-        page10.titleFont = [UIFont systemFontOfSize:20];
-        page10.desc = [CCUtility localizableBrand:@"_intro_196_22_" table: @"Intro"];
-        page10.descPositionY = descPositionY;
-        page10.descColor = COLOR_GRAY;
-        page10.descFont = [UIFont systemFontOfSize:14];
-        page10.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro196-11"]];
-        page10.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page10.titleIconPositionY = titleIconPositionY;
-        page10.showTitleView = NO;
-
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-        
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2, page3, page4, page5, page6, page7, page8, page9, page10]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, page2, page3, page4, page5, page6, page7, page8, page9, page10, pageEnd]];
-        
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-    }
-
-    else if ([version isEqualToString:@"1.97"]) {
-        
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-        
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_197_00_" table: @"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-        
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_197_01_" table: @"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_197_02_" table: @"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro197-1"]];
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-        
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, pageEnd]];
-        
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-    }
-
-    else if ([version isEqualToString:@"1.99"]) {
-        
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-        
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_199_00_" table: @"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-        
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_199_01_" table: @"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_199_02_" table: @"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro199-1"]];
-#endif
-#ifdef NC
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro199-1_Nextcloud"]];
-#endif
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-        
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, pageEnd]];
-        
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-    }
-
-    else if ([version isEqualToString:@"2.0"]) {
-        
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-        
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_200_00_" table: @"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-        
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_200_01_" table: @"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_200_02_" table: @"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-1"]];
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *page2 = [EAIntroPage page];
-        page2.title = [CCUtility localizableBrand:@"_intro_200_03_" table: @"Intro"]; //
-        page2.titlePositionY = titlePositionY;
-        page2.titleColor = COLOR_GRAY;
-        page2.titleFont = [UIFont systemFontOfSize:20];
-        page2.desc = [CCUtility localizableBrand:@"_intro_200_04_" table: @"Intro"];
-        page2.descPositionY = descPositionY;
-        page2.descColor = COLOR_GRAY;
-        page2.descFont = [UIFont systemFontOfSize:14];
-        page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-2"]];
-        page2.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page2.titleIconPositionY = titleIconPositionY;
-        page2.showTitleView = NO;
-
-        EAIntroPage *page3 = [EAIntroPage page];
-        page3.title = [CCUtility localizableBrand:@"_intro_200_05_" table: @"Intro"]; //
-        page3.titlePositionY = titlePositionY;
-        page3.titleColor = COLOR_GRAY;
-        page3.titleFont = [UIFont systemFontOfSize:20];
-        page3.desc = [CCUtility localizableBrand:@"_intro_200_06_" table: @"Intro"];
-        page3.descPositionY = descPositionY;
-        page3.descColor = COLOR_GRAY;
-        page3.descFont = [UIFont systemFontOfSize:14];
-        page3.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-3"]];
-        page3.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page3.titleIconPositionY = titleIconPositionY;
-        page3.showTitleView = NO;
-
-        EAIntroPage *page4 = [EAIntroPage page];
-        page4.title = [CCUtility localizableBrand:@"_intro_200_07_" table: @"Intro"]; //
-        page4.titlePositionY = titlePositionY;
-        page4.titleColor = COLOR_GRAY;
-        page4.titleFont = [UIFont systemFontOfSize:20];
-        page4.desc = [CCUtility localizableBrand:@"_intro_200_08_" table: @"Intro"];
-        page4.descPositionY = descPositionY;
-        page4.descColor = COLOR_GRAY;
-        page4.descFont = [UIFont systemFontOfSize:14];
-        page4.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-4"]];
-        page4.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page4.titleIconPositionY = titleIconPositionY;
-        page4.showTitleView = NO;
-
-        EAIntroPage *page5 = [EAIntroPage page];
-        page5.title = [CCUtility localizableBrand:@"_intro_200_09_" table: @"Intro"]; //
-        page5.titlePositionY = titlePositionY;
-        page5.titleColor = COLOR_GRAY;
-        page5.titleFont = [UIFont systemFontOfSize:20];
-        page5.desc = [CCUtility localizableBrand:@"_intro_200_10_" table: @"Intro"];
-        page5.descPositionY = descPositionY;
-        page5.descColor = COLOR_GRAY;
-        page5.descFont = [UIFont systemFontOfSize:14];
-        page5.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro200-5"]];
-        page5.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page5.titleIconPositionY = titleIconPositionY;
-        page5.showTitleView = NO;
-
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-        
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2, page3, page4, page5]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, page2, page3, page4, page5, pageEnd]];
-        
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-    }
-    
-    else if ([version isEqualToString:@"2.10"]) {
-            
-        if (height <= 480) { titleIconPositionY = 20; titlePositionY = 230; descPositionY = 180; }
-        if (height >= 500 && height <= 800) { titleIconPositionY = 50; titlePositionY = height / 2; descPositionY = height / 2 - 40 ; }
-        if (height >= 1024) { titleIconPositionY = 100; titlePositionY = 290; descPositionY = 250; }
-            
-        EAIntroPage *page0 = [EAIntroPage page];
-        page0.title = [@"Version " stringByAppendingString:version];
-        page0.titlePositionY = titlePositionY;
-        page0.titleColor = COLOR_GRAY;
-        page0.titleFont = [UIFont systemFontOfSize:20];
-        page0.desc = [CCUtility localizableBrand:@"_intro_210_00_" table: @"Intro"];
-        page0.descPositionY = descPositionY;
-        page0.descColor = COLOR_GRAY;
-        page0.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStart"]];
-#endif
-#ifdef NC
-        page0.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introStartNextcloud"]];
-#endif
-        page0.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page0.titleIconPositionY = titleIconPositionY;
-        page0.showTitleView = NO;
-            
-        EAIntroPage *page1 = [EAIntroPage page];
-        page1.title = [CCUtility localizableBrand:@"_intro_210_01_" table: @"Intro"]; //
-        page1.titlePositionY = titlePositionY;
-        page1.titleColor = COLOR_GRAY;
-        page1.titleFont = [UIFont systemFontOfSize:20];
-        page1.desc = [CCUtility localizableBrand:@"_intro_210_02_" table: @"Intro"];
-        page1.descPositionY = descPositionY;
-        page1.descColor = COLOR_GRAY;
-        page1.descFont = [UIFont systemFontOfSize:14];
-        page1.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro210-1"]];
-        page1.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page1.titleIconPositionY = titleIconPositionY;
-        page1.showTitleView = NO;
-        
-        EAIntroPage *page2 = [EAIntroPage page];
-        page2.title = [CCUtility localizableBrand:@"_intro_210_03_" table: @"Intro"]; //
-        page2.titlePositionY = titlePositionY;
-        page2.titleColor = COLOR_GRAY;
-        page2.titleFont = [UIFont systemFontOfSize:20];
-        page2.desc = [CCUtility localizableBrand:@"_intro_210_04_" table: @"Intro"];
-        page2.descPositionY = descPositionY;
-        page2.descColor = COLOR_GRAY;
-        page2.descFont = [UIFont systemFontOfSize:14];
-        page2.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"intro210-2"]];
-        page2.bgImage = [UIImage imageNamed:@"bgbianco"];
-        page2.titleIconPositionY = titleIconPositionY;
-        page2.showTitleView = NO;
-
-        EAIntroPage *pageEnd = [EAIntroPage page];
-        pageEnd.title = [CCUtility localizableBrand:@"_intro_END_01_" table: @"Intro"]; //
-        pageEnd.titlePositionY = titlePositionY;
-        pageEnd.titleColor = COLOR_GRAY;
-        pageEnd.titleFont = [UIFont systemFontOfSize:20];
-        pageEnd.descPositionY = descPositionY;
-        pageEnd.descColor = COLOR_GRAY;
-        pageEnd.descFont = [UIFont systemFontOfSize:14];
-#ifdef CC
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEnd"]];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_" table: @"Intro"];
-#endif
-#ifdef NC
-        pageEnd.titleIconView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"introEndNextcloud"]];
-        pageEnd.desc = [CCUtility localizableBrand:@"_intro_END_02_Nextcloud_" table: @"Intro"];
-#endif
-        pageEnd.bgImage = [UIImage imageNamed:@"bgbianco"];
-        pageEnd.titleIconPositionY = titleIconPositionY;
-        pageEnd.showTitleView = NO;
-            
-        if (review) intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page1, page2]];
-        else intro = [[EAIntroView alloc] initWithFrame:self.rootView.bounds andPages:@[page0, page1, page2, pageEnd]];
-            
-        //intro.backgroundColor = [UIColor whiteColor];
-        intro.tapToNext = YES;
-        intro.pageControl.pageIndicatorTintColor = [UIColor lightGrayColor];
-        intro.pageControl.currentPageIndicatorTintColor = [UIColor blackColor];
-        intro.pageControl.backgroundColor = [UIColor clearColor];
-        [intro.skipButton setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-            
-        [intro setDelegate:self];
-        [intro showInView:self.rootView animateDuration:duration];
-
-    } else {
-        
-        [self.delegate introDidFinish:intro wasSkipped:NO];
-    }
-
-}
-
 @end

iOSClient/Main/CCSplit.m

@@ -119,7 +119,7 @@
         
         self.intro = [[CCIntro alloc] initWithDelegate:self delegateView:self.view];
         
-        [self.intro showIntroVersion:self.version duration:1.0 review:NO];
+        //[self.intro showIntroVersion:self.version duration:1.0 review:NO];
     }
 }
 

iOSClient/Settings/CCManageHelp.m

@@ -60,24 +60,6 @@
     row.action.formSelector = @selector(intro:);
     [section addFormRow:row];
 
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"switchuser" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_switch_user_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    row.action.formSelector = @selector(switchUser:);
-    [section addFormRow:row];
-
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"controlcenter" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_control_center_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    row.action.formSelector = @selector(controlCenter:);
-    [section addFormRow:row];
-
-    row = [XLFormRowDescriptor formRowDescriptorWithTag:@"copypaste" rowType:XLFormRowDescriptorTypeButton title:NSLocalizedString(@"_help_copy_paste_", nil)];
-    [row.cellConfig setObject:[UIFont systemFontOfSize:15.0]forKey:@"textLabel.font"];
-    [row.cellConfig setObject:@(NSTextAlignmentLeft) forKey:@"textLabel.textAlignment"];
-    row.action.formSelector = @selector(copypaste:);
-    [section addFormRow:row];
-
     section = [XLFormSectionDescriptor formSection];
     [form addFormSection:section];
     
@@ -113,46 +95,4 @@
     [self.intro showIntroCryptoCloud:0.1];
 }
 
-- (void)share:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [self.intro showIntroVersion:@"1.91" duration:0.1 review:YES];
-}
-
-- (void)itunesshare:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [self.intro showIntroVersion:@"1.94" duration:0.1 review:YES];
-}
-
-- (void)shareExt:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [self.intro showIntroVersion:@"1.96" duration:0.1 review:YES];
-}
-
-- (void)switchUser:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [self.intro showIntroVersion:@"1.99" duration:0.1 review:YES];
-}
-
-- (void)controlCenter:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [self.intro showIntroVersion:@"2.0" duration:0.1 review:YES];
-}
-
-- (void)copypaste:(XLFormRowDescriptor *)sender
-{
-    [self deselectFormRow:sender];
-    
-    [self.intro showIntroVersion:@"2.10" duration:0.1 review:YES];
-}
-
 @end

iOSClient/en.lproj/Intro.strings

@@ -13,8 +13,7 @@
 "_intro_03_" = "ENCRYPTION KEY";
 "_intro_04_" = "In order to immediately start using _brand_ you will be asked to enter a encryption key (minimum 4 characters, maximum 64 characters). The combination will be required just once and it cannot be modified. Should you forget it, you will never be able to retrieve it and your files will remain encrypted. Should you re-install _brand_ or access to your data from another iPhone, use the same combination you entered the first time.";
 "_intro_05_" = "LOGIN";
-"_intro_06_" = "Afterwards, you can choose your favourite Cloud among those available (Dropbox, ownCloud), and create your own account by entering the requested data.";
-"_intro_06_Nextcloud_" = "Afterwards, you can create your own account by entering the requested data.";
+"_intro_06_" = "Afterwards, you can create your own account by entering the requested data.";
 "_intro_07_" = "_brand_";
 "_intro_08_" = "From now on, you will be able to see all the files stored in your Cloud. You will be able to rename, move, delete them, send them to other compatible programs installed in your iPhone, and much more.";
 "_intro_09_" = "OFFLINE & LOCAL STORAGE";
@@ -28,111 +27,9 @@
 "_intro_17_" = "PASSWORD LOCK";
 "_intro_18_" = "In order to  prevent other potential users of your iPhone from accessing your _brand_, you can activate the 'password lock' directly from the settings. The password lock can be modified, disabled, or even used to protect access to individual folders.";
 "_intro_19_" = "START";
-"_intro_20_" = "Good, you’re now ready to start using your _brand_. We remind you that you can find further information and news or contact us on the site: \n\n http://cryptocloud.twsweb.it \n\n Come and visit us!";
-"_intro_20_Nextcloud_" = "Good, you’re now ready to start using your _brand_. We remind you that you can find further information and news or contact us on the site: \n\n https://nextcloud.com \n\n Come and visit us!";
+"_intro_20_" = "Good, you’re now ready to start using your _brand_. We remind you that you can find further information and news or contact us on the site: \n\n https://nextcloud.com \n\n Come and visit us!";
 
 // Intro END
 
-"_intro_END_01_"    = "_brand_";
-"_intro_END_02_"    = "Good ! You’re now ready to start using your _brand_, follow us on Twitter : @Crypto_Cloud and leave your opinion on AppStore, it is important to us.";
-"_intro_END_02_Nextcloud_" = "Good ! You’re now ready to start using your _brand_, follow us on Twitter : @Nextclouders and leave your opinion on AppStore, it is important to us.";
-
-// Intro 1.90
-
-"_intro_190_00_"    = "New : Synchronization folders. \n\n Modify in 'Automatic uploading from the camera' : now you can choose whether to use the service in the background (default is now OFF). \n\n New menu 'Help in Settings' for reviewing helps and tutorials.";
-"_intro_190_01_"    = "SYNCHRONIZATION";
-"_intro_190_02_"    = "Now you can enable synchronization to folder. All files on the server will be downloaded and will always be updated and available, synchronization occurs whenever the folder will be updated.";
-"_intro_190_03_"    = "HOW TO";
-"_intro_190_04_"    = "Swipe on the folder to synchronize, choose 'More' and select option : Keep the folder synchronized. (Attention, if the folder contains many files it will take a long time and much bandwidth for the first synchronization !).";
-"_intro_190_05_"    = "BADGE";
-"_intro_190_06_"    = "Your synchronized folders now have a new badge that identifies them.";
-"_intro_190_07_"    = "SETTINGS";
-"_intro_190_08_"    = "A new option has been added to Settings.";
-"_intro_190_09_"    = "SYNCHRONIZATIONS FOLDERS";
-"_intro_190_10_"    = "Here you can activate synchronization 'only' if there is a Wi-Fi network; the list of active synchronizations is specified as well.";
-"_intro_190_11_"    = "DELETE SYNCHRONIZATIONS";
-"_intro_190_12_"    = "In addition to the menu 'Other' directly available from folder, here you can delete a synchronization. The deletion of a synchronization does not delete files locally.";
-
-// Intro 1.91
-
-"_intro_191_00_"    = "New options for sharing files or folders.";
-"_intro_191_01_"    = "SHARE";
-"_intro_191_02_"    = "Now you can share a file or folder and remove the share. For ownCloud accounts you can protect sharing with password and assign expiration date.";
-"_intro_191_03_"    = "HOW TO";
-"_intro_191_04_"    = "Swipe on the file or folder to share, choose 'More' and select option : Share. (Sharing is not activated on encrypted files or folders).";
-"_intro_191_05_"    = "SETTINGS";
-"_intro_191_06_"    = "A mask will appear where you can: disable/enable share link, push 'Send link to ...' for send link : via email - copy - open with other programs etc., and for OwnCloud protect with password or assign an expiration date. You always possible later deactivate/activate or modify any option.";
-"_intro_191_07_"    = "BADGE";
-"_intro_191_08_"    = "The shares now have a new badge visible on the right.";
-
-// Intro 1.94
-
-"_intro_194_00_"    = "Connecting to your iPhone or iPad through iTunes for file sharing. \n\n Fingerprint and 6 number for password.";
-"_intro_194_01_"    = "iTunes";
-"_intro_194_02_"    = "Connect your iPhone or iPad to iTunes, select App - File sharing and _brand_, you can now Add or Save the files on your Mac or PC.";
-"_intro_194_03_"    = "LOCAL STORAGE";
-"_intro_194_04_"    = "It is the 'Local storage' the area where is activate the sharing with iTunes.";
-"_intro_194_05_"    = "MORE";
-"_intro_194_06_"    = "Any file in the 'Local storage' can be uploaded on your Cloud or open with other compatible Apps.";
-"_intro_194_07_"    = "FINGERPRINT";
-"_intro_194_08_"    = "Now you can use the fingerprint reader (if your device has it) for enter the password, password that for the simple version is now to 6 numbers, go immediately to enter the new code.";
-
-// Intro 1.96
-
-"_intro_196_00_"    = "Share extension";
-"_intro_196_01_"    = "ACTIVATION";
-"_intro_196_02_"    = "On your iPhone go to Photo, select the image or video to share on the cloud, tap the 'Action'";
-"_intro_196_03_"    = "MORE";
-"_intro_196_04_"    = "All programs with which you can share will appear, if _brand_ doesn't appears tap 'more'";
-"_intro_196_05_"    = "ACTIVITY";
-"_intro_196_06_"    = "Looking _brand_, enable it and tap 'done'";
-"_intro_196_07_"    = "SHARE";
-"_intro_196_08_"    = "Now _brand_ is present among the App that you can use for sharing, tap it";
-"_intro_196_09_"    = "FOLDER";
-"_intro_196_10_"    = "Now you're ready to save the shared image, bottom tap folder: if you want to change the destination folder";
-"_intro_196_11_"    = "ENCRYPTED OR NOT";
-"_intro_196_12_"    = "Tap the symbol to switch saved encrypted or not";
-"_intro_196_13_"    = "SAVE";
-"_intro_196_14_"    = "At the end press Save to send everything to the cloud, or Cancel to exit, or swipe on the file you want to delete because it is not sent cloud (handy if you have selected multiple files but in the end you do not want them to send all)";
-"_intro_196_15_"    = "RECONNECT DROPBOX";
-"_intro_196_16_"    = "The development of extension for the shares has changed the policy to dropbox so need to re-perform the account login. Go immediately to Settings / Change your credentials, chosen your Dropbox account (if you have more of a challenge for everyone) and tap modify account, now just only confirm";
-"_intro_196_17_"    = "RESOURCE CONNECTION [ONLY OWNCLOUD]";
-"_intro_196_18_"    = "This symbol indicates that the resource is of another account, tap to see your permissions";
-"_intro_196_19_"    = "CHANGE PERMISSION [ONLY OWNCLOUD]";
-"_intro_196_20_"    = "In sharing your resources you can: \n\n1) Tap to delete the user/group \n\n2) Tap to change the permissions to him established";
-"_intro_196_21_"    = "PERMISSION AND INFORMATION [ONLY OWNCLOUD]";
-"_intro_196_22_"    = "Here is the mask to change permissions. Below you will see some information";
-
-// Intro 1.97
-
-"_intro_197_00_"    = "Possibility to delete the file directly in the preview \n\n Folder synchronization in the background \n\n ownCloud : available file preview";
-"_intro_197_01_"    = "Translate";
-"_intro_197_02_"    = "Translation problems with your language?\n\n Help us and write us at _mail_me_";
-
-// Intro 1.99
-
-"_intro_199_01_" = "Quickly switch between your accounts";
-"_intro_199_00_" = "Quickly switch between your accounts";
-"_intro_199_02_" = "Now you can quickly switch between your accounts. From home tap the _brand_ logo and choose the account (available when there is no activity)";
-
-// Intro 2.00
-
-"_intro_200_00_" = "_brand_ Control Center : looks and manage quickly the transfers";
-"_intro_200_01_" = "Open _brand_ Control Center";
-"_intro_200_02_" = "Place your finger on the navigation bar of _brand_ (as in figure)";
-"_intro_200_03_" = "Open _brand_ Control Center";
-"_intro_200_04_" = "Slide your finger down onto the screen to reveal _brand_ Control Center";
-"_intro_200_05_" = "Open _brand_ Control Center";
-"_intro_200_06_" = "Continue up to about half the screen or to the bottom, then release your finger";
-"_intro_200_07_" = "Open _brand_ Control Center";
-"_intro_200_08_" = "Here you can see if there are ongoing transfers";
-"_intro_200_09_" = "Close _brand_ Control Center";
-"_intro_200_10_" = "Place your finger in the final part of the _brand_ Control Center and slide your finger up onto the screen to close it";
-
-// Intro 2.10
-
-"_intro_210_00_" = "Copy / Paste files ";
-"_intro_210_01_" = "Copy files";
-"_intro_210_02_" = "Now you can finally copy any file or files, identify the files to be copied and perform a long press touch; if the files are successfully downloaded a menu is visualized as shown in figure";
-"_intro_210_03_" = "Paste files ";
-"_intro_210_04_" = "Now change folder or even account and perform a long press touch to paste a file in clear or in encrypted mode";
+"_intro_END_01_" = "_brand_";
+"_intro_END_02_" = "Good ! You’re now ready to start using your _brand_, follow us on Twitter : @Nextclouders and leave your opinion on AppStore, it is important to us.";

iOSClient/en.lproj/Localizable.strings

@@ -109,8 +109,6 @@
 "_credentials_"             = "Credentials";
 "_manage_account_"          = "Manage account";
 "_modify_account_"          = "Modify account";
-"_add_owncloud_"            = "Add ownCloud account";
-"_add_dropbox_"             = "Add Dropbox account";
 "_add_nextcloud_"           = "Add Nextcloud account";
 "_delete_account_"          = "Delete account";
 "_want_delete_"             = "Do you really want to delete it?";
@@ -180,18 +178,10 @@
 "_optimized_photos_how_"    = "If your iPhone is low on space, full-resolution photos are automatically replaced with optimized versions. The full-resolution versions are stored in your Cloud.";
 "_upload_del_photos_how_"   = "Files will be removed from _brand_ memory after they’ve been uploaded to the Cloud. They will remain in the camera roll. Just download the files to see them.";
 
-// Manage Synchronizations [DISMISS]
-
-"_sync_wifi_how_"           = "The files in synchronized folders will be updated only when Wi-Fi is available";
-"_sync_active_"             = "Active synchronizations of folders";
-"_sync_active_footer_"      = "You can swipe to delete an active synchronization";
-
 // Login
 
 "_connect_server_anyway_"   = "Do you want to connect to the server anyway?";
 "_connection_error_"        = "Connection error";
-"_add_your_owncloud_"       = "Add your ownCloud account";
-"_add_your_dropbox_"        = "Add your Dropbox account";
 "_add_your_nextcloud_"      = "Add your Nextcloud account";
 "_key_aes_256_"             = "Encryption key passcode";